Skip to content
Merged
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
22 changes: 11 additions & 11 deletions src/api/__mocks__/DashboardApiClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { PageRequest } from '@pagopa/selfcare-common-frontend/lib/model/PageRequ
import { EmailString } from '@pagopa/ts-commons/lib/strings';
import { PartyUserOnCreation } from '../../model/PartyUser';
import { ProductRole } from '../../model/ProductRole';
import { InstitutionUserDetailsResource, RoleEnum } from '../generated/b4f-dashboard/InstitutionUserDetailsResource';
import {
InstitutionUserDetailsResource,
RoleEnum,
} from '../generated/b4f-dashboard/InstitutionUserDetailsResource';
import { SelcRoleEnum } from '../generated/b4f-dashboard/ProductRoleInfoResource';
import { ProductUserResource } from '../generated/b4f-dashboard/ProductUserResource';
import {
Expand Down Expand Up @@ -155,28 +158,28 @@ export const DashboardApi = {
_institutionId: string,
_userId: string
): Promise<InstitutionUserDetailsResource | null> =>
new Promise((resolve) => resolve(mockedInstitutionUserDetailsResource)),
Promise.resolve(mockedInstitutionUserDetailsResource),

getPartyUsers: async (
_institutionId: string,
_productId?: string,
_role?: string,
_productRoles?: Array<ProductRole>
): Promise<Array<InstitutionUserDetailsResource>> =>
new Promise((resolve) => resolve(mockedInstitutionUserResource)),
Promise.resolve(mockedInstitutionUserResource),

getPartyProductUsers: async (
_institutionId: string,
_productId: string,
_role?: string
): Promise<Array<ProductUserResource>> =>
new Promise((resolve) => resolve(mockedProductUserResource)),
Promise.resolve(mockedProductUserResource),

savePartyUser: async (
_institutionId: string,
_productId: string,
_user: PartyUserOnCreation
): Promise<UserIdResource> => new Promise((resolve) => resolve({ id: 'newUserId' })),
): Promise<UserIdResource> => Promise.resolve({ id: 'newUserId' }),

