refactor: update ui

graasp · Sep 27, 2024 · 6523dfe · 6523dfe
1 parent f1c7c8e
commit 6523dfe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/cypress/support/server.ts b/cypress/support/server.ts
@@ -433,19 +433,15 @@ export const mockGetItemsTags = (
   ).as('getItemsTags');
 };
 
-export const mockGetLoginSchemaType = (
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  itemLogins: { [key: string]: string },
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  member: Member | null,
-): void => {
+export const mockGetLoginSchemaType = (itemLogins: {
+  [key: string]: string;
+}): void => {
   cy.intercept(
     {
       method: DEFAULT_GET.method,
       url: new RegExp(`${API_HOST}/${buildGetItemLoginSchemaRoute(ID_FORMAT)}`),
     },
     ({ reply, url }) => {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const itemId = url.slice(API_HOST.length).split('/')[2];
 
       // todo: add response for itemLoginSchemaType

diff --git a/src/contexts/CurrentMemberContext.tsx b/src/contexts/CurrentMemberContext.tsx
@@ -1,6 +1,7 @@
 import { createContext, useContext, useEffect } from 'react';
 
 import { AccountType } from '@graasp/sdk';
+import { DEFAULT_LANG } from '@graasp/translations';
 
 import i18n from '@/config/i18n';
 import { hooks } from '@/config/queryClient';
@@ -25,7 +26,7 @@ export const CurrentMemberContextProvider = ({
   const lang =
     query.data && query.data?.type === AccountType.Individual
       ? query.data?.extra?.lang
-      : undefined;
+      : DEFAULT_LANG;
   useEffect(() => {
     if (lang !== i18n.language) {
       i18n.changeLanguage(lang);

diff --git a/src/modules/item/Item.tsx b/src/modules/item/Item.tsx
@@ -281,7 +281,7 @@ const AppContent = ({ item }: { item: AppItemType }): JSX.Element => {
         contextPayload={{
           apiHost: API_HOST,
           settings: item.settings,
-          lang: item.lang ?? memberLang,
+          lang: memberLang,
           permission: PermissionLevel.Read,
           context: Context.Player,
           accountId: member?.id,

diff --git a/src/modules/pages/ItemPage.tsx b/src/modules/pages/ItemPage.tsx
@@ -3,7 +3,7 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { Container, Stack, Typography, styled } from '@mui/material';
 
 import { ItemLoginSchemaType } from '@graasp/sdk';
-import { Button, CustomInitialLoader } from '@graasp/ui';
+import { Button, CustomInitialLoader, ItemLoginWrapper } from '@graasp/ui';
 
 import { usePlayerTranslation } from '@/config/i18n';
 import { HOME_PATH } from '@/config/paths';
@@ -109,13 +109,15 @@ const ItemPage = (): JSX.Element | null => {
     }
 
     return (
-      <ItemLoginScreen
+      <ItemLoginWrapper
         itemId={itemId}
         signIn={itemLoginSignIn}
         itemLoginSchemaType={itemLoginSchemaType}
         usernameInputId={ITEM_LOGIN_USERNAME_INPUT_ID}
         signInButtonId={ITEM_LOGIN_SIGN_IN_BUTTON_ID}
         passwordInputId={ITEM_LOGIN_PASSWORD_INPUT_ID}
+        enrollContent={<EnrollScreen />}
+        // requestAccessContent={<Reque}
       />
     );
   }