feat: remove displaying description above folder

graasp · Mar 6, 2024 · 6324c02 · 6324c02
1 parent 1a4fe1e
commit 6324c02
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 35 deletions.
diff --git a/src/components/main/ItemsGrid.tsx b/src/components/main/ItemsGrid.tsx
@@ -1,13 +1,7 @@
 import { Box, Grid, Pagination } from '@mui/material';
 
-import {
-  DescriptionPlacement,
-  DiscriminatedItem,
-  ItemMembership,
-  ResultOf,
-} from '@graasp/sdk';
+import { DiscriminatedItem, ItemMembership, ResultOf } from '@graasp/sdk';
 
-import { hooks } from '@/config/queryClient';
 import { ShowOnlyMeChangeType } from '@/config/types';
 
 import { ITEM_PAGE_SIZE } from '../../config/constants';
@@ -20,8 +14,6 @@ import EmptyItem from './EmptyItem';
 import ItemCard from './ItemCard';
 import ItemsToolbar from './ItemsToolbar';
 
-const { useItem } = hooks;
-
 type Props = {
   id?: string;
   items?: DiscriminatedItem[];
@@ -58,7 +50,6 @@ const ItemsGrid = ({
   page = 1,
 }: Props): JSX.Element => {
   const pagesCount = Math.ceil(Math.max(1, totalCount / ITEM_PAGE_SIZE));
-  const { data: parentItem } = useItem(parentId);
   const renderItems = () => {
     if (!items?.length) {
       return (
@@ -88,10 +79,6 @@ const ItemsGrid = ({
       <ItemsToolbar
         title={title}
         subTitleElement={<FolderDescription itemId={parentId} />}
-        showSubTitleAbove={
-          parentItem?.settings.descriptionPlacement ===
-          DescriptionPlacement.ABOVE
-        }
         headerElements={headerElements}
         onShowOnlyMeChange={onShowOnlyMeChange}
         showOnlyMe={showOnlyMe}

diff --git a/src/components/main/ItemsTable.tsx b/src/components/main/ItemsTable.tsx
@@ -2,7 +2,6 @@ import { useCallback } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 import {
-  DescriptionPlacement,
   DiscriminatedItem,
   ItemMembership,
   ItemType,
@@ -276,10 +275,6 @@ const ItemsTable = ({
       <ItemsToolbar
         title={tableTitle}
         subTitleElement={itemId ? <FolderDescription itemId={itemId} /> : null}
-        showSubTitleAbove={
-          parentItem?.settings.descriptionPlacement ===
-          DescriptionPlacement.ABOVE
-        }
         headerElements={headerElements}
         onShowOnlyMeChange={onShowOnlyMeChange}
         showOnlyMe={showOnlyMe}

diff --git a/src/components/main/ItemsToolbar.tsx b/src/components/main/ItemsToolbar.tsx
@@ -9,7 +9,6 @@ import SelectTypes from '../common/SelectTypes';
 type Props = {
   title: string;
   subTitleElement?: JSX.Element | null;
-  showSubTitleAbove?: boolean;
   headerElements?: JSX.Element[];
   onShowOnlyMeChange?: ShowOnlyMeChangeType;
   showOnlyMe?: boolean;
@@ -18,30 +17,27 @@ type Props = {
 const ItemsToolbar = ({
   title,
   subTitleElement,
-  showSubTitleAbove,
   headerElements,
   onShowOnlyMeChange,
   showOnlyMe,
 }: Props): JSX.Element => {
   const { t } = useBuilderTranslation();
   return (
     <>
-      <Stack direction={showSubTitleAbove ? 'column-reverse' : 'column'}>
-        <Stack direction="row" justifyContent="space-between" spacing={1}>
-          <Typography variant="h4" sx={{ wordWrap: 'break-word' }}>
-            {title}
-          </Typography>
-          <Stack
-            direction="row"
-            alignItems="center"
-            justifyContent="flex-end"
-            spacing={1}
-          >
-            {headerElements}
-          </Stack>
+      <Stack direction="row" justifyContent="space-between" spacing={1}>
+        <Typography variant="h4" sx={{ wordWrap: 'break-word' }}>
+          {title}
+        </Typography>
+        <Stack
+          direction="row"
+          alignItems="center"
+          justifyContent="flex-end"
+          spacing={1}
+        >
+          {headerElements}
         </Stack>
-        {subTitleElement}
       </Stack>
+      {subTitleElement}
       <Stack direction="column" mt={2} mb={2} spacing={1}>
         {onShowOnlyMeChange && (
           <FormControlLabel