From 1da37725a1fb03b04ca0bff849e471c3348749ce Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Thu, 27 Jan 2022 10:11:17 +0100 Subject: [PATCH] Add myCloudogu data processing link (#1935) Add data processing link to docs and plugin overview --- docs/de/user/admin/plugins.md | 2 ++ docs/en/user/admin/plugins.md | 13 ++++++++----- gradle/changelog/dp_link.yaml | 2 ++ scm-ui/ui-webapp/public/locales/de/admin.json | 2 +- scm-ui/ui-webapp/public/locales/en/admin.json | 2 +- .../admin/plugins/components/MyCloudoguBanner.tsx | 5 ++++- 6 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 gradle/changelog/dp_link.yaml diff --git a/docs/de/user/admin/plugins.md b/docs/de/user/admin/plugins.md index f0049cd38c..24b9100370 100644 --- a/docs/de/user/admin/plugins.md +++ b/docs/de/user/admin/plugins.md @@ -10,6 +10,8 @@ Damit Änderungen der Plugins wirksam werden, muss der SCM-Manager-Server neu ge ### myCloudogu-Plugins Einige besondere Plugins sind nur für Instanzen des SCM-Managers verfügbar, die mit myCloudogu verbunden sind. Der SCM-Manager kann über den Button „Mit myCloudogu verbinden“ mit myCloudogu verbunden werden. +[Mehr Details zur Datenverarbeitung.](https://scm-manager.org/data-processing) + ![Plugin-Center nicht verbunden, Button zur Verbindung mit myCloudogu](assets/administration-plugin-center-not-connected.png) Sie werden dann zur myCloudogu-Login-Maske weitergeleitet. ![myCloudogu-Login-Maske](assets/myCloudogu-login.png) diff --git a/docs/en/user/admin/plugins.md b/docs/en/user/admin/plugins.md index e7c374e537..fc40d1709b 100644 --- a/docs/en/user/admin/plugins.md +++ b/docs/en/user/admin/plugins.md @@ -9,12 +9,15 @@ Plugins can be managed by action icons on the tiles. System relevant plugins tha In order for changes to plugins to become effective, the SCM-Manager server needs to be restarted. That can be done after every single action. It is also possible to queue several actions like the installation of a new plugin, updates or the deletion of a plugin and to perform all actions with one restart. If an action (installation, uninstallation, update) for a plugin was performed, the buttons "Execute changes" and "Abort changes" appear. If you choose to execute the changes, a popup window that shows the current queue (all actions without a restart) appears. Now the user can decide whether to execute the changes by restarting the server. If there are actions in the queue that are no longer desired, the queue can be emptied with the abort changes button. ### myCloudogu plugins -Some special plugins are only available to instances of SCM-Manager that are connected to myCloudogu. You may connect your instance by clicking the button “Connect to myCloudogu” ![Plugin-center not connected](assets/administration-plugin-center-not-connected.png). - -You will be redirected to a myCloudogu login form. ![myCloudogu-Login-Form](assets/myCloudogu-Login.png) If you already have an account you simply log in. Otherwise you can create an account either by using a confederate identity provider (Google or github) -or with your email. -After a successful login you will return to the SCM-Manager. Here you can review the instance and account to connect. By clicking the button “Connect” you approve the connection and return to the plugin center. ![Confirmation of connection](assets/administration-myC-confirmation.png) +Some special plugins are only available to instances of SCM-Manager that are connected to myCloudogu. You may connect your instance by clicking the button “Connect to myCloudogu”. +[More details on data processing.](https://scm-manager.org/data-processing) +![Plugin-center not connected](assets/administration-plugin-center-not-connected.png) +You will be redirected to a myCloudogu login form. +![myCloudogu-Login-Form](assets/myCloudogu-Login.png) +If you already have an account you simply log in. Otherwise you can create an account either by using a confederate identity provider (Google or github) or with your email. +After a successful login you will return to the SCM-Manager. Here you can review the instance and account to connect. By clicking the button “Connect” you approve the connection and return to the plugin center. +![Confirmation of connection](assets/administration-myC-confirmation.png) Now you can install myCloudogu plugins like basic plugins. ![Plugin-center connected with myCloudogu](assets/administration-plugin-center-connected.png) Only one user with sufficient permissions needs to connect the instance with myCloudogu. The myCloudogu plugins can than be installed by every user with suitable permissions. diff --git a/gradle/changelog/dp_link.yaml b/gradle/changelog/dp_link.yaml new file mode 100644 index 0000000000..639e6994d0 --- /dev/null +++ b/gradle/changelog/dp_link.yaml @@ -0,0 +1,2 @@ +- type: added + description: Add myCloudogu data processing link ((#1935)[https://github.com/scm-manager/scm-manager/pull/1935]) diff --git a/scm-ui/ui-webapp/public/locales/de/admin.json b/scm-ui/ui-webapp/public/locales/de/admin.json index 2459bc1075..ad413ccbc2 100644 --- a/scm-ui/ui-webapp/public/locales/de/admin.json +++ b/scm-ui/ui-webapp/public/locales/de/admin.json @@ -92,7 +92,7 @@ "button": { "label": "Mit <0>myCloudogu verbinden" }, - "description": "Verbinden Sie Ihren SCM-Manager mit <0>myCloudogu um besondere Plugins zu installieren. myCloudogu ist die Heimat der SCM-Manager Community, getragen von Maintainern des SCM-Managers. Sie haben noch kein Konto? Erstellen Sie während der Verbindung der SCM-Manager-Instanz kostenfrei ein myCloudogu-Konto." + "description": "Verbinden Sie Ihren SCM-Manager mit <0>myCloudogu um besondere Plugins zu installieren. myCloudogu ist die Heimat der SCM-Manager Community, getragen von Maintainern des SCM-Managers. Sie haben noch kein Konto? Erstellen Sie während der Verbindung der SCM-Manager-Instanz kostenfrei ein myCloudogu-Konto. <1>Mehr Details zur Datenverarbeitung." } } }, diff --git a/scm-ui/ui-webapp/public/locales/en/admin.json b/scm-ui/ui-webapp/public/locales/en/admin.json index 18121a3c3f..a44c6e6509 100644 --- a/scm-ui/ui-webapp/public/locales/en/admin.json +++ b/scm-ui/ui-webapp/public/locales/en/admin.json @@ -92,7 +92,7 @@ "button": { "label": "Connect to <0>myCloudogu" }, - "description": "Connect your SCM-Manager with <0>myCloudogu to install special plugins. myCloudogu is the home of the SCM-Manager Community, sustained by the maintainers of the SCM-Manager. You don't have an account yet? Create a free myCloudogu account while connecting your SCM-Manager instance." + "description": "Connect your SCM-Manager with <0>myCloudogu to install special plugins. myCloudogu is the home of the SCM-Manager Community, sustained by the maintainers of the SCM-Manager. You don't have an account yet? Create a free myCloudogu account while connecting your SCM-Manager instance. <1>More details on data processing." } } }, diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/MyCloudoguBanner.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/MyCloudoguBanner.tsx index 685e1a3170..f06720566b 100644 --- a/scm-ui/ui-webapp/src/admin/plugins/components/MyCloudoguBanner.tsx +++ b/scm-ui/ui-webapp/src/admin/plugins/components/MyCloudoguBanner.tsx @@ -51,7 +51,10 @@ const MyCloudoguBanner: FC = ({ loginLink }) => { myCloudogu]} + components={[ + myCloudogu, + Data Processing + ]} />