Mag 511fixrights (#357)

* WIP * fix(cardRights): add contribright --------- Co-authored-by: FlorentMr <florent.mariotti@cgi.com>
OPEN-ENT-NG · Dec 5, 2024 · 2f9de05 · 2f9de05
1 parent 66be678
commit 2f9de05
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 10 deletions.
diff --git a/frontend/src/components/board-card/BoardCard.tsx b/frontend/src/components/board-card/BoardCard.tsx
@@ -39,6 +39,8 @@ const BoardCard: FC<BoardCardProps> = ({
     registerDropdown,
     closeDropdown,
     handleDoubleClick,
+    hasContribRights,
+    hasEditRights,
   } = useBoardCard(card);
 
   const { t } = useTranslation("magneto");
@@ -50,6 +52,8 @@ const BoardCard: FC<BoardCardProps> = ({
     lockOrUnlockMagnet,
     card,
     isOwnerOrManager,
+    hasContribRights,
+    hasEditRights,
   );
 
   const sortableProps = useSortable({

diff --git a/frontend/src/components/board-card/useCardDropDownItems.tsx b/frontend/src/components/board-card/useCardDropDownItems.tsx
@@ -23,6 +23,8 @@ export const useCardDropDownItems = (
   lockOrUnlockMagnet: () => void,
   card: Card,
   isOwnerOrManager: boolean,
+  hasContribRights: boolean,
+  hasEditRights: boolean,
 ): DropDownListItem[] => {
   const { t } = useTranslation("magneto");
   const { openActiveCardAction, setIsModalDuplicate } = useBoard();
@@ -112,8 +114,11 @@ export const useCardDropDownItems = (
   );
 
   return useMemo(() => {
-    if (readOnly) return [menuItems.preview];
-    if (isOwnerOrManager)
+    if (readOnly) {
+      return [menuItems.preview];
+    }
+
+    if (isOwnerOrManager) {
       return [
         menuItems.preview,
         menuItems.duplicate,
@@ -122,13 +127,31 @@ export const useCardDropDownItems = (
         menuItems.lock,
         menuItems.delete,
       ];
-    if (isLocked)
+    }
+
+    if (isLocked) {
       return [menuItems.preview, menuItems.duplicate, menuItems.move];
-    return [
-      menuItems.preview,
-      menuItems.duplicate,
-      menuItems.edit,
-      menuItems.move,
-    ];
-  }, [isOwnerOrManager, readOnly, menuItems, isLocked]);
+    }
+
+    if (hasEditRights) {
+      return [
+        menuItems.preview,
+        menuItems.duplicate,
+        menuItems.edit,
+        menuItems.move,
+      ];
+    }
+
+    if (hasContribRights) {
+      return [menuItems.preview, menuItems.duplicate];
+    }
+    return [menuItems.preview];
+  }, [
+    isOwnerOrManager,
+    readOnly,
+    menuItems,
+    isLocked,
+    hasContribRights,
+    hasEditRights,
+  ]);
 };
diff --git a/frontend/src/hooks/useBoardCard.ts b/frontend/src/hooks/useBoardCard.ts
@@ -26,6 +26,7 @@ export const useBoardCard = (card: Card) => {
     activeCard,
     closeActiveCardAction,
     openActiveCardAction,
+    hasContribRights,
   } = useBoard();
   const { user } = useUser();
   const { openDropdownId, registerDropdown, toggleDropdown, closeDropdown } =
@@ -37,6 +38,8 @@ export const useBoardCard = (card: Card) => {
 
   const states = useMemo(
     () => ({
+      hasEditRights: hasEditRights(),
+      hasContribRights: hasContribRights(),
       isOpen: openDropdownId === card.id,
       isActiveCardId: activeCard?.id === card.id,
       isOwnerOrManager: (() => {
@@ -53,6 +56,7 @@ export const useBoardCard = (card: Card) => {
       openDropdownId,
       hasManageRights,
       hasEditRights,
+      hasContribRights,
     ],
   );
 

diff --git a/frontend/src/providers/BoardProvider/index.tsx b/frontend/src/providers/BoardProvider/index.tsx
@@ -99,6 +99,10 @@ export const BoardProvider: FC<BoardProviderProps> = ({ children }) => {
     }
   }, [boardData]);
 
+  const hasContribRights = (): boolean => {
+    return board.owner.userId === user?.userId || !!boardRights?.contrib;
+  };
+
   const hasEditRights = (): boolean => {
     return board.owner.userId === user?.userId || !!boardRights?.publish;
   };
@@ -137,6 +141,7 @@ export const BoardProvider: FC<BoardProviderProps> = ({ children }) => {
       isLoading,
       isFetching,
       boardRights,
+      hasContribRights,
       hasEditRights,
       hasManageRights,
       displayModals,

diff --git a/frontend/src/providers/BoardProvider/types.ts b/frontend/src/providers/BoardProvider/types.ts
@@ -21,6 +21,7 @@ export type BoardContextType = {
   isLoading: boolean;
   isFetching: boolean;
   boardRights: Record<RightRole, boolean> | null;
+  hasContribRights: () => boolean;
   hasEditRights: () => boolean;
   hasManageRights: () => boolean;
   displayModals: DisplayModalsState;