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
12 changes: 0 additions & 12 deletions src/api/OnboardingApiClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ import {
} from '@pagopa/selfcare-common-frontend/lib/utils/api-utils';
import { storageTokenOps } from '@pagopa/selfcare-common-frontend/lib/utils/storage';
import { ENV } from '../utils/env';
import { CheckManagerDto } from './generated/onboarding/CheckManagerDto';
import { createClient, WithDefaultsT } from './generated/onboarding/client';
import { OnboardingUserDto } from './generated/onboarding/OnboardingUserDto';
import { UserDataValidationDto } from './generated/onboarding/UserDataValidationDto';
import { UserTaxCodeDto } from './generated/onboarding/UserTaxCodeDto';

const withBearerAndInstitutionId: WithDefaultsT<'bearerAuth'> =
(wrappedOperation) => (params: any) => {
Expand Down Expand Up @@ -41,16 +39,6 @@ const onRedirectToLogin = () =>
);

export const OnboardingApi = {
searchUserApi: async (user: UserTaxCodeDto): Promise<any> => {
const result = await apiClient.searchUserId({ body: user });
return extractResponse(result, 200, onRedirectToLogin);
},

checkManagerApi: async (user: CheckManagerDto): Promise<any> => {
const result = await apiClient.checkManager({ body: user });
return extractResponse(result, 200, onRedirectToLogin);
},

validateLegalRepresentative: async (user: UserDataValidationDto): Promise<any> => {
const result = await apiClient.validateUsingPOST({
body: {
Expand Down
78 changes: 6 additions & 72 deletions src/pages/addUserFlow/addManager/AddLegalRepresentativeForm.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Grid } from '@mui/material';

import { ButtonNaked } from '@pagopa/mui-italia';
import { TitleBox, useErrorDispatcher, useLoading } from '@pagopa/selfcare-common-frontend/lib';

import { trackEvent } from '@pagopa/selfcare-common-frontend/lib/services/analyticsService';
import { resolvePathVariables } from '@pagopa/selfcare-common-frontend/lib/utils/routes-utils';
import { useFormik } from 'formik';
Expand All @@ -17,18 +15,14 @@ import { Party } from '../../../model/Party';
import { AddedUsersList } from '../../../model/PartyUser';
import { RequestOutcomeMessage } from '../../../model/UserRegistry';
import {
checkManagerService,
onboardingAggregatorService,
onboardingPostUser,
searchUserService,
validateLegalRepresentative,
} from '../../../services/onboardingService';
import { getLegalRepresentativeService } from '../../../services/usersService';
import {
LOADING_TASK_CHECK_MANAGER,
LOADING_TASK_GET_LEGAL_REPRESENTATIVE,
LOADING_TASK_ONBOARDING_USER_WITH_LEGAL_REPRESENTATIVE,
LOADING_TASK_SEARCH_USER_PDV,
} from '../../../utils/constants';
import { ENV } from '../../../utils/env';
import { findNewestManager, getOutcomeContent, renderErrorMessage } from '../utils/helpers';
Expand Down Expand Up @@ -62,8 +56,6 @@ export default function AddLegalRepresentativeForm({

const requestId = uniqueId();
const { t } = useTranslation();
const setLoadingSearchUserPDV = useLoading(LOADING_TASK_SEARCH_USER_PDV);
const setLoadingCheckManager = useLoading(LOADING_TASK_CHECK_MANAGER);
const setLoadingGetLegalRepresentative = useLoading(LOADING_TASK_GET_LEGAL_REPRESENTATIVE);
const setLoadingOnboarding = useLoading(LOADING_TASK_ONBOARDING_USER_WITH_LEGAL_REPRESENTATIVE);
const addError = useErrorDispatcher();
Expand Down Expand Up @@ -104,68 +96,6 @@ export default function AddLegalRepresentativeForm({
.finally(() => setLoadingGetLegalRepresentative(false));
}, [productId, party]);

const searchUser = async (user: AddedUsersList) => {
setLoadingSearchUserPDV(true);
await searchUserService({ taxCode: user.taxCode })
.then(async (data) => {
if (data.id) {
await checkManager(data.id, user);
} else {
await validateUser(user);
}
})
.catch(async (error) => {
await validateUser(user);
addError({
id: `SEARCH_USER_ERROR`,
blocking: false,
error,
techDescription: `Something gone wrong while calling search-user`,
toNotify: true,
});
})
.finally(() => setLoadingSearchUserPDV(false));
};

const checkManager = async (userId: string, user: AddedUsersList) => {
setLoadingCheckManager(true);
checkManagerService({
institutionType: activeOnboardingOnSelectedProduct.institutionType as InstitutionTypeEnum,
origin: party?.origin,
originId: party?.originId,
productId,
subunitCode: party?.subunitCode,
taxCode: party.vatNumber,
userId,
})
.then(async (data) => {
if (data) {
setIsChangedManager(!data.result);
if (!data.result) {
trackEvent('CHANGE_LEGAL_REPRESENTATIVE', {
request_id: requestId,
party_id: party.partyId,
product_id: productId,
from: 'dashboard',
});
} else {
await validateUser(user);
}
}
})
.catch(async (error) => {
await validateUser(user);
addError({
id: `VALIDATE_USER_ERROR`,
blocking: false,
error,
techDescription: `Something gone wrong while calling validate-user`,
toNotify: true,
});
})
.finally(() => setLoadingCheckManager(false));
};

const initialFormData = {
taxCode: '',
name: '',
Expand All @@ -179,9 +109,13 @@ export default function AddLegalRepresentativeForm({
validate: (user) => validateManagerForm(user, addedUserList, t),

onSubmit: async (user) => {
if (previousLegalRepresentative) {
await searchUser(user);
if (
previousLegalRepresentative?.fiscalCode &&
previousLegalRepresentative.fiscalCode !== user.taxCode
) {
setIsChangedManager(true);
} else {
setIsChangedManager(false);
await validateUser(user);
}
},
Expand Down
10 changes: 0 additions & 10 deletions src/services/__mocks__/usersService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ import { mockedProductUserResource } from '../../api/__mocks__/DashboardApiClien
import { CheckUserResponse } from '../../api/generated/b4f-dashboard/CheckUserResponse';
import { ProductUserResource } from '../../api/generated/b4f-dashboard/ProductUserResource';
import { UserCountResource } from '../../api/generated/b4f-dashboard/UserCountResource';
import { CheckManagerDto } from '../../api/generated/onboarding/CheckManagerDto';
import { OnboardingUserDto } from '../../api/generated/onboarding/OnboardingUserDto';
import { UserDataValidationDto } from '../../api/generated/onboarding/UserDataValidationDto';
import { UserTaxCodeDto } from '../../api/generated/onboarding/UserTaxCodeDto';
import { Party, UserRole, UserStatus } from '../../model/Party';
import { PartyGroup, PartyGroupStatus } from '../../model/PartyGroup';
import {
Expand Down Expand Up @@ -1350,14 +1348,6 @@ export const fetchUserGroups = (
return Promise.resolve(userGroups);
};

export const searchUserMocked = (_user: UserTaxCodeDto): Promise<any> =>
Promise.resolve({
id: '121312312',
});

export const checkManagerMocked = (_user: CheckManagerDto): Promise<any> =>
Promise.resolve({ result: false });

export const validateLegalRepresentativeMocked = (_user: UserDataValidationDto): Promise<void> =>
new Promise((resolve) => resolve());

Expand Down
22 changes: 0 additions & 22 deletions src/services/onboardingService.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,11 @@
import { CheckManagerDto } from '../api/generated/onboarding/CheckManagerDto';
import { OnboardingUserDto } from '../api/generated/onboarding/OnboardingUserDto';
import { UserDataValidationDto } from '../api/generated/onboarding/UserDataValidationDto';
import { UserTaxCodeDto } from '../api/generated/onboarding/UserTaxCodeDto';
import { OnboardingApi } from '../api/OnboardingApiClient';
import {
checkManagerMocked,
onboardingPostUserMocked,
searchUserMocked,
validateLegalRepresentativeMocked,
} from './__mocks__/usersService';

export const searchUserService = (userTaxCode: UserTaxCodeDto): Promise<any> => {
/* istanbul ignore if */
if (process.env.REACT_APP_API_MOCK_PARTY_USERS === 'true') {
return searchUserMocked(userTaxCode);
} else {
return OnboardingApi.searchUserApi(userTaxCode);
}
};

export const checkManagerService = (user: CheckManagerDto): Promise<any> => {
/* istanbul ignore if */
if (process.env.REACT_APP_API_MOCK_PARTY_USERS === 'true') {
return checkManagerMocked(user);
} else {
return OnboardingApi.checkManagerApi(user);
}
};

export const validateLegalRepresentative = (user: UserDataValidationDto): Promise<any> => {
/* istanbul ignore if */
if (process.env.REACT_APP_API_MOCK_PARTY_USERS === 'true') {
Expand Down
Loading