latest fixes

.env.local.example

@@ -38,8 +38,8 @@ NEXT_PUBLIC_PLATFORM_PROTOCOL=https
 NEXT_PUBLIC_PLATFORM_PORT=3000
 
 
-# Google Analytics
-NEXT_PUBLIC_GA_ID='G-XXXXXXXXXX'
+# Google Analytics 
+NEXT_PUBLIC_GA_ID=G-XXXXXXXXXX
 
 FEATURE_SITEMAPS='false'
 FEATURE_SITEMAP_BACKEND_BASE_URL= http://backendurl/api

.github/workflows/deploy-Dataspace.yml

@@ -42,18 +42,21 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '24'
           cache: 'npm'
 
       - name: Install dependencies
-        run: npm install --legacy-peer-deps
+        run: npm install
 
       - name: Generate
         run: npm run generate:ci
         env:
           BACKEND_GRAPHQL_URL: ${{ vars.BACKEND_GRAPHQL_URL }}
           NODE_ENV: production
 
+      - name: Lint
+        run: npm run lint
+
       - name: Build
         run: npm run build
 
@@ -95,8 +98,8 @@ jobs:
     if: github.ref_name == 'dev'
     uses: CivicDataLab/CivicDataSpace-test/.github/workflows/run-smoke.yml@CI
     secrets:
-      HOME_URL_DEV:    ${{ secrets.HOME_URL_DEV }}
-      TEST_EMAIL_1:    ${{ secrets.TEST_EMAIL_1 }}
+      HOME_URL_DEV: ${{ secrets.HOME_URL_DEV }}
+      TEST_EMAIL_1: ${{ secrets.TEST_EMAIL_1 }}
       TEST_PASSWORD_1: ${{ secrets.TEST_PASSWORD_1 }}
-      TEST_EMAIL_2:    ${{ secrets.TEST_EMAIL_2 }}
+      TEST_EMAIL_2: ${{ secrets.TEST_EMAIL_2 }}
       TEST_PASSWORD_2: ${{ secrets.TEST_PASSWORD_2 }}

.github/workflows/pre-merge.yml

@@ -30,7 +30,7 @@ jobs:
       NEXT_PUBLIC_PLATFORM_DOMAIN: ${{ vars.NEXT_PUBLIC_PLATFORM_DOMAIN }}
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
 
     steps:
       - uses: actions/checkout@v4
@@ -41,11 +41,15 @@ jobs:
           cache: 'npm'
 
       - name: Install dependencies
-        run: npm ci --force
+        run: npm ci
 
       - name: Generate GraphQL types (CI-safe)
         run: npm run generate
         env:
           BACKEND_GRAPHQL_URL: ${{vars.BACKEND_GRAPHQL_URL}}
+
+      - name: Lint
+        run: npm run lint
+
       - name: Build application
         run: npm run build --if-present

.nvmrc

@@ -0,0 +1 @@
+24

Dockerfile

@@ -1,6 +1,6 @@
 #Creates a layer from node:alpine image.
 # FROM chub.cloud.gov.in/mit6c0-ogd/node-16:nic_server
-FROM node:alpine
+FROM node:24-alpine
 
 
 # RUN echo 'deb http://deb.debian.org/debian stretch main' >> apk update \

app/[locale]/(user)/collaboratives/CollaborativesListingClient.tsx

@@ -2,13 +2,13 @@
 
 import { ComponentType, useState } from 'react';
 import Image from 'next/image';
+import GraphqlPagination from '@/app/[locale]/dashboard/components/GraphqlPagination/graphqlPagination';
 import { graphql } from '@/gql';
 import { TypeCollaborative } from '@/gql/generated/graphql';
 import { useQuery } from '@tanstack/react-query';
 import { Button, Card, Icon, SearchInput, Select, Text } from 'opub-ui';
 
 import { GraphQLPublic } from '@/lib/api';
-import { getCollaborativeDetailUrl } from '@/lib/collaborativesRouting';
 import { cn, formatDate, generateJsonLd } from '@/lib/utils';
 import BreadCrumbs from '@/components/BreadCrumbs';
 import { Icons } from '@/components/icons';
