implemented ui for available plugins page

scm-ui-components/packages/ui-components/src/CardColumn.js

@@ -25,12 +25,17 @@ const styles = {
   },
   content: {
     display: "flex",
-    flexGrow: 1
+    flexGrow: 1,
+    alignItems: "center",
+    justifyContent: "space-between"
   },
   footer: {
     display: "flex",
     marginTop: "auto",
     paddingBottom: "1.5rem"
+  },
+  noBottomMargin: {
+    marginBottom: "0 !important"
   }
 };
 
@@ -38,9 +43,11 @@ type Props = {
   title: string,
   description: string,
   avatar: React.Node,
+  contentRight?: React.Node,
   footerLeft: React.Node,
   footerRight: React.Node,
   link: string,
+
   // context props
   classes: any
 };
@@ -55,7 +62,15 @@ class CardColumn extends React.Component<Props> {
   };
 
   render() {
-    const { avatar, title, description, footerLeft, footerRight, classes } = this.props;
+    const {
+      avatar,
+      title,
+      description,
+      contentRight,
+      footerLeft,
+      footerRight,
+      classes
+    } = this.props;
     const link = this.createLink();
     return (
       <>
@@ -64,16 +79,29 @@ class CardColumn extends React.Component<Props> {
           <figure className={classNames(classes.centerImage, "media-left")}>
             {avatar}
           </figure>
-          <div className={classNames("media-content", "text-box", classes.flexFullHeight)}>
+          <div
+            className={classNames(
+              "media-content",
+              "text-box",
+              classes.flexFullHeight
+            )}
+          >
             <div className={classes.content}>
-              <div className="content shorten-text">
+              <div
+                className={classNames(
+                  "content",
+                  "shorten-text",
+                  classes.noBottomMargin
+                )}
+              >
                 <p className="is-marginless">
                   <strong>{title}</strong>
                 </p>
                 <p className="shorten-text">{description}</p>
               </div>
+              {contentRight && contentRight}
             </div>
-            <div className={classNames(classes.footer, "level")}>
+            <div className={classNames("level", classes.footer)}>
               <div className="level-left is-hidden-mobile">{footerLeft}</div>
               <div className="level-right is-mobile">{footerRight}</div>
             </div>

scm-ui/src/admin/containers/Admin.js

@@ -1,14 +1,24 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import {Redirect, Route, Switch} from "react-router-dom";
+import { Redirect, Route, Switch } from "react-router-dom";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
 import type { History } from "history";
 import { connect } from "react-redux";
 import { compose } from "redux";
 import type { Links } from "@scm-manager/ui-types";
-import { Page, Navigation, NavLink, Section, SubNavigation } from "@scm-manager/ui-components";
-import { getLinks } from "../../modules/indexResource";
+import {
+  Page,
+  Navigation,
+  NavLink,
+  Section,
+  SubNavigation
+} from "@scm-manager/ui-components";
+import {
+  getLinks,
+  getAvailablePluginsLink,
+  getInstalledPluginsLink
+} from "../../modules/indexResource";
 import AdminDetails from "./AdminDetails";
 import PluginsOverview from "../plugins/containers/PluginsOverview";
 import GlobalConfig from "./GlobalConfig";
@@ -18,6 +28,8 @@ import CreateRepositoryRole from "../roles/containers/CreateRepositoryRole";
 
 type Props = {
   links: Links,
+  availablePluginsLink: string,
+  installedPluginsLink: string,
 
   // context objects
   t: string => string,
@@ -28,7 +40,7 @@ type Props = {
 class Admin extends React.Component<Props> {
   stripEndingSlash = (url: string) => {
     if (url.endsWith("/")) {
-      if(url.includes("role")) {
+      if (url.includes("role")) {
         return url.substring(0, url.length - 2);
       }
       return url.substring(0, url.length - 1);
@@ -47,7 +59,7 @@ class Admin extends React.Component<Props> {
   };
 
   render() {
-    const { links, t } = this.props;
+    const { links, availablePluginsLink, installedPluginsLink, t } = this.props;
 
     const url = this.matchedUrl();
     const extensionProps = {
@@ -62,34 +74,54 @@ class Admin extends React.Component<Props> {
             <Switch>
               <Redirect exact from={url} to={`${url}/info`} />
               <Route path={`${url}/info`} exact component={AdminDetails} />
-              <Route path={`${url}/settings/general`} exact component={GlobalConfig} />
-              <Redirect exact from={`${url}/plugins`} to={`${url}/plugins/installed/`} />
+              <Route
+                path={`${url}/settings/general`}
+                exact
+                component={GlobalConfig}
+              />
+              <Redirect
+                exact
+                from={`${url}/plugins`}
+                to={`${url}/plugins/installed/`}
+              />
               <Route
                 path={`${url}/plugins/installed`}
                 exact
                 render={() => (
-                  <PluginsOverview baseUrl={`${url}/plugins/installed`} installed={true} />
+                  <PluginsOverview
+                    baseUrl={`${url}/plugins/installed`}
+                    installed={true}
+                  />
                 )}
               />
               <Route
                 path={`${url}/plugins/installed/:page`}
                 exact
                 render={() => (
-                  <PluginsOverview baseUrl={`${url}/plugins/installed`} installed={true} />
+                  <PluginsOverview
+                    baseUrl={`${url}/plugins/installed`}
+                    installed={true}
+                  />
                 )}
               />
               <Route
                 path={`${url}/plugins/available`}
                 exact
                 render={() => (
-                  <PluginsOverview baseUrl={`${url}/plugins/available`} installed={false} />
+                  <PluginsOverview
+                    baseUrl={`${url}/plugins/available`}
+                    installed={false}
+                  />
                 )}
               />
               <Route
                 path={`${url}/plugins/available/:page`}
                 exact
                 render={() => (
-                  <PluginsOverview baseUrl={`${url}/plugins/available`} installed={false} />
+                  <PluginsOverview
+                    baseUrl={`${url}/plugins/available`}
+                    installed={false}
+                  />
                 )}
               />
               <Route
@@ -109,17 +141,13 @@ class Admin extends React.Component<Props> {
               <Route
                 path={`${url}/roles/create`}
                 render={() => (
-                  <CreateRepositoryRole
-                    history={this.props.history}
-                  />
+                  <CreateRepositoryRole history={this.props.history} />
                 )}
               />
               <Route
                 path={`${url}/roles/:page`}
                 exact
-                render={() => (
-                  <RepositoryRoles baseUrl={`${url}/roles`} />
-                )}
+                render={() => <RepositoryRoles baseUrl={`${url}/roles`} />}
               />
               <ExtensionPoint
                 name="admin.route"
@@ -136,24 +164,26 @@ class Admin extends React.Component<Props> {
                   icon="fas fa-info-circle"
                   label={t("admin.menu.informationNavLink")}
                 />
-                {
-                 links.plugins &&
+                {(availablePluginsLink || installedPluginsLink) && (
                   <SubNavigation
                     to={`${url}/plugins/`}
                     icon="fas fa-puzzle-piece"
                     label={t("plugins.menu.pluginsNavLink")}
                   >
+                    {installedPluginsLink && (
                       <NavLink
                         to={`${url}/plugins/installed/`}
                         label={t("plugins.menu.installedNavLink")}
                       />
-                  {/* Activate this again after available plugins page is created */}
-                  {/*<NavLink*/}
-                  {/*  to={`${url}/plugins/available/`}*/}
-                  {/*  label={t("plugins.menu.availableNavLink")}*/}
-                  {/*/>*/}
+                    )}
+                    {availablePluginsLink && (
+                      <NavLink
+                        to={`${url}/plugins/available/`}
+                        label={t("plugins.menu.availableNavLink")}
+                      />
+                    )}
                   </SubNavigation>
-                }
+                )}
                 <NavLink
                   to={`${url}/roles/`}
                   icon="fas fa-user-shield"
@@ -191,8 +221,12 @@ class Admin extends React.Component<Props> {
 
 const mapStateToProps = (state: any) => {
   const links = getLinks(state);
+  const availablePluginsLink = getAvailablePluginsLink(state);
+  const installedPluginsLink = getInstalledPluginsLink(state);
   return {
-    links
+    links,
+    availablePluginsLink,
+    installedPluginsLink
   };
 };
 

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

@@ -1,11 +1,21 @@
 //@flow
 import React from "react";
+import injectSheet from "react-jss";
 import type { Plugin } from "@scm-manager/ui-types";
 import { CardColumn } from "@scm-manager/ui-components";
 import PluginAvatar from "./PluginAvatar";
 
 type Props = {
-  plugin: Plugin
+  plugin: Plugin,
+
+  // context props
+  classes: any
+};
+
+const styles = {
+  link: {
+    pointerEvents: "all"
+  }
 };
 
 class PluginEntry extends React.Component<Props> {
@@ -13,6 +23,17 @@ class PluginEntry extends React.Component<Props> {
     return <PluginAvatar plugin={plugin} />;
   };
 
+  createContentRight = (plugin: Plugin) => {
+    const { classes } = this.props;
+    if (plugin._links && plugin._links.install && plugin._links.install.href) {
+      return (
+        <a className={classes.link} href={plugin._links.install.href}>
+          <i className="fas fa-cloud-download-alt fa-2x" />
+        </a>
+      );
+    }
+  };
+
   createFooterLeft = (plugin: Plugin) => {
     return <small className="level-item">{plugin.author}</small>;
   };
@@ -24,6 +45,7 @@ class PluginEntry extends React.Component<Props> {
   render() {
     const { plugin } = this.props;
     const avatar = this.createAvatar(plugin);
+    const contentRight = this.createContentRight(plugin);
     const footerLeft = this.createFooterLeft(plugin);
     const footerRight = this.createFooterRight(plugin);
 
@@ -34,6 +56,7 @@ class PluginEntry extends React.Component<Props> {
         avatar={avatar}
         title={plugin.name}
         description={plugin.description}
+        contentRight={contentRight}
         footerLeft={footerLeft}
         footerRight={footerRight}
       />
@@ -41,4 +64,4 @@ class PluginEntry extends React.Component<Props> {
   }
 }
 
-export default PluginEntry;
+export default injectSheet(styles)(PluginEntry);

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

@@ -18,7 +18,10 @@ import {
   isFetchPluginsPending
 } from "../modules/plugins";
 import PluginsList from "../components/PluginsList";
-import { getPluginsLink } from "../../../modules/indexResource";
+import {
+  getAvailablePluginsLink,
+  getInstalledPluginsLink
+} from "../../../modules/indexResource";
 
 type Props = {
   loading: boolean,
@@ -26,7 +29,8 @@ type Props = {
   collection: PluginCollection,
   baseUrl: string,
   installed: boolean,
-  pluginsLink: string,
+  availablePluginsLink: string,
+  installedPluginsLink: string,
 
   // context objects
   t: string => string,
@@ -37,8 +41,27 @@ type Props = {
 
 class PluginsOverview extends React.Component<Props> {
   componentDidMount() {
-    const { fetchPluginsByLink, pluginsLink } = this.props;
-    fetchPluginsByLink(pluginsLink);
+    const {
+      installed,
+      fetchPluginsByLink,
+      availablePluginsLink,
+      installedPluginsLink
+    } = this.props;
+    fetchPluginsByLink(installed ? installedPluginsLink : availablePluginsLink);
+  }
+
+  componentDidUpdate(prevProps) {
+    const {
+      installed,
+      fetchPluginsByLink,
+      availablePluginsLink,
+      installedPluginsLink
+    } = this.props;
+    if (prevProps.installed !== installed) {
+      fetchPluginsByLink(
+        installed ? installedPluginsLink : availablePluginsLink
+      );
+    }
   }
 
   render() {
@@ -81,13 +104,15 @@ const mapStateToProps = state => {
   const collection = getPluginCollection(state);
   const loading = isFetchPluginsPending(state);
   const error = getFetchPluginsFailure(state);
-  const pluginsLink = getPluginsLink(state);
+  const availablePluginsLink = getAvailablePluginsLink(state);
+  const installedPluginsLink = getInstalledPluginsLink(state);
 
   return {
     collection,
     loading,
     error,
-    pluginsLink
+    availablePluginsLink,
+    installedPluginsLink
   };
 };
 

scm-ui/src/modules/indexResource.js

@@ -116,8 +116,12 @@ export function getUiPluginsLink(state: Object) {
   return getLink(state, "uiPlugins");
 }
 
-export function getPluginsLink(state: Object) {
-  return getLink(state, "plugins");
+export function getAvailablePluginsLink(state: Object) {
+  return getLink(state, "availablePlugins");
+}
+
+export function getInstalledPluginsLink(state: Object) {
+  return getLink(state, "installedPlugins");
 }
 
 export function getMeLink(state: Object) {