From 71c4967594450c81577b6f8012685596c9b5b1a0 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Tue, 18 Jun 2019 17:50:28 +0200 Subject: [PATCH 1/7] add administration trans, rename existing trans, move repositoryRoles to admin --- scm-ui/public/locales/de/admin.json | 43 +++++++++++++++++++++++++++ scm-ui/public/locales/de/commons.json | 2 +- scm-ui/public/locales/de/config.json | 38 ++--------------------- scm-ui/public/locales/en/admin.json | 43 +++++++++++++++++++++++++++ scm-ui/public/locales/en/commons.json | 2 +- scm-ui/public/locales/en/config.json | 38 ++--------------------- 6 files changed, 94 insertions(+), 72 deletions(-) create mode 100644 scm-ui/public/locales/de/admin.json create mode 100644 scm-ui/public/locales/en/admin.json diff --git a/scm-ui/public/locales/de/admin.json b/scm-ui/public/locales/de/admin.json new file mode 100644 index 0000000000..c79707b9c7 --- /dev/null +++ b/scm-ui/public/locales/de/admin.json @@ -0,0 +1,43 @@ +{ + "admin": { + "menu": { + "navigationLabel": "Administrations Navigation", + "informationNavLink": "Informationen", + "settingsNavLink": "Einstellungen", + "generalNavLink": "Generell" + } + }, + "repositoryRole": { + "navLink": "Berechtigungsrollen", + "title": "Berechtigungsrollen", + "errorTitle": "Fehler", + "errorSubtitle": "Unbekannter Berechtigungsrollen Fehler", + "createSubtitle": "Berechtigungsrolle erstellen", + "editSubtitle": "Berechtigungsrolle bearbeiten", + "overview": { + "title": "Übersicht aller verfügbaren Berechtigungsrollen", + "noPermissionRoles": "Keine Berechtigungsrollen gefunden.", + "createButton": "Berechtigungsrolle erstellen" + }, + "editButton": "Bearbeiten", + "name": "Name", + "type": "Typ", + "verbs": "Berechtigungen", + "system": "System", + "form": { + "name": "Name", + "permissions": "Berechtigungen", + "submit": "Speichern" + }, + "delete": { + "button": "Delete", + "subtitle": "Delete Permission Role", + "confirmAlert": { + "title": "Delete Permission Role", + "message": "Do you really want to delete this permission role? All users who own this role will lose their permissions.", + "submit": "Yes", + "cancel": "No" + } + } + } +} diff --git a/scm-ui/public/locales/de/commons.json b/scm-ui/public/locales/de/commons.json index b9cc93b1ed..38042c4806 100644 --- a/scm-ui/public/locales/de/commons.json +++ b/scm-ui/public/locales/de/commons.json @@ -37,7 +37,7 @@ "users": "Benutzer", "logout": "Abmelden", "groups": "Gruppen", - "config": "Einstellungen" + "admin": "Administration" }, "filterEntries": "Einträge filtern", "paginator": { diff --git a/scm-ui/public/locales/de/config.json b/scm-ui/public/locales/de/config.json index 3fc61a9b47..972d846c2b 100644 --- a/scm-ui/public/locales/de/config.json +++ b/scm-ui/public/locales/de/config.json @@ -1,44 +1,12 @@ { "config": { - "navigationLabel": "Einstellungs Navigation", + "navigationLabel": "Administrations Navigation", "globalConfigurationNavLink": "Globale Einstellungen", - "title": "Einstellungen", + "title": "Administration", "errorTitle": "Fehler", "errorSubtitle": "Unbekannter Einstellungen Fehler" }, - "repositoryRole": { - "navLink": "Berechtigungsrollen", - "title": "Berechtigungsrollen", - "errorTitle": "Fehler", - "errorSubtitle": "Unbekannter Berechtigungsrollen Fehler", - "createSubtitle": "Berechtigungsrolle erstellen", - "editSubtitle": "Berechtigungsrolle bearbeiten", - "overview": { - "title": "Übersicht aller verfügbaren Berechtigungsrollen", - "noPermissionRoles": "Keine Berechtigungsrollen gefunden.", - "createButton": "Berechtigungsrolle erstellen" - }, - "editButton": "Bearbeiten", - "name": "Name", - "type": "Typ", - "verbs": "Berechtigungen", - "system": "System", - "form": { - "name": "Name", - "permissions": "Berechtigungen", - "submit": "Speichern" - } - }, - "deleteRole" : { - "button": "Löschen", - "subtitle": "Berechtigungsrolle löschen", - "confirmAlert": { - "title": "Berechtigungsrolle löschen", - "message": "Soll die Berechtigungsrolle wirklich gelöscht werden? Alle Nutzer dieser Rolle verlieren Ihre Berechtigungen.", - "submit": "Ja", - "cancel": "Nein" - } - }, + "config-form": { "submit": "Speichern", "submit-success-notification": "Einstellungen wurden erfolgreich geändert!", diff --git a/scm-ui/public/locales/en/admin.json b/scm-ui/public/locales/en/admin.json new file mode 100644 index 0000000000..1dd3a7a092 --- /dev/null +++ b/scm-ui/public/locales/en/admin.json @@ -0,0 +1,43 @@ +{ + "admin": { + "menu": { + "navigationLabel": "Administration Navigation", + "informationNavLink": "Information", + "settingsNavLink": "Settings", + "generalNavLink": "General" + } + }, + "repositoryRole": { + "navLink": "Permission Roles", + "title": "Permission Roles", + "errorTitle": "Error", + "errorSubtitle": "Unknown Permission Role Error", + "createSubtitle": "Create Permission Role", + "editSubtitle": "Edit Permission Role", + "overview": { + "title": "Overview of all permission roles", + "noPermissionRoles": "No permission roles found.", + "createButton": "Create Permission Role" + }, + "editButton": "Edit", + "name": "Name", + "type": "Type", + "verbs": "Permissions", + "system": "System", + "form": { + "name": "Name", + "permissions": "Permissions", + "submit": "Save" + }, + "delete" : { + "button": "Löschen", + "subtitle": "Berechtigungsrolle löschen", + "confirmAlert": { + "title": "Berechtigungsrolle löschen", + "message": "Soll die Berechtigungsrolle wirklich gelöscht werden? Alle Nutzer dieser Rolle verlieren Ihre Berechtigungen.", + "submit": "Ja", + "cancel": "Nein" + } + } + } +} diff --git a/scm-ui/public/locales/en/commons.json b/scm-ui/public/locales/en/commons.json index b5af3e9ef9..b41d2b341e 100644 --- a/scm-ui/public/locales/en/commons.json +++ b/scm-ui/public/locales/en/commons.json @@ -37,7 +37,7 @@ "users": "Users", "logout": "Logout", "groups": "Groups", - "config": "Configuration" + "admin": "Administration" }, "filterEntries": "filter entries", "paginator": { diff --git a/scm-ui/public/locales/en/config.json b/scm-ui/public/locales/en/config.json index d7ffa3d229..967ad2c1de 100644 --- a/scm-ui/public/locales/en/config.json +++ b/scm-ui/public/locales/en/config.json @@ -1,44 +1,12 @@ { "config": { - "navigationLabel": "Configuration Navigation", + "navigationLabel": "Administration Navigation", "globalConfigurationNavLink": "Global Configuration", - "title": "Configuration", + "title": "Administration", "errorTitle": "Error", "errorSubtitle": "Unknown Config Error" }, - "repositoryRole": { - "navLink": "Permission Roles", - "title": "Permission Roles", - "errorTitle": "Error", - "errorSubtitle": "Unknown Permission Role Error", - "createSubtitle": "Create Permission Role", - "editSubtitle": "Edit Permission Role", - "overview": { - "title": "Overview of all permission roles", - "noPermissionRoles": "No permission roles found.", - "createButton": "Create Permission Role" - }, - "editButton": "Edit", - "name": "Name", - "type": "Type", - "verbs": "Permissions", - "system": "System", - "form": { - "name": "Name", - "permissions": "Permissions", - "submit": "Save" - } - }, - "deleteRole": { - "button": "Delete", - "subtitle": "Delete Permission Role", - "confirmAlert": { - "title": "Delete Permission Role", - "message": "Do you really want to delete this permission role? All users who own this role will lose their permissions.", - "submit": "Yes", - "cancel": "No" - } - }, + "config-form": { "submit": "Submit", "submit-success-notification": "Configuration changed successfully!", From c5252da2ec9d07ed49d6be4e47f7a81565024a9c Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 19 Jun 2019 09:58:17 +0200 Subject: [PATCH 2/7] moved config components in admin dir --- .../components/form/BaseUrlSettings.js | 0 .../components/form/ConfigForm.js | 6 +-- .../components/form/GeneralSettings.js | 0 .../components/form/LoginAttempt.js | 0 .../form/NamespaceStrategySelect.js | 0 .../components/form/ProxySettings.js | 0 .../components/table/ArrayConfigTable.js | 0 .../components/table/ProxyExcludesTable.js | 0 .../Config.js => admin/containers/Admin.js} | 41 ++++++++++++++----- scm-ui/src/admin/containers/AdminDetails.js | 30 ++++++++++++++ .../containers/GlobalConfig.js | 2 +- .../src/{config => admin}/modules/config.js | 0 .../{config => admin}/modules/config.test.js | 0 .../modules/namespaceStrategies.js | 1 - .../modules/namespaceStrategies.test.js | 0 .../roles/components/AvailableVerbs.js | 0 .../roles/components/PermissionRoleDetails.js | 2 +- .../components/PermissionRoleDetailsTable.js | 2 +- .../roles/components/PermissionRoleRow.js | 0 .../roles/components/PermissionRoleTable.js | 2 +- .../roles/components/SystemRoleTag.js | 2 +- .../roles/containers/CreateRepositoryRole.js | 2 +- .../roles/containers/DeleteRepositoryRole.js | 14 +++---- .../roles/containers/EditRepositoryRole.js | 2 +- .../roles/containers/RepositoryRoleForm.js | 2 +- .../roles/containers/RepositoryRoles.js | 2 +- .../roles/containers/SingleRepositoryRole.js | 2 +- .../{config => admin}/roles/modules/roles.js | 0 .../roles/modules/roles.test.js | 0 29 files changed, 80 insertions(+), 32 deletions(-) rename scm-ui/src/{config => admin}/components/form/BaseUrlSettings.js (100%) rename scm-ui/src/{config => admin}/components/form/ConfigForm.js (97%) rename scm-ui/src/{config => admin}/components/form/GeneralSettings.js (100%) rename scm-ui/src/{config => admin}/components/form/LoginAttempt.js (100%) rename scm-ui/src/{config => admin}/components/form/NamespaceStrategySelect.js (100%) rename scm-ui/src/{config => admin}/components/form/ProxySettings.js (100%) rename scm-ui/src/{config => admin}/components/table/ArrayConfigTable.js (100%) rename scm-ui/src/{config => admin}/components/table/ProxyExcludesTable.js (100%) rename scm-ui/src/{config/containers/Config.js => admin/containers/Admin.js} (70%) create mode 100644 scm-ui/src/admin/containers/AdminDetails.js rename scm-ui/src/{config => admin}/containers/GlobalConfig.js (98%) rename scm-ui/src/{config => admin}/modules/config.js (100%) rename scm-ui/src/{config => admin}/modules/config.test.js (100%) rename scm-ui/src/{config => admin}/modules/namespaceStrategies.js (99%) rename scm-ui/src/{config => admin}/modules/namespaceStrategies.test.js (100%) rename scm-ui/src/{config => admin}/roles/components/AvailableVerbs.js (100%) rename scm-ui/src/{config => admin}/roles/components/PermissionRoleDetails.js (94%) rename scm-ui/src/{config => admin}/roles/components/PermissionRoleDetailsTable.js (92%) rename scm-ui/src/{config => admin}/roles/components/PermissionRoleRow.js (100%) rename scm-ui/src/{config => admin}/roles/components/PermissionRoleTable.js (93%) rename scm-ui/src/{config => admin}/roles/components/SystemRoleTag.js (89%) rename scm-ui/src/{config => admin}/roles/containers/CreateRepositoryRole.js (97%) rename scm-ui/src/{config => admin}/roles/containers/DeleteRepositoryRole.js (83%) rename scm-ui/src/{config => admin}/roles/containers/EditRepositoryRole.js (97%) rename scm-ui/src/{config => admin}/roles/containers/RepositoryRoleForm.js (98%) rename scm-ui/src/{config => admin}/roles/containers/RepositoryRoles.js (98%) rename scm-ui/src/{config => admin}/roles/containers/SingleRepositoryRole.js (98%) rename scm-ui/src/{config => admin}/roles/modules/roles.js (100%) rename scm-ui/src/{config => admin}/roles/modules/roles.test.js (100%) diff --git a/scm-ui/src/config/components/form/BaseUrlSettings.js b/scm-ui/src/admin/components/form/BaseUrlSettings.js similarity index 100% rename from scm-ui/src/config/components/form/BaseUrlSettings.js rename to scm-ui/src/admin/components/form/BaseUrlSettings.js diff --git a/scm-ui/src/config/components/form/ConfigForm.js b/scm-ui/src/admin/components/form/ConfigForm.js similarity index 97% rename from scm-ui/src/config/components/form/ConfigForm.js rename to scm-ui/src/admin/components/form/ConfigForm.js index 05e6d6dd15..20e2db2599 100644 --- a/scm-ui/src/config/components/form/ConfigForm.js +++ b/scm-ui/src/admin/components/form/ConfigForm.js @@ -99,7 +99,7 @@ class ConfigForm extends React.Component { return ( ); } @@ -108,7 +108,7 @@ class ConfigForm extends React.Component { noPermissionNotification = ( this.onClose()} /> ); @@ -167,7 +167,7 @@ class ConfigForm extends React.Component {
{ +class Admin extends React.Component { stripEndingSlash = (url: string) => { if (url.endsWith("/")) { return url.substring(0, url.length - 2); @@ -55,7 +56,9 @@ class Config extends React.Component {
- + + + ( @@ -86,7 +89,7 @@ class Config extends React.Component { )} /> @@ -94,22 +97,38 @@ class Config extends React.Component {
-
+
+ + + +
@@ -128,5 +147,5 @@ const mapStateToProps = (state: any) => { export default compose( connect(mapStateToProps), - translate("config") -)(Config); + translate("admin") +)(Admin); diff --git a/scm-ui/src/admin/containers/AdminDetails.js b/scm-ui/src/admin/containers/AdminDetails.js new file mode 100644 index 0000000000..bce824d998 --- /dev/null +++ b/scm-ui/src/admin/containers/AdminDetails.js @@ -0,0 +1,30 @@ +// @flow +import React from "react"; +import { translate } from "react-i18next"; +import { Title, Loading, ErrorNotification } from "@scm-manager/ui-components"; + +type Props = { + loading: boolean, + error: Error, + + // context objects + t: string => string +}; + + +class AdminDetails extends React.Component { + + render() { + const { t, loading } = this.props; + + if (loading) { + return ; + } + + return ( + <>Nothing special. + ); + } +} + +export default translate("admin")(AdminDetails); diff --git a/scm-ui/src/config/containers/GlobalConfig.js b/scm-ui/src/admin/containers/GlobalConfig.js similarity index 98% rename from scm-ui/src/config/containers/GlobalConfig.js rename to scm-ui/src/admin/containers/GlobalConfig.js index 1d7a389584..0708144c87 100644 --- a/scm-ui/src/config/containers/GlobalConfig.js +++ b/scm-ui/src/admin/containers/GlobalConfig.js @@ -80,7 +80,7 @@ class GlobalConfig extends React.Component { className="delete" onClick={() => this.setState({ configChanged: false })} /> - {this.props.t("config-form.submit-success-notification")} + {this.props.t("config.form.submit-success-notification")}
); } diff --git a/scm-ui/src/config/modules/config.js b/scm-ui/src/admin/modules/config.js similarity index 100% rename from scm-ui/src/config/modules/config.js rename to scm-ui/src/admin/modules/config.js diff --git a/scm-ui/src/config/modules/config.test.js b/scm-ui/src/admin/modules/config.test.js similarity index 100% rename from scm-ui/src/config/modules/config.test.js rename to scm-ui/src/admin/modules/config.test.js diff --git a/scm-ui/src/config/modules/namespaceStrategies.js b/scm-ui/src/admin/modules/namespaceStrategies.js similarity index 99% rename from scm-ui/src/config/modules/namespaceStrategies.js rename to scm-ui/src/admin/modules/namespaceStrategies.js index a9d2ef0cf6..b6788420f4 100644 --- a/scm-ui/src/config/modules/namespaceStrategies.js +++ b/scm-ui/src/admin/modules/namespaceStrategies.js @@ -1,5 +1,4 @@ // @flow - import * as types from "../../modules/types"; import type { Action, NamespaceStrategies } from "@scm-manager/ui-types"; import { apiClient } from "@scm-manager/ui-components"; diff --git a/scm-ui/src/config/modules/namespaceStrategies.test.js b/scm-ui/src/admin/modules/namespaceStrategies.test.js similarity index 100% rename from scm-ui/src/config/modules/namespaceStrategies.test.js rename to scm-ui/src/admin/modules/namespaceStrategies.test.js diff --git a/scm-ui/src/config/roles/components/AvailableVerbs.js b/scm-ui/src/admin/roles/components/AvailableVerbs.js similarity index 100% rename from scm-ui/src/config/roles/components/AvailableVerbs.js rename to scm-ui/src/admin/roles/components/AvailableVerbs.js diff --git a/scm-ui/src/config/roles/components/PermissionRoleDetails.js b/scm-ui/src/admin/roles/components/PermissionRoleDetails.js similarity index 94% rename from scm-ui/src/config/roles/components/PermissionRoleDetails.js rename to scm-ui/src/admin/roles/components/PermissionRoleDetails.js index 610bc98b6a..4410e286ae 100644 --- a/scm-ui/src/config/roles/components/PermissionRoleDetails.js +++ b/scm-ui/src/admin/roles/components/PermissionRoleDetails.js @@ -47,4 +47,4 @@ class PermissionRoleDetails extends React.Component { } } -export default translate("config")(PermissionRoleDetails); +export default translate("admin")(PermissionRoleDetails); diff --git a/scm-ui/src/config/roles/components/PermissionRoleDetailsTable.js b/scm-ui/src/admin/roles/components/PermissionRoleDetailsTable.js similarity index 92% rename from scm-ui/src/config/roles/components/PermissionRoleDetailsTable.js rename to scm-ui/src/admin/roles/components/PermissionRoleDetailsTable.js index 28ab5e1f14..852fe3f778 100644 --- a/scm-ui/src/config/roles/components/PermissionRoleDetailsTable.js +++ b/scm-ui/src/admin/roles/components/PermissionRoleDetailsTable.js @@ -35,4 +35,4 @@ class PermissionRoleDetailsTable extends React.Component { } } -export default translate("config")(PermissionRoleDetailsTable); +export default translate("admin")(PermissionRoleDetailsTable); diff --git a/scm-ui/src/config/roles/components/PermissionRoleRow.js b/scm-ui/src/admin/roles/components/PermissionRoleRow.js similarity index 100% rename from scm-ui/src/config/roles/components/PermissionRoleRow.js rename to scm-ui/src/admin/roles/components/PermissionRoleRow.js diff --git a/scm-ui/src/config/roles/components/PermissionRoleTable.js b/scm-ui/src/admin/roles/components/PermissionRoleTable.js similarity index 93% rename from scm-ui/src/config/roles/components/PermissionRoleTable.js rename to scm-ui/src/admin/roles/components/PermissionRoleTable.js index 13c5d775d1..a81f5d9b61 100644 --- a/scm-ui/src/config/roles/components/PermissionRoleTable.js +++ b/scm-ui/src/admin/roles/components/PermissionRoleTable.js @@ -34,4 +34,4 @@ class PermissionRoleTable extends React.Component { } } -export default translate("config")(PermissionRoleTable); +export default translate("admin")(PermissionRoleTable); diff --git a/scm-ui/src/config/roles/components/SystemRoleTag.js b/scm-ui/src/admin/roles/components/SystemRoleTag.js similarity index 89% rename from scm-ui/src/config/roles/components/SystemRoleTag.js rename to scm-ui/src/admin/roles/components/SystemRoleTag.js index 8aad57eddc..f1e8b0781b 100644 --- a/scm-ui/src/config/roles/components/SystemRoleTag.js +++ b/scm-ui/src/admin/roles/components/SystemRoleTag.js @@ -34,4 +34,4 @@ class SystemRoleTag extends React.Component { } } -export default injectSheet(styles)(translate("config")(SystemRoleTag)); +export default injectSheet(styles)(translate("admin")(SystemRoleTag)); diff --git a/scm-ui/src/config/roles/containers/CreateRepositoryRole.js b/scm-ui/src/admin/roles/containers/CreateRepositoryRole.js similarity index 97% rename from scm-ui/src/config/roles/containers/CreateRepositoryRole.js rename to scm-ui/src/admin/roles/containers/CreateRepositoryRole.js index 55b141469f..5018b033c8 100644 --- a/scm-ui/src/config/roles/containers/CreateRepositoryRole.js +++ b/scm-ui/src/admin/roles/containers/CreateRepositoryRole.js @@ -85,4 +85,4 @@ const mapDispatchToProps = dispatch => { export default connect( mapStateToProps, mapDispatchToProps -)(translate("config")(CreateRepositoryRole)); +)(translate("admin")(CreateRepositoryRole)); diff --git a/scm-ui/src/config/roles/containers/DeleteRepositoryRole.js b/scm-ui/src/admin/roles/containers/DeleteRepositoryRole.js similarity index 83% rename from scm-ui/src/config/roles/containers/DeleteRepositoryRole.js rename to scm-ui/src/admin/roles/containers/DeleteRepositoryRole.js index a00cc21840..113e1c2181 100644 --- a/scm-ui/src/config/roles/containers/DeleteRepositoryRole.js +++ b/scm-ui/src/admin/roles/containers/DeleteRepositoryRole.js @@ -45,15 +45,15 @@ class DeleteRepositoryRole extends React.Component { confirmDelete = () => { const { t } = this.props; confirmAlert({ - title: t("deleteRole.confirmAlert.title"), - message: t("deleteRole.confirmAlert.message"), + title: t("repositoryRole.delete.confirmAlert.title"), + message: t("repositoryRole.delete.confirmAlert.message"), buttons: [ { - label: t("deleteRole.confirmAlert.submit"), + label: t("repositoryRole.delete.confirmAlert.submit"), onClick: () => this.deleteRole() }, { - label: t("deleteRole.confirmAlert.cancel"), + label: t("repositoryRole.delete.confirmAlert.cancel"), onClick: () => null } ] @@ -74,12 +74,12 @@ class DeleteRepositoryRole extends React.Component { return ( <> - +
@@ -110,4 +110,4 @@ const mapDispatchToProps = dispatch => { export default connect( mapStateToProps, mapDispatchToProps -)(withRouter(translate("config")(DeleteRepositoryRole))); +)(withRouter(translate("admin")(DeleteRepositoryRole))); diff --git a/scm-ui/src/config/roles/containers/EditRepositoryRole.js b/scm-ui/src/admin/roles/containers/EditRepositoryRole.js similarity index 97% rename from scm-ui/src/config/roles/containers/EditRepositoryRole.js rename to scm-ui/src/admin/roles/containers/EditRepositoryRole.js index 15e3bee6ae..c1314b439f 100644 --- a/scm-ui/src/config/roles/containers/EditRepositoryRole.js +++ b/scm-ui/src/admin/roles/containers/EditRepositoryRole.js @@ -78,4 +78,4 @@ const mapDispatchToProps = dispatch => { export default connect( mapStateToProps, mapDispatchToProps -)(translate("config")(EditRepositoryRole)); +)(translate("admin")(EditRepositoryRole)); diff --git a/scm-ui/src/config/roles/containers/RepositoryRoleForm.js b/scm-ui/src/admin/roles/containers/RepositoryRoleForm.js similarity index 98% rename from scm-ui/src/config/roles/containers/RepositoryRoleForm.js rename to scm-ui/src/admin/roles/containers/RepositoryRoleForm.js index 9269af3838..fc7aa05f67 100644 --- a/scm-ui/src/config/roles/containers/RepositoryRoleForm.js +++ b/scm-ui/src/admin/roles/containers/RepositoryRoleForm.js @@ -169,4 +169,4 @@ const mapDispatchToProps = dispatch => { export default connect( mapStateToProps, mapDispatchToProps -)(translate("config")(RepositoryRoleForm)); +)(translate("admin")(RepositoryRoleForm)); diff --git a/scm-ui/src/config/roles/containers/RepositoryRoles.js b/scm-ui/src/admin/roles/containers/RepositoryRoles.js similarity index 98% rename from scm-ui/src/config/roles/containers/RepositoryRoles.js rename to scm-ui/src/admin/roles/containers/RepositoryRoles.js index 2de1d3d74c..912af7f8c2 100644 --- a/scm-ui/src/config/roles/containers/RepositoryRoles.js +++ b/scm-ui/src/admin/roles/containers/RepositoryRoles.js @@ -151,5 +151,5 @@ export default withRouter( connect( mapStateToProps, mapDispatchToProps - )(translate("config")(RepositoryRoles)) + )(translate("admin")(RepositoryRoles)) ); diff --git a/scm-ui/src/config/roles/containers/SingleRepositoryRole.js b/scm-ui/src/admin/roles/containers/SingleRepositoryRole.js similarity index 98% rename from scm-ui/src/config/roles/containers/SingleRepositoryRole.js rename to scm-ui/src/admin/roles/containers/SingleRepositoryRole.js index 4aec3b0b06..5c392d222d 100644 --- a/scm-ui/src/config/roles/containers/SingleRepositoryRole.js +++ b/scm-ui/src/admin/roles/containers/SingleRepositoryRole.js @@ -129,5 +129,5 @@ export default withRouter( connect( mapStateToProps, mapDispatchToProps - )(translate("config")(SingleRepositoryRole)) + )(translate("admin")(SingleRepositoryRole)) ); diff --git a/scm-ui/src/config/roles/modules/roles.js b/scm-ui/src/admin/roles/modules/roles.js similarity index 100% rename from scm-ui/src/config/roles/modules/roles.js rename to scm-ui/src/admin/roles/modules/roles.js diff --git a/scm-ui/src/config/roles/modules/roles.test.js b/scm-ui/src/admin/roles/modules/roles.test.js similarity index 100% rename from scm-ui/src/config/roles/modules/roles.test.js rename to scm-ui/src/admin/roles/modules/roles.test.js From 9bcc73938e8cf791531542ac7698460c32dd6c47 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 19 Jun 2019 09:59:32 +0200 Subject: [PATCH 3/7] changed imports/binders to new location --- .../ui-components/src/config/Configuration.js | 4 ++-- .../src/config/ConfigurationBinder.js | 8 ++++---- .../src/navigation/PrimaryNavigation.js | 2 +- scm-ui/public/locales/de/config.json | 18 ++++++++---------- scm-ui/public/locales/en/config.json | 18 ++++++++---------- scm-ui/src/containers/Main.js | 7 ++++--- scm-ui/src/createReduxStore.js | 6 +++--- scm-ui/src/repos/containers/Create.js | 2 +- 8 files changed, 31 insertions(+), 34 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/config/Configuration.js b/scm-ui-components/packages/ui-components/src/config/Configuration.js index 0eb6f6ffc2..3607777989 100644 --- a/scm-ui-components/packages/ui-components/src/config/Configuration.js +++ b/scm-ui-components/packages/ui-components/src/config/Configuration.js @@ -136,7 +136,7 @@ class Configuration extends React.Component { className="delete" onClick={() => this.setState({ configChanged: false })} /> - {this.props.t("config-form.submit-success-notification")} + {this.props.t("config.form.submit-success-notification")}
); } @@ -167,7 +167,7 @@ class Configuration extends React.Component { {this.props.render(renderProps)}
diff --git a/scm-ui-components/packages/ui-components/src/config/ConfigurationBinder.js b/scm-ui-components/packages/ui-components/src/config/ConfigurationBinder.js index 7d0dfe7ed8..e1ee8f562a 100644 --- a/scm-ui-components/packages/ui-components/src/config/ConfigurationBinder.js +++ b/scm-ui-components/packages/ui-components/src/config/ConfigurationBinder.js @@ -29,20 +29,20 @@ class ConfigurationBinder { // create NavigationLink with translated label const ConfigNavLink = translate(this.i18nNamespace)(({t}) => { - return this.navLink("/config" + to, labelI18nKey, t); + return this.navLink("/admin/settings" + to, labelI18nKey, t); }); // bind navigation link to extension point - binder.bind("config.navigation", ConfigNavLink, configPredicate); + binder.bind("admin.setting", ConfigNavLink, configPredicate); // route for global configuration, passes the link from the index resource to component const ConfigRoute = ({ url, links, ...additionalProps }) => { const link = links[linkName].href; - return this.route(url + to, ); + return this.route(url + "/settings" + to, ); }; // bind config route to extension point - binder.bind("config.route", ConfigRoute, configPredicate); + binder.bind("admin.route", ConfigRoute, configPredicate); } bindRepository(to: string, labelI18nKey: string, linkName: string, RepositoryComponent: any) { diff --git a/scm-ui-components/packages/ui-components/src/navigation/PrimaryNavigation.js b/scm-ui-components/packages/ui-components/src/navigation/PrimaryNavigation.js index ce0c2d75dc..871d630350 100644 --- a/scm-ui-components/packages/ui-components/src/navigation/PrimaryNavigation.js +++ b/scm-ui-components/packages/ui-components/src/navigation/PrimaryNavigation.js @@ -75,7 +75,7 @@ class PrimaryNavigation extends React.Component { "primary-navigation.groups", "groups" ); - append("/config", "/config", "primary-navigation.config", "config"); + append("/admin", "/admin", "primary-navigation.admin", "config"); navigationItems.push( { authenticated={authenticated} /> Date: Thu, 20 Jun 2019 15:41:10 +0200 Subject: [PATCH 4/7] corrected RepositoryRole paths --- scm-ui/src/admin/roles/containers/CreateRepositoryRole.js | 2 +- scm-ui/src/admin/roles/containers/DeleteRepositoryRole.js | 2 +- scm-ui/src/admin/roles/containers/EditRepositoryRole.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-ui/src/admin/roles/containers/CreateRepositoryRole.js b/scm-ui/src/admin/roles/containers/CreateRepositoryRole.js index 5018b033c8..63e04e580e 100644 --- a/scm-ui/src/admin/roles/containers/CreateRepositoryRole.js +++ b/scm-ui/src/admin/roles/containers/CreateRepositoryRole.js @@ -32,7 +32,7 @@ type Props = { class CreateRepositoryRole extends React.Component { repositoryRoleCreated = (role: RepositoryRole) => { const { history } = this.props; - history.push("/config/role/" + role.name + "/info"); + history.push("/admin/role/" + role.name + "/info"); }; createRepositoryRole = (role: RepositoryRole) => { diff --git a/scm-ui/src/admin/roles/containers/DeleteRepositoryRole.js b/scm-ui/src/admin/roles/containers/DeleteRepositoryRole.js index 113e1c2181..0300866b50 100644 --- a/scm-ui/src/admin/roles/containers/DeleteRepositoryRole.js +++ b/scm-ui/src/admin/roles/containers/DeleteRepositoryRole.js @@ -35,7 +35,7 @@ class DeleteRepositoryRole extends React.Component { }; roleDeleted = () => { - this.props.history.push("/config/roles/"); + this.props.history.push("/admin/roles/"); }; deleteRole = () => { diff --git a/scm-ui/src/admin/roles/containers/EditRepositoryRole.js b/scm-ui/src/admin/roles/containers/EditRepositoryRole.js index c1314b439f..45576d02e3 100644 --- a/scm-ui/src/admin/roles/containers/EditRepositoryRole.js +++ b/scm-ui/src/admin/roles/containers/EditRepositoryRole.js @@ -29,7 +29,7 @@ type Props = { class EditRepositoryRole extends React.Component { repositoryRoleUpdated = () => { - this.props.history.push("/config/roles/"); + this.props.history.push("/admin/roles/"); }; updateRepositoryRole = (role: RepositoryRole) => { From 87cf34dd318b023ab835f3084430e65e8c36a4f0 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Mon, 24 Jun 2019 14:37:25 +0200 Subject: [PATCH 5/7] add current version to admin-information --- scm-ui/public/locales/de/admin.json | 3 +++ scm-ui/public/locales/en/admin.json | 3 +++ scm-ui/src/admin/containers/AdminDetails.js | 25 +++++++++++++++------ scm-ui/src/modules/indexResource.js | 5 +++++ 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/scm-ui/public/locales/de/admin.json b/scm-ui/public/locales/de/admin.json index c79707b9c7..d7ced4ce70 100644 --- a/scm-ui/public/locales/de/admin.json +++ b/scm-ui/public/locales/de/admin.json @@ -5,6 +5,9 @@ "informationNavLink": "Informationen", "settingsNavLink": "Einstellungen", "generalNavLink": "Generell" + }, + "information": { + "currentAppVersion": "Aktuelle Software-Versionsnummer" } }, "repositoryRole": { diff --git a/scm-ui/public/locales/en/admin.json b/scm-ui/public/locales/en/admin.json index 1dd3a7a092..83b13990c0 100644 --- a/scm-ui/public/locales/en/admin.json +++ b/scm-ui/public/locales/en/admin.json @@ -5,6 +5,9 @@ "informationNavLink": "Information", "settingsNavLink": "Settings", "generalNavLink": "General" + }, + "information": { + "currentAppVersion": "Current Application Version" } }, "repositoryRole": { diff --git a/scm-ui/src/admin/containers/AdminDetails.js b/scm-ui/src/admin/containers/AdminDetails.js index bce824d998..f096929ca0 100644 --- a/scm-ui/src/admin/containers/AdminDetails.js +++ b/scm-ui/src/admin/containers/AdminDetails.js @@ -1,19 +1,22 @@ // @flow import React from "react"; import { translate } from "react-i18next"; -import { Title, Loading, ErrorNotification } from "@scm-manager/ui-components"; +import {Loading, Subtitle} from "@scm-manager/ui-components"; +import {getAppVersion} from "../../modules/indexResource"; +import {connect} from "react-redux"; +import Title from "@scm-manager/ui-components/src/layout/Title"; type Props = { loading: boolean, error: Error, + version: string, + // context objects t: string => string }; - class AdminDetails extends React.Component { - render() { const { t, loading } = this.props; @@ -21,10 +24,18 @@ class AdminDetails extends React.Component { return ; } - return ( - <>Nothing special. - ); + return <> + + <Subtitle subtitle={this.props.version}/> + </>; } } -export default translate("admin")(AdminDetails); +const mapStateToProps = (state: any) => { + const version = getAppVersion(state); + return { + version + }; +}; + +export default connect(mapStateToProps)(translate("admin")(AdminDetails)); diff --git a/scm-ui/src/modules/indexResource.js b/scm-ui/src/modules/indexResource.js index 12126e4841..e9b7e67baf 100644 --- a/scm-ui/src/modules/indexResource.js +++ b/scm-ui/src/modules/indexResource.js @@ -73,6 +73,7 @@ export default function reducer( case FETCH_INDEXRESOURCES_SUCCESS: return { ...state, + version: action.payload.version, links: action.payload._links }; default: @@ -107,6 +108,10 @@ export function getLinkCollection(state: Object, name: string): Link[] { return []; } +export function getAppVersion(state: Object) { + return state.indexResources.version; +} + export function getUiPluginsLink(state: Object) { return getLink(state, "uiPlugins"); } From 207390bdade3d7bb3e94df67efec7fca55e67cfd Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com> Date: Mon, 24 Jun 2019 15:13:04 +0200 Subject: [PATCH 6/7] fix routing for /admin/ --- scm-ui/src/admin/containers/Admin.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scm-ui/src/admin/containers/Admin.js b/scm-ui/src/admin/containers/Admin.js index ae2523b44f..40ab00f95a 100644 --- a/scm-ui/src/admin/containers/Admin.js +++ b/scm-ui/src/admin/containers/Admin.js @@ -27,7 +27,10 @@ type Props = { class Admin extends React.Component<Props> { stripEndingSlash = (url: string) => { if (url.endsWith("/")) { - return url.substring(0, url.length - 2); + if(url.includes("role")) { + return url.substring(0, url.length - 2); + } + return url.substring(0, url.length - 1); } return url; }; From 19af44d4c8fc82be3b3d1cbbf414023adf0a4cac Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com> Date: Tue, 25 Jun 2019 05:54:20 +0000 Subject: [PATCH 7/7] Close branch feature/admin_section