refactor: apply changes

Author: kim

cypress/e2e/player/main.cy.ts

@@ -36,17 +36,17 @@ import {
 
 const GRAASP_DOCUMENT_ITEM = PackedDocumentItemFactory();
 const items = [
-  { ...GRAASP_LINK_ITEM, permission: 'admin' as const },
+  { ...GRAASP_LINK_ITEM, permission: 'admin' as const, creator: null },
   {
     ...GRAASP_LINK_ITEM_IFRAME_ONLY,
     permission: 'admin' as const,
   },
-  { ...YOUTUBE_LINK_ITEM, permission: 'admin' as const },
-  { ...IMAGE_ITEM_DEFAULT, permission: 'admin' as const },
-  { ...VIDEO_ITEM_DEFAULT, permission: 'admin' as const },
-  { ...PDF_ITEM_DEFAULT, permission: 'admin' as const },
-  { ...GRAASP_DOCUMENT_ITEM, permission: 'admin' as const },
-  { ...GRAASP_APP_ITEM, permission: 'admin' as const },
+  { ...YOUTUBE_LINK_ITEM, permission: 'admin' as const, creator: null },
+  { ...IMAGE_ITEM_DEFAULT, permission: 'admin' as const, creator: null },
+  { ...VIDEO_ITEM_DEFAULT, permission: 'admin' as const, creator: null },
+  { ...PDF_ITEM_DEFAULT, permission: 'admin' as const, creator: null },
+  { ...GRAASP_DOCUMENT_ITEM, permission: 'admin' as const, creator: null },
+  { ...GRAASP_APP_ITEM, permission: 'admin' as const, creator: null },
   ...FOLDER_WITH_SUBFOLDER_ITEM.items,
   ...FOLDER_WITHOUT_CHILDREN_ORDER.items,
 ];

cypress/e2e/player/utils.ts

@@ -1,5 +1,6 @@
 import {
   CompleteGuest,
+  FileItemExtra,
   HttpMethod,
   MimeTypes,
   appendQueryParamToUrl,
@@ -96,7 +97,7 @@ export const expectAppViewScreenLayout = ({ id, extra }: AppItem): void => {
 };
 
 export const expectFileViewScreenLayout = ({ id, extra }: FileItem): void => {
-  const mimetype = getFileExtra(extra)?.mimetype ?? '';
+  const mimetype = getFileExtra(extra as FileItemExtra)?.mimetype ?? '';
   // embedded element
   let selector = '';
   if (MimeTypes.isImage(mimetype)) {

cypress/fixtures/files.ts

@@ -14,7 +14,6 @@ export const IMAGE_ITEM_DEFAULT: FileItem & { readFilepath: string } = {
   description: 'a default image description',
   type: 'file',
   path: 'bd5519a2_5ba9_4305_b221_185facbe6a99',
-  creator: CURRENT_MEMBER,
   createdAt: '2021-03-16T16:00:50.968Z',
   updatedAt: '2021-03-16T16:00:52.655Z',
   extra: buildFileExtra({
@@ -39,7 +38,6 @@ export const VIDEO_ITEM_DEFAULT: FileItem & { readFilepath: string } = {
   description: 'a default video description',
   type: 'file',
   path: 'qd5519a2_5ba9_4305_b221_185facbe6a99',
-  creator: CURRENT_MEMBER,
   createdAt: '2021-03-16T16:00:50.968Z',
   updatedAt: '2021-03-16T16:00:52.655Z',
   extra: buildFileExtra({
@@ -64,7 +62,6 @@ export const PDF_ITEM_DEFAULT: FileItem & { readFilepath: string } = {
   description: 'a default pdf description',
   type: 'file',
   path: 'cd5519a2_5ba9_4305_b221_185facbe6a99',
-  creator: CURRENT_MEMBER,
   createdAt: '2021-03-16T16:00:50.968Z',
   updatedAt: '2021-03-16T16:00:52.655Z',
   extra: buildFileExtra({

cypress/support/server.ts

@@ -1659,15 +1659,12 @@ export const mockGetPublishItemsForMember = (
         `${API_HOST}/${buildGetPublishedItemsForMemberRoute(ID_FORMAT)}`,
       ),
     },
-    ({ reply, url }) => {
+    ({ reply }) => {
       if (shoulThrow) {
         return reply({ statusCode: StatusCodes.INTERNAL_SERVER_ERROR });
       }
 
-      const memberId = url.slice(API_HOST.length).split('/')[4];
-      const published = publishedItemData
-        .filter((p) => p.item.creator.id === memberId)
-        .map((i) => i.item);
+      const published = publishedItemData.map((i) => i.item);
       return reply(published);
     },
   ).as('getPublishedItemsForMember');

src/AuthContext.tsx

@@ -131,7 +131,7 @@ export function AuthProvider({
             id: currentMember.id,
             lang: getCurrentAccountLang(currentMember, DEFAULT_LANG),
             type: AccountType.Guest as const,
-            item: currentMember.itemLoginSchema.item as GenericItem,
+            item: currentMember.itemLoginSchema.item as unknown as GenericItem,
           },
           logout,
           login: null,

src/modules/builder/components/item/settings/ItemMetadataContent.tsx

@@ -10,6 +10,7 @@ import TableRow from '@mui/material/TableRow';
 import Typography from '@mui/material/Typography';
 
 import {
+  FileItemExtra,
   formatDate,
   formatFileSize,
   getFileExtra,
@@ -41,7 +42,7 @@ const ItemMetadataContent = (): JSX.Element => {
   let size = null;
   let mimetype = null;
   if (item.type === 'file') {
-    const extra = getFileExtra(item.extra);
+    const extra = getFileExtra(item.extra as FileItemExtra);
     mimetype = extra?.mimetype;
     size = extra?.size;
   }
@@ -84,7 +85,6 @@ const ItemMetadataContent = (): JSX.Element => {
                 {mimetype ?? getItemType(item)}
                 <Preview>
                   {item.type === 'folder' &&
-                    // TODO: fix any
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     (isCapsule(item as any) ? (
                       <ConvertToFolderButton

src/modules/builder/components/table/ItemCard.tsx

@@ -7,14 +7,14 @@ import { formatDate, getLinkThumbnailUrl } from '@graasp/sdk';
 
 import { NS } from '@/config/constants';
 import { ITEM_CARD_CLASS, buildItemCard } from '@/config/selectors';
-import type { Item } from '@/openapi/client';
+import type { PackedItem } from '@/openapi/client';
 import { Card, type CardProps } from '@/ui/Card/Card';
 import TextDisplay from '@/ui/TextDisplay/TextDisplay';
 
 import { getItemType } from '~builder/utils/capsule';
 
 type Props = {
-  item: Item;
+  item: PackedItem;
   dense?: boolean;
   footer: JSX.Element;
   isOver?: boolean;

src/modules/builder/components/table/useSorting.tsx

@@ -2,7 +2,7 @@ import { Dispatch, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { NS } from '@/config/constants';
-import type { GenericItem } from '@/openapi/client';
+import type { PackedItem } from '@/openapi/client';
 
 import { Ordering, OrderingType } from '~builder/enums';
 
@@ -24,14 +24,14 @@ export const useSorting = ({
   ordering: OrderingType;
   setSortBy: Dispatch<AllSortingOptions>;
   setOrdering: Dispatch<OrderingType>;
-  sortFn: (a: GenericItem, b: GenericItem) => number;
+  sortFn: (a: PackedItem, b: PackedItem) => number;
 } => {
   const [sortBy, setSortBy] = useState<AllSortingOptions>(
     s ?? SortingOptions.ItemUpdatedAt,
   );
   const [ordering, setOrdering] = useState<OrderingType>(o);
 
-  const sortFn = (a: GenericItem, b: GenericItem) => {
+  const sortFn = (a: PackedItem, b: PackedItem) => {
     const f = ordering === Ordering.ASC ? 1 : -1;
     let value = 0;
     switch (sortBy) {

src/modules/player/common/ItemThumbnail.tsx

@@ -19,9 +19,8 @@ const ItemThumbnail = ({
   return (
     <ItemIcon
       type={item.type}
-      // TODO: fix type
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      mimetype={getMimetype((item as any).extra)}
+      mimetype={getMimetype(item.extra as any)}
       alt={item.name}
       iconSrc={thumbnailSrc}
     />