feat: [Duplicate Applet] Enhance Duplication (M2-7729)

src/modules/Builder/features/ReportConfigSetting/ReportConfigSetting.hooks.test.ts

@@ -38,9 +38,15 @@ const renderReportServerHook = (message: string) => {
  (verifyReportServer as jest.Mock).mockResolvedValue({
  json: async () => ({ message }),
  });
- (useParams as jest.Mock).mockReturnValue({ appletId: 'testAppletId', ownerId: 'testOwnerId' });
 
- return renderHook(() => useCheckReportServer({ url: mockUrl, publicKey: mockPublicKey }));
+ return renderHook(() =>
+ useCheckReportServer({
+ url: mockUrl,
+ publicKey: mockPublicKey,
+ appletId: 'testAppletId',
+ ownerId: 'testOwnerId',
+ }),
+ );
 };
 
 const renderDefaultValuesHook = (appletData = {}, params) => {
@@ -104,10 +110,14 @@ describe('useCheckReportServer', () => {
  (setPasswordReportServer as jest.Mock).mockResolvedValue({
  json: async () => ({ message: SUCCESS_MESSAGE }),
  });
- (useParams as jest.Mock).mockReturnValue({ appletId: 'testAppletId', ownerId: 'testOwnerId' });
 
  const { result } = renderHook(() =>
- useCheckReportServer({ url: mockUrl, publicKey: 'mockPublicKey' }),
+ useCheckReportServer({
+ url: mockUrl,
+ publicKey: 'mockPublicKey',
+ appletId: 'testAppletId',
+ ownerId: 'testOwnerId',
+ }),
  );
 
  let setPasswordResult;
@@ -131,10 +141,14 @@ describe('useCheckReportServer', () => {
  (setPasswordReportServer as jest.Mock).mockResolvedValue({
  json: async () => ({ message: 'OTHER_MESSAGE' }),
  });
- (useParams as jest.Mock).mockReturnValue({ appletId: 'testAppletId', ownerId: 'testOwnerId' });
 
  const { result } = renderHook(() =>
- useCheckReportServer({ url: mockUrl, publicKey: 'mockPublicKey' }),
+ useCheckReportServer({
+ url: mockUrl,
+ publicKey: 'mockPublicKey',
+ appletId: 'testAppletId',
+ ownerId: 'testOwnerId',
+ }),
  );
 
  let setPasswordResult;

src/modules/Builder/features/ReportConfigSetting/ReportConfigSetting.hooks.ts

@@ -12,9 +12,12 @@ import {
  defaultValues as initialValues,
 } from './ReportConfigSetting.const';
 
-export const useCheckReportServer = ({ url, publicKey }: UseCheckReportServer) => {
- const { appletId = '', ownerId = '' } = useParams();
-
+export const useCheckReportServer = ({
+ url,
+ publicKey,
+ appletId,
+ ownerId,
+}: UseCheckReportServer) => {
  const onVerify = async () => {
  const token = authStorage.getAccessToken();
 

src/modules/Builder/features/ReportConfigSetting/ReportConfigSetting.tsx

@@ -4,6 +4,7 @@ import { useForm, useFormContext } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { Box } from '@mui/material';
 import { ObjectSchema } from 'yup';
+import { useParams } from 'react-router-dom';
 
 import {
  postReportConfigApi,
@@ -180,9 +181,13 @@ export const ReportConfigSetting = ({ 'data-testid': dataTestid }: ReportConfigS
  )
  : null;
 
+ const { appletId = '', ownerId = '' } = useParams();
+
  const { onVerify, onSetPassword } = useCheckReportServer({
  url: reportServerUrl,
  publicKey: reportPublicKey,
+ appletId,
+ ownerId,
  });
 
  const handleAddEmail = async (value: string) => {

src/modules/Builder/features/ReportConfigSetting/ReportConfigSetting.types.ts

@@ -22,6 +22,8 @@ export type VerifyReportServer = {
 export type UseCheckReportServer = {
  url: string;
  publicKey: string;
+ appletId: string;
+ ownerId: string;
 };
 
 export type SetPasswordReportServer = {

src/modules/Dashboard/api/api.ts

@@ -316,7 +316,7 @@ export const postSubjectInvitationApi = (
  );
 
 export const duplicateAppletApi = ({ appletId, options }: DuplicateApplet, signal?: AbortSignal) =>
- authApiClient.post(
+ authApiClient.post<ResponseWithObject<Applet>>(
  `/applets/${appletId}/duplicate`,
  { ...options },
  {

src/modules/Dashboard/api/api.types.ts

@@ -308,6 +308,7 @@ export type DuplicateApplet = AppletId & {
  options: {
  encryption: Encryption;
  displayName: string;
+ includeReportServer?: boolean;
  };
 };
 

src/modules/Dashboard/features/Applet/Popups/DuplicatePopups/DuplicatePopups.test.tsx

@@ -3,8 +3,9 @@ import mockAxios from 'jest-mock-axios';
 
 import { expectBanner } from 'shared/utils';
 import { renderWithProviders } from 'shared/utils/renderWithProviders';
-import { mockedApplet, mockedAppletData, mockedPassword } from 'shared/mock';
+import { mockedApplet, mockedAppletData, mockedAppletId, mockedPassword } from 'shared/mock';
 import * as encryptionFunctions from 'shared/utils/encryption';
+import { mockGetRequestResponses } from 'shared/utils/axios-mocks';
 
 import { DuplicatePopups } from './DuplicatePopups';
 
@@ -37,6 +38,7 @@ describe('DuplicatePopups', () => {
  });
 
  test('should show an error if the name already exists in database', async () => {
+ mockAxios.post.mockResolvedValueOnce({ data: { result: mockedAppletData } });
  mockAxios.post.mockResolvedValueOnce({ data: { result: { name: 'name' } } });
  mockAxios.post.mockResolvedValueOnce({ data: { result: { name: 'name (1)' } } });
 
@@ -53,6 +55,10 @@ describe('DuplicatePopups', () => {
  });
 
  test('should duplicate and open success modal', async () => {
+ mockGetRequestResponses({
+ [`/applets/${mockedAppletId}`]: { data: { result: mockedAppletData } },
+ });
+
  mockAxios.post.mockResolvedValueOnce({ data: { result: { name: 'name' } } });
  mockAxios.post.mockResolvedValueOnce({ data: { result: { name: 'name' } } });
  mockAxios.post.mockResolvedValueOnce({ data: { result: mockedAppletData } });
@@ -102,6 +108,8 @@ describe('DuplicatePopups', () => {
  });
  });
 
+ // TODO Add test(s) for duplicating with report server configuration - https://mindlogger.atlassian.net/browse/M2-8037
+
  // TODO uncomment after useasync changes
  // test('should open error modal', async () => {
  // mockAxios.post.mockRejectedValue(new Error('error'));