feat: update for item login (#1407)

* feat: update for item login * refactor: apply changes * refactor: update * refactor: fix tests * refactor: fix tests * fix: permission table * fix: update deps * fix: update deps * fix: copy tests * fix: selectors for icons in tests --------- Co-authored-by: spaenleh <[email protected]>
graasp · Aug 26, 2024 · 3e7f6db · 3e7f6db
1 parent 1c9da1a
commit 3e7f6db
Show file tree

Hide file tree

Showing 49 changed files with 650 additions and 680 deletions.
diff --git a/cypress/e2e/invitations/createInvitation.cy.ts b/cypress/e2e/invitations/createInvitation.cy.ts
@@ -23,7 +23,7 @@ const inviteItem = ({
   cy.get(`#${buildShareButtonId(id)}`).click();
 
   cy.fillShareForm({
-    member: { email },
+    email,
     permission,
     submit,
     selector: `#${CREATE_MEMBERSHIP_FORM_ID}`,
@@ -62,7 +62,7 @@ describe('Create Invitation', () => {
         memberships: [
           {
             item,
-            member: MEMBERS.ANNA,
+            account: MEMBERS.ANNA,
             permission: PermissionLevel.Admin,
           },
         ],

diff --git a/cypress/e2e/item/copy/copy.cy.ts b/cypress/e2e/item/copy/copy.cy.ts
@@ -7,7 +7,6 @@ import { HOME_PATH, buildItemPath } from '../../../../src/config/paths';
 import {
   COPY_MANY_ITEMS_BUTTON_SELECTOR,
   ITEM_MENU_COPY_BUTTON_CLASS,
-  MY_GRAASP_ITEM_PATH,
   buildItemCard,
   buildItemsGridMoreButtonSelector,
 } from '../../../../src/config/selectors';
@@ -51,7 +50,7 @@ describe('Copy Item', () => {
 
     // copy
     const { id: copyItemId } = FOLDER;
-    copyItem({ id: copyItemId, toItemPath: MY_GRAASP_ITEM_PATH });
+    copyItem({ id: copyItemId, toItemPath: '' });
 
     cy.wait('@copyItems').then(({ request: { url } }) => {
       cy.get(`#${buildItemCard(copyItemId)}`).should('be.visible');
@@ -86,8 +85,7 @@ describe('Copy Item', () => {
 
     // copy
     const { id } = IMAGE_ITEM_CHILD;
-    const toItemPath = MY_GRAASP_ITEM_PATH;
-    copyItem({ id, toItemPath });
+    copyItem({ id, toItemPath: '' });
 
     cy.wait('@copyItems').then(({ request: { url } }) => {
       cy.get(`#${buildItemCard(id)}`).should('exist');
@@ -139,7 +137,6 @@ describe('Copy Item', () => {
     folders.forEach((item) => {
       cy.selectItem(item.id);
     });
-
     // copy on home
     copyItems({ toItemPath: toItem.path });
 

diff --git a/cypress/e2e/item/hide/hideItem.cy.ts b/cypress/e2e/item/hide/hideItem.cy.ts
@@ -23,7 +23,7 @@ const HIDDEN_ITEM: ItemForTest = {
     {
       item: hiddenItem,
       permission: PermissionLevel.Admin,
-      member: MEMBERS.ANNA,
+      account: MEMBERS.ANNA,
       creator: MEMBERS.ANNA,
       id: 'ecbfbd2a-5688-12db-ae93-0242ac130002',
       createdAt: '2021-08-11T12:56:36.834Z',
@@ -32,7 +32,7 @@ const HIDDEN_ITEM: ItemForTest = {
     {
       item: hiddenItem,
       permission: PermissionLevel.Read,
-      member: MEMBERS.BOB,
+      account: MEMBERS.BOB,
       creator: MEMBERS.ANNA,
       id: 'ecbfbd2a-5688-12db-ae93-0242ac130002',
       createdAt: '2021-08-11T12:56:36.834Z',

diff --git a/cypress/e2e/item/move/move.cy.ts b/cypress/e2e/item/move/move.cy.ts
@@ -7,7 +7,6 @@ import { HOME_PATH, buildItemPath } from '../../../../src/config/paths';
 import {
   ITEM_MENU_MOVE_BUTTON_CLASS,
   MOVE_MANY_ITEMS_BUTTON_SELECTOR,
-  MY_GRAASP_ITEM_PATH,
   buildItemsGridMoreButtonSelector,
   buildNavigationModalItemId,
 } from '../../../../src/config/selectors';
@@ -123,7 +122,7 @@ describe('Move Items', () => {
 
     // move
     const { id: movedItem } = CHILD;
-    moveItem({ id: movedItem, toItemPath: MY_GRAASP_ITEM_PATH });
+    moveItem({ id: movedItem, toItemPath: '' });
 
     cy.wait('@moveItems').then(({ request: { body, url } }) => {
       expect(body.parentId).to.equal(undefined);

diff --git a/cypress/e2e/item/publish/viewPublished.cy.ts b/cypress/e2e/item/publish/viewPublished.cy.ts
@@ -106,7 +106,7 @@ describe('Published Items', () => {
       cy.setUpApi({
         items,
         publishedItemData,
-        getPublishedItems: true,
+        getPublishedItemsError: true,
       });
       cy.visit(PUBLISHED_ITEMS_PATH);
 

diff --git a/cypress/e2e/item/trash/delete.cy.ts b/cypress/e2e/item/trash/delete.cy.ts
@@ -3,12 +3,13 @@ import { PackedRecycledItemDataFactory } from '@graasp/sdk';
 import { RECYCLE_BIN_PATH } from '../../../../src/config/paths';
 import {
   CONFIRM_DELETE_BUTTON_ID,
+  DELETE_SINGLE_ITEM_BUTTON_SELECTOR,
   RECYCLE_BIN_DELETE_MANY_ITEMS_BUTTON_ID,
   buildItemCard,
 } from '../../../../src/config/selectors';
 
 const deleteItem = (id: string) => {
-  cy.get(`#${buildItemCard(id)} [data-testid="DeleteIcon"]`).click();
+  cy.get(`#${buildItemCard(id)} ${DELETE_SINGLE_ITEM_BUTTON_SELECTOR}`).click();
   cy.get(`#${CONFIRM_DELETE_BUTTON_ID}`).click();
 };
 

diff --git a/cypress/e2e/item/view/viewDocument.cy.ts b/cypress/e2e/item/view/viewDocument.cy.ts
@@ -17,7 +17,7 @@ describe('View Document', () => {
             memberships: [
               buildItemMembership({
                 item: DOCUMENT,
-                member: CURRENT_USER,
+                account: CURRENT_USER,
               }),
             ],
           },

diff --git a/cypress/e2e/item/view/viewLink.cy.ts b/cypress/e2e/item/view/viewLink.cy.ts
@@ -17,7 +17,7 @@ describe('Links', () => {
           memberships: [
             buildItemMembership({
               item: GRAASP_LINK_ITEM,
-              member: CURRENT_USER,
+              account: CURRENT_USER,
             }),
           ],
         },
@@ -26,7 +26,7 @@ describe('Links', () => {
           memberships: [
             buildItemMembership({
               item: GRAASP_LINK_ITEM_IFRAME_ONLY,
-              member: CURRENT_USER,
+              account: CURRENT_USER,
             }),
           ],
         },
@@ -35,7 +35,7 @@ describe('Links', () => {
           memberships: [
             buildItemMembership({
               item: YOUTUBE_LINK_ITEM,
-              member: CURRENT_USER,
+              account: CURRENT_USER,
             }),
           ],
         },

diff --git a/cypress/e2e/memberships/createItemMembership.cy.ts b/cypress/e2e/memberships/createItemMembership.cy.ts
@@ -15,19 +15,19 @@ import { MEMBERS } from '../../fixtures/members';
 
 const shareItem = ({
   id,
-  member,
+  email,
   permission,
   submit,
 }: {
-  member: { email: string };
+  email: string;
   permission: PermissionLevel;
   submit?: boolean;
   id: string;
 }) => {
   cy.get(`#${buildShareButtonId(id)}`).click();
 
   cy.fillShareForm({
-    member,
+    email,
     permission,
     submit,
     selector: `#${CREATE_MEMBERSHIP_FORM_ID}`,
@@ -50,7 +50,7 @@ describe('Create Membership', () => {
     // share
     const member = MEMBERS.FANNY;
     const permission = PermissionLevel.Read;
-    shareItem({ id, member, permission });
+    shareItem({ id, email: member.email, permission });
 
     cy.wait('@postInvitations').then(
       ({
@@ -71,7 +71,7 @@ describe('Create Membership', () => {
 
   it('cannot share item twice', () => {
     const ITEM = PackedFolderItemFactory();
-    const member = MEMBERS.ANNA;
+    const account = MEMBERS.ANNA;
     cy.setUpApi({
       items: [
         {
@@ -80,7 +80,7 @@ describe('Create Membership', () => {
             {
               item: ITEM,
               permission: PermissionLevel.Read,
-              member,
+              account,
             },
           ],
         },
@@ -94,7 +94,7 @@ describe('Create Membership', () => {
 
     // fill
     const permission = PermissionLevel.Read;
-    shareItem({ id, member, permission });
+    shareItem({ id, email: account.email, permission });
 
     cy.get(`#${SHARE_ITEM_SHARE_BUTTON_ID}`).should('be.disabled');
   });
@@ -108,7 +108,7 @@ describe('Create Membership', () => {
 
     // fill
     const permission = PermissionLevel.Read;
-    shareItem({ id, member: { email: 'wrong' }, permission });
+    shareItem({ id, email: 'wrong', permission });
 
     cy.get(`#${SHARE_ITEM_SHARE_BUTTON_ID}`).should('be.disabled');
   });

diff --git a/cypress/e2e/memberships/deleteItemMembership.cy.ts b/cypress/e2e/memberships/deleteItemMembership.cy.ts
@@ -67,12 +67,12 @@ describe('Delete Membership', () => {
         memberships: [
           {
             permission: PermissionLevel.Admin,
-            member: CURRENT_USER,
+            account: CURRENT_USER,
             item,
           } as unknown as ItemMembership,
           {
             permission: PermissionLevel.Read,
-            member: MEMBERS.BOB,
+            account: MEMBERS.BOB,
             item,
           } as unknown as ItemMembership,
         ],

diff --git a/cypress/e2e/memberships/editItemMembership.cy.ts b/cypress/e2e/memberships/editItemMembership.cy.ts
@@ -1,8 +1,4 @@
-import {
-  ItemMembership,
-  PackedFolderItemFactory,
-  PermissionLevel,
-} from '@graasp/sdk';
+import { PackedFolderItemFactory, PermissionLevel } from '@graasp/sdk';
 
 import { buildItemPath, buildItemSharePath } from '../../../src/config/paths';
 import {
@@ -81,15 +77,17 @@ describe('Edit Membership', () => {
     const child: ItemForTest = PackedFolderItemFactory();
     const memberships = [
       {
+        id: 'membership-0',
         permission: PermissionLevel.Admin,
-        member: CURRENT_USER,
+        account: CURRENT_USER,
         item: child,
-      } as unknown as ItemMembership,
+      },
       {
+        id: 'membership-1',
         permission: PermissionLevel.Write,
-        member: MEMBERS.BOB,
+        account: MEMBERS.BOB,
         item,
-      } as unknown as ItemMembership,
+      },
     ];
     const items = [
       {

diff --git a/cypress/e2e/memberships/viewMemberships.cy.ts b/cypress/e2e/memberships/viewMemberships.cy.ts
@@ -30,9 +30,9 @@ describe('View Memberships', () => {
 
     // panel only contains 2 avatars: one user, one +x
     // check contains member avatar
-    for (const { permission, member, id } of filteredMemberships) {
+    for (const { permission, account, id } of filteredMemberships) {
       const { name, email } = Object.values(MEMBERS).find(
-        ({ id: mId }) => mId === member.id,
+        ({ id: mId }) => mId === account.id,
       );
       // check name and mail
       cy.get(buildItemMembershipRowSelector(id))
@@ -66,9 +66,9 @@ describe('View Memberships Read-Only Mode', () => {
     cy.get(`#${buildShareButtonId(item.id)}`).click();
 
     // check contains member avatar
-    for (const { permission, member, id } of memberships) {
+    for (const { permission, account, id } of memberships) {
       const { name, email } = Object.values(MEMBERS).find(
-        ({ id: mId }) => mId === member.id,
+        ({ id: mId }) => mId === account.id,
       );
       // check name, mail and permission
       cy.get(buildItemMembershipRowSelector(id))

diff --git a/cypress/fixtures/chatbox.ts b/cypress/fixtures/chatbox.ts
@@ -30,7 +30,7 @@ export const ITEM_WITH_CHATBOX_MESSAGES: ItemForTest = {
     {
       item,
       permission: PermissionLevel.Write,
-      member: MEMBERS.ANNA,
+      account: MEMBERS.ANNA,
       creator: MEMBERS.ANNA,
       createdAt: '2021-09-11T12:56:36.834Z',
       updatedAt: '2021-09-11T12:56:36.834Z',
@@ -72,7 +72,7 @@ const ITEM_WITH_CHATBOX_MESSAGES_AND_ADMIN: ItemForTest = {
     {
       item: items[0],
       permission: PermissionLevel.Admin,
-      member: MEMBERS.ANNA,
+      account: MEMBERS.ANNA,
       creator: MEMBERS.ANNA,
       createdAt: '2021-08-11T12:56:36.834Z',
       id: '78ad2166-3862-4593-a13c-d380e7b66674',
@@ -110,7 +110,7 @@ export const ITEM_WITHOUT_CHATBOX_MESSAGES: ItemForTest = {
 export const SAMPLE_MENTIONS: ChatMention[] = [
   {
     id: '7062d5e6-a4a0-4828-b4b9-8bc9e21f7abd',
-    member: CURRENT_USER,
+    account: CURRENT_USER,
     createdAt: '2021-08-11T12:56:36.834Z', // '2022-07-18T07:48:05.008Z',
     updatedAt: '2021-08-11T12:56:36.834Z', // '2022-07-18T07:48:05.008Z',
     status: MentionStatus.Unread,

diff --git a/cypress/fixtures/invitations.ts b/cypress/fixtures/invitations.ts
@@ -54,7 +54,7 @@ export const ITEMS_WITH_INVITATIONS: ApiConfig = {
           id: 'ecafbd2a-5688-11eb-be93-0242ac130002',
           item: itemsWithInvitations[0],
           permission: PermissionLevel.Admin,
-          member: MEMBERS.FANNY,
+          account: MEMBERS.FANNY,
           createdAt: '2021-08-11T12:56:36.834Z',
           updatedAt: '2021-08-11T12:56:36.834Z',
           creator: MEMBERS.ANNA,
@@ -63,7 +63,7 @@ export const ITEMS_WITH_INVITATIONS: ApiConfig = {
           id: 'ecafbd2a-5688-11eb-be93-0212ac130002',
           item: itemsWithInvitations[0],
           permission: PermissionLevel.Admin,
-          member: MEMBERS.ANNA,
+          account: MEMBERS.ANNA,
           createdAt: '2021-08-11T12:56:36.834Z',
           updatedAt: '2021-08-11T12:56:36.834Z',
           creator: MEMBERS.ANNA,
@@ -132,7 +132,7 @@ export const ITEM_WITH_INVITATIONS_WRITE_ACCESS: ApiConfig = {
           id: 'ecafbd2a-5688-11eb-be93-0242ac130002',
           item: itemsWithInvitationsWriteAccess[0],
           permission: PermissionLevel.Write,
-          member: MEMBERS.ANNA,
+          account: MEMBERS.ANNA,
           createdAt: '2021-08-11T12:56:36.834Z',
           updatedAt: '2021-08-11T12:56:36.834Z',
           creator: MEMBERS.ANNA,