Merge pull request #385 from CivicDataLab/dev

Hotfixes

Author: Deepthi-Chand

.github/workflows/deploy-Dataspace-dev.yml

@@ -3,37 +3,46 @@ name: Update DataSpace Dev
 on:
   push:
     branches: ['dev']
-env:
-  KEYCLOAK_CLIENT_ID: 'dataspace'
-  KEYCLOAK_CLIENT_SECRET: 'Q2iHhyXNOqOu7Xaln7Z45QrDnbff13eu'
-  AUTH_ISSUER: 'https://opub-kc.civicdatalab.in/auth/realms/DataSpace'
-  NEXTAUTH_URL: 'https://dev.civicdataspace.in'
-  NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in'
-  NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
-  END_SESSION_URL: 'https://opub-kc.civicdatalab.in/auth/realms/DataSpace/protocol/openid-connect/logout'
-  REFRESH_TOKEN_URL: 'https://opub-kc.civicdatalab.in/auth/realms/DataSpace/protocol/openid-connect/token'
-  NEXT_PUBLIC_BACKEND_URL: 'https://dev.api.civicdataspace.in'
-  BACKEND_GRAPHQL_URL: 'https://dev.api.civicdataspace.in/api/graphql'
-  NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
-  NEXT_PUBLIC_BACKEND_GRAPHQL_URL: 'https://dev.api.civicdataspace.in/api/graphql'
-  BACKEND_URL: 'https://dev.api.civicdataspace.in'
-  NEXT_PUBLIC_PLATFORM_URL: 'https://dev.civicdataspace.in'
-  NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}
-
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
-
+    environment: development
+    env:
+      KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_CLIENT_ID }}
+      KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}
+      AUTH_ISSUER: ${{ secrets.AUTH_ISSUER }}
+      NEXTAUTH_URL: ${{ vars.NEXTAUTH_URL }}
+      NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
+      NEXT_PUBLIC_NEXTAUTH_URL: ${{ vars.NEXT_PUBLIC_NEXTAUTH_URL }}
+      END_SESSION_URL: ${{ secrets.END_SESSION_URL }}
+      REFRESH_TOKEN_URL: ${{ secrets.REFRESH_TOKEN_URL }}
+      NEXT_PUBLIC_BACKEND_URL: ${{ vars.NEXT_PUBLIC_BACKEND_URL }}
+      BACKEND_URL: ${{ vars.BACKEND_URL }}
+      NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{ vars.NEXT_PUBLIC_BACKEND_GRAPHQL_URL }}
+      BACKEND_GRAPHQL_URL: ${{ vars.BACKEND_GRAPHQL_URL }}
+      NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{ vars.NEXT_PUBLIC_ENABLE_ACCESSMODEL }}
+      NEXT_PUBLIC_ANALYTICS_URL: ${{ vars.NEXT_PUBLIC_ANALYTICS_URL }}
+      NEXT_PUBLIC_PLATFORM_URL: ${{ vars.NEXT_PUBLIC_PLATFORM_URL }}
+    
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
       - name: Install dependencies
-        run: npm install
+        run: npm install --legacy-peer-deps
 
       - name: Generate
-        run: npm run generate
+        run: npm run generate:ci
+        env:
+          BACKEND_GRAPHQL_URL: ${{ vars.BACKEND_GRAPHQL_URL }}
+          NODE_ENV: production
 
       - name: Build
         run: npm run build
@@ -45,27 +54,28 @@ jobs:
         run: mv public public2
 
       - name: Send .next2 to EC2
-        uses: appleboy/scp-action@master
+        uses: appleboy/scp-action@v0.1.7
         with:
-          host: ${{ secrets.EC2_HOST_DEV_DS }}
-          username: ${{ secrets.EC2_USERNAME_DS }}
+          host: ${{ vars.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_PRIVATE_KEY }}
           source: .next2
           target: DataExchange/DataExFrontend
 
       - name: Send public2 to EC2
