WIP e2e typing for projects with no base entity props

Vizzuality · Nov 8, 2024 · 3aa8496 · 3aa8496
1 parent a97283a
commit 3aa8496
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 48 deletions.
diff --git a/client/src/containers/projects/table/view/scorecard-prioritization/columns.tsx b/client/src/containers/projects/table/view/scorecard-prioritization/columns.tsx
@@ -1,18 +1,18 @@
+import { ProjectType } from "@shared/contracts/projects.contract";
 import { Project } from "@shared/entities/projects.entity";
 import { createColumnHelper } from "@tanstack/react-table";
-
 const columnHelper = createColumnHelper<
   Partial<Project> & {
     // ! these types should be part of the Project entity eventually, we are adding them here to silent TS for now
-    financialFeasibility: number;
-    legalFeasibility: number;
-    implementationFeasibility: number;
-    socialFeasibility: number;
-    securityRating: number;
-    availabilityOfExperiencedLabor: number;
-    availabilityOfAlternatingFunding: number;
-    coastalProtectionBenefit: number;
-    biodiversityBenefit: number;
+    //   financialFeasibility: number;
+    //   legalFeasibility: number;
+    //   implementationFeasibility: number;
+    //   socialFeasibility: number;
+    //   securityRating: number;
+    //   availabilityOfExperiencedLabor: number;
+    //   availabilityOfAlternatingFunding: number;
+    //   coastalProtectionBenefit: number;
+    //   biodiversityBenefit: number;
   }
 >();
 
@@ -21,40 +21,40 @@ export const TABLE_COLUMNS = [
     enableSorting: true,
     header: () => <span>Project Name</span>,
   }),
-  columnHelper.accessor("financialFeasibility", {
-    enableSorting: true,
-    header: () => <span>Financial feasibility</span>,
-  }),
-  columnHelper.accessor("legalFeasibility", {
-    enableSorting: true,
-    header: () => <span>Legal Feasibility</span>,
-  }),
-  columnHelper.accessor("implementationFeasibility", {
-    enableSorting: true,
-    header: () => <span>Implementation feasibility</span>,
-  }),
-  columnHelper.accessor("socialFeasibility", {
-    enableSorting: true,
-    header: () => <span>Social Feasibility</span>,
-  }),
-  columnHelper.accessor("securityRating", {
-    enableSorting: true,
-    header: () => <span>Security Rating</span>,
-  }),
-  columnHelper.accessor("availabilityOfExperiencedLabor", {
-    enableSorting: true,
-    header: () => <span>Availability of experienced labor</span>,
-  }),
-  columnHelper.accessor("availabilityOfAlternatingFunding", {
-    enableSorting: true,
-    header: () => <span>Availability of alternating funding</span>,
-  }),
-  columnHelper.accessor("coastalProtectionBenefit", {
-    enableSorting: true,
-    header: () => <span>Coastal Protection benefit</span>,
-  }),
-  columnHelper.accessor("biodiversityBenefit", {
-    enableSorting: true,
-    header: () => <span>Biodiversity benefit</span>,
-  }),
+  // columnHelper.accessor("financialFeasibility", {
+  //   enableSorting: true,
+  //   header: () => <span>Financial feasibility</span>,
+  // }),
+  // columnHelper.accessor("legalFeasibility", {
+  //   enableSorting: true,
+  //   header: () => <span>Legal Feasibility</span>,
+  // }),
+  // columnHelper.accessor("implementationFeasibility", {
+  //   enableSorting: true,
+  //   header: () => <span>Implementation feasibility</span>,
+  // }),
+  // columnHelper.accessor("socialFeasibility", {
+  //   enableSorting: true,
+  //   header: () => <span>Social Feasibility</span>,
+  // }),
+  // columnHelper.accessor("securityRating", {
+  //   enableSorting: true,
+  //   header: () => <span>Security Rating</span>,
+  // }),
+  // columnHelper.accessor("availabilityOfExperiencedLabor", {
+  //   enableSorting: true,
+  //   header: () => <span>Availability of experienced labor</span>,
+  // }),
+  // columnHelper.accessor("availabilityOfAlternatingFunding", {
+  //   enableSorting: true,
+  //   header: () => <span>Availability of alternating funding</span>,
+  // }),
+  // columnHelper.accessor("coastalProtectionBenefit", {
+  //   enableSorting: true,
+  //   header: () => <span>Coastal Protection benefit</span>,
+  // }),
+  // columnHelper.accessor("biodiversityBenefit", {
+  //   enableSorting: true,
+  //   header: () => <span>Biodiversity benefit</span>,
+  // }),
 ];
diff --git a/client/src/containers/projects/table/view/scorecard-prioritization/index.tsx b/client/src/containers/projects/table/view/scorecard-prioritization/index.tsx
@@ -62,6 +62,10 @@ export function ScoredCardPrioritizationTable() {
     {
       query: {
         ...filtersToQueryParams(filters),
+
+        filter: {
+          activitySubtype: [""],
+        },
         // fields: TABLE_COLUMNS.map((column) => column.accessorKey),
         // ...(sorting.length > 0 && {
         //   sort: sorting.map((sort) => `${sort.desc ? "" : "-"}${sort.id}`),

diff --git a/shared/contracts/projects.contract.ts b/shared/contracts/projects.contract.ts
@@ -12,9 +12,12 @@ import {
   ProjectMapFilters,
 } from "@shared/dtos/projects/projects-map.dto";
 import { generateEntityQuerySchema } from "@shared/schemas/query-param.schema";
+import { BaseEntity } from "typeorm";
 
 const contract = initContract();
 
+export type ProjectType = Omit<Project, keyof BaseEntity>;
+
 export const projectsQuerySchema = generateEntityQuerySchema(Project);
 export const projectsContract = contract.router({
   getProjects: {
@@ -23,7 +26,9 @@ export const projectsContract = contract.router({
     responses: {
       200: contract.type<ApiPaginationResponse<Project>>(),
     },
-    query: projectsQuerySchema,
+    query: projectsQuerySchema.merge(
+      z.object({ costRangeSelector: z.string().optional() }),
+    ),
   },
   getProject: {
     method: "GET",

diff --git a/shared/entities/projects.entity.ts b/shared/entities/projects.entity.ts
@@ -57,7 +57,7 @@ export class Project extends BaseEntity {
     length: 255,
     nullable: true,
   })
-  activitySubtype: string;
+  activitySubtype: RESTORATION_ACTIVITY_SUBTYPE;
 
   @Column({ name: "project_size", type: "decimal" })
   projectSize: number;