Add submodules for go-api and risk-api

.github/workflows/ci.yml

@@ -230,26 +230,39 @@
       - name: Lint CSS
         run: pnpm lint:css
 
-  # FIXME: Identify a way to generate schema before we run typecheck
-  # typecheck:
-  #   name: Typecheck
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Install pnpm
-  #       uses: pnpm/action-setup@v4
-  #     - name: Install Node.js
-  #       uses: actions/setup-node@v4
-  #       with:
-  #         node-version: 20
-  #         cache: 'pnpm'
-  #     - name: Install dependencies
-  #       run: pnpm install
-  #
-  #     - name: Typecheck
-  #       run: pnpm typecheck
+  typecheck:
+    name: Typecheck
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: app
+    needs: [ui]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: ui-build
+          path: packages/ui/dist
+
+      - name: Generate types
+        run: pnpm generate:type
+
+      - name: Typecheck
+        run: pnpm typecheck
 
   typos:
     name: Spell Check with Typos
     runs-on: ubuntu-latest
     steps:

.gitmodules

@@ -0,0 +1,8 @@
+[submodule "go-api"]
+	path = go-api
+	url = https://github.com/IFRCGo/go-api.git
+	branch = feature/schema-file
+[submodule "risk-api"]
+	path = risk-api
+	url = https://github.com/IFRCGo/go-risk-module-api.git
+	branch = feature/schema-file

app/package.json

@@ -17,8 +17,8 @@
         "initialize:type:go-api": "test -f ./generated/types.ts && true || cp types.stub.ts ./generated/types.ts",
         "initialize:type:risk-api": "test -f ./generated/riskTypes.ts && true || cp types.stub.ts ./generated/riskTypes.ts",
         "generate:type": "pnpm generate:type:go-api && pnpm generate:type:risk-api",
-        "generate:type:go-api": "dotenv -- cross-var openapi-typescript \"%APP_API_ENDPOINT%api-docs/\" -o ./generated/types.ts --alphabetize",
-        "generate:type:risk-api": "dotenv -- cross-var openapi-typescript \"%APP_RISK_API_ENDPOINT%api-docs/\" -o ./generated/riskTypes.ts --alphabetize",
+        "generate:type:go-api": "dotenv -- cross-var openapi-typescript ../go-api/openapi-schema.yaml -o ./generated/types.ts --alphabetize",
+        "generate:type:risk-api": "dotenv -- cross-var openapi-typescript ../risk-api/openapi-schema.yaml -o ./generated/riskTypes.ts --alphabetize",
         "prestart": "pnpm initialize:type",
         "start": "pnpm -F @ifrc-go/ui build && vite",
         "prebuild": "pnpm initialize:type",

app/src/components/PerExportModal/index.tsx

@@ -45,6 +45,7 @@ function PerExportModal(props: Props) {
             export_id: Number(perId),
             export_type: 'per' as const,
             per_country: Number(countryId),
+            is_pga: false,
         }),
         [perId, countryId],
     );

app/src/components/SelectOutput/index.tsx

@@ -3,7 +3,7 @@ import { TextOutput } from '@ifrc-go/ui';
 import { isDefined } from '@togglecorp/fujs';
 
 interface Props<VALUE, OPTION> {
-    className: string;
+    className?: string;
     value: VALUE | undefined;
     options: OPTION[] | undefined;
     keySelector: (datum: OPTION) => VALUE;

app/src/components/domain/DrefExportModal/index.tsx

@@ -57,7 +57,8 @@ function DrefExportModal(props: Props) {
                 export_id: id,
                 export_type: type,
                 selector: '#pdf-preview-ready',
-                per_country: undefined, // FIXME: typing is altered by the useRequest function
+                per_country: undefined,
+                is_pga: false,
             };
         },
         [id, applicationType],

app/src/views/AccountMyFormsDref/DrefTableActions/index.tsx

@@ -142,6 +142,7 @@ function DrefTableActions(props: Props) {
                 allocationRequested: response?.additional_allocation,
                 previousAllocation: response?.dref_allocated_so_far ?? 0,
                 totalDREFAllocation: response?.total_dref_allocation,
+                noOfPeopleTargeted: response?.number_of_people_targeted,
                 toBeAllocatedFrom:
                     response?.type_of_dref_display === 'Imminent'
                     // FIXME: can't compare imminent with Anticipatory Pillar

app/src/views/DrefOperationalUpdateForm/schema.ts

@@ -52,13 +52,15 @@ export type OpsUpdateRequestBody = GoApiBody<'/api/v2/dref-op-update/{id}/', 'PA
 };
 
 type NeedIdentifiedResponse = NonNullable<OpsUpdateRequestBody['needs_identified']>[number];
+type NsActionResponse = NonNullable<OpsUpdateRequestBody['national_society_actions']>[number];
 type InterventionResponse = NonNullable<OpsUpdateRequestBody['planned_interventions']>[number];
 type IndicatorResponse = NonNullable<InterventionResponse['indicators']>[number];
 type RiskSecurityResponse = NonNullable<OpsUpdateRequestBody['risk_security']>[number];
 type ImagesFileResponse = NonNullable<OpsUpdateRequestBody['images_file']>[number];
 type SourceInformationResponse = NonNullable<OpsUpdateRequestBody['source_information']>[number];
 
 type NeedIdentifiedFormFields = NeedIdentifiedResponse & { client_id: string };
+type NsActionFormFields = NsActionResponse & { client_id: string; }
 type InterventionFormFields = InterventionResponse & { client_id: string };
 type IndicatorFormFields = IndicatorResponse & { client_id: string };
 type SourceInformationFormFields = SourceInformationResponse & { client_id: string };
@@ -81,9 +83,13 @@ type OpsUpdateFormFields = (
                         DeepReplace<
                             DeepReplace<
                                 DeepReplace<
-                                    OpsUpdateRequestBody,
-                                    NeedIdentifiedResponse,
-                                    NeedIdentifiedFormFields
+                                    DeepReplace<
+                                        OpsUpdateRequestBody,
+                                        NeedIdentifiedResponse,
+                                        NeedIdentifiedFormFields
+                                    >,
+                                    NsActionResponse,
+                                    NsActionFormFields
                                 >,
                                 InterventionResponse,
                                 InterventionFormFields

app/src/views/OperationalLearning/Sources/AllExtractsModal/Extract/index.tsx

@@ -15,7 +15,7 @@ interface Props {
     emergencyName: string | null | undefined;
     appealDocumentURL: string;
     extract: string | null | undefined;
-    operationStartDate: string;
+    operationStartDate: string | null | undefined;
 }
 function Extract(props: Props) {
     const {

app/src/views/OperationalLearning/Stats/OperationalLearningMap/index.tsx

@@ -87,7 +87,7 @@ function OperationalLearningMap(props: Props) {
             }
 
             const features = learningByCountry
-                .map((value) => {
+                ?.map((value) => {
                     const country = countriesMap?.[value.country_id];
                     if (isNotDefined(country)) {
                         return undefined;

app/src/views/SurgeCatalogueBasecampOffice/index.tsx

@@ -66,7 +66,6 @@ export function Component() {
                     label={strings.compositionLabel}
                     strongLabel
                 />
-                <div>{strings.compositionDescription}</div>
             </SurgeContentContainer>
             <SurgeContentContainer
                 heading={strings.standardComponents}