feature: show list of apps being installed in the app store (#1790)

* show list of apps being installed in the app store * fix: show count of apps still installing * feature: show Waiting separately * Show newly installed apps in Installed * show newly installed version --------- Co-authored-by: Teppo Kurki <[email protected]>
SignalK · Nov 23, 2024 · 1f329d4 · 1f329d4
1 parent 8fdca1a
commit 1f329d4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 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
@@ -123,6 +123,22 @@ const Apps = function (props) {
                   </span>
                 )}
               </Button>
+              {props.appStore.installing.length > 0 && (
+                <>
+                  <Button
+                    color={view === 'Installing' ? 'primary' : 'secondary'}
+                    onClick={() => setSelectedView('Installing')}
+                  >
+                    Installs & Removes
+                    {installingCount(props.appStore) > 0 && (
+                      <span className="badge__update">
+                        {installingCount(props.appStore)}
+                      </span>
+                    )}
+                  </Button>
+                  {props.appStore.installing.length > 0 && '(Pending restart)'}
+                </>
+              )}
             </div>
           </div>
 
@@ -176,11 +192,19 @@ const Apps = function (props) {
   )
 }
 
+const installingCount = (appStore) => {
+  return appStore.installing.filter((app) => {
+    return app.isWaiting || app.isInstalling
+  }).length
+}
+
 const selectedViewToFilter = (selectedView, appStore) => {
   if (selectedView === 'Installed') {
-    return (app) => app.installing || app.installedVersion
+    return (app) => app.installedVersion || app.installing
   } else if (selectedView === 'Updates') {
     return (app) => updateAvailable(app, appStore)
+  } else if (selectedView === 'Installing') {
+    return (app) => app.installing
   }
   return () => true
 }

diff --git a/packages/server-admin-ui/src/views/appstore/Grid/cell-renderers/ActionCellRenderer.js b/packages/server-admin-ui/src/views/appstore/Grid/cell-renderers/ActionCellRenderer.js
@@ -36,7 +36,11 @@ function ActionCellRenderer(props) {
     // If the app has progressed we show the status
 
     if (app.isInstalling || app.isRemoving || app.isWaiting) {
-      status = app.isRemove ? 'Removing' : 'Installing'
+      status = app.isRemove
+        ? 'Removing'
+        : app.isWaiting
+        ? 'Waiting..'
+        : 'Installing'
       progress = (
         <Progress
           className="progress-sm progress__bar"

diff --git a/packages/server-admin-ui/src/views/appstore/Grid/cell-renderers/VersionCellRenderer.js b/packages/server-admin-ui/src/views/appstore/Grid/cell-renderers/VersionCellRenderer.js
@@ -5,7 +5,10 @@ export default function NameCellRenderer(props) {
     <div className="cell__renderer cell-version center">
       <div className="version__container">
         <span className="version">
-          v{props.data.installedVersion || props.data.version}
+          v
+          {props.data.newVersion
+            ? props.data.installedVersion
+            : props.data.version}
         </span>
 
         {/*