-        uses: appleboy/scp-action@master
+        uses: appleboy/scp-action@v0.1.7
         with:
-          host: ${{ secrets.EC2_HOST_DEV_DS }}
-          username: ${{ secrets.EC2_USERNAME_DS }}
+          host: ${{ vars.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_PRIVATE_KEY }}
           source: public2
           target: DataExchange/DataExFrontend
 
       - name: Update with new Build
         uses: appleboy/ssh-action@v1.0.3
+        continue-on-error: false
         with:
-          host: ${{ secrets.EC2_HOST_DEV_DS }}
-          username: ${{ secrets.EC2_USERNAME_DS }}
+          host: ${{ vars.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_PRIVATE_KEY }}
           script: rm -rf DataExchange/DataExFrontend/.next; rm -rf DataExchange/DataExFrontend/public; mv DataExchange/DataExFrontend/.next2 DataExchange/DataExFrontend/.next; mv DataExchange/DataExFrontend/public2 DataExchange/DataExFrontend/public; /home/ubuntu/.nvm/versions/node/v20.11.1/bin/pm2 restart dataspace

.github/workflows/pre-merge.yml

@@ -5,27 +5,28 @@ on:
     branches: ['dev']
   pull_request:
     branches: ['dev']
-env:
-  KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
-  KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
-  AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
-  NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
-  NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
-  NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
-  END_SESSION_URL: ${{secrets.END_SESSION_URL}}
-  REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
-  NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
-  BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
-  NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
-  NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
-  BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
-  NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
-  NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}
+
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    environment: development
+    env:
+      KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
+      KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
+      AUTH_ISSUER: ${{ secrets.AUTH_ISSUER }}
+      NEXTAUTH_URL: ${{vars.NEXTAUTH_URL}}
+      NEXT_PUBLIC_NEXTAUTH_URL: ${{ vars.NEXT_PUBLIC_NEXTAUTH_URL }}
+      NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
+      END_SESSION_URL: ${{ vars.END_SESSION_URL }}
+      REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
+      NEXT_PUBLIC_BACKEND_URL: ${{vars.NEXT_PUBLIC_BACKEND_URL}}
+      BACKEND_GRAPHQL_URL: ${{vars.BACKEND_GRAPHQL_URL}}
+      NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{vars.NEXT_PUBLIC_ENABLE_ACCESSMODEL}}
+      NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{vars.NEXT_PUBLIC_BACKEND_GRAPHQL_URL}}
+      BACKEND_URL: ${{vars.BACKEND_URL}}
+      NEXT_PUBLIC_PLATFORM_URL: ${{vars.NEXT_PUBLIC_PLATFORM_URL}}
+      NEXT_PUBLIC_ANALYTICS_URL: ${{vars.NEXT_PUBLIC_ANALYTICS_URL}}
     strategy:
       matrix:
         node-version: [20.x]
@@ -42,33 +43,8 @@ jobs:
         run: npm ci --force
 
       - name: Generate GraphQL types (CI-safe)
-        run: |
-          # Ensure generated directory exists
-          mkdir -p ./gql/generated
-          
-          # Try to generate with timeout and fallback
-          timeout 60s npm run generate:ci || {
-            echo "GraphQL codegen failed or timed out, checking for existing files..."
-            if [ -d "./gql/generated" ] && [ "$(ls -A ./gql/generated 2>/dev/null)" ]; then
-              echo "Using existing generated files"
-            else
-              echo "Creating minimal generated files for build to proceed"
-              echo "// Auto-generated fallback file for CI builds" > ./gql/generated/index.ts
-              echo "export type Maybe<T> = T | null;" >> ./gql/generated/index.ts
-              echo "export type Scalars = {" >> ./gql/generated/index.ts
-              echo "  ID: string;" >> ./gql/generated/index.ts
-              echo "  String: string;" >> ./gql/generated/index.ts
-              echo "  Boolean: boolean;" >> ./gql/generated/index.ts
-              echo "  Int: number;" >> ./gql/generated/index.ts
-              echo "  Float: number;" >> ./gql/generated/index.ts
-              echo "};" >> ./gql/generated/index.ts
-              echo "export {};" >> ./gql/generated/index.ts
-              echo "Created fallback generated files"
-            fi
-          }
+        run: npm run generate
         env:
