Rename 'user management' app to 'admin settings'

changelog/unreleased/enhancement-rename-user-management

@@ -0,0 +1,5 @@
+Enhancement: Rename "user management" app
+
+The "user management" app has been renamed to "admin settings" because the app will contain a variety of general settings in the future.
+
+https://github.com/owncloud/web/pull/8175

config/config.json.sample-ocis

@@ -16,7 +16,7 @@
     "text-editor",
     "draw-io",
     "external",
-    "user-management"
+    "admin-settings"
   ],
   "external_apps": [
     {

config/vite_ocis/config.json

@@ -14,7 +14,7 @@
     "pdf-viewer",
     "search",
     "external",
-    "user-management"
+    "admin-settings"
   ],
   "external_apps": [
     {

dev/docker/ocis.web.config.json

@@ -30,7 +30,7 @@
     "pdf-viewer",
     "search",
     "external",
-    "user-management"
+    "admin-settings"
   ],
   "external_apps": [
     {

package.json

@@ -13,7 +13,7 @@
     "serve": "SERVER=true pnpm build:w",
     "test:e2e:cucumber": "NODE_TLS_REJECT_UNAUTHORIZED=0 cucumber-js --profile=e2e -f json:tests/e2e/cucumber/report/cucumber_report.json",
     "test:unit": "NODE_OPTIONS=--unhandled-rejections=throw jest --config ./tests/unit/config/jest.config.js",
-    "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages '@ownclouders/babel-preset;@ownclouders/eslint-config;@ownclouders/prettier-config;@ownclouders/tsconfig;@ownclouders/web-client;@ownclouders/web-pkg,draw-io;external;web-app-files;text-editor;preview;@ownclouders/design-system;pdf-viewer;web-app-search;user-management;web-runtime'",
+    "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages '@ownclouders/babel-preset;@ownclouders/eslint-config;@ownclouders/prettier-config;@ownclouders/tsconfig;@ownclouders/web-client;@ownclouders/web-pkg,draw-io;external;web-app-files;text-editor;preview;@ownclouders/design-system;pdf-viewer;web-app-search;admin-settings;web-runtime'",
     "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ./third-party-licenses/third-party-licenses.csv",
     "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ./third-party-licenses/third-party-licenses",
     "vite": "pnpm vite:ocis",

packages/web-app-user-management/l10n/.tx/config → packages/web-app-admin-settings/l10n/.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:owncloud-org:p:owncloud-web:r:user-management]
+[o:owncloud-org:p:owncloud-web:r:admin-settings]
 file_filter = locale/<lang>/LC_MESSAGES/app.po
 minimum_perc = 0
 source_file = template.pot

packages/web-app-user-management/package.json → packages/web-app-admin-settings/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "user-management",
+  "name": "admin-settings",
   "version": "0.0.0",
   "private": true,
-  "description": "ownCloud user management",
+  "description": "ownCloud admin settings",
   "license": "AGPL-3.0",
   "dependencies": {
     "email-validator": "^2.0.4",

packages/web-app-user-management/src/components/AppTemplate.vue → packages/web-app-admin-settings/src/components/AppTemplate.vue

@@ -2,8 +2,8 @@
   <main class="oc-flex oc-height-1-1 app-content oc-width-1-1">
     <app-loading-spinner v-if="loading" />
     <template v-else>
-      <div id="user-management-wrapper" class="oc-width-expand">
-        <div id="user-management-app-bar" ref="appBar" class="oc-app-bar oc-py-s">
+      <div id="admin-settings-wrapper" class="oc-width-expand">
+        <div id="admin-settings-app-bar" ref="appBar" class="oc-app-bar oc-py-s">
           <div class="oc-flex oc-flex-between">
             <oc-breadcrumb class="oc-flex oc-flex-middle" :items="breadcrumbs" />
             <div>
@@ -83,7 +83,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-#user-management-app-bar {
+#admin-settings-app-bar {
   background-color: var(--oc-color-background-default);
   border-top-right-radius: 15px;
   box-sizing: border-box;
@@ -102,13 +102,13 @@ export default defineComponent({
   }
 }
 
-.user-management-app-bar-actions {
+.admin-settings-app-bar-actions {
   align-items: center;
   display: flex;
   min-height: 3rem;
 }
 
-#user-management-wrapper {
+#admin-settings-wrapper {
   overflow-y: auto;
 }
 </style>

packages/web-app-user-management/src/index.js → packages/web-app-admin-settings/src/index.js

@@ -7,22 +7,22 @@ function $gettext(msg) {
 }
 
 const appInfo = {
-  name: $gettext('User management'),
-  id: 'user-management',
-  icon: 'user-settings',
+  name: $gettext('Administration Settings'),
+  id: 'admin-settings',
+  icon: 'settings-4',
   isFileEditor: false
 }
 
 const routes = [
   {
     path: '/',
     redirect: () => {
-      return { name: 'user-management-users' }
+      return { name: 'admin-settings-users' }
     }
   },
   {
     path: '/users',
-    name: 'user-management-users',
+    name: 'admin-settings-users',
     component: Users,
     meta: {
       authContext: 'user',
@@ -31,7 +31,7 @@ const routes = [
   },
   {
     path: '/groups',
-    name: 'user-management-groups',
+    name: 'admin-settings-groups',
     component: Groups,
     meta: {
       authContext: 'user',

packages/web-app-user-management/src/views/Groups.vue → packages/web-app-admin-settings/src/views/Groups.vue

@@ -12,7 +12,7 @@
       @toggleSideBar="toggleSideBar"
     >
       <template #topbarActions>
-        <div class="user-management-app-bar-actions oc-mt-xs">
+        <div class="admin-settings-app-bar-actions oc-mt-xs">
           <div v-if="selectedGroups.length" class="oc-flex oc-flex-middle">
             <span v-text="selectedGroupsText" />
             <oc-button
@@ -41,7 +41,7 @@
       <template #mainContent>
         <no-content-message
           v-if="!groups.length"
-          id="user-management-groups-empty"
+          id="admin-settings-groups-empty"
           class="files-empty"
           icon="user"
         >
@@ -134,10 +134,10 @@ export default defineComponent({
     },
     breadcrumbs() {
       return [
-        { text: this.$gettext('User management'), to: { path: '/user-management' } },
+        { text: this.$gettext('Administration Settings'), to: { path: '/admin-settings' } },
         {
           text: this.$gettext('Groups'),
-          onClick: () => eventBus.publish('app.user-management.list.load')
+          onClick: () => eventBus.publish('app.admin-settings.list.load')
         }
       ]
     },
@@ -193,7 +193,7 @@ export default defineComponent({
   async mounted() {
     await this.loadResourcesTask.perform(this)
 
-    const loadResourcesEventToken = eventBus.subscribe('app.user-management.list.load', () => {
+    const loadResourcesEventToken = eventBus.subscribe('app.admin-settings.list.load', () => {
       this.loadResourcesTask.perform(this)
     })
 
@@ -202,7 +202,7 @@ export default defineComponent({
     window.addEventListener('resize', this.calculateListHeaderPosition)
 
     this.$on('beforeDestroy', () => {
-      eventBus.unsubscribe('app.user-management.list.load', loadResourcesEventToken)
+      eventBus.unsubscribe('app.admin-settings.list.load', loadResourcesEventToken)
     })
   },
 

packages/web-app-user-management/src/views/Users.vue → packages/web-app-admin-settings/src/views/Users.vue

@@ -12,7 +12,7 @@
       @toggleSideBar="toggleSideBar"
     >
       <template #topbarActions>
-        <div class="user-management-app-bar-actions oc-mt-xs">
+        <div class="admin-settings-app-bar-actions oc-mt-xs">
           <div v-if="selectedUsers.length" class="oc-flex oc-flex-middle">
             <span v-text="selectedUsersText" />
             <oc-button
@@ -41,7 +41,7 @@
       <template #mainContent>
         <no-content-message
           v-if="!users.length"
-          id="user-management-users-empty"
+          id="admin-settings-users-empty"
           class="files-empty"
           icon="user"
         >
@@ -190,10 +190,10 @@ export default defineComponent({
     },
     breadcrumbs() {
       return [
-        { text: this.$gettext('User management'), to: { path: '/user-management' } },
+        { text: this.$gettext('Administration Settings'), to: { path: '/admin-settings' } },
         {
           text: this.$gettext('Users'),
-          onClick: () => eventBus.publish('app.user-management.list.load')
+          onClick: () => eventBus.publish('app.admin-settings.list.load')
         }
       ]
     },
@@ -248,7 +248,7 @@ export default defineComponent({
   async mounted() {
     await this.loadResourcesTask.perform(this)
 
-    const loadResourcesEventToken = eventBus.subscribe('app.user-management.list.load', () => {
+    const loadResourcesEventToken = eventBus.subscribe('app.admin-settings.list.load', () => {
       this.loadResourcesTask.perform(this)
     })
 
@@ -257,7 +257,7 @@ export default defineComponent({
     window.addEventListener('resize', this.calculateListHeaderPosition)
 
     this.$on('beforeDestroy', () => {
-      eventBus.unsubscribe('app.user-management.list.load', loadResourcesEventToken)
+      eventBus.unsubscribe('app.admin-settings.list.load', loadResourcesEventToken)
     })
   },
 

packages/web-app-user-management/tests/unit/components/AppTemplate.spec.ts → packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts

@@ -8,7 +8,7 @@ const stubSelectors = {
 }
 
 const elSelectors = {
-  userManagementWrapper: '#user-management-wrapper'
+  adminSettingsWrapper: '#admin-settings-wrapper'
 }
 
 afterEach(() => jest.clearAllMocks())
@@ -23,9 +23,9 @@ describe('AppTemplate', () => {
       const { wrapper } = getWrapper({ propsData: { loading: true } })
       expect(wrapper.find(stubSelectors.sideBar).exists()).toBeFalsy()
     })
-    it('should not show user management wrapper', () => {
+    it('should not show admin settings wrapper', () => {
       const { wrapper } = getWrapper({ propsData: { loading: true } })
-      expect(wrapper.find(elSelectors.userManagementWrapper).exists()).toBeFalsy()
+      expect(wrapper.find(elSelectors.adminSettingsWrapper).exists()).toBeFalsy()
     })
   })
   describe('loading is false', () => {
@@ -37,9 +37,9 @@ describe('AppTemplate', () => {
       const { wrapper } = getWrapper({ propsData: { loading: false } })
       expect(wrapper.find(stubSelectors.sideBar).exists()).toBeTruthy()
     })
-    it('should show user management wrapper', () => {
+    it('should show admin settings wrapper', () => {
       const { wrapper } = getWrapper({ propsData: { loading: false } })
-      expect(wrapper.find(elSelectors.userManagementWrapper).exists()).toBeTruthy()
+      expect(wrapper.find(elSelectors.adminSettingsWrapper).exists()).toBeTruthy()
     })
   })
   describe('sideBarOpen is true', () => {
@@ -58,10 +58,10 @@ describe('AppTemplate', () => {
     describe('oc breadcrumb component', () => {
       it('receives correct props', () => {
         const { wrapper } = getWrapper({
-          propsData: { breadcrumbs: [{ text: 'User management' }, { text: 'Users' }] }
+          propsData: { breadcrumbs: [{ text: 'Administration Settings' }, { text: 'Users' }] }
         })
         expect(wrapper.find(stubSelectors.ocBreadcrumb).props().items).toEqual([
-          { text: 'User management' },
+          { text: 'Administration Settings' },
           { text: 'Users' }
         ])
       })

packages/web-runtime/src/container/bootstrap.ts

@@ -183,7 +183,8 @@ const rewriteDeprecatedAppNames = (
 ): RuntimeConfiguration => {
   const appAliases = [
     { name: 'preview', oldName: 'media-viewer' },
-    { name: 'text-editor', oldName: 'markdown-editor' }
+    { name: 'text-editor', oldName: 'markdown-editor' },
+    { name: 'admin-settings', oldName: 'user-management' }
   ]
   return {
     ...runtimeConfiguration,