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

Jump to bottom

feat(procedures): implement gdpr document upload and confirmation #13654

Merged
merged 1 commit into from
Oct 21, 2024
Merged

feat(procedures): implement gdpr document upload and confirmation #13654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 15 additions & 17 deletions ...bleMFA/create/form/Modal/ConfirmModal.tsx → ...s/confirmModal/ConfirmModal.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,25 @@ type Props = {
isPending: boolean;
onClose: () => void;
onValidate: () => void;
title: string;
descriptionInsure: string;
descriptionConfirm: string;
noButtonLabel: string;
yesButtonLabel: string;
};

export const ConfirmModal: FunctionComponent<Props> = ({
onClose,
onValidate,
isPending,
title,
descriptionInsure,
descriptionConfirm,
noButtonLabel,
yesButtonLabel,
}) => {
const { t } = useTranslation('account-disable-2fa');

return (
<OsdsModal
dismissible={false}
onOdsModalClose={onClose}
headline={t(
'account-disable-2fa-create-form-confirm-modal-send-document-title',
)}
>
<OsdsModal dismissible={false} onOdsModalClose={onClose} headline={title}>
<div className="flex items-center gap-x-6">
<div className="rounded-full p-4 bg-[#bef1ff]">
<OsdsIcon
Expand All @@ -56,9 +58,7 @@ export const ConfirmModal: FunctionComponent<Props> = ({
className="block"
hue={ODS_TEXT_COLOR_HUE._500}
>
{t(
'account-disable-2fa-create-form-confirm-modal-send-document-description-insure',
)}
{descriptionInsure}
</OsdsText>
<OsdsText
level={ODS_TEXT_LEVEL.caption}
Expand All @@ -67,9 +67,7 @@ export const ConfirmModal: FunctionComponent<Props> = ({
className="block mt-2"
hue={ODS_TEXT_COLOR_HUE._500}
>
{t(
'account-disable-2fa-create-form-confirm-modal-send-document-description-confirm',
)}
{descriptionConfirm}
</OsdsText>
</div>
</div>
Expand All @@ -84,7 +82,7 @@ export const ConfirmModal: FunctionComponent<Props> = ({
color={ODS_THEME_COLOR_INTENT.primary}
onClick={onClose}
>
{t('account-disable-2fa-confirm-modal-no')}
{noButtonLabel}
</OsdsButton>
<OsdsButton
slot="actions"
Expand All @@ -93,7 +91,7 @@ export const ConfirmModal: FunctionComponent<Props> = ({
variant={ODS_BUTTON_VARIANT.flat}
color={ODS_THEME_COLOR_INTENT.primary}
>
{t('account-disable-2fa-confirm-modal-yes')}
{yesButtonLabel}
</OsdsButton>
</>
)}
Expand Down
23 changes: 12 additions & 11 deletions ...bleMFA/create/form/Modal/SuccessModal.tsx → ...s/successModal/SuccessModal.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,21 @@ import {
OsdsModal,
OsdsText,
} from '@ovhcloud/ods-components/react';
import { useTranslation } from 'react-i18next';
import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';

type Props = {
title: string;
description: string;
ovhHomePageHref: string;
ovhHomePageLabel: string;
};

export const SuccessModal: FunctionComponent<Props> = ({ ovhHomePageHref }) => {
const { t } = useTranslation('account-disable-2fa');

export const SuccessModal: FunctionComponent<Props> = ({
ovhHomePageHref,
title,
description,
ovhHomePageLabel,
}) => {
const gotToHomePage = () => {
window.location.href = ovhHomePageHref;
};
Expand All @@ -43,9 +48,7 @@ export const SuccessModal: FunctionComponent<Props> = ({ ovhHomePageHref }) => {
className="block font-bold"
hue={ODS_TEXT_COLOR_HUE._700}
>
{t(
'account-disable-2fa-create-form-success-modal-send-document-title',
)}
{title}
</OsdsText>
<OsdsText
level={ODS_TEXT_LEVEL.caption}
Expand All @@ -54,9 +57,7 @@ export const SuccessModal: FunctionComponent<Props> = ({ ovhHomePageHref }) => {
className="block mt-2"
hue={ODS_TEXT_COLOR_HUE._500}
>
{t(
'account-disable-2fa-create-form-success-modal-send-document-description',
)}
{description}
</OsdsText>
</div>
<OsdsButton
Expand All @@ -65,7 +66,7 @@ export const SuccessModal: FunctionComponent<Props> = ({ ovhHomePageHref }) => {
color={ODS_THEME_COLOR_INTENT.primary}
onClick={gotToHomePage}
>
{t('account-disable-2fa-success-modal-back-home')}
{ovhHomePageLabel}
</OsdsButton>
</OsdsModal>
);
Expand Down
47 changes: 47 additions & 0 deletions packages/manager/apps/procedures/src/data/api/rgdp/rgdpApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { FileWithError } from '@/components/FileInput/FileInputContainer';
import { GDPRFormValues } from '@/types/gdpr.type';

export type UploadLink = {
link: string;
method: string;
headers: any;
};

export type GetUploadDocumentsLinks = {
numberOfDocuments: number;
formData: Omit<
GDPRFormValues,
'idDocumentFront' | 'idDocumentBack' | 'otherDocuments'
>;
};

export type UploadDocuments = {
fileLinks: UploadLink[];
files: FileWithError[];
};

export const getUploadDocumentsLinks = ({
formData,
numberOfDocuments,
}: GetUploadDocumentsLinks): Promise<UploadLink[]> => {
return new Promise((res) => {
setTimeout(() => {
res([]);
console.log('value', numberOfDocuments, formData);
}, 500);
});
};

export const uploadDocuments = (documents: UploadDocuments): Promise<void> =>
new Promise((res) => {
setTimeout(() => {
res();
}, 500);
});

export const finalize = (): Promise<void> =>
new Promise((res) => {
setTimeout(() => {
res();
}, 500);
});
51 changes: 51 additions & 0 deletions packages/manager/apps/procedures/src/data/hooks/rgdp/useRGDP.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { useMutation } from '@tanstack/react-query';
import {
UploadLink,
getUploadDocumentsLinks,
GetUploadDocumentsLinks,
UploadDocuments,
uploadDocuments,
finalize,
} from '@/data/api/rgdp/rgdpApi';

export const useRGDPSendForm = ({
onSuccess,
onError,
}: {
onSuccess: (links: UploadLink[]) => void;
onError: () => void;
}) =>
useMutation({
mutationFn: (data: GetUploadDocumentsLinks) =>
getUploadDocumentsLinks(data),
onSuccess: (links) => {
onSuccess?.(links);
},
onError: () => {
onError?.();
},
});

export const useRGDPUploadDocuments = ({
onSuccess,
onError,
}: {
onSuccess: () => void;
onError: () => void;
}) =>
useMutation({
mutationFn: async (documents: UploadDocuments) => {
if (documents.fileLinks.length > 0) {
await uploadDocuments(documents);
}
await finalize();
},
onSuccess: () => {
onSuccess?.();
},
onError: () => {
onError?.();
},
retry: 1,
retryDelay: 3000,
});
30 changes: 26 additions & 4 deletions packages/manager/apps/procedures/src/pages/disableMFA/create/form/Form.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import { FormDocumentFieldList } from './FormDocumentFields/FormDocumentFieldLis
import { LegalFrom } from '@/types/user.type';
import useUser from '@/context/User/useUser';
import { useUploadDocuments } from '@/data/hooks/useDocuments';
import { ConfirmModal } from './Modal/ConfirmModal';
import { SuccessModal } from './Modal/SuccessModal';
import { ovhHomePageHref } from './constants/form.constants';
import { getWebSiteRedirectUrl } from '@/utils/url-builder';
import { ConfirmModal } from '@/components/modals/confirmModal/ConfirmModal.component';
import { SuccessModal } from '@/components/modals/successModal/SuccessModal.component';

const flatFiles = (files: FieldValues) =>
Object.values(files)
Expand Down Expand Up @@ -132,14 +132,36 @@ const FormCreateRequest = () => {

{showConfirmModal && (
<ConfirmModal
title={t(
'account-disable-2fa-create-form-confirm-modal-send-document-title',
)}
descriptionInsure={t(
'account-disable-2fa-create-form-confirm-modal-send-document-description-insure',
)}
descriptionConfirm={t(
'account-disable-2fa-create-form-confirm-modal-send-document-description-confirm',
)}
noButtonLabel={t('account-disable-2fa-confirm-modal-no')}
yesButtonLabel={t('account-disable-2fa-confirm-modal-yes')}
isPending={isPending}
onClose={() => setShowConfirmModal(false)}
onValidate={() => {
mutate({ files });
}}
/>
)}
{showSuccessModal && <SuccessModal ovhHomePageHref={ovhHomePageHref} />}
{showSuccessModal && (
<SuccessModal
ovhHomePageHref={getWebSiteRedirectUrl()}
title={t(
'account-disable-2fa-create-form-success-modal-send-document-title',
)}
description={t(
'account-disable-2fa-create-form-success-modal-send-document-description',
)}
ovhHomePageLabel={t('account-disable-2fa-success-modal-back-home')}
/>
)}
</form>
);
};
Expand Down
1 change: 0 additions & 1 deletion ...ges/manager/apps/procedures/src/pages/disableMFA/create/form/constants/form.constants.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading