wip

Author: PanchoutNathan

src/frontend/apps/impress/src/features/docs/doc-header/components/DocHeader.tsx

@@ -8,6 +8,7 @@ import {
   Doc,
   LinkReach,
   currentDocRole,
+  getDocLinkReach,
   useTrans,
 } from '@/docs/doc-management';
 import { useResponsiveStore } from '@/stores';
@@ -24,8 +25,8 @@ export const DocHeader = ({ doc }: DocHeaderProps) => {
   const { isDesktop } = useResponsiveStore();
 
   const { t } = useTranslation();
-  const docIsPublic = doc.link_reach === LinkReach.PUBLIC;
-  const docIsAuth = doc.link_reach === LinkReach.AUTHENTICATED;
+  const docIsPublic = getDocLinkReach(doc) === LinkReach.PUBLIC;
+  const docIsAuth = getDocLinkReach(doc) === LinkReach.AUTHENTICATED;
 
   const { transRole } = useTrans();
 

src/frontend/apps/impress/src/features/docs/doc-header/components/DocToolBox.tsx

@@ -23,7 +23,8 @@ const DocToolBoxLicence = dynamic(() =>
 
 export const DocToolBox = ({ doc }: DocToolBoxProps) => {
   const { t } = useTranslation();
-  const hasAccesses = doc.nb_accesses_direct > 1 && doc.abilities.accesses_view;
+  const hasAccesses =
+    doc.nb_accesses_direct >= 1 && doc.abilities.accesses_view;
   const queryClient = useQueryClient();
 
   const { spacingsTokens } = useCunninghamTheme();

src/frontend/apps/impress/src/features/docs/doc-management/types.tsx

@@ -27,6 +27,13 @@ export enum Role {
   OWNER = 'owner',
 }
 
+export const RoleImportance = {
+  [Role.READER]: 1,
+  [Role.EDITOR]: 2,
+  [Role.ADMIN]: 3,
+  [Role.OWNER]: 4,
+};
+
 export enum LinkReach {
   RESTRICTED = 'restricted',
   AUTHENTICATED = 'authenticated',

src/frontend/apps/impress/src/features/docs/doc-management/utils.ts

@@ -22,3 +22,29 @@ export const base64ToYDoc = (base64: string) => {
 export const base64ToBlocknoteXmlFragment = (base64: string) => {
   return base64ToYDoc(base64).getXmlFragment('document-store');
 };
+
+export const getDocLinkReach = (doc: Doc) => {
+  if (doc.computed_link_reach) {
+    return doc.computed_link_reach;
+  }
+  return doc.link_reach;
+};
+
+export const getDocLinkRole = (doc: Doc) => {
+  if (doc.computed_link_role) {
+    return doc.computed_link_role;
+  }
+  return doc.link_role;
+};
+
+export const docLinkIsDesync = (doc: Doc) => {
+  // If the document has no ancestors
+  if (!doc.ancestors_link_reach) {
+    return false;
+  }
+
+  return (
+    getDocLinkReach(doc) !== doc.ancestors_link_reach ||
+    getDocLinkRole(doc) !== doc.ancestors_link_role
+  );
+};

src/frontend/apps/impress/src/features/docs/doc-share/components/DocInheritedShareContent.tsx

@@ -6,7 +6,12 @@ import { createGlobalStyle } from 'styled-components';
 import { Box, Text } from '@/components';
 import { useCunninghamTheme } from '@/cunningham';
 
-import { Access, useDoc, useDocStore } from '../../doc-management';
+import {
+  Access,
+  RoleImportance,
+  useDoc,
+  useDocStore,
+} from '../../doc-management';
 import SimpleFileIcon from '../../docs-grid/assets/simple-document.svg';
 
 import { DocShareMemberItem } from './DocShareMemberItem';
@@ -23,6 +28,28 @@ type Props = {
   rawAccesses: Access[];
 };
 
+const getAncestorsRole = (access: Access) => {
+  if (!access.max_ancestors_role) {
+    return access.role;
+  }
+  const currentRoleImportance = RoleImportance[access.role];
+  const maxAncestorsRoleImportance = RoleImportance[access.max_ancestors_role];
+
+  return currentRoleImportance > maxAncestorsRoleImportance
+    ? access.role
+    : access.max_ancestors_role;
+};
+
+const getMaxRoleBetweenAccesses = (access1: Access, access2: Access) => {
+  const role1 = getAncestorsRole(access1);
+  const role2 = getAncestorsRole(access2);
+
+  const roleImportance1 = RoleImportance[role1];
+  const roleImportance2 = RoleImportance[role2];
+
+  return roleImportance1 > roleImportance2 ? role1 : role2;
+};
+
 export const DocInheritedShareContent = ({ rawAccesses }: Props) => {
   const { t } = useTranslation();
   const { spacingsTokens } = useCunninghamTheme();
@@ -46,8 +73,19 @@ export const DocInheritedShareContent = ({ rawAccesses }: Props) => {
         continue;
       }
 
-      if (!members.some((member) => member.user.id === access.user.id)) {
+      const findIndex = members.findIndex(
+        (member) => member.user.id === access.user.id,
+      );
+      if (findIndex === -1) {
         members.push(access);
+      } else {
+        const accessToUpdate = members[findIndex];
+        const currentRole = getAncestorsRole(accessToUpdate);
+        const maxRole = getMaxRoleBetweenAccesses(accessToUpdate, access);
+
+        if (maxRole !== currentRole) {
+          members[findIndex] = access;
+        }
       }
 
       // Check if this document has a longer path than our current candidate

src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareMemberItem.tsx

@@ -1,5 +1,6 @@
 import { VariantType, useToastProvider } from '@openfun/cunningham-react';
 import { useQueryClient } from '@tanstack/react-query';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import {
@@ -9,7 +10,13 @@ import {
   IconOptions,
 } from '@/components';
 import { useCunninghamTheme } from '@/cunningham';
-import { Access, Doc, KEY_SUB_PAGE, Role } from '@/docs/doc-management/';
+import {
+  Access,
+  Doc,
+  KEY_SUB_PAGE,
+  Role,
+  RoleImportance,
+} from '@/docs/doc-management/';
 import { useResponsiveStore } from '@/stores';
 
 import { useDeleteDocAccess, useUpdateDocAccess } from '../api';
@@ -90,6 +97,17 @@ export const DocShareMemberItem = ({
   ];
 
   const canUpdate = isInherited ? false : doc.abilities.accesses_manage;
+  const currentRole = useMemo(() => {
+    if (!access.max_ancestors_role) {
+      return access.role;
+    }
+    const currentRoleImportance = RoleImportance[access.role];
+    const maxAncestorsRoleImportance =
+      RoleImportance[access.max_ancestors_role];
+    return currentRoleImportance > maxAncestorsRoleImportance
+      ? access.role
+      : access.max_ancestors_role;
+  }, [access]);
 
   return (
     <Box
@@ -103,7 +121,7 @@ export const DocShareMemberItem = ({
         right={
           <Box $direction="row" $align="center" $gap={spacingsTokens['2xs']}>
             <DocRoleDropdown
-              currentRole={access.role}
+              currentRole={currentRole}
               onSelectRole={onUpdate}
               canUpdate={canUpdate}
               message={message}

src/frontend/apps/impress/src/features/docs/doc-share/components/DocVisibility.tsx

@@ -21,6 +21,8 @@ import {
   KEY_LIST_DOC,
   LinkReach,
   LinkRole,
+  docLinkIsDesync,
+  getDocLinkReach,
   useUpdateDocLink,
 } from '@/features/docs';
 import { useResponsiveStore } from '@/stores';
@@ -40,9 +42,7 @@ export const DocVisibility = ({ doc }: DocVisibilityProps) => {
   const { isDesktop } = useResponsiveStore();
   const { spacingsTokens, colorsTokens } = useCunninghamTheme();
   const canManage = doc.abilities.accesses_manage;
-  const [linkReach, setLinkReach] = useState<LinkReach>(
-    doc.computed_link_reach,
-  );
+  const [linkReach, setLinkReach] = useState<LinkReach>(getDocLinkReach(doc));
   const [docLinkRole, setDocLinkRole] = useState<LinkRole>(
     doc.computed_link_role ?? LinkRole.READER,
   );
@@ -154,15 +154,7 @@ export const DocVisibility = ({ doc }: DocVisibilityProps) => {
   };
 
   const showDesync = useMemo(() => {
-    // If the document has no ancestors, we don't show the desync
-    if (!doc.ancestors_link_reach) {
-      return false;
-    }
-
-    return (
-      doc.computed_link_reach !== doc.ancestors_link_reach ||
-      doc.computed_link_role !== doc.ancestors_link_role
-    );
+    return docLinkIsDesync(doc);
   }, [doc]);
 
   return (

src/frontend/apps/impress/src/features/docs/doc-tree/components/DocSubPageItem.tsx

@@ -138,7 +138,7 @@ export const DocSubPageItem = (props: Props) => {
             <Text $css={ItemTextCss} $size="sm" $variation="1000">
               {doc.title || untitledDocument}
             </Text>
-            {doc.nb_accesses_direct > 1 && (
+            {doc.nb_accesses_direct >= 1 && (
               <Icon
                 variant="filled"
                 iconName="group"