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 aa063c245..b2607acd0 100644 --- a/packages/server-admin-ui/src/views/appstore/Apps/Apps.js +++ b/packages/server-admin-ui/src/views/appstore/Apps/Apps.js @@ -125,18 +125,18 @@ const Apps = function (props) { {props.appStore.installing.length > 0 && ( <> - setSelectedView('Installing')} - > - Installs & Removes - {installingCount(props.appStore) > 0 && ( - - {installingCount(props.appStore)} - - )} - - {props.appStore.installing.length > 0 && ('(Pending restart)')} + setSelectedView('Installing')} + > + Installs & Removes + {installingCount(props.appStore) > 0 && ( + + {installingCount(props.appStore)} + + )} + + {props.appStore.installing.length > 0 && '(Pending restart)'} > )} 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 index 9256ae63e..628adb1d8 100644 --- 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' : (app.isWaiting ? 'Waiting..' : 'Installing') + status = app.isRemove + ? 'Removing' + : app.isWaiting + ? 'Waiting..' + : 'Installing' progress = ( - v{props.data.newVersion ? props.data.installedVersion : props.data.version} + v + {props.data.newVersion + ? props.data.installedVersion + : props.data.version} {/*