From 00ffa737f8e9ba38bec1866b1c6af4a00bc1da84 Mon Sep 17 00:00:00 2001
From: Scott Bender <scott@scottbender.net>
Date: Thu, 12 Sep 2024 08:15:16 -0400
Subject: [PATCH 1/2] feature: show list of apps being installed in the app
 store

there's currently no easy way to see which apps are being installed and know when all are finished
---
 .../src/views/appstore/Apps/Apps.js               | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/server-admin-ui/src/views/appstore/Apps/Apps.js b/packages/server-admin-ui/src/views/appstore/Apps/Apps.js
index 06c8f5409..949f9b3d4 100644
--- a/packages/server-admin-ui/src/views/appstore/Apps/Apps.js
+++ b/packages/server-admin-ui/src/views/appstore/Apps/Apps.js
@@ -123,6 +123,17 @@ const Apps = function (props) {
                   </span>
                 )}
               </Button>
+              {props.appStore.installing.length > 0 && (
+              <Button
+                color={view === 'Installing' ? 'primary' : 'secondary'}
+                onClick={() => setSelectedView('Installing')}
+              >
+                Installing
+                  <span className="badge__update">
+                    {props.appStore.installing.length}
+                  </span>
+              </Button>
+              )}
             </div>
           </div>
 
@@ -178,9 +189,11 @@ const Apps = function (props) {
 
 const selectedViewToFilter = (selectedView, appStore) => {
   if (selectedView === 'Installed') {
-    return (app) => app.installing || app.installedVersion
+    return (app) => app.installedVersion
   } else if (selectedView === 'Updates') {
     return (app) => updateAvailable(app, appStore)
+  } else if (selectedView === 'Installing') {
+    return (app) => app.installing
   }
   return () => true
 }

From 262f96f2388dc352448cd88a420d1bd12104518b Mon Sep 17 00:00:00 2001
From: Scott Bender <scott@scottbender.net>
Date: Thu, 12 Sep 2024 08:20:12 -0400
Subject: [PATCH 2/2] chore: run format and eslist

---
 .../server-admin-ui/src/views/appstore/Apps/Apps.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/server-admin-ui/src/views/appstore/Apps/Apps.js b/packages/server-admin-ui/src/views/appstore/Apps/Apps.js
index 949f9b3d4..0932974b0 100644
--- a/packages/server-admin-ui/src/views/appstore/Apps/Apps.js
+++ b/packages/server-admin-ui/src/views/appstore/Apps/Apps.js
@@ -124,15 +124,15 @@ const Apps = function (props) {
                 )}
               </Button>
               {props.appStore.installing.length > 0 && (
-              <Button
-                color={view === 'Installing' ? 'primary' : 'secondary'}
-                onClick={() => setSelectedView('Installing')}
-              >
-                Installing
+                <Button
+                  color={view === 'Installing' ? 'primary' : 'secondary'}
+                  onClick={() => setSelectedView('Installing')}
+                >
+                  Installing
                   <span className="badge__update">
                     {props.appStore.installing.length}
                   </span>
-              </Button>
+                </Button>
               )}
             </div>
           </div>