fix types

__e2e__/proposals/proposalPassedReadonly.spec.ts

@@ -91,7 +91,8 @@ test.beforeAll(async () => {
         fieldConfig: {},
         options: [],
         index: 0,
-        private: false
+        private: false,
+        dependsOnStepIndex: null
       },
       {
         type: 'milestone',
@@ -102,7 +103,8 @@ test.beforeAll(async () => {
         required: false,
         id: uuid(),
         index: 0,
-        private: false
+        private: false,
+        dependsOnStepIndex: null
       }
     ]
   }).then(({ proposal }) => proposal.id);

__integration-tests__/server/pages/api/proposals/[id]/index.spec.ts

@@ -82,7 +82,8 @@ describe('GET /api/proposals/[id] - Get proposal', () => {
         options: [],
         private: false,
         required: true,
-        fieldConfig: null
+        fieldConfig: null,
+        dependsOnStepIndex: null
       }
     ];
     const formId = await createForm(fieldsInput);

components/[pageId]/DocumentPage/DocumentPage.tsx

@@ -62,6 +62,8 @@ const RewardProperties = dynamic(
   () => import('components/[pageId]/DocumentPage/components/RewardProperties').then((r) => r.RewardProperties),
   { ssr: false }
 );
+export type ProposalProps = ReturnType<typeof useProposal> & ReturnType<typeof useProposalFormAnswers>;
+
 export type DocumentPageProps = {
   page: PageWithContent;
   savePage: (p: Partial<Page>) => void;
@@ -72,8 +74,7 @@ export type DocumentPageProps = {
   setSidebarView?: IPageSidebarContext['setActiveView'];
   showCard?: (cardId: string | null) => void;
   showParentChip?: boolean;
-} & ReturnType<typeof useProposal> &
-  ReturnType<typeof useProposalFormAnswers>;
+} & ProposalProps;
 
 function DocumentPageComponent({
   insideModal = false,

components/[pageId]/DocumentPage/DocumentPageWithSidebars.tsx

@@ -13,13 +13,13 @@ import { DocumentColumn, DocumentColumnLayout } from './components/DocumentColum
 import { PageSidebar } from './components/Sidebar/PageSidebar';
 import { ProposalSidebar } from './components/Sidebar/ProposalSidebar';
 import { RewardSidebar } from './components/Sidebar/RewardSidebar';
-import type { DocumentPageProps } from './DocumentPage';
+import type { DocumentPageProps, ProposalProps } from './DocumentPage';
 import { DocumentPage } from './DocumentPage';
 import { usePageSidebar } from './hooks/usePageSidebar';
 import { useProposal } from './hooks/useProposal';
 import { useReward } from './hooks/useReward';
 
-type DocumentPageWithSidebarsProps = DocumentPageProps & {
+type DocumentPageWithSidebarsProps = Omit<DocumentPageProps, keyof ProposalProps> & {
   readOnly?: boolean;
   insideModal?: boolean;
   refreshPage?: VoidFunction;

lib/proposals/__tests__/createDraftProposal.spec.ts

@@ -23,7 +23,8 @@ describe('createDraftProposal', () => {
         options: [],
         private: false,
         required: true,
-        fieldConfig: {}
+        fieldConfig: {},
+        dependsOnStepIndex: null
       },
       {
         id: uuid(),
@@ -34,7 +35,8 @@ describe('createDraftProposal', () => {
         options: [],
         private: true,
         required: true,
-        fieldConfig: {}
+        fieldConfig: {},
+        dependsOnStepIndex: null
       }
     ];
 

lib/proposals/__tests__/getProposalTemplate.spec.ts

@@ -44,7 +44,8 @@ describe('getProposal', () => {
         options: [],
         private: true,
         required: true,
-        fieldConfig: {}
+        fieldConfig: {},
+        dependsOnStepIndex: null
       }
     ];
     const formId = await createForm(fieldsInput);

lib/proposals/createDraftProposal.ts

@@ -151,7 +151,8 @@ export async function createDraftProposal(input: CreateDraftProposalInput) {
         private: false,
         required: true,
         id: uuid(),
-        fieldConfig: createDefaultProjectAndMembersFieldConfig({ allFieldsRequired: true })
+        fieldConfig: createDefaultProjectAndMembersFieldConfig({ allFieldsRequired: true }),
+        dependsOnStepIndex: null
       }
     ];
   }

lib/proposals/forms/__tests__/getProposalProjectFormAnswers.spec.ts

@@ -34,7 +34,8 @@ const fieldsInput: FormFieldInput[] = [
           private: true
         }
       }
-    })
+    }),
+    dependsOnStepIndex: null
   }
 ];
 

lib/proposals/forms/__tests__/upsertProposalFormFields.spec.ts

@@ -16,7 +16,8 @@ const numberFieldInput: FormFieldInput = {
   options: [],
   private: true,
   required: true,
-  fieldConfig: {}
+  fieldConfig: {},
+  dependsOnStepIndex: null
 };
 
 describe('upsertProposalFormFields', () => {
@@ -45,7 +46,8 @@ describe('upsertProposalFormFields', () => {
         options: [],
         private: false,
         required: true,
-        fieldConfig: {}
+        fieldConfig: {},
+        dependsOnStepIndex: null
       },
       {
         id: v4(),
@@ -56,7 +58,8 @@ describe('upsertProposalFormFields', () => {
         options: [],
         private: true,
         required: true,
-        fieldConfig: {}
+        fieldConfig: {},
+        dependsOnStepIndex: null
       }
     ];
 
@@ -104,7 +107,8 @@ describe('upsertProposalFormFields', () => {
         options: [],
         private: false,
         required: true,
-        fieldConfig: {}
+        fieldConfig: {},
+        dependsOnStepIndex: null
       },
       {
         id: v4(),
@@ -115,7 +119,8 @@ describe('upsertProposalFormFields', () => {
         options: [],
         private: true,
         required: false,
-        fieldConfig: {}
+        fieldConfig: {},
+        dependsOnStepIndex: null
       }
     ];
 

scripts/applicationImport/restoreFormFromLogs.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { prisma } from '@charmverse/core/prisma-client';
 import { FormFieldInput } from '@root/lib/proposals/forms/interfaces';
 import { createProposal } from 'lib/proposals/createProposal';

testing/mocks/form.ts

@@ -20,6 +20,7 @@ export function getFormInput(input: Partial<FormFieldInput>): FormFieldInput {
     private: false,
     required: true,
     fieldConfig: {},
+    dependsOnStepIndex: null,
     ...input
   };
 }