fix: remove memberid login in itemLogin component (#925)

graasp · Jul 3, 2024 · 3c5bf8e · 3c5bf8e
1 parent 64c8bdf
commit 3c5bf8e
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 291 deletions.
diff --git a/package.json b/package.json
@@ -88,7 +88,6 @@
     "react-dnd-html5-backend": "16.0.1",
     "react-quill": "2.0.0",
     "react-rnd": "10.4.11",
-    "react-text-mask": "5.5.0",
     "uuid": "10.0.0",
     "vitest": "1.6.0"
   },

diff --git a/src/constants.ts b/src/constants.ts
@@ -23,7 +23,6 @@ export const SETTINGS = {
     },
     SIGN_IN_MODE: {
       PSEUDONYM: 'pseudonym',
-      MEMBER_ID: 'memberId',
     },
   },
 };

diff --git a/src/itemLogin/ItemLoginAuthorization.tsx b/src/itemLogin/ItemLoginAuthorization.tsx
@@ -29,7 +29,6 @@ export type ItemLoginAuthorizationProps = {
   usernameInputId?: string;
   signInButtonId?: string;
   passwordInputId?: string;
-  modeSelectId?: string;
   ForbiddenContent?: ReactElement;
 };
 
@@ -41,11 +40,9 @@ const ItemLoginAuthorization =
     itemId,
     signIn,
     Error: ErrorComponent,
-    memberIdInputId,
     usernameInputId,
     signInButtonId,
     passwordInputId,
-    modeSelectId,
     ForbiddenContent = <ForbiddenText />,
   }: ItemLoginAuthorizationProps) =>
   (ChildComponent: typeof React.Component | (() => JSX.Element)) => {
@@ -102,11 +99,9 @@ const ItemLoginAuthorization =
             itemId={itemId}
             signIn={signIn}
             itemLoginSchemaType={itemLoginSchemaType}
-            memberIdInputId={memberIdInputId}
             usernameInputId={usernameInputId}
             signInButtonId={signInButtonId}
             passwordInputId={passwordInputId}
-            modeSelectId={modeSelectId}
           />
         );
       }

diff --git a/src/itemLogin/ItemLoginScreen.stories.tsx b/src/itemLogin/ItemLoginScreen.stories.tsx
@@ -17,16 +17,6 @@ const meta: Meta<typeof ItemLoginScreen> = {
     signIn: fn(),
   },
   argTypes: {
-    memberIdInputId: {
-      table: {
-        category: TABLE_CATEGORIES.SELECTORS,
-      },
-    },
-    modeSelectId: {
-      table: {
-        category: TABLE_CATEGORIES.SELECTORS,
-      },
-    },
     passwordInputId: {
       table: {
         category: TABLE_CATEGORIES.SELECTORS,
@@ -54,45 +44,42 @@ export const ItemLoginUsernameAndPassword: Story = {
   args: {
     itemLoginSchemaType: ItemLoginSchemaType.UsernameAndPassword,
   },
-};
+  play: async ({ args, canvasElement }) => {
+    const canvas = within(canvasElement);
 
-ItemLoginUsernameAndPassword.play = async ({ args, canvasElement }) => {
-  const canvas = within(canvasElement);
+    await userEvent.type(
+      canvas.getByLabelText('Pseudonym'),
+      'email@provider.com',
+    );
+    await userEvent.type(canvas.getByLabelText('Password'), 'mypassword');
+    await userEvent.click(canvas.getByText('Sign In'));
 
-  await userEvent.type(
-    canvas.getByLabelText('Pseudonym'),
-    'email@provider.com',
-  );
-  await userEvent.type(canvas.getByLabelText('Password'), 'mypassword');
-  await userEvent.click(canvas.getByText('Sign In'));
-
-  expect(args.signIn).toHaveBeenCalled();
+    expect(args.signIn).toHaveBeenCalled();
+  },
 };
 
 export const ItemLoginUsername: Story = {
   args: {
     itemLoginSchemaType: ItemLoginSchemaType.Username,
   },
-};
-
-ItemLoginUsername.play = async ({ args, canvasElement }) => {
-  const canvas = within(canvasElement);
+  play: async ({ args, canvasElement }) => {
+    const canvas = within(canvasElement);
 
-  await userEvent.type(
-    canvas.getByLabelText('Pseudonym'),
-    'email@provider.com',
-  );
-  await userEvent.click(canvas.getByText('Sign In'));
+    await userEvent.type(
+      canvas.getByLabelText('Pseudonym'),
+      'email@provider.com',
+    );
+    await userEvent.click(canvas.getByText('Sign In'));
 
-  expect(args.signIn).toHaveBeenCalled();
+    expect(args.signIn).toHaveBeenCalled();
+  },
 };
 
 export const Forbidden: Story = {
   args: {},
-};
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
 
-Forbidden.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-
-  await expect(canvas.getByText(FORBIDDEN_TEXT)).toBeInTheDocument();
+    await expect(canvas.getByText(FORBIDDEN_TEXT)).toBeInTheDocument();
+  },
 };