year update, fix search

Author: mluena

client/src/containers/projects/form/index.tsx

@@ -68,6 +68,8 @@ import CSVImport from "@/components/new-dataset/step-description/csv-import";
 import { useGetObjectives } from "@/types/generated/objective";
 import { useGetProjectFieldMetadata } from "@/types/generated/project-field-metadata";
 
+const currentYear = new Date().getFullYear();
+
 const ProjectFieldLabel = ({
   title,
   data,
@@ -242,6 +244,7 @@ export default function ProjectForm() {
         status: {
           fields: ["name"],
         },
+        year_established: true,
         funding: {
           fields: ["name"],
         },
@@ -370,6 +373,12 @@ export default function ProjectForm() {
       status: z.coerce.number().min(1, {
         message: "Please enter status",
       }),
+      year_established: z.coerce
+        .number()
+        .int()
+        .min(1900, "Year must be after 1900")
+        .max(currentYear, "Year cannot be in the future")
+        .optional(),
       funding: z.coerce.number().min(1, {
         message: "Please select type of funding",
       }),
@@ -410,6 +419,7 @@ export default function ProjectForm() {
           previousData?.countries?.data?.map(({ id }: { id?: number }) => id as number) || [],
         sdgs: previousData?.sdgs?.data?.map(({ id }: { id?: number }) => id as number) || [],
         status: previousData?.status?.data?.id as number,
+        year_established: (previousData as any)?.year_established as number,
         funding: previousData?.funding?.data?.id as number,
         organization_type: previousData?.organization_type?.data?.id as number,
         source_country: previousData?.source_country?.data?.id as number,
@@ -606,6 +616,7 @@ export default function ProjectForm() {
           valueType="project"
           values={{
             data: {
+              year_established: "",
               name: "",
               highlight: "",
               status: "",
@@ -841,6 +852,36 @@ export default function ProjectForm() {
                   );
                 }}
               />
+
+              <FormField
+                control={form.control}
+                name="year_established"
+                render={({ field }) => (
+                  <FormItem className="space-y-1.5">
+                    <ProjectFieldLabel
+                      title="Year established"
+                      data={dataInfo?.data?.attributes?.year_established}
+                      required
+                    />
+                    <FormControl>
+                      <Input
+                        {...field}
+                        value={field.value}
+                        className={cn({
+                          "border-none bg-gray-300/20 placeholder:text-gray-300/95": true,
+                          "bg-green-400 placeholder:text-gray-400": changes?.includes(field.name),
+                        })}
+                        placeholder="Specify year"
+                        disabled={
+                          ME_DATA?.role?.type === "authenticated" && suggestionStatus === "declined"
+                        }
+                      />
+                    </FormControl>
+
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
               <FormField
                 control={form.control}
                 name="status"

client/src/containers/projects/index.tsx

@@ -33,7 +33,7 @@ const Projects = () => {
     page: 1,
     pageSize: 200,
   });
-  console.log(projectSearch);
+  console.log(projectSearch, projectsData);
   return (
     <ul className="grid grid-cols-1 space-y-1.5">
       {projectsData?.data?.map((p) => {

client/src/containers/projects/popup.tsx

@@ -60,6 +60,7 @@ const ProjectPopup = () => {
         status: {
           fields: ["name", "maturity", "state"],
         },
+        year_established: true,
         funding: {
           fields: ["name"],
         },
@@ -88,6 +89,7 @@ const ProjectPopup = () => {
   const sdgs = data?.data?.attributes?.sdgs;
   const countries = data?.data?.attributes?.countries;
   const projectStatus = data?.data?.attributes?.status?.data?.attributes;
+  const yearEstablished = data?.data?.attributes?.year_established;
   const projectTypeOfFunding = data?.data?.attributes?.funding?.data?.attributes?.name;
   const projectOtherFunding = data?.data?.attributes?.other_funding;
   const organizationType = data?.data?.attributes?.organization_type?.data?.attributes?.name;
@@ -116,7 +118,19 @@ const ProjectPopup = () => {
       <div className="divide-y divide-gray-200 px-10">
         {/* STATUS */}
         <div className="py-5">
+          {/* STATUS  - progress bar*/}
           <ProjectsStatusProgressBar {...projectStatus} />
+          {/* STATUS  - year established*/}
+          {!yearEstablished && (
+            <div className="space-y-3.5">
+              <div className="flex items-center space-x-1">
+                <span className="text-xxs font-semibold uppercase tracking-wide text-gray-500">
+                  Year established:
+                </span>
+                <span className="text-xs">{yearEstablished || "Not provided"}</span>
+              </div>
+            </div>
+          )}
         </div>
         <section className="space-y-5 py-5">
           {/* HIGHLIGHT */}

client/src/types/generated/strapi.schemas.ts

@@ -3219,6 +3219,7 @@ export type SdgProjectsDataItemAttributes = {
   updatedAt?: string;
   updatedBy?: SdgProjectsDataItemAttributesUpdatedBy;
   video_link?: string;
+  year_established?: number;
 };
 
 export type SdgProjectsDataItem = {
@@ -5349,6 +5350,7 @@ export interface ProjectFieldMetadata {
   updatedAt?: string;
   updatedBy?: ProjectFieldMetadataUpdatedBy;
   video_link?: string;
+  year_established?: string;
 }
 
 export type ProjectFieldMetadataCreatedByDataAttributesUpdatedByDataAttributes = {
@@ -5555,6 +5557,7 @@ export type ProjectFieldMetadataRequestData = {
   source_country?: string;
   status?: string;
   video_link?: string;
+  year_established?: string;
 };
 
 export interface ProjectFieldMetadataRequest {
@@ -5721,6 +5724,7 @@ export type ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributes
   updatedAt?: string;
   updatedBy?: ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesUpdatedBy;
   video_link?: string;
+  year_established?: number;
 };
 
 export type ProjectEditSuggestionPillarDataAttributesProjectsDataItem = {
@@ -7391,6 +7395,7 @@ export interface Project {
   updatedAt?: string;
   updatedBy?: ProjectUpdatedBy;
   video_link?: string;
+  year_established?: number;
 }
 
 export interface ProjectResponseDataObject {
@@ -7507,6 +7512,7 @@ export type ProjectPillarDataAttributesProjectsDataItemAttributes = {
   updatedAt?: string;
   updatedBy?: ProjectPillarDataAttributesProjectsDataItemAttributesUpdatedBy;
   video_link?: string;
+  year_established?: number;
 };
 
 export type ProjectPillarDataAttributesProjectsDataItem = {
@@ -9128,6 +9134,7 @@ export type ProjectRequestData = {
   source_country?: ProjectRequestDataSourceCountry;
   status?: ProjectRequestDataStatus;
   video_link?: string;
+  year_established?: number;
 };
 
 export type PillarResponseMeta = { [key: string]: any };
@@ -9211,6 +9218,7 @@ export type PillarProjectsDataItemAttributes = {
   updatedAt?: string;
   updatedBy?: PillarProjectsDataItemAttributesUpdatedBy;
   video_link?: string;
+  year_established?: number;
 };
 
 export type PillarProjectsDataItemAttributesStatusDataAttributes = { [key: string]: any };

cms/package.json

@@ -30,6 +30,10 @@
     "strapi-plugin-config-sync": "^1.2.1",
     "strapi-plugin-import-export-entries": "^1.21.1"
   },
+  "devDependencies": {
+    "@types/csv-parse": "^1.2.2",
+    "@types/csv-stringify": "^3.1.0"
+  },
   "packageManager": "yarn@3.6.4",
   "engines": {
     "node": ">=16.0.0 <=20.x.x",
@@ -38,9 +42,5 @@
   "strapi": {
     "uuid": "d6c35ecd-a7d3-4e06-bbec-080329e0e5b8",
     "telemetryDisabled": true
-  },
-  "devDependencies": {
-    "@types/csv-parse": "^1.2.2",
-    "@types/csv-stringify": "^3.1.0"
   }
 }

cms/src/api/project-status/content-types/project-status/schema.json

@@ -16,6 +16,9 @@
       "type": "string"
     },
     "maturity": {
+      "type": "string"
+    },
+    "state": {
       "type": "integer"
     }
   }

cms/src/api/project/content-types/project/schema.json

@@ -81,6 +81,9 @@
     },
     "video_link": {
       "type": "string"
+    },
+    "year_established": {
+      "type": "integer"
     }
   }
 }

cms/src/api/project/controllers/project.ts

@@ -133,15 +133,15 @@ export default factories.createCoreController("api::project.project", () => ({
         pillar: { select: ["id", "name"] },
         sdgs: { select: ["id", "name"] },
         countries: { select: ["id", "name", "iso3"] },
-        status: { select: ["maturity", "name"] },
+        status: { select: ["maturity", "name", "state"] },
       };
 
       // --- Sorting ---
       // Note: status.maturity lives in populated relation; Strapi can sort by relation fields in many cases.
       // If it doesn't in your setup, we will sort in JS as fallback (below).
       const sort =
         sortField === "status"
-          ? [{ status: { maturity: sortOrder } }]
+          ? [{ status: { state: sortOrder } }]
           : [{ name: sortOrder }];
 
       // --- Case: empty q OR q too short -> return all with filters/sort/pagination ---
@@ -175,24 +175,28 @@ export default factories.createCoreController("api::project.project", () => ({
       }
 
       // --- Search flow ---
-      // 1) Pre-filter in DB using containsi on name/highlight (same as GET_PROJECTS_OPTIONS)
-      // to reduce candidates
+      const qTrim = (q ?? "").trim();
+      if (!qTrim)
+        return ctx.send({
+          data: [],
+          meta: { pagination: { page, pageSize, pageCount: 0, total: 0 } },
+        });
+
+      const qLower = qTrim.toLowerCase();
+
+      // Get candidates with your base filters only (or keep your DB prefilter if you want)
       const candidates = await strapi.db
         .query("api::project.project")
         .findMany({
-          where: {
-            ...where,
-            $or: [
-              { name: { $containsi: q } },
-              { highlight: { $containsi: q } },
-            ],
-          },
+          where,
+          // make sure highlight is actually included:
+          select: ["id", "name", "highlight"],
           populate,
-          limit: 2000, // adjust if needed
+          limit: 2000,
         });
 
-      // 2) Whole-word filter on NAME only (your requirements)
-      const rawTokens = q
+      // 3) Whole-word filter on NAME only (your requirement)
+      const rawTokens = qTrim
         .split(/\s+/)
         .map((t) => t.trim())
         .filter(Boolean);
@@ -201,16 +205,22 @@ export default factories.createCoreController("api::project.project", () => ({
       );
       const wordRes = tokens.map((t) => new RegExp(`(^|\\W)${t}($|\\W)`, "i"));
 
-      const filtered = candidates.filter((p: any) => {
-        const name = String(p.name ?? "");
-        return wordRes.every((re) => re.test(name));
+      const filtered = candidates.filter((p) => {
+        const name = String(p?.name ?? "");
+        const highlight = String(p?.highlight ?? "");
+
+        const matchesHighlight = highlight.toLowerCase().includes(qLower);
+        const matchesNameWholeWord = wordRes.every((re) => re.test(name));
+
+        // ✅ keep if either matches
+        return matchesHighlight || matchesNameWholeWord;
       });
 
-      // 3) Sort fallback in JS (reliable)
-      const sorted = filtered.sort((a: any, b: any) => {
+      // 4) Sort fallback in JS (reliable)
+      const sorted = filtered.sort((a, b) => {
         if (sortField === "status") {
-          const av = a?.status?.maturity ?? Number.NEGATIVE_INFINITY;
-          const bv = b?.status?.maturity ?? Number.NEGATIVE_INFINITY;
+          const av = a?.status?.state ?? Number.NEGATIVE_INFINITY;
+          const bv = b?.status?.state ?? Number.NEGATIVE_INFINITY;
           return sortOrder === "asc" ? av - bv : bv - av;
         }
         const av = String(a?.name ?? "");
@@ -220,13 +230,13 @@ export default factories.createCoreController("api::project.project", () => ({
           : bv.localeCompare(av);
       });
 
-      // 4) Pagination
+      // 5) Pagination
       const total = sorted.length;
       const pageCount = Math.ceil(total / pageSize);
       const pageItems = sorted.slice(offset, offset + pageSize);
 
       return ctx.send({
-        data: pageItems.map((p: any) => {
+        data: pageItems.map((p) => {
           const { id, ...attributes } = p;
           return { id, attributes };
         }),

cms/types/generated/contentTypes.d.ts

@@ -1345,6 +1345,7 @@ export interface ApiProjectProject extends Schema.CollectionType {
     >;
     other_funding: Attribute.String;
     video_link: Attribute.String;
+    year_established: Attribute.Integer;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;
@@ -1515,7 +1516,8 @@ export interface ApiProjectStatusProjectStatus extends Schema.CollectionType {
   };
   attributes: {
     name: Attribute.String;
-    maturity: Attribute.Integer;
+    maturity: Attribute.String;
+    state: Attribute.Integer;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;