fix: addressed PR comments

client/src/app/(overview)/url-store.ts

@@ -3,7 +3,6 @@ import {
   RESTORATION_ACTIVITY_SUBTYPE,
 } from "@shared/entities/activity.enum";
 import { ECOSYSTEM } from "@shared/entities/ecosystem.enum";
-import { PROJECT_SCORE } from "@shared/entities/project-score.enum";
 import {
   COST_TYPE_SELECTOR,
   PROJECT_PRICE_TYPE,
@@ -37,18 +36,6 @@ export const filtersSchema = z.object({
   [FILTER_KEYS[9]]: z.array(z.number()).length(2),
 });
 
-export const scorecardFiltersSchema = z.object({
-  availabilityOfExperiencedLabor: z.nativeEnum(PROJECT_SCORE).optional(),
-  availabilityOfAlternatingFunding: z.nativeEnum(PROJECT_SCORE).optional(),
-  coastalProtectionBenefits: z.nativeEnum(PROJECT_SCORE).optional(),
-  biodiversityBenefit: z.nativeEnum(PROJECT_SCORE).optional(),
-  financialFeasibility: z.nativeEnum(PROJECT_SCORE).optional(),
-  legalFeasibility: z.nativeEnum(PROJECT_SCORE).optional(),
-  implementationFeasibility: z.nativeEnum(PROJECT_SCORE).optional(),
-  socialFeasibility: z.nativeEnum(PROJECT_SCORE).optional(),
-  securityRating: z.nativeEnum(PROJECT_SCORE).optional(),
-});
-
 export const INITIAL_FILTERS_STATE: z.infer<typeof filtersSchema> = {
   keyword: "",
   projectSizeFilter: PROJECT_SIZE_FILTER.MEDIUM,
@@ -62,20 +49,6 @@ export const INITIAL_FILTERS_STATE: z.infer<typeof filtersSchema> = {
   abatementPotentialRange: INITIAL_ABATEMENT_POTENTIAL_RANGE,
 };
 
-export const INITIAL_SCORECARD_FILTERS_STATE: z.infer<
-  typeof scorecardFiltersSchema
-> = {
-  availabilityOfExperiencedLabor: undefined,
-  availabilityOfAlternatingFunding: undefined,
-  coastalProtectionBenefits: undefined,
-  biodiversityBenefit: undefined,
-  financialFeasibility: undefined,
-  legalFeasibility: undefined,
-  implementationFeasibility: undefined,
-  socialFeasibility: undefined,
-  securityRating: undefined,
-};
-
 export function useGlobalFilters() {
   const [popup, setPopup] = useAtom(popupAtom);
   const [filters, setFilters] = useQueryState(
@@ -95,27 +68,6 @@ export function useGlobalFilters() {
   return [filters, updateFilters] as const;
 }
 
-export function useScorecardFilters() {
-  const [popup, setPopup] = useAtom(popupAtom);
-  const [filters, setFilters] = useQueryState(
-    "scorecardFilters",
-    parseAsJson(scorecardFiltersSchema.parse).withDefault(
-      INITIAL_SCORECARD_FILTERS_STATE,
-    ),
-  );
-
-  const updateFilters = async (
-    updater: (
-      prev: typeof INITIAL_SCORECARD_FILTERS_STATE,
-    ) => typeof INITIAL_SCORECARD_FILTERS_STATE,
-  ) => {
-    await setFilters(updater);
-    if (popup) setPopup(null);
-  };
-
-  return [filters, updateFilters] as const;
-}
-
 export function useTableView() {
   return useQueryState(
     "table",

client/src/components/ui/score-card.tsx

@@ -1,27 +1,31 @@
-export type Score = "high" | "medium" | "low";
+import { PROJECT_SCORE } from "@shared/entities/project-score.enum";
+
+import { cn } from "@/lib/utils";
 
 interface ScoreIndicatorProps {
-  score: Score;
   className?: string;
   children?: React.ReactNode;
+  bgColorClasses?: Record<PROJECT_SCORE, string>;
 }
 
+export const DEFAULT_BG_CLASSES = {
+  high: "bg-high",
+  medium: "bg-medium",
+  low: "bg-low",
+};
+
 export const ScoreIndicator = ({
-  score,
   children,
   className = "",
 }: ScoreIndicatorProps) => {
-  const bgColorClass = {
-    high: "bg-high",
-    medium: "bg-medium",
-    low: "bg-low",
-  }[score];
-
   return (
     <div
-      className={`flex h-10 items-center justify-center font-medium capitalize text-deep-ocean ${bgColorClass} ${className}`}
+      className={cn(
+        "flex h-10 items-center justify-center font-normal capitalize text-deep-ocean",
+        className,
+      )}
     >
-      {children ? children : score}
+      {children}
     </div>
   );
 };

client/src/containers/overview/filters/index.tsx

@@ -76,7 +76,7 @@ export default function ProjectsFilters() {
     setFiltersOpen((prev) => ({ ...prev, filtersOpen: false }));
   };
 
-  const { queryKey } = queryKeys.projects.countries;
+  const { queryKey } = queryKeys.tables.countries;
   const { data: countryOptions } = client.projects.getProjectCountries.useQuery(
     queryKey,
     {},

client/src/containers/overview/project-details/index.tsx

@@ -1,5 +1,6 @@
 import Link from "next/link";
 
+import { PROJECT_SCORE } from "@shared/entities/project-score.enum";
 import { useAtom } from "jotai";
 import { ChevronUp, ChevronDown, NotebookPen } from "lucide-react";
 
@@ -8,6 +9,7 @@ import {
   formatCurrency,
   renderAbatementCurrency,
 } from "@/lib/format";
+import { cn } from "@/lib/utils";
 
 import { projectDetailsAtom } from "@/app/(overview)/store";
 
@@ -27,7 +29,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { Label } from "@/components/ui/label";
-import { ScoreIndicator } from "@/components/ui/score-card";
+import { ScoreIndicator, DEFAULT_BG_CLASSES } from "@/components/ui/score-card";
 import {
   Sheet,
   SheetContent,
@@ -380,9 +382,13 @@ export default function ProjectDetails() {
                   <div key={item.name} className="flex">
                     <div className="w-2/3 content-center py-2">{item.name}</div>
                     <ScoreIndicator
-                      className="w-1/3"
-                      score={item.rating as "high" | "medium" | "low"}
-                    />
+                      className={cn(
+                        "w-1/3",
+                        DEFAULT_BG_CLASSES[item.rating as PROJECT_SCORE],
+                      )}
+                    >
+                      {item.rating}
+                    </ScoreIndicator>
                   </div>
                   {projectData.scorecard.length !== index + 1 && (
                     <hr className="m-0" />

client/src/containers/overview/table/utils.ts

@@ -1,14 +1,10 @@
-import { ProjectScorecardView } from "@shared/entities/project-scorecard.view";
-import { Project } from "@shared/entities/projects.entity";
 import { z } from "zod";
 
-import {
-  filtersSchema,
-  scorecardFiltersSchema,
-} from "@/app/(overview)/url-store";
+import { filtersSchema } from "@/app/(overview)/url-store";
 
-export const NO_DATA: Project[] = [];
-export const NO_SCORECARD_DATA: ProjectScorecardView[] = [];
+import { scorecardFiltersSchema } from "./view/scorecard-prioritization/schema";
+
+export const NO_DATA = [];
 
 const OMITTED_FIELDS = [
   "keyword",
@@ -20,7 +16,8 @@ const OMITTED_FIELDS = [
 export const filtersToQueryParams = (
   filters: z.infer<typeof filtersSchema | typeof scorecardFiltersSchema>,
 ) => {
-  return Object.keys(filters)
+  debugger;
+  const queryParams = Object.keys(filters)
     .filter((key) => !OMITTED_FIELDS.includes(key))
     .reduce(
       (acc, key) => ({
@@ -31,4 +28,5 @@ export const filtersToQueryParams = (
       }),
       {},
     );
+  return queryParams;
 };

client/src/containers/overview/table/view/key-costs/index.tsx

@@ -3,6 +3,7 @@
 import { useState } from "react";
 
 import { ChevronDownIcon, ChevronUpIcon } from "@radix-ui/react-icons";
+import { projectsQuerySchema } from "@shared/contracts/projects.contract";
 import { keepPreviousData } from "@tanstack/react-query";
 import {
   flexRender,
@@ -51,7 +52,7 @@ export function KeyCostsTable() {
     pageSize: Number.parseInt(PAGINATION_SIZE_OPTIONS[0]),
   });
 
-  const queryKey = queryKeys.projects.all(tableView, {
+  const queryKey = queryKeys.tables.all(tableView, projectsQuerySchema, {
     ...filters,
     sorting,
     pagination,

client/src/containers/overview/table/view/overview/columns.tsx

@@ -1,12 +1,13 @@
 import { ProjectType } from "@shared/contracts/projects.contract";
+import { PROJECT_SCORE } from "@shared/entities/project-score.enum";
 import { createColumnHelper } from "@tanstack/react-table";
 import { z } from "zod";
 
 import { formatNumber } from "@/lib/format";
 
 import { filtersSchema } from "@/app/(overview)/url-store";
 
-import { ScoreIndicator } from "@/components/ui/score-card";
+import { DEFAULT_BG_CLASSES, ScoreIndicator } from "@/components/ui/score-card";
 
 const columnHelper = createColumnHelper<Partial<ProjectType>>();
 
@@ -23,7 +24,11 @@ export const columns = (filters: z.infer<typeof filtersSchema>) => [
       if (value === undefined) {
         return "-";
       }
-      return <ScoreIndicator score={value} />;
+      return (
+        <ScoreIndicator className={DEFAULT_BG_CLASSES[value as PROJECT_SCORE]}>
+          {value}
+        </ScoreIndicator>
+      );
     },
   }),
   columnHelper.accessor(

client/src/containers/overview/table/view/overview/index.tsx

@@ -60,7 +60,7 @@ export function OverviewTable() {
     pageSize: Number.parseInt(PAGINATION_SIZE_OPTIONS[0]),
   });
 
-  const queryKey = queryKeys.projects.all(tableView, {
+  const queryKey = queryKeys.tables.all(tableView, projectsQuerySchema, {
     ...filters,
     sorting,
     pagination,