change plugin overview action buttons

scm-ui/public/locales/de/admin.json

@@ -29,9 +29,11 @@
       "installedNavLink": "Installiert",
       "availableNavLink": "Verfügbar"
     },
-    "executePending": "Ausstehende Änderungen ausführen",
+    "executePending": "Änderungen ausführen",
+    "outdatedPlugins": "{{count}} veraltetes Plugin",
+    "outdatedPlugins_plural": "{{count}} veraltete Plugins",
     "updateAll": "Alle Plugins aktualisieren",
-    "cancelPending": "Ausstehende Änderungen abbrechen",
+    "cancelPending": "Änderungen abbrechen",
     "noPlugins": "Keine Plugins gefunden.",
     "modal": {
       "title": {
@@ -50,7 +52,7 @@
       "updateAndRestart": "Aktualisieren und Neustarten",
       "uninstallAndRestart": "Deinstallieren and Neustarten",
       "executeAndRestart": "Ausführen und Neustarten",
-      "updateAllAndRestart": "Alle aktualisieren und Neustarten",
+      "updateAll": "Alle Plugins aktualisieren",
       "abort": "Abbrechen",
       "author": "Autor",
       "version": "Version",

scm-ui/public/locales/en/admin.json

@@ -29,9 +29,11 @@
       "installedNavLink": "Installed",
       "availableNavLink": "Available"
     },
-    "executePending": "Execute pending changes",
+    "executePending": "Execute changes",
-    "updateAll": "Update all",
+    "outdatedPlugins": "{{count}} outdated plugin",
-    "cancelPending": "Cancel pending changes",
+    "outdatedPlugins_plural": "{{count}} outdated plugins",
+    "updateAll": "Update all plugins",
+    "cancelPending": "Cancel changes",
     "noPlugins": "No plugins found.",
     "modal": {
       "title": {

scm-ui/src/admin/plugins/components/MultiPluginAction.js

@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import { Button } from "@scm-manager/ui-components";
-import type {PendingPlugins, PluginCollection} from "@scm-manager/ui-types";
+import type { PendingPlugins, PluginCollection } from "@scm-manager/ui-types";
 import { translate } from "react-i18next";
 import MultiPluginActionModal from "./MultiPluginActionModal";
 
@@ -17,7 +17,7 @@ type Props = {
   installedPlugins?: PluginCollection,
 
   // context props
-  t: string => string
+  t: (key: string, params?: Object) => string
 };
 
 type State = {
@@ -39,19 +39,25 @@ class MultiPluginAction extends React.Component<Props, State> {
   };
 
   renderLabel = () => {
-    const {t, actionType} = this.props;
+    const { t, actionType, installedPlugins } = this.props;
+    const outdatedPlugins =
+      actionType === MultiPluginActionType.UPDATE_ALL &&
+      installedPlugins._embedded.plugins.filter(p => p._links.update).length;
+
     if (actionType === MultiPluginActionType.EXECUTE_PENDING) {
       return t("plugins.executePending");
     } else if (actionType === MultiPluginActionType.CANCEL_PENDING) {
       return t("plugins.cancelPending");
     } else {
-      return t("plugins.updateAll");
+      return t("plugins.outdatedPlugins", {
+        count: outdatedPlugins
+      });
     }
   };
 
   renderModal = () => {
     const { showModal } = this.state;
-    const {pendingPlugins, installedPlugins, actionType} = this.props;
+    const { pendingPlugins, installedPlugins, actionType } = this.props;
     if (showModal) {
       return (
         <MultiPluginActionModal
@@ -73,12 +79,26 @@ class MultiPluginAction extends React.Component<Props, State> {
     return null;
   };
 
+  renderIcon = () => {
+    const { actionType } = this.props;
+
+    if (actionType === MultiPluginActionType.EXECUTE_PENDING) {
+      return "arrow-circle-right";
+    } else if (actionType === MultiPluginActionType.CANCEL_PENDING) {
+      return "times";
+    } else {
+      return "sync-alt";
+    }
+  };
+
   render() {
     return (
       <>
         {this.renderModal()}
         <Button
           color="primary"
+          reducedMobile={true}
+          icon={this.renderIcon()}
           label={this.renderLabel()}
           action={this.toggleModal}
         />

scm-ui/src/admin/plugins/containers/PluginsOverview.js

@@ -113,34 +113,47 @@ class PluginsOverview extends React.Component<Props> {
 
   createActions = () => {
     const { pendingPlugins, collection } = this.props;
-    return (
+    const buttons = [];
-      <ButtonGroup>
+
-        {pendingPlugins &&
+    if (
+      pendingPlugins &&
       pendingPlugins._links &&
-          pendingPlugins._links.execute && (
+      pendingPlugins._links.execute
+    ) {
+      buttons.push(
         <MultiPluginAction
           pendingPlugins={pendingPlugins}
           actionType={MultiPluginActionType.EXECUTE_PENDING}
         />
-          )}
+      );
-        {pendingPlugins &&
+    }
+
+    if (
+      pendingPlugins &&
       pendingPlugins._links &&
-          pendingPlugins._links.cancel && (
+      pendingPlugins._links.cancel
+    ) {
+      buttons.push(
         <MultiPluginAction
           pendingPlugins={pendingPlugins}
           actionType={MultiPluginActionType.CANCEL_PENDING}
         />
-          )}
+      );
-        {collection &&
+    }
-          collection._links &&
+
-          collection._links.update && (
+    if (collection && collection._links && collection._links.update) {
+      buttons.push(
         <MultiPluginAction
           installedPlugins={collection}
           actionType={MultiPluginActionType.UPDATE_ALL}
         />
-          )}
-      </ButtonGroup>
       );
+    }
+
+    if (buttons.length > 0) {
+      return <ButtonGroup>{buttons}</ButtonGroup>;
+    }
+    return null;
   };
 
   render() {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/InstalledPluginResource.java

@@ -66,7 +66,7 @@ public class InstalledPluginResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(CollectionDto.class)
-  public Response updateAll(@QueryParam("restart") boolean restartAfterInstallation) {
+  public Response updateAll() {
     pluginManager.updateAll();
     return Response.ok().build();
   }