Lazy load categories and marketplaceVersion (#16258)

Co-authored-by: Douglas Gubert <d-gubert@users.noreply.github.com>
RocketChat · Feb 28, 2020 · 8771184 · 8771184
1 parent dbc774a
commit 8771184
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/app/apps/client/admin/apps.js b/app/apps/client/admin/apps.js
@@ -36,27 +36,25 @@ Template.apps.onCreated(function() {
 
 	(async () => {
 		try {
-			const appsFromMarketplace = await Apps.getAppsFromMarketplace().catch(() => []);
 			const installedApps = await Apps.getApps();
+			let apps = installedApps.map((app) => ({ ...app, installed: true }));
+
+			this.state.set('apps', apps);
+
+			const appsFromMarketplace = await Apps.getAppsFromMarketplace().catch(() => []);
 
-			const apps = installedApps.map((app) => {
+			apps = apps.map((app) => {
 				const appFromMarketplace = appsFromMarketplace.find(({ id } = {}) => id === app.id);
 
-				if (!appFromMarketplace) {
+				if (appFromMarketplace) {
 					return {
 						...app,
-						installed: true,
+						categories: appFromMarketplace.categories,
+						marketplaceVersion: appFromMarketplace.version,
 					};
 				}
-
-				return {
-					...app,
-					installed: true,
-					categories: appFromMarketplace.categories,
-					marketplaceVersion: appFromMarketplace.version,
-				};
+				return app;
 			});
-
 			this.state.set('apps', apps);
 		} catch (error) {
 			handleAPIError(error);

diff --git a/package-lock.json b/package-lock.json