-          BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
-          NODE_ENV: 'production'
-
+          BACKEND_GRAPHQL_URL: ${{vars.BACKEND_GRAPHQL_URL}}
       - name: Build application
         run: npm run build --if-present

.github/workflows/push-to-ec2.yml

@@ -72,7 +72,7 @@ export default function Versions({ data }: VersionsProps) {
         header: 'Last Updated',
         cell: ({ row }: any) => (
           <Text variant="bodyMd">
-            {formatDate(row.original.updatedAt || row.original.createdAt)}
+            {formatDate(row.original.updatedAt || row.original.createdAt) || ''}
           </Text>
         ),
       },

app/[locale]/(user)/aimodels/[modelId]/components/Versions/index.tsx

@@ -64,6 +64,10 @@ const PublishedCollaboratives = graphql(`
         id
         name
       }
+      coverImage {
+        name
+        path
+      }
       datasetCount
       metadata {
         metadataItem {
@@ -214,7 +218,7 @@ const CollaborativesListingClient = () => {
             </Text>
 
             {/* Search and Filter Section */}
-            <div className="flex flex-wrap gap-6 lg:flex-nowrap">
+            <div className="flex flex-wrap gap-6 pt-4 lg:flex-nowrap">
               <SearchInput
                 label={''}
                 className={cn('w-full', Styles.Search)}
@@ -300,12 +304,18 @@ const CollaborativesListingClient = () => {
                         title={collaborative.title || ''}
                         variation="collapsed"
                         iconColor="warning"
-                        imageUrl={`${process.env.NEXT_PUBLIC_BACKEND_URL}/${collaborative.logo?.path.replace('/code/files/', '')}`}
+                        imageUrl={
+                          collaborative.coverImage
+                            ? `${process.env.NEXT_PUBLIC_BACKEND_URL}/${collaborative.coverImage?.path.replace('/code/files/', '')}`
+                            : `${process.env.NEXT_PUBLIC_BACKEND_URL}/${collaborative.logo?.path.replace('/code/files/', '')}`
+                        }
+                        // imageUrl={`${process.env.NEXT_PUBLIC_BACKEND_URL}/${collaborative.logo?.path.replace('/code/files/', '')}`}
                         metadataContent={[
                           {
-                            icon: Icons.calendar as any,
+                            icon: Icons.calendarEvent as any,
                             label: 'Started',
-                            value: formatDate(collaborative.startedOn),
+                            value: formatDate(collaborative.startedOn) || '',
+                            stroke: 1.2,
                           },
                           {
                             icon: Icons.dataset as any,
@@ -314,7 +324,7 @@ const CollaborativesListingClient = () => {
                               collaborative.datasetCount?.toString() || '0',
                           },
                           {
-                            icon: Icons.globe as ComponentType<any>,
+                            icon: Icons.worldPin as ComponentType<any>,
                             label: 'Geography',
                             value:
                               collaborative.geographies &&
@@ -323,16 +333,19 @@ const CollaborativesListingClient = () => {
                                     .map((geo: any) => geo.name)
                                     .join(', ')
                                 : 'N/A',
+                            stroke: 1.2,
                           },
                         ]}
                         href={`/collaboratives/${collaborative.slug}`}
-                        footerContent={[
+                        leftFooterChips={[
                           {
                             icon: collaborative.sectors?.[0]?.name
                               ? `/Sectors/${collaborative.sectors[0].name}.svg`
                               : '/Sectors/default.svg',
                             label: 'Sectors',
                           },
+                        ]}
+                        rightFooterChips={[
                           {
                             icon: collaborative.isIndividualCollaborative
                               ? collaborative?.user?.profilePicture