suspendPartyRelation: async (_relationshipId: string): Promise<void> =>
new Promise((resolve) => resolve()),
Expand All @@ -185,7 +188,7 @@ export const DashboardApi = {
new Promise((resolve) => resolve()),

fetchUserRegistryByFiscalCode: async (_taxCode: string): Promise<UserResource | null> =>
new Promise((resolve) => resolve(mockedUserResource)),
Promise.resolve(mockedUserResource),

deletePartyRelation: async (_relationshipId: string): Promise<void> =>
new Promise<void>((resolve) => resolve()),
Expand All @@ -202,11 +205,8 @@ export const DashboardApi = {
_institutionId: string,
_pageRequest: PageRequest
): Promise<Array<UserGroupPlainResource>> =>
new Promise((resolve) => resolve(userGroupPlainResourceArray)),
Promise.resolve(userGroupPlainResourceArray),

addMemberToUserGroup: async (
_id: string,
_userId: string,
): Promise<void> =>
addMemberToUserGroup: async (_id: string, _userId: string): Promise<void> =>
new Promise((resolve) => resolve()),
};
4 changes: 3 additions & 1 deletion src/locale/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ export default {
},
editRegistryForm: {
title: 'Modifica il profilo utente',
userData: 'Dati utente',
subTitle: 'Inserisci i dati dell’utente che vuoi aggiungere.',
fiscalCode: {
label: 'Codice Fiscale',
},
Expand All @@ -291,7 +293,7 @@ export default {
label: 'Conferma e-mail',
},
backButton: 'Indietro',
confirmButton: 'Conferma',
confirmButton: 'Continua',
errors: {
userNotFind: "Impossibile individuare l'utente desiderato",
invalidEmail: 'L’indirizzo email non è valido',
Expand Down
134 changes: 67 additions & 67 deletions src/microcomponents/mock_dashboard/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
import { Box, Grid } from '@mui/material';
import { Footer, Header } from '@pagopa/selfcare-common-frontend/lib';
import { useUnloadEventOnExit } from '@pagopa/selfcare-common-frontend/lib/hooks/useUnloadEventInterceptor';
import i18n from '@pagopa/selfcare-common-frontend/lib/locale/locale-utils';
import { userSelectors } from '@pagopa/selfcare-common-frontend/lib/redux/slices/userSlice';
import { trackEvent } from '@pagopa/selfcare-common-frontend/lib/services/analyticsService';
import React, { useEffect, useState } from 'react';
import { useSelector } from 'react-redux';
import { ENV } from '../../utils/env';

type Props = {
children?: React.ReactNode;
};

export default function Layout({ children }: Props) {
const onExit = useUnloadEventOnExit();
const loggedUser = useSelector(userSelectors.selectLoggedUser);
const [showDocBtn, setShowDocBtn] = useState(false);

useEffect(() => {
if (i18n.language === 'it') {
setShowDocBtn(true);
} else {
setShowDocBtn(false);
}
}, [i18n.language]);

return (
<Box
sx={{
display: 'flex',
flexDirection: 'column',
minHeight: '100vh',
}}
>
<Header
withSecondHeader={true}
onExit={onExit}
assistanceEmail="[email protected]"
loggedUser={
loggedUser
? {
id: loggedUser ? loggedUser.uid : '',
name: loggedUser?.name,
surname: loggedUser?.surname,
email: loggedUser?.email,
}
: false
}
onDocumentationClick={
showDocBtn
? () => {
trackEvent('OPEN_OPERATIVE_MANUAL', {
from: 'dashboard',
});
window.open(ENV.URL_DOCUMENTATION, '_blank');
}
: undefined
}
/>
<Grid container direction="row" flexGrow={1}>
{children}
</Grid>
<Footer onExit={onExit} loggedUser={!!loggedUser} />
</Box>
);
}
import { Box, Grid } from '@mui/material';
import { Footer, Header } from '@pagopa/selfcare-common-frontend/lib';
import { useUnloadEventOnExit } from '@pagopa/selfcare-common-frontend/lib/hooks/useUnloadEventInterceptor';
import i18n from '@pagopa/selfcare-common-frontend/lib/locale/locale-utils';
import { userSelectors } from '@pagopa/selfcare-common-frontend/lib/redux/slices/userSlice';
import { trackEvent } from '@pagopa/selfcare-common-frontend/lib/services/analyticsService';
import React, { useEffect, useState } from 'react';
import { useSelector } from 'react-redux';
import { ENV } from '../../utils/env';

type Props = {
children?: React.ReactNode;
};

export default function Layout({ children }: Readonly<Props>) {
const onExit = useUnloadEventOnExit();
const loggedUser = useSelector(userSelectors.selectLoggedUser);
const [showDocBtn, setShowDocBtn] = useState(false);

useEffect(() => {
if (i18n.language === 'it') {
setShowDocBtn(true);
} else {
setShowDocBtn(false);
}
}, [i18n.language]);

return (
<Box
sx={{
display: 'flex',
flexDirection: 'column',
minHeight: '100vh',
}}
>
<Header
withSecondHeader={true}
onExit={onExit}
assistanceEmail="[email protected]"
loggedUser={
loggedUser
? {
id: loggedUser ? loggedUser.uid : '',
name: loggedUser?.name,
surname: loggedUser?.surname,
email: loggedUser?.email,
}
: false
}
onDocumentationClick={
showDocBtn
? () => {
trackEvent('OPEN_OPERATIVE_MANUAL', {
from: 'dashboard',
});
window.open(ENV.DOCUMENTATION_LINKS.SELFCARE, '_blank');
}
: undefined
}
/>
<Grid container direction="row" flexGrow={1}>
{children}
</Grid>
<Footer onExit={onExit} loggedUser={!!loggedUser} />
</Box>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Party } from '../../../../model/Party';
import { PartyUserDetail, PartyUserProduct } from '../../../../model/PartyUser';
import { Product } from '../../../../model/Product';
import { ProductRolesLists } from '../../../../model/ProductRole';
import { ENV } from '../../../../utils/env';
import UserProductRoles from '../../components/UserProductRoles';
import UserProductActions from './../../components/UserProductActions';
import UserProductGroups from './../../components/UserProductGroups';
Expand All @@ -32,7 +33,7 @@ export default function UserProductDetail({
product,
isProductDetailPage,
handleOpenDelete,
}: Props) {
}: Readonly<Props>) {
const { t } = useTranslation();
const showActionOnProduct = userProduct.roles.length === 1;
const isPnpg = product.id.startsWith('prod-pn-pg');
Expand Down Expand Up @@ -125,7 +126,7 @@ export default function UserProductDetail({
components={{
1: (
<Link
href="https://docs.pagopa.it/interoperabilita-1/manuale-operativo/guida-alladesione#aggiungere-o-rimuovere-un-operatore-amministrativo-a-pdnd-interoperabilita"
href={ENV.DOCUMENTATION_LINKS.PDND}
color={'text.primary'}
sx={{ textDecorationColor: 'text.primary' }}
target="_blank"
Expand Down
28 changes: 4 additions & 24 deletions src/pages/dashboardUserEdit/AddProductToUserPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Grid, styled, Typography } from '@mui/material';
import { TitleBox } from '@pagopa/selfcare-common-frontend/lib';
import { resolvePathVariables } from '@pagopa/selfcare-common-frontend/lib/utils/routes-utils';
import { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useHistory } from 'react-router-dom';
Expand All @@ -11,8 +10,7 @@ import { AsyncOnboardingUserData, PartyUserOnCreation } from '../../model/PartyU
import { Product } from '../../model/Product';
import { ProductsRolesMap } from '../../model/ProductRole';
import { RequestOutcomeMessage } from '../../model/UserRegistry';
import { DASHBOARD_USERS_ROUTES } from '../../routes';
import AddLegalRepresentativeForm from './AddLegalRepresentativeForm';
import AddLegalRepresentativeForm from './components/AddLegalRepresentativeForm';
import AddUserForm from './components/AddUserForm';
import { MessageNoAction } from './components/MessageNoAction';

Expand Down Expand Up @@ -55,35 +53,17 @@ function AddProductToUserPage({ party, activeProducts, productsRolesMap, partyUs
*/
};

const paths = [
{
description: t('userPagesPath.detailRedirect'),
onClick: () =>
history.push(
resolvePathVariables(DASHBOARD_USERS_ROUTES.PARTY_USERS.subRoutes.MAIN.path, {
partyId: party.partyId,
})
),
},
{
description: `${partyUser.name} ${partyUser.surname}`,
onClick: goBack,
},
{
description: t('userEdit.addProduct.navigation'),
},
];


return outcome ? (
<Grid container justifyContent={'center'} width={'100%'}>
<MessageNoAction {...outcome} />
</Grid>
) : (
<Grid container item px={3} mt={3} sx={{ width: '100%' }}>
<Grid container item px={3} mt={3} sx={{ width: '100%' }} justifyContent={'center'}>
<Grid container item xs={12} md={8}>
<ProductNavigationBar
paths={paths as any}
showBackComponent={false}
showBackComponent={true}
goBack={goBack}
backLabel={t('userPagesPath.exit')}
colorBackComponent="primary.main"
Expand Down
37 changes: 17 additions & 20 deletions src/pages/dashboardUserEdit/AddUsersPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Grid } from '@mui/material';
import { ButtonNaked } from '@pagopa/mui-italia/dist/components/ButtonNaked/ButtonNaked';
import TitleBox from '@pagopa/selfcare-common-frontend/lib/components/TitleBox';
import { resolvePathVariables } from '@pagopa/selfcare-common-frontend/lib/utils/routes-utils';
import { useState } from 'react';
Expand All @@ -10,8 +11,8 @@ import { AsyncOnboardingUserData } from '../../model/PartyUser';
import { Product } from '../../model/Product';
import { ProductsRolesMap } from '../../model/ProductRole';
import { RequestOutcomeMessage } from '../../model/UserRegistry';
import { DASHBOARD_USERS_ROUTES } from '../../routes';
import AddLegalRepresentativeForm from './AddLegalRepresentativeForm';
import { ENV } from '../../utils/env';
import AddLegalRepresentativeForm from './components/AddLegalRepresentativeForm';
import AddUserForm from './components/AddUserForm';
import { MessageNoAction } from './components/MessageNoAction';

Expand Down Expand Up @@ -39,24 +40,9 @@ export default function AddUsersPage({ party, activeProducts, productsRolesMap }
};

const goBack = () => {
history.goBack();
history.push(resolvePathVariables(ENV.ROUTES.USERS, { partyId: party.partyId }));
};

const paths = [
{
description: t('userPagesPath.detailRedirect'),
onClick: () =>
history.push(
resolvePathVariables(DASHBOARD_USERS_ROUTES.PARTY_USERS.subRoutes.MAIN.path, {
partyId: party.partyId,
})
),
},
{
description: t('userPagesPath.addUser'),
},
];

return outcome ? (
<MessageNoAction {...outcome} />
) : (
Expand All @@ -71,7 +57,6 @@ export default function AddUsersPage({ party, activeProducts, productsRolesMap }
<Grid container item xs={12} md={8}>
<Grid item xs={12} mb={2}>
<ProductNavigationBar
paths={paths as any}
showBackComponent={true}
goBack={goBack}
backLabel={t('userPagesPath.exit')}
Expand All @@ -85,9 +70,21 @@ export default function AddUsersPage({ party, activeProducts, productsRolesMap }
title={t('userEdit.addForm.title')}
subTitle={t('userEdit.addForm.subTitle')}
mbTitle={1}
mbSubTitle={5}
mbSubTitle={1}
/>
</Grid>
<Grid item xs={12} mb={4}>
<ButtonNaked
component="button"
color="primary"
sx={{ fontWeight: 'fontWeightSemiBold', fontSize: '14px', textDecoration: 'underline' }}
onClick={() => {
window.open(ENV.DOCUMENTATION_LINKS.USERS);
}}
>
{t('userEdit.addForm.addLegalRepresentative.moreInformationOnRoles')}
</ButtonNaked>
</Grid>
<Grid item xs={12}>
{currentStep === 1 && (
<AddUserForm
Expand Down
Loading