Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/move user routes to app routes #666

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Refactor/move user routes to app routes #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3b94e3
refactor(account): move user screen routes to app routes
ChristiaanScheermeijer Jan 7, 2025
f618461
chore: fix import
ChristiaanScheermeijer Jan 29, 2025
069c801
chore: combine imports
ChristiaanScheermeijer Jan 29, 2025
dc21b2a
chore: remove broken vitest extend
ChristiaanScheermeijer Jan 30, 2025
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
1 change: 0 additions & 1 deletion packages/ui-react/src/components/Button/Button.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';
import { axe } from 'vitest-axe';
import AccountCircle from '@jwp/ott-theme/assets/icons/account_circle.svg?react';
import 'vitest-axe/extend-expect';

import { renderWithRouter } from '../../../test/utils';
import Icon from '../Icon/Icon';
Expand Down
53 changes: 4 additions & 49 deletions packages/ui-react/src/pages/User/User.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { useCallback, useEffect, useState } from 'react';
import { useCallback, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { Navigate, Route, Routes, useNavigate } from 'react-router-dom';
import { useNavigate, Outlet } from 'react-router-dom';
import { shallow } from '@jwp/ott-common/src/utils/compare';
import { getModule } from '@jwp/ott-common/src/modules/container';
import { useAccountStore } from '@jwp/ott-common/src/stores/AccountStore';
import { useConfigStore } from '@jwp/ott-common/src/stores/ConfigStore';
import FavoritesController from '@jwp/ott-common/src/controllers/FavoritesController';
import AccountController from '@jwp/ott-common/src/controllers/AccountController';
import { ACCESS_MODEL } from '@jwp/ott-common/src/constants';
import useBreakpoint, { Breakpoint } from '@jwp/ott-ui-react/src/hooks/useBreakpoint';
Expand All @@ -14,20 +13,14 @@ import BalanceWallet from '@jwp/ott-theme/assets/icons/balance_wallet.svg?react'
import Exit from '@jwp/ott-theme/assets/icons/exit.svg?react';
import Favorite from '@jwp/ott-theme/assets/icons/favorite.svg?react';
import { RELATIVE_PATH_USER_ACCOUNT, RELATIVE_PATH_USER_FAVORITES, RELATIVE_PATH_USER_PAYMENTS } from '@jwp/ott-common/src/paths';
import { useFavoritesStore } from '@jwp/ott-common/src/stores/FavoritesStore';

import AccountComponent from '../../components/Account/Account';
import Button from '../../components/Button/Button';
import ConfirmationDialog from '../../components/ConfirmationDialog/ConfirmationDialog';
import Favorites from '../../components/Favorites/Favorites';
import LoadingOverlay from '../../components/LoadingOverlay/LoadingOverlay';
import PaymentContainer from '../../containers/PaymentContainer/PaymentContainer';
import Icon from '../../components/Icon/Icon';

import styles from './User.module.scss';

const User = (): JSX.Element => {
const favoritesController = getModule(FavoritesController);
const accountController = getModule(AccountController);

const { accessModel, favoritesList } = useConfigStore(
Expand All @@ -40,12 +33,9 @@ const User = (): JSX.Element => {
const navigate = useNavigate();
const { t } = useTranslation('user');
const breakpoint = useBreakpoint();
const [clearFavoritesOpen, setClearFavoritesOpen] = useState(false);

const isLargeScreen = breakpoint > Breakpoint.md;
const { user: customer, subscription, loading } = useAccountStore();
const { canUpdateEmail } = accountController.getFeatures();
const favorites = useFavoritesStore((state) => state.getPlaylist());
const { user: customer, loading } = useAccountStore();

const onLogout = useCallback(async () => {
// Empty customer on a user page leads to navigate (code bellow), so we don't repeat it here
Expand Down Expand Up @@ -114,42 +104,7 @@ const User = (): JSX.Element => {
</nav>
)}
<div className={styles.mainColumn}>
<Routes>
<Route
path={RELATIVE_PATH_USER_ACCOUNT}
element={<AccountComponent panelClassName={styles.panel} panelHeaderClassName={styles.panelHeader} canUpdateEmail={canUpdateEmail} />}
/>
{favoritesList && (
<Route
path={RELATIVE_PATH_USER_FAVORITES}
element={
<>
<Favorites
playlist={favorites}
onClearFavoritesClick={() => setClearFavoritesOpen(true)}
accessModel={accessModel}
hasSubscription={!!subscription}
/>
<ConfirmationDialog
open={clearFavoritesOpen}
title={t('favorites.clear_favorites_title')}
body={t('favorites.clear_favorites_body')}
onConfirm={async () => {
await favoritesController.clear();
setClearFavoritesOpen(false);
}}
onClose={() => setClearFavoritesOpen(false)}
/>
</>
}
/>
)}
<Route
path={RELATIVE_PATH_USER_PAYMENTS}
element={accessModel !== ACCESS_MODEL.AVOD ? <PaymentContainer /> : <Navigate to={RELATIVE_PATH_USER_ACCOUNT} />}
/>
<Route path="*" element={<Navigate to={RELATIVE_PATH_USER_ACCOUNT} />} />
</Routes>
<Outlet />
</div>
</div>
);
Expand Down
Loading
Loading