@@ -86,6 +86,8 @@ const PublishedCollaboratives = graphql(`
 const CollaborativesListingClient = () => {
   const [searchTerm, setSearchTerm] = useState('');
   const [sortBy, setSortBy] = useState('title_asc');
+  const [currentPage, setCurrentPage] = useState(1);
+  const [pageSize, setPageSize] = useState(9);
 
   const {
     data: collaborativesData,
@@ -142,6 +144,17 @@ const CollaborativesListingClient = () => {
       return 0;
     });
 
+  const totalPages = Math.max(
+    1,
+    Math.ceil(filteredAndSortedCollaboratives.length / pageSize)
+  );
+  const safePage = Math.min(currentPage, totalPages);
+  const start = (safePage - 1) * pageSize;
+  const paginatedCollaboratives = filteredAndSortedCollaboratives.slice(
+    start,
+    start + pageSize
+  );
+
   const jsonLd = generateJsonLd({
     '@context': 'https://schema.org',
     '@type': 'WebPage',
@@ -225,9 +238,11 @@ const CollaborativesListingClient = () => {
                 className={cn('w-full', Styles.Search)}
                 onSubmit={(e) => {
                   setSearchTerm(e);
+                  setCurrentPage(1);
                 }}
                 onClear={() => {
                   setSearchTerm('');
+                  setCurrentPage(1);
                 }}
                 name={'Start typing to search for any collaborative'}
               />
@@ -271,6 +286,7 @@ const CollaborativesListingClient = () => {
                   ]}
                   onChange={(e: any) => {
                     setSortBy(e);
+                    setCurrentPage(1);
                   }}
                 />
               </div>
@@ -297,8 +313,18 @@ const CollaborativesListingClient = () => {
             <>
               {/* Collaboratives Grid */}
               {filteredAndSortedCollaboratives.length > 0 ? (
-                <div className="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
-                  {filteredAndSortedCollaboratives.map(
+                <GraphqlPagination
+                  totalRows={filteredAndSortedCollaboratives.length}
+                  pageSize={pageSize}
+                  currentPage={safePage}
+                  onPageChange={setCurrentPage}
+                  onPageSizeChange={(newSize) => {
+                    setPageSize(newSize);
+                    setCurrentPage(1);
+                  }}
+                  view="collapsed"
+                >
+                  {paginatedCollaboratives.map(
                     (collaborative: TypeCollaborative) => (
                       <Card
                         key={collaborative.id}
@@ -362,7 +388,7 @@ const CollaborativesListingClient = () => {
                       />
                     )
                   )}
-                </div>
+                </GraphqlPagination>
               ) : (
                 <div className="flex flex-col items-center justify-center gap-4 py-20">
                   <Icon source={Icons.search} size={48} color="subdued" />
@@ -376,6 +402,7 @@ const CollaborativesListingClient = () => {
                     <Button
                       onClick={() => {
                         setSearchTerm('');
+                        setCurrentPage(1);
                       }}
                       kind="secondary"
                     >

app/[locale]/(user)/collaboratives/[collaborativeSlug]/page.tsx

@@ -55,7 +55,7 @@ export async function generateMetadata({
         image: `${process.env.NEXT_PUBLIC_PLATFORM_URL}/og.png`,
       },
     });
-  } catch (error) {
+  } catch {
     // Fallback to generic metadata if the API call fails
     return generatePageMetadata({
       title: `Collaborative Details | CivicDataSpace`,

app/[locale]/(user)/collaboratives/components/Details.tsx

@@ -44,7 +44,7 @@ const PrimaryDetails = ({ data, isLoading }: { data: any; isLoading: any }) => {
               <Button
                 kind="tertiary"
                 className="lg:hidden"
-                onClick={(e) => setOpen(true)}
+                onClick={() => setOpen(true)}
               >
                 <div className="flex items-center gap-2 py-2">
                   <Icon source={Icons.info} size={24} color="default" />

app/[locale]/(user)/components/ListingComponent.tsx

@@ -8,7 +8,6 @@ import { fetchData } from '@/fetch';
 import { useTourTrigger } from '@/hooks/use-tour-trigger';
 import {
   Button,
-  ButtonGroup,
   Card,
   Icon,
   Pill,
@@ -237,7 +236,7 @@ const ListingComponent: React.FC<ListingProps> = ({
   const [variables, setVariables] = useState('');
   const [open, setOpen] = useState(false);
   const [queryParams, setQueryParams] = useReducer(queryReducer, initialState);
-  const [view, setView] = useState<'collapsed' | 'expanded'>('collapsed');
+  const [view] = useState<'collapsed' | 'expanded'>('collapsed');
 
   const count = facets?.total ?? 0;
   const datasetDetails = facets?.results ?? [];

app/[locale]/(user)/datasets/[datasetIdentifier]/components/PrimaryData/index.tsx

@@ -43,7 +43,7 @@ const PrimaryData: React.FC<PrimaryDataProps> = ({ data, isLoading }) => {
                 <Button
                   kind="tertiary"
                   className="lg:hidden"
-                  onClick={(e) => setOpen(true)}
+                  onClick={() => setOpen(true)}
                 >
                   <div className="flex items-center gap-2 py-2">
                     <Icon source={Icons.info} size={24} color="default" />

app/[locale]/(user)/datasets/[datasetIdentifier]/components/SimilarDatasets/index.tsx

@@ -1,5 +1,4 @@
 import { useParams } from 'next/navigation';
-import { stripMarkdown } from '@/app/[locale]/(user)/search/components/UnifiedListingComponent';
 import { graphql } from '@/gql';
 import { useQuery } from '@tanstack/react-query';
 import {

app/[locale]/(user)/publishers/PublishersListingClient.tsx

@@ -4,7 +4,7 @@ import { useState } from 'react';
 import Image from 'next/image';
 import { graphql } from '@/gql';
 import { useQuery } from '@tanstack/react-query';
-import { Button, ButtonGroup, Spinner, Text } from 'opub-ui';
+import { Button, ButtonGroup, Text } from 'opub-ui';
 
 import { GraphQL } from '@/lib/api';
 import { cn, generateJsonLd } from '@/lib/utils';

app/[locale]/(user)/search/components/UnifiedListingComponent.tsx

@@ -1,14 +1,12 @@
 'use client';
 
-import React, { useEffect, useReducer, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useReducer, useRef, useState } from 'react';
 import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import GraphqlPagination from '@/app/[locale]/dashboard/components/GraphqlPagination/graphqlPagination';
 import {
   Button,
-  ButtonGroup,
   Card,
-  Icon,
   Pill,
   SearchInput,
   Select,
@@ -315,7 +313,7 @@ const UnifiedListingComponent: React.FC<UnifiedListingProps> = ({
   const [variables, setVariables] = useState('');
   const [open, setOpen] = useState(false);
   const [queryParams, setQueryParams] = useReducer(queryReducer, initialState);
-  const [view, setView] = useState<'collapsed' | 'expanded'>('collapsed');
+  const [view] = useState<'collapsed' | 'expanded'>('collapsed');
   const [persistedTypeCounts, setPersistedTypeCounts] = useState<
     Record<string, number>
   >({});
@@ -382,10 +380,6 @@ const UnifiedListingComponent: React.FC<UnifiedListingProps> = ({
     setQueryParams({ type: 'SET_SORT', payload: sortOption });
   };
 
-  const handleOrderChange = (sortOrder: string) => {
-    setQueryParams({ type: 'SET_ORDER', payload: sortOrder });
-  };
-
   const handleTypeFilter = (types: string) => {
     setQueryParams({ type: 'SET_TYPES', payload: types });
   };
@@ -444,7 +438,10 @@ const UnifiedListingComponent: React.FC<UnifiedListingProps> = ({
     );
 
   // Get type counts from aggregations
-  const typeCounts = aggregations.types || {};
+  const typeCounts = useMemo(
+    () => aggregations.types || {},
+    [aggregations.types]
+  );
   const liveTypeCounts = Object.entries(typeCounts).reduce(
     (acc, [key, value]) => {
       if (typeof value === 'number') {
@@ -457,13 +454,23 @@ const UnifiedListingComponent: React.FC<UnifiedListingProps> = ({
   const displayTypeCounts = { ...persistedTypeCounts, ...liveTypeCounts };
 
   useEffect(() => {
-    if (Object.keys(liveTypeCounts).length === 0) return;
+    const counts = Object.entries(typeCounts).reduce(
+      (acc, [key, value]) => {
+        if (typeof value === 'number') {
+          acc[key] = value;
+        }
+        return acc;
+      },
+      {} as Record<string, number>
+    );
+
+    if (Object.keys(counts).length === 0) return;
 
     setPersistedTypeCounts((prev) => {
       const next = { ...prev };
       let changed = false;
 
-      Object.entries(liveTypeCounts).forEach(([key, value]) => {
+      Object.entries(counts).forEach(([key, value]) => {
         if (next[key] !== value) {
           next[key] = value;
           changed = true;

app/[locale]/(user)/sectors/SectorsListing.tsx

@@ -48,7 +48,7 @@ const SectorsListing = () => {
 
   useEffect(() => {
     refetch();
-  }, [searchText]);
+  }, [searchText, refetch]);
 
   const handleSortChange = (e: string) => {
     const [field, direction] = e.split('_');

app/[locale]/(user)/usecases/components/Details.tsx

@@ -42,7 +42,7 @@ const PrimaryDetails = ({ data, isLoading }: { data: any; isLoading: any }) => {
               <Button
                 kind="tertiary"
                 className="lg:hidden"
-                onClick={(e) => setOpen(true)}
+                onClick={() => setOpen(true)}
               >
                 <div className="flex items-center gap-2 py-2">
                   <Icon source={Icons.info} size={24} color="default" />

app/[locale]/dashboard/[entityType]/[entitySlug]/admin/page.tsx

@@ -176,7 +176,7 @@ const Admin = () => {
   useEffect(() => {
     usersList.refetch();
     setRefetch(false);
-  }, [refetch]);
+  }, [refetch, usersList]);
 
   return (
     <div>