Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cypress/e2e/builder/fixtures/chatbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
ItemType,
MentionStatus,
PackedFolderItemFactory,
PermissionLevel,
} from '@graasp/sdk';

import { DEFAULT_FOLDER_ITEM } from '../../../fixtures/items';
Expand All @@ -29,7 +28,7 @@ export const ITEM_WITH_CHATBOX_MESSAGES: ItemForTest = {
memberships: [
{
item,
permission: PermissionLevel.Write,
permission: 'write',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
createdAt: '2021-09-11T12:56:36.834Z',
Expand Down Expand Up @@ -71,7 +70,7 @@ const ITEM_WITH_CHATBOX_MESSAGES_AND_ADMIN: ItemForTest = {
memberships: [
{
item: items[0],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
createdAt: '2021-08-11T12:56:36.834Z',
Expand Down
28 changes: 14 additions & 14 deletions cypress/e2e/builder/fixtures/invitations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ import {
DiscriminatedItem,
Invitation,
PackedFolderItemFactory,
PermissionLevel,
PermissionLevelOptions,
} from '@graasp/sdk';

import { v4 } from 'uuid';

import type { PermissionLevel } from '@/openapi/client/types.gen';

import { MEMBERS } from '../../../fixtures/members';
import { ApiConfig } from '../../../support/types';

export const buildInvitation = (args: {
item: DiscriminatedItem;
email?: string;
permission?: PermissionLevelOptions;
permission?: PermissionLevel;
}): Invitation => {
const { item, email, permission } = args;
return {
// set temporary id for react-key
id: v4(),
email: email ?? '',
permission: permission ?? PermissionLevel.Read,
permission: permission ?? 'read',
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
creator: MEMBERS.ANNA,
Expand Down Expand Up @@ -56,7 +56,7 @@ export const ITEMS_WITH_INVITATIONS = {
{
id: 'ecafbd2a-5688-11eb-be93-0242ac130002',
item: itemsWithInvitations[0],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.FANNY,
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -65,7 +65,7 @@ export const ITEMS_WITH_INVITATIONS = {
{
id: 'ecafbd2a-5688-11eb-be93-0212ac130002',
item: itemsWithInvitations[0],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -76,7 +76,7 @@ export const ITEMS_WITH_INVITATIONS = {
{
id: 'ecafbd2a-5688-11eb-be92-0242ac130005',
item: itemsWithInvitations[0],
permission: PermissionLevel.Write,
permission: 'write',
email: MEMBERS.BOB.email,
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -85,7 +85,7 @@ export const ITEMS_WITH_INVITATIONS = {
{
id: 'ecafbd1a-5688-11eb-be93-0242ac130006',
item: itemsWithInvitations[1],
permission: PermissionLevel.Write,
permission: 'write',
email: MEMBERS.CEDRIC.email,
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -94,7 +94,7 @@ export const ITEMS_WITH_INVITATIONS = {
{
id: 'ecbfbd2a-5688-11eb-be93-0242ac130007',
item: itemsWithInvitations[1],
permission: PermissionLevel.Read,
permission: 'read',
email: MEMBERS.DAVID.email,
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -113,15 +113,15 @@ const itemsWithInvitationsWriteAccess: DiscriminatedItem[] = [
id: 'bcafbd2a-5688-11eb-ae93-0242ac130002',
path: 'bcafbd2a_5688_11eb_ae93_0242ac130002',
},
{ permission: PermissionLevel.Write },
{ permission: 'write' },
),
PackedFolderItemFactory(
{
id: 'ecafbd2a-5688-11eb-ae93-0242ac130002',
creator: MEMBERS.BOB,
path: 'bcafbd2a_5688_11eb_ae93_0242ac130002.ecafbd2a_5688_11eb_ae93_0242ac130002',
},
{ permission: PermissionLevel.Write },
{ permission: 'write' },
),
];
export const ITEM_WITH_INVITATIONS_WRITE_ACCESS: ApiConfig = {
Expand All @@ -134,7 +134,7 @@ export const ITEM_WITH_INVITATIONS_WRITE_ACCESS: ApiConfig = {
{
id: 'ecafbd2a-5688-11eb-be93-0242ac130002',
item: itemsWithInvitationsWriteAccess[0],
permission: PermissionLevel.Write,
permission: 'write',
account: MEMBERS.ANNA,
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -145,7 +145,7 @@ export const ITEM_WITH_INVITATIONS_WRITE_ACCESS: ApiConfig = {
{
id: 'ecafbd2a-5688-11eb-be92-0242ac130005',
item: itemsWithInvitationsWriteAccess[0],
permission: PermissionLevel.Write,
permission: 'write',
email: MEMBERS.CEDRIC.email,
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -154,7 +154,7 @@ export const ITEM_WITH_INVITATIONS_WRITE_ACCESS: ApiConfig = {
{
id: 'ecafbd1a-5688-11eb-be93-0242ac130006',
item: itemsWithInvitationsWriteAccess[1],
permission: PermissionLevel.Read,
permission: 'read',
email: MEMBERS.DAVID.email,
createdAt: '2021-08-11T12:56:36.834Z',
updatedAt: '2021-08-11T12:56:36.834Z',
Expand Down
15 changes: 7 additions & 8 deletions cypress/e2e/builder/fixtures/items.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
ItemValidationProcess,
ItemValidationStatus,
PackedItem,
PermissionLevel,
} from '@graasp/sdk';

import { DEFAULT_FOLDER_ITEM } from '../../../fixtures/items';
Expand Down Expand Up @@ -34,7 +33,7 @@ export const generateOwnItems = (number: number): ItemForTest[] => {
memberships: [
{
item,
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
createdAt: '2021-08-11T12:56:36.834Z',
Expand Down Expand Up @@ -107,7 +106,7 @@ export const SAMPLE_PUBLIC_ITEMS: ApiConfig = {
memberships: [
{
item: samplePublicItems[0],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
id: 'ecbfbd2a-5688-12db-ae93-0242ac130032',
Expand All @@ -116,7 +115,7 @@ export const SAMPLE_PUBLIC_ITEMS: ApiConfig = {
},
{
item: samplePublicItems[0],
permission: PermissionLevel.Read,
permission: 'read',
account: MEMBERS.BOB,
creator: MEMBERS.ANNA,
id: 'ecbfbd2a-5688-12db-ae91-0242ac130002',
Expand All @@ -130,7 +129,7 @@ export const SAMPLE_PUBLIC_ITEMS: ApiConfig = {
memberships: [
{
item: samplePublicItems[1],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
id: 'ecbfbd2a-5688-121b-ae93-0242ac130002',
Expand All @@ -153,7 +152,7 @@ export const SAMPLE_PUBLIC_ITEMS: ApiConfig = {
memberships: [
{
item: samplePublicItems[2],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
id: 'ecbfbd1a-5688-12db-ae93-0242ac130002',
Expand All @@ -176,7 +175,7 @@ export const SAMPLE_PUBLIC_ITEMS: ApiConfig = {
memberships: [
{
item: samplePublicItems[1],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
id: 'ecbfbd2a-5644-12db-ae93-0242ac130002',
Expand All @@ -185,7 +184,7 @@ export const SAMPLE_PUBLIC_ITEMS: ApiConfig = {
},
{
item: samplePublicItems[1],
permission: PermissionLevel.Read,
permission: 'read',
account: MEMBERS.BOB,
creator: MEMBERS.ANNA,
id: 'ecbfbd2a-5338-12db-ae93-0242ac130002',
Expand Down
20 changes: 10 additions & 10 deletions cypress/e2e/builder/fixtures/memberships.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ import {
Member,
MemberFactory,
PackedFolderItemFactory,
PermissionLevel,
PermissionLevelOptions,
} from '@graasp/sdk';

import { v4 } from 'uuid';

import type { PermissionLevel } from '@/openapi/client/types.gen';

import { MEMBERS } from '../../../fixtures/members';
import { ApiConfig } from '../../../support/types';

export const buildItemMembership = (args: {
permission?: PermissionLevelOptions;
permission?: PermissionLevel;
item: DiscriminatedItem;
account: Partial<Account>;
creator?: Member;
}): ItemMembership => ({
permission: args.permission ?? PermissionLevel.Admin,
permission: args.permission ?? 'admin',
account: MemberFactory(args.account),
item: args.item,
creator: MemberFactory(args.creator ?? args.account),
Expand Down Expand Up @@ -56,7 +56,7 @@ export const ITEMS_WITH_MEMBERSHIPS: ApiConfig = {
{
id: 'ecafbd2a-5688-11eb-be93-0242ac130002',
item: sampleItems[0],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -65,7 +65,7 @@ export const ITEMS_WITH_MEMBERSHIPS: ApiConfig = {
{
id: 'ecafbd2a-5688-11eb-be92-0242ac130002',
item: sampleItems[0],
permission: PermissionLevel.Write,
permission: 'write',
account: MEMBERS.BOB,
creator: MEMBERS.ANNA,
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -74,7 +74,7 @@ export const ITEMS_WITH_MEMBERSHIPS: ApiConfig = {
{
id: 'ecafbd1a-5688-11eb-be93-0242ac130002',
item: sampleItems[0],
permission: PermissionLevel.Write,
permission: 'write',
account: MEMBERS.CEDRIC,
updatedAt: '2021-08-11T12:56:36.834Z',
createdAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -83,7 +83,7 @@ export const ITEMS_WITH_MEMBERSHIPS: ApiConfig = {
{
id: 'ecbfbd2a-5688-11eb-be93-0242ac130002',
item: sampleItems[0],
permission: PermissionLevel.Read,
permission: 'read',
account: MEMBERS.DAVID,
creator: MEMBERS.ANNA,
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -97,7 +97,7 @@ export const ITEMS_WITH_MEMBERSHIPS: ApiConfig = {
{
id: 'ecafbd2a-5688-11eb-be93-0242ac130002',
item: sampleItems[1],
permission: PermissionLevel.Admin,
permission: 'admin',
account: MEMBERS.ANNA,
creator: MEMBERS.ANNA,
updatedAt: '2021-08-11T12:56:36.834Z',
Expand All @@ -106,7 +106,7 @@ export const ITEMS_WITH_MEMBERSHIPS: ApiConfig = {
{
id: 'ecafbd2a-5688-11eb-be92-0242ac130002',
item: sampleItems[0],
permission: PermissionLevel.Write,
permission: 'write',
account: MEMBERS.BOB,
creator: MEMBERS.ANNA,
updatedAt: '2021-08-11T12:56:36.834Z',
Expand Down
3 changes: 1 addition & 2 deletions cypress/e2e/builder/fixtures/publish/publish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
PackedH5PItemFactory,
PackedLinkItemFactory,
PackedShortcutItemFactory,
PermissionLevel,
} from '@graasp/sdk';

import { v4 } from 'uuid';
Expand Down Expand Up @@ -50,7 +49,7 @@ export const createPublicItemByType = (
extra: {} as never,
settings: {},
createdAt: new Date().toISOString(),
permission: PermissionLevel.Admin,
permission: 'admin',
...publicVisibility,
};
default:
Expand Down
18 changes: 8 additions & 10 deletions cypress/e2e/builder/invitations/createInvitation.cy.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import {
PackedFolderItemFactory,
PermissionLevel,
PermissionLevelOptions,
} from '@graasp/sdk';
import { PackedFolderItemFactory } from '@graasp/sdk';

import type { PermissionLevel } from '@/openapi/client/types.gen';

import {
CREATE_MEMBERSHIP_FORM_ID,
Expand All @@ -21,7 +19,7 @@ const inviteItem = ({
}: {
id: string;
email: string;
permission: PermissionLevelOptions;
permission: PermissionLevel;
submit?: boolean;
}) => {
cy.get(`#${buildShareButtonId(id)}`).click();
Expand All @@ -44,7 +42,7 @@ describe('Create Invitation', () => {

// invite
const email = 'mock@email.com';
const permission = PermissionLevel.Read;
const permission = 'read';
inviteItem({ id, email, permission });

cy.wait('@postInvitations').then(({ request: { url, body } }) => {
Expand All @@ -68,7 +66,7 @@ describe('Create Invitation', () => {
id: '79c25df6-8f2b-4bba-be9b-6459b2694ee7',
item,
account: MEMBERS.ANNA,
permission: PermissionLevel.Admin,
permission: 'admin' as const,
createdAt: '2024-02-05T16:45:00Z',
updatedAt: '2024-02-05T16:45:00Z',
},
Expand All @@ -83,7 +81,7 @@ describe('Create Invitation', () => {

// person to invite
const { email } = MEMBERS.ANNA;
inviteItem({ id, email, permission: PermissionLevel.Read });
inviteItem({ id, email, permission: 'read' });

cy.get(`#${SHARE_ITEM_SHARE_BUTTON_ID}`).should('be.disabled');
});
Expand All @@ -97,7 +95,7 @@ describe('Create Invitation', () => {

// invite
const email = 'mock';
const permission = PermissionLevel.Read;
const permission = 'read';
inviteItem({ id, email, permission });

cy.get(`#${SHARE_ITEM_SHARE_BUTTON_ID}`).should('be.disabled');
Expand Down
Loading
Loading