Space management actions followup

changelog/unreleased/enhancement-spaces-list-in-admin-settings

@@ -8,4 +8,5 @@ https://github.com/owncloud/web/pull/8190
 https://github.com/owncloud/web/pull/8192
 https://github.com/owncloud/web/pull/8199
 https://github.com/owncloud/web/pull/8224
+https://github.com/owncloud/web/pull/8229
 https://github.com/owncloud/web/issues/8219

packages/web-pkg/src/components/sideBar/Spaces/Details/SpaceDetails.vue

@@ -54,7 +54,7 @@
           <span v-text="ownerUsernames" />
         </td>
       </tr>
-      <tr>
+      <tr v-if="!space.disabled">
         <th scope="col" class="oc-pr-s" v-text="$gettext('Quota')" />
         <td>
           <space-quota :space-quota="space.spaceQuota" />

packages/web-pkg/src/mixins/spaces/disable.ts

@@ -1,5 +1,6 @@
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
 import { clientService } from 'web-pkg/src/services'
+import { SpaceResource } from 'web-client'
 
 export default {
   computed: {
@@ -64,15 +65,16 @@ export default {
       this.createModal(modal)
     },
 
-    $_disable_disableSpace(space) {
+    $_disable_disableSpace(space: SpaceResource) {
       const accessToken = this.$store.getters['runtime/auth/accessToken']
       const graphClient = clientService.graphAuthenticated(this.configuration.server, accessToken)
       return graphClient.drives
-        .deleteDrive(space.id)
+        .deleteDrive(space.id.toString())
         .then(() => {
           this.hideModal()
           if (this.$router.currentRoute.name === 'admin-settings-spaces') {
             space.disabled = true
+            space.spaceQuota = { total: space.spaceQuota.total }
           }
           this.UPDATE_SPACE_FIELD({
             id: space.id,

packages/web-pkg/src/mixins/spaces/restore.ts

@@ -1,5 +1,6 @@
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
 import { clientService } from 'web-pkg/src/services'
+import { SpaceResource } from 'web-client'
 
 export default {
   computed: {
@@ -62,23 +63,24 @@ export default {
       this.createModal(modal)
     },
 
-    $_restore_restoreSpace(space) {
+    $_restore_restoreSpace(space: SpaceResource) {
       const accessToken = this.$store.getters['runtime/auth/accessToken']
       const graphClient = clientService.graphAuthenticated(this.configuration.server, accessToken)
       return graphClient.drives
         .updateDrive(
-          space.id,
+          space.id.toString(),
           { name: space.name },
           {
             headers: {
               Restore: true
             }
           }
         )
-        .then(() => {
+        .then((updatedSpace) => {
           this.hideModal()
           if (this.$router.currentRoute.name === 'admin-settings-spaces') {
             space.disabled = false
+            space.spaceQuota = updatedSpace.data.quota
           }
           this.UPDATE_SPACE_FIELD({
             id: space.id,

packages/web-pkg/src/services/permissionManager.ts

@@ -13,18 +13,18 @@ interface Permission {
     type: string
   }
 }
-export enum RoleName {
+export enum UserRoleName {
   Admin = 'admin',
   SpaceAdmin = 'spaceadmin',
   User = 'user',
   Guest = 'guest'
 }
-interface Role {
-  name: RoleName
+interface UserRole {
+  name: UserRoleName
   settings: Array<Permission>
 }
 interface User {
-  role: Role
+  role: UserRole
 }
 
 export class PermissionManager {
@@ -35,11 +35,11 @@ export class PermissionManager {
   }
 
   public hasUserManagement() {
-    return this.user.role?.name === RoleName.Admin
+    return this.user.role?.name === UserRoleName.Admin
   }
 
   public hasSpaceManagement() {
-    return [RoleName.Admin, RoleName.SpaceAdmin].includes(this.user.role?.name)
+    return [UserRoleName.Admin, UserRoleName.SpaceAdmin].includes(this.user.role?.name)
   }
 
   public canEditSpaceQuota() {

packages/web-pkg/tests/unit/mixins/spaces/disable.spec.ts

@@ -87,7 +87,7 @@ describe('disable', () => {
       graphMock.drives.deleteDrive.mockResolvedValue(mockAxiosResolve())
       const { wrapper } = getWrapper(graphMock)
       const hideModalStub = jest.spyOn(wrapper.vm, 'hideModal')
-      await wrapper.vm.$_disable_disableSpace(1)
+      await wrapper.vm.$_disable_disableSpace({ id: 1 })
 
       expect(hideModalStub).toHaveBeenCalledTimes(1)
     })
@@ -98,7 +98,7 @@ describe('disable', () => {
       graphMock.drives.deleteDrive.mockRejectedValue(new Error())
       const { wrapper } = getWrapper(graphMock)
       const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
-      await wrapper.vm.$_disable_disableSpace(1)
+      await wrapper.vm.$_disable_disableSpace({ id: 1 })
 
       expect(showMessageStub).toHaveBeenCalledTimes(1)
     })

packages/web-pkg/tests/unit/mixins/spaces/restore.spec.ts

@@ -88,7 +88,7 @@ describe('restore', () => {
       graphMock.drives.updateDrive.mockResolvedValue(mockAxiosResolve())
       const { wrapper } = getWrapper(graphMock)
       const hideModalStub = jest.spyOn(wrapper.vm, 'hideModal')
-      await wrapper.vm.$_restore_restoreSpace(1, 'renamed space')
+      await wrapper.vm.$_restore_restoreSpace({ id: 1 }, 'renamed space')
 
       expect(hideModalStub).toHaveBeenCalledTimes(1)
     })
@@ -99,7 +99,7 @@ describe('restore', () => {
       graphMock.drives.updateDrive.mockRejectedValue(new Error())
       const { wrapper } = getWrapper(graphMock)
       const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
-      await wrapper.vm.$_restore_restoreSpace(1)
+      await wrapper.vm.$_restore_restoreSpace({ id: 1 })
 
       expect(showMessageStub).toHaveBeenCalledTimes(1)
     })