refactor: apply PR requested changes

graasp · Apr 26, 2024 · 2ff019e · 2ff019e
1 parent 75e0f02
commit 2ff019e
Show file tree

Hide file tree

Showing 7 changed files with 155 additions and 160 deletions.
diff --git a/cypress/support/server.ts b/cypress/support/server.ts
@@ -81,8 +81,6 @@ export const mockGetAccessibleItems = (items: MockItem[]): void => {
       const page = parseInt(params.get('page') ?? '1', 10);
       const pageSize = parseInt(params.get('pageSize') ?? '10', 10);
 
-      // as { page: number; pageSize: number };
-
       // warning: we don't check memberships
       const root = items.filter((i) => !i.path.includes('.'));
 

diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "@graasp/query-client": "3.4.1",
     "@graasp/sdk": "4.4.0",
     "@graasp/translations": "1.25.3",
-    "@graasp/ui": "github:graasp/graasp-ui#row-menu",
+    "@graasp/ui": "4.16.0",
     "@mui/icons-material": "5.15.14",
     "@mui/lab": "5.0.0-alpha.169",
     "@mui/material": "5.15.14",

diff --git a/src/components/collection/CopyButton.tsx b/src/components/collection/CopyButton.tsx
@@ -39,7 +39,6 @@ export const useCopyAction = (id?: string) => {
       ids: [id],
     };
 
-    // if the location to copy the item is MyItems or SharedItems root, then set the payload.to argument to be undefined
     payload.to = to;
 
     copyItems(payload);

diff --git a/src/components/collection/copyModal/AccessibleNavigationTree.tsx b/src/components/collection/copyModal/AccessibleNavigationTree.tsx
@@ -5,6 +5,8 @@ import { Alert, Skeleton } from '@mui/material';
 import { ItemType, PermissionLevel } from '@graasp/sdk';
 import { RowMenuProps, RowMenus } from '@graasp/ui';
 
+import { useLibraryTranslation } from '../../../config/i18n';
+import LIBRARY from '../../../langs/constants';
 import { QueryClientContext } from '../../QueryClientContext';
 
 interface AccessibleNavigationTreeProps {
@@ -20,8 +22,8 @@ const AccessibleNavigationTree = ({
   onNavigate,
   selectedId,
 }: AccessibleNavigationTreeProps): JSX.Element => {
+  const { t } = useLibraryTranslation();
   const [page, setPage] = useState(1);
-  // todo: show only items with admin rights
   const { hooks } = useContext(QueryClientContext);
   const { data: accessibleItems, isLoading } = hooks.useAccessibleItems(
     {
@@ -59,7 +61,7 @@ const AccessibleNavigationTree = ({
     );
   }
 
-  return <Alert severity="error">An unexpected error happened</Alert>;
+  return <Alert severity="error">{t(LIBRARY.UNEXPECTED_ERROR_MESSAGE)}</Alert>;
 };
 
 export default AccessibleNavigationTree;
diff --git a/src/components/collection/copyModal/ChildrenNavigationTree.tsx b/src/components/collection/copyModal/ChildrenNavigationTree.tsx
@@ -28,14 +28,13 @@ const ChildrenNavigationTree = ({
   const { hooks } = useContext(QueryClientContext);
   const { data: children, isLoading } = hooks.useChildren(
     selectedNavigationItem.id,
+    { types: [ItemType.FOLDER] },
   );
-  // TODO: use hook's filter when available
-  const folders = children?.filter((f) => f.type === ItemType.FOLDER);
 
   if (children) {
     return (
       <RowMenus
-        elements={folders}
+        elements={children}
         onNavigate={onNavigate}
         selectedId={selectedId}
         onClick={onClick}
@@ -57,7 +56,7 @@ const ChildrenNavigationTree = ({
       </>
     );
   }
-  return <Alert severity="error">An unexpected error happened</Alert>;
+  return <Alert severity="error">{t(LIBRARY.UNEXPECTED_ERROR_MESSAGE)}</Alert>;
 };
 
 export default ChildrenNavigationTree;
diff --git a/src/components/collection/copyModal/RootNavigationTree.tsx b/src/components/collection/copyModal/RootNavigationTree.tsx
@@ -36,11 +36,8 @@ const RootNavigationTree = ({
     },
     { pageSize: 5 },
   );
-  const recentFolders = recentItems?.data?.filter(
-    ({ type }) => type === ItemType.FOLDER,
-  );
 
-  if (recentItems) {
+  if (recentItems?.data?.length) {
     return (
       <>
         <Typography color="darkgrey" variant="subtitle2">
@@ -53,13 +50,13 @@ const RootNavigationTree = ({
           onClick={onClick}
           //   root items cannot be disabled - but they are disabled by the button
         />
-        {recentFolders && (
+        {recentItems && (
           <>
             <Typography color="darkgrey" variant="subtitle2">
               {t(LIBRARY.COPY_MODAL_RECENT_TITLE)}
             </Typography>
             <RowMenus
-              elements={recentFolders}
+              elements={recentItems.data}
               onNavigate={onNavigate}
               selectedId={selectedId}
               onClick={onClick}
@@ -81,7 +78,7 @@ const RootNavigationTree = ({
     );
   }
 
-  return <Alert severity="error">An unexpected error happened</Alert>;
+  return <Alert severity="error">{t(LIBRARY.UNEXPECTED_ERROR_MESSAGE)}</Alert>;
 };
 
 export default RootNavigationTree;