Fix user permissions on elements (#565)

* fix(useDirectoryContent): populate ownerLabel and lastModifiedByLabel instead of owner existing attribute which is used to compute user permissions on elements
* update commons-ui version to 0.71.1

Signed-off-by: sBouzols <[email protected]>

Author: sBouzols

package-lock.json

@@ -7,7 +7,7 @@
     "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@gridsuite/commons-ui": "0.71.0",
+        "@gridsuite/commons-ui": "0.71.1",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",

package.json

@@ -122,7 +122,7 @@ export const getColumnsDefinition = (childrenMetadata: Record<UUID, ElementAttri
         headerName: intl.formatMessage({
             id: 'creator',
         }),
-        field: 'owner',
+        field: 'ownerLabel',
         cellRenderer: UserCellRenderer,
         minWidth: 110,
         flex: 1,
@@ -140,7 +140,7 @@ export const getColumnsDefinition = (childrenMetadata: Record<UUID, ElementAttri
         headerName: intl.formatMessage({
             id: 'modifiedBy',
         }),
-        field: 'lastModifiedBy',
+        field: 'lastModifiedByLabel',
         cellRenderer: UserCellRenderer,
         minWidth: 110,
         flex: 1,

src/components/utils/directory-content-utils.ts

@@ -85,8 +85,8 @@ export const useDirectoryContent = () => {
                     // discarding request for older directory
                     if (previousData.current === currentChildren) {
                         res[1].forEach((e) => {
-                            e.owner = getName(e.owner, res[0].data);
-                            e.lastModifiedBy = getName(e.lastModifiedBy, res[0].data);
+                            e.ownerLabel = getName(e.owner, res[0].data);
+                            e.lastModifiedByLabel = getName(e.lastModifiedBy, res[0].data);
                             metadata[e.elementUuid] = e;
                         });
                         setChildrenMetadata(metadata);
@@ -107,8 +107,8 @@ export const useDirectoryContent = () => {
         }
         return currentChildren.map((x) => ({
             ...x,
-            owner: childrenMetadata?.[x.elementUuid]?.owner,
-            lastModifiedBy: childrenMetadata?.[x.elementUuid]?.lastModifiedBy,
+            ownerLabel: childrenMetadata?.[x.elementUuid]?.ownerLabel,
+            lastModifiedLabel: childrenMetadata?.[x.elementUuid]?.lastModifiedByLabel,
         }));
     }, [currentChildren, childrenMetadata]);
 

src/hooks/useDirectoryContent.ts

@@ -268,7 +268,7 @@ export function updateElement(elementUuid: UUID, element: unknown) {
     });
 }
 
-export function insertDirectory(directoryName: string, parentUuid: UUID, owner: string) {
+export function insertDirectory(directoryName: string, parentUuid: UUID, ownerId: string) {
     console.info("Inserting a new folder '%s'", directoryName);
     const insertDirectoryUrl = `${PREFIX_DIRECTORY_SERVER_QUERIES}/v1/directories/${parentUuid}/elements`;
     return backendFetchJson(insertDirectoryUrl, {
@@ -281,12 +281,12 @@ export function insertDirectory(directoryName: string, parentUuid: UUID, owner:
             elementUuid: null,
             elementName: directoryName,
             type: 'DIRECTORY',
-            owner,
+            ownerId,
         }),
     });
 }
 
-export function insertRootDirectory(directoryName: string, owner: string) {
+export function insertRootDirectory(directoryName: string, ownerId: string) {
     console.info("Inserting a new root folder '%s'", directoryName);
     const insertRootDirectoryUrl = `${PREFIX_DIRECTORY_SERVER_QUERIES}/v1/root-directories`;
     return backendFetchJson(insertRootDirectoryUrl, {
@@ -297,7 +297,7 @@ export function insertRootDirectory(directoryName: string, owner: string) {
         },
         body: JSON.stringify({
             elementName: directoryName,
-            owner,
+            ownerId,
         }),
     });
 }