Merge af7a73c into a86d1cb

seanbudd · web-flow · commit 272ade842934 · 2023-07-25T15:30:09.000+10:00
diff --git a/source/gui/_addonStoreGui/controls/details.py b/source/gui/_addonStoreGui/controls/details.py
@@ -201,7 +201,7 @@ def _refresh(self):
 			self.otherDetailsTextCtrl.SetValue("")
 			if not details:
 				self.contentsPanel.Hide()
-				if self._detailsVM._isLoading:
+				if self._detailsVM._listVM._isLoading:
 					self.updateAddonName(AddonDetails._loadingAddonsLabelText)
 				else:
 					self.updateAddonName(AddonDetails._noAddonSelectedLabelText)
diff --git a/source/gui/_addonStoreGui/controls/storeDialog.py b/source/gui/_addonStoreGui/controls/storeDialog.py
@@ -309,6 +309,8 @@ def _toggleFilterControls(self):
 			self.includeIncompatibleCtrl.Disable()
 
 	def onListTabPageChange(self, evt: wx.EVT_CHOICE):
+		self.searchFilterCtrl.SetValue("")
+
 		self._storeVM._filterEnabledDisabled = EnabledStatus.ALL
 		self.enabledFilterCtrl.SetSelection(0)
 
diff --git a/source/gui/_addonStoreGui/viewModels/addonList.py b/source/gui/_addonStoreGui/viewModels/addonList.py
@@ -127,9 +127,9 @@ def __repr__(self) -> str:
 
 
 class AddonDetailsVM:
-	def __init__(self, listItem: Optional[AddonListItemVM] = None):
-		self._listItem: Optional[AddonListItemVM] = listItem
-		self._isLoading: bool = False
+	def __init__(self, listVM: AddonListVM):
+		self._listVM = listVM
+		self._listItem: Optional[AddonListItemVM] = listVM.getSelection()
 		self.updated = extensionPoints.Action()  # triggered by setting L{self._listItem}
 
 	@property
@@ -158,6 +158,7 @@ def __init__(
 			addons: List[AddonListItemVM],
 			storeVM: "AddonStoreVM",
 	):
+		self._isLoading: bool = False
 		self._addons: CaseInsensitiveDict[AddonListItemVM] = CaseInsensitiveDict()
 		self._storeVM = storeVM
 		self.itemUpdated = extensionPoints.Action()
diff --git a/source/gui/_addonStoreGui/viewModels/store.py b/source/gui/_addonStoreGui/viewModels/store.py
@@ -98,7 +98,7 @@ def __init__(self):
 			storeVM=self,
 		)
 		self.detailsVM: AddonDetailsVM = AddonDetailsVM(
-			listItem=self.listVM.getSelection()
+			listVM=self.listVM
 		)
 		self.actionVMList = self._makeActionsList()
 		self.listVM.selectionChanged.register(self._onSelectedItemChanged)
@@ -370,7 +370,7 @@ def refresh(self):
 			raise NotImplementedError(f"Unhandled status filter key {self._filteredStatusKey}")
 
 	def _getAvailableAddonsInBG(self):
-		self.detailsVM._isLoading = True
+		self.listVM._isLoading = True
 		self.listVM.resetListItems([])
 		log.debug("getting available addons in the background")
 		assert addonDataManager
@@ -393,7 +393,9 @@ def _getAvailableAddonsInBG(self):
 		self._availableAddons = availableAddons
 		self.listVM.resetListItems(self._createListItemVMs())
 		self.detailsVM.listItem = self.listVM.getSelection()
-		self.detailsVM._isLoading = False
+		self.listVM._isLoading = False
+		# ensure calling on the main thread.
+		core.callLater(delay=0, callable=self.detailsVM.updated.notify, addonDetailsVM=self.detailsVM)
 		log.debug("completed refresh")
 
 	def cancelDownloads(self):
