feat(user) refactored workspaces in roles and user so they can share …

…table component
pimcore · Jan 20, 2025 · acfb548 · acfb548
1 parent f00390f
commit acfb548
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/assets/js/src/core/modules/user/management/detail/tabs/workspaces/workspaces-container.tsx b/assets/js/src/core/modules/user/management/detail/tabs/workspaces/workspaces-container.tsx
@@ -29,10 +29,6 @@ const WorkspacesContainer = ({ ...props }): React.JSX.Element => {
   const { id } = useUserContext()
   const { user, isLoading, changeUserInState } = useUserDraft(id)
 
-  if (user === undefined) {
-    return <></>
-  }
-
   const [assetWorkspaces, setAssetWorkspaces] = React.useState<UserWorkspace[]>(user?.assetWorkspaces ?? [])
   const [documentWorkspaces, setDocumentWorkspaces] = React.useState<UserWorkspace[]>(user?.documentWorkspaces ?? [])
   const [objectWorkspaces, setObjectWorkspaces] = React.useState<UserWorkspace[]>(user?.dataObjectWorkspaces ?? [])
@@ -45,6 +41,10 @@ const WorkspacesContainer = ({ ...props }): React.JSX.Element => {
     type: 'error'
   })
 
+  if (user === undefined) {
+    return <></>
+  }
+
   const documentsAccordion = [
     {
       key: '1',

diff --git a/assets/js/src/core/modules/user/roles/detail/tabs/workspaces/workspaces-container.tsx b/assets/js/src/core/modules/user/roles/detail/tabs/workspaces/workspaces-container.tsx
@@ -29,10 +29,6 @@ const WorkspacesContainer = ({ ...props }): React.JSX.Element => {
   const { id } = useRoleContext()
   const { item, isLoading, changeItemInState } = useRoleDraft(id)
 
-  if (item === undefined) {
-    return <></>
-  }
-
   const [assetWorkspaces, setAssetWorkspaces] = React.useState<UserWorkspace[]>(item?.assetWorkspaces ?? [])
   const [documentWorkspaces, setDocumentWorkspaces] = React.useState<UserWorkspace[]>(item?.documentWorkspaces ?? [])
   const [objectWorkspaces, setObjectWorkspaces] = React.useState<UserWorkspace[]>(item?.dataObjectWorkspaces ?? [])
@@ -45,6 +41,10 @@ const WorkspacesContainer = ({ ...props }): React.JSX.Element => {
     type: 'error'
   })
 
+  if (item === undefined) {
+    return <></>
+  }
+
   const documentsAccordion = [
     {
       key: '1',