Skip to content

Commit fe29d36

Browse files
UdayRajSahai2UdayRajSahai2
committed
Merge branch 'dev' into 33-while-creation-of-the-models-sometimes-the-toast-appears-to-be-blank-especially-after-the-publish-of-ai-model
2 parents ebbbcc6 + 073128c commit fe29d36

5 files changed

Lines changed: 58 additions & 112 deletions

File tree

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

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,46 @@ name: Update DataSpace Dev
33
on:
44
push:
55
branches: ['dev']
6-
env:
7-
KEYCLOAK_CLIENT_ID: 'dataspace'
8-
KEYCLOAK_CLIENT_SECRET: 'Q2iHhyXNOqOu7Xaln7Z45QrDnbff13eu'
9-
AUTH_ISSUER: 'https://opub-kc.civicdatalab.in/auth/realms/DataSpace'
10-
NEXTAUTH_URL: 'https://dev.civicdataspace.in'
11-
NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in'
12-
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
13-
END_SESSION_URL: 'https://opub-kc.civicdatalab.in/auth/realms/DataSpace/protocol/openid-connect/logout'
14-
REFRESH_TOKEN_URL: 'https://opub-kc.civicdatalab.in/auth/realms/DataSpace/protocol/openid-connect/token'
15-
NEXT_PUBLIC_BACKEND_URL: 'https://dev.api.civicdataspace.in'
16-
BACKEND_GRAPHQL_URL: 'https://dev.api.civicdataspace.in/api/graphql'
17-
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
18-
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: 'https://dev.api.civicdataspace.in/api/graphql'
19-
BACKEND_URL: 'https://dev.api.civicdataspace.in'
20-
NEXT_PUBLIC_PLATFORM_URL: 'https://dev.civicdataspace.in'
21-
NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}
22-
236

247
jobs:
258
deploy:
269
runs-on: ubuntu-latest
27-
10+
environment: development
11+
env:
12+
KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_CLIENT_ID }}
13+
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}
14+
AUTH_ISSUER: ${{ secrets.AUTH_ISSUER }}
15+
NEXTAUTH_URL: ${{ vars.NEXTAUTH_URL }}
16+
NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
17+
NEXT_PUBLIC_NEXTAUTH_URL: ${{ vars.NEXT_PUBLIC_NEXTAUTH_URL }}
18+
END_SESSION_URL: ${{ secrets.END_SESSION_URL }}
19+
REFRESH_TOKEN_URL: ${{ secrets.REFRESH_TOKEN_URL }}
20+
NEXT_PUBLIC_BACKEND_URL: ${{ vars.NEXT_PUBLIC_BACKEND_URL }}
21+
BACKEND_URL: ${{ vars.BACKEND_URL }}
22+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{ vars.NEXT_PUBLIC_BACKEND_GRAPHQL_URL }}
23+
BACKEND_GRAPHQL_URL: ${{ vars.BACKEND_GRAPHQL_URL }}
24+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{ vars.NEXT_PUBLIC_ENABLE_ACCESSMODEL }}
25+
NEXT_PUBLIC_ANALYTICS_URL: ${{ vars.NEXT_PUBLIC_ANALYTICS_URL }}
26+
NEXT_PUBLIC_PLATFORM_URL: ${{ vars.NEXT_PUBLIC_PLATFORM_URL }}
27+
2828
steps:
2929
- name: Checkout code
3030
uses: actions/checkout@v4
3131

32+
- name: Setup Node.js
33+
uses: actions/setup-node@v4
34+
with:
35+
node-version: '20'
36+
cache: 'npm'
37+
3238
- name: Install dependencies
33-
run: npm install
39+
run: npm install --legacy-peer-deps
3440

3541
- name: Generate
36-
run: npm run generate
42+
run: npm run generate:ci
43+
env:
44+
BACKEND_GRAPHQL_URL: ${{ vars.BACKEND_GRAPHQL_URL }}
45+
NODE_ENV: production
3746

3847
- name: Build
3948
run: npm run build
@@ -45,27 +54,28 @@ jobs:
4554
run: mv public public2
4655

4756
- name: Send .next2 to EC2
48-
uses: appleboy/scp-action@master
57+
uses: appleboy/scp-action@v0.1.7
4958
with:
50-
host: ${{ secrets.EC2_HOST_DEV_DS }}
51-
username: ${{ secrets.EC2_USERNAME_DS }}
59+
host: ${{ vars.EC2_HOST }}
60+
username: ${{ secrets.EC2_USERNAME }}
5261
key: ${{ secrets.EC2_PRIVATE_KEY }}
5362
source: .next2
5463
target: DataExchange/DataExFrontend
5564

5665
- name: Send public2 to EC2
57-
uses: appleboy/scp-action@master
66+
uses: appleboy/scp-action@v0.1.7
5867
with:
59-
host: ${{ secrets.EC2_HOST_DEV_DS }}
60-
username: ${{ secrets.EC2_USERNAME_DS }}
68+
host: ${{ vars.EC2_HOST }}
69+
username: ${{ secrets.EC2_USERNAME }}
6170
key: ${{ secrets.EC2_PRIVATE_KEY }}
6271
source: public2
6372
target: DataExchange/DataExFrontend
6473

6574
- name: Update with new Build
6675
uses: appleboy/ssh-action@v1.0.3
76+
continue-on-error: false
6777
with:
68-
host: ${{ secrets.EC2_HOST_DEV_DS }}
69-
username: ${{ secrets.EC2_USERNAME_DS }}
78+
host: ${{ vars.EC2_HOST }}
79+
username: ${{ secrets.EC2_USERNAME }}
7080
key: ${{ secrets.EC2_PRIVATE_KEY }}
7181
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‎

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,28 @@ on:
55
branches: ['dev']
66
pull_request:
77
branches: ['dev']
8-
env:
9-
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
10-
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
11-
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
12-
NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
13-
NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
14-
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
15-
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
16-
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
17-
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
18-
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
19-
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
20-
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
21-
BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
22-
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
23-
NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}
8+
249

2510
jobs:
2611
build:
2712
runs-on: ubuntu-latest
28-
13+
environment: development
14+
env:
15+
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
16+
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
17+
AUTH_ISSUER: ${{ secrets.AUTH_ISSUER }}
18+
NEXTAUTH_URL: ${{vars.NEXTAUTH_URL}}
19+
NEXT_PUBLIC_NEXTAUTH_URL: ${{ vars.NEXT_PUBLIC_NEXTAUTH_URL }}
20+
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
21+
END_SESSION_URL: ${{ vars.END_SESSION_URL }}
22+
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
23+
NEXT_PUBLIC_BACKEND_URL: ${{vars.NEXT_PUBLIC_BACKEND_URL}}
24+
BACKEND_GRAPHQL_URL: ${{vars.BACKEND_GRAPHQL_URL}}
25+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{vars.NEXT_PUBLIC_ENABLE_ACCESSMODEL}}
26+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{vars.NEXT_PUBLIC_BACKEND_GRAPHQL_URL}}
27+
BACKEND_URL: ${{vars.BACKEND_URL}}
28+
NEXT_PUBLIC_PLATFORM_URL: ${{vars.NEXT_PUBLIC_PLATFORM_URL}}
29+
NEXT_PUBLIC_ANALYTICS_URL: ${{vars.NEXT_PUBLIC_ANALYTICS_URL}}
2930
strategy:
3031
matrix:
3132
node-version: [20.x]
@@ -42,33 +43,8 @@ jobs:
4243
run: npm ci --force
4344

4445
- name: Generate GraphQL types (CI-safe)
45-
run: |
46-
# Ensure generated directory exists
47-
mkdir -p ./gql/generated
48-
49-
# Try to generate with timeout and fallback
50-
timeout 60s npm run generate:ci || {
51-
echo "GraphQL codegen failed or timed out, checking for existing files..."
52-
if [ -d "./gql/generated" ] && [ "$(ls -A ./gql/generated 2>/dev/null)" ]; then
53-
echo "Using existing generated files"
54-
else
55-
echo "Creating minimal generated files for build to proceed"
56-
echo "// Auto-generated fallback file for CI builds" > ./gql/generated/index.ts
57-
echo "export type Maybe<T> = T | null;" >> ./gql/generated/index.ts
58-
echo "export type Scalars = {" >> ./gql/generated/index.ts
59-
echo " ID: string;" >> ./gql/generated/index.ts
60-
echo " String: string;" >> ./gql/generated/index.ts
61-
echo " Boolean: boolean;" >> ./gql/generated/index.ts
62-
echo " Int: number;" >> ./gql/generated/index.ts
63-
echo " Float: number;" >> ./gql/generated/index.ts
64-
echo "};" >> ./gql/generated/index.ts
65-
echo "export {};" >> ./gql/generated/index.ts
66-
echo "Created fallback generated files"
67-
fi
68-
}
46+
run: npm run generate
6947
env:
70-
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
71-
NODE_ENV: 'production'
72-
48+
BACKEND_GRAPHQL_URL: ${{vars.BACKEND_GRAPHQL_URL}}
7349
- name: Build application
7450
run: npm run build --if-present

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

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎components/provider.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { Toaster, Tooltip } from 'opub-ui';
1010

1111
import { RouterEvents } from '@/lib/navigation';
1212
import SessionGuard from './SessionGuard';
13-
import { TourGuide } from './Tour';
1413

1514
export default function Provider({ children }: { children: React.ReactNode }) {
1615
const [client] = React.useState(

‎hooks/use-key-press.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export function useKeyPress(targetKey: string, withMeta?: boolean): boolean {
2525
// If released key is our target key then set to false
2626
const upHandler = ({
2727
key,
28-
metaKey,
2928
}: {
3029
key: string;
3130
metaKey?: boolean;

0 commit comments

Comments
 (0)