Merge branch 'development' into prod-helm-deploy

# Conflicts:
#	.github/workflows/dev-build.yml
#	.github/workflows/prod-build.yml
#	Dockerfile.prod
#	yarn.lock

Author: vcnainala

.eslintignore

@@ -1,7 +1,7 @@
 # This worklflow will perform following actions when the code is pushed to development branch:
 # - Run end to end test.
 # - Check Linting.
-# - Build the latest docker image in development which needs both e2etest and lint to pass first.
+# - Build the latest docker image in development which needs both e2e and lint to pass first.
 # - Push the latest docker image to Google Artifact Registry-Dev.
 # - Rollout the latest image in GKE.
 # 
@@ -16,17 +16,14 @@ on:
     branches: [development]
 
 env:
-  PROJECT_ID: ${{ secrets.GKE_PROJECT }}
-  GKE_CLUSTER_DEV: nmrxiv-dev
-  GKE_ZONE: europe-west3-a
   DEPLOYMENT_NAME: nmrxiv-nmrium
   DOCKER_HUB_USERNAME : ${{ secrets.DOCKER_HUB_USERNAME  }}
   DOCKER_HUB_PASSWORD : ${{ secrets.DOCKER_HUB_PASSWORD  }}
   REPOSITORY_NAME: nmrium-react-wrapper
   REPOSITORY_NAMESPACE: nfdi4chem
 
 jobs:
-  e2etest:
+  e2e:
     uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/e2e.yml@main 
 
   lint:
@@ -36,25 +33,15 @@ jobs:
     name: Deploy to dev
     if: github.ref == 'refs/heads/development'
     runs-on: ubuntu-latest
-    needs: [lint, e2etest]
+    needs: [lint, e2e]
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
-    # Setup gcloud CLI
-    - name: Setup CLI
-      uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-      with:
-        service_account_key: ${{ secrets.GKE_SA_KEY }}
-        project_id: ${{ secrets.GKE_PROJECT }}
-
-    # Get the GKE credentials so we can deploy to the cluster
-    - name: Get GKE credentials
-      uses: google-github-actions/[email protected]
-      with:
-        cluster_name: ${{ env.GKE_CLUSTER_DEV }}
-        location: ${{ env.GKE_ZONE }}
-        credentials: ${{ secrets.GKE_SA_KEY }}
+    - name: Update version number
+      run: |
+          VERSION=${GITHUB_REF//*\/}
+          echo "export default { version: '$VERSION' };" > src/versionInfo.ts
 
     - name: Log in to Docker Hub
       uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
@@ -73,10 +60,3 @@ jobs:
         tags: ${{ env.REPOSITORY_NAMESPACE }}/${{ env.REPOSITORY_NAME }}:dev-latest
         username: ${{ env.DOCKER_HUB_USERNAME  }}
         password: ${{ env.DOCKER_HUB_PASSWORD  }}
-
-    # Deploy the latest Docker image to the GKE cluster
-    - name: Deploy
-      run: |-
-        kubectl rollout restart deployment/$DEPLOYMENT_NAME
-        kubectl rollout status deployment/$DEPLOYMENT_NAME --timeout=300s
-        kubectl get services -o wide

.eslintrc.yml

@@ -6,7 +6,7 @@ on:
         - development
 
 jobs:
-    e2etest:
+    e2e:
         uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/e2e.yml@main 
     lint:
         uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/nodejs.yml@main 

.github/workflows/dev-build.yml

@@ -4,17 +4,17 @@ on:
   workflow_call:  
 
 jobs:
-    e2etest:
-      runs-on: ubuntu-latest
+    e2e:
+      runs-on: macos-latest
       strategy:
         matrix:
           project: [chromium, firefox, webkit]
         fail-fast: false
       steps:
-        - uses: actions/checkout@v3
-        - uses: actions/setup-node@v3
+        - uses: actions/checkout@v4
+        - uses: actions/setup-node@v4
           with:
-            node-version: 18.x
+            node-version-file: package.json
         - name: Install dependencies
           run: npm ci
         - name: Install Playwright
@@ -26,8 +26,9 @@ jobs:
           continue-on-error: ${{ matrix.project == 'webkit' }}
         - name: Upload test results
           if: always()
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           with:
-            name: test-results-${{ matrix.project }}
-            path: test-results
-  
+            name: playwright-${{ matrix.project }}
+            path: |
+                test-results
+                playwright-report

.github/workflows/dev-check.yml

@@ -7,10 +7,10 @@ jobs:
   nodejs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version-file: package.json
       - name: Install dependencies
         run: npm ci
       - name: Run ESLint

.github/workflows/e2e.yml

@@ -17,9 +17,6 @@ on:
     branches: [prod-helm-deploy]
 
 env:
-  PROJECT_ID: ${{ secrets.GKE_PROJECT }}
-  GKE_CLUSTER_PROD: nmrxiv-prod
-  GKE_ZONE: europe-west3-a
   DEPLOYMENT_NAME: nmrxiv-nmrium
   DOCKER_HUB_USERNAME : ${{ secrets.DOCKER_HUB_USERNAME  }}
   DOCKER_HUB_PASSWORD : ${{ secrets.DOCKER_HUB_PASSWORD  }}
@@ -34,28 +31,13 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/[email protected]
-    
-    # Setup gcloud CLI
-    - name: Setup CLI
-      uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-      with:
-        service_account_key: ${{ secrets.GKE_SA_KEY }}
-        project_id: ${{ secrets.GKE_PROJECT }}
 
     # Login to Docker Hub
     - name: Log in to Docker Hub
       uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
       with:
         username: ${{ env.DOCKER_HUB_USERNAME  }}
         password: ${{ env.DOCKER_HUB_PASSWORD  }}
-
-    # Get the GKE credentials so we can deploy to the cluster
-    - name: Get GKE credentials
-      uses: google-github-actions/[email protected]
-      with:
-        cluster_name: ${{ env.GKE_CLUSTER_PROD }}
-        location: ${{ env.GKE_ZONE }}
-        credentials: ${{ secrets.GKE_SA_KEY }}
 
     #Fetch latest release
     - name: Fetch latest release
@@ -94,11 +76,3 @@ jobs:
       uses: EndBug/[email protected]
       with: 
         default_author: github_actions
-
-    # Deploy the latest Docker image to the GKE cluster
-    - name: Deploy
-      if: ${{ steps.fetch-latest-release.outputs.tag_name }}
-      run: |-
-        kubectl rollout restart deployment/$DEPLOYMENT_NAME
-        kubectl rollout status deployment/$DEPLOYMENT_NAME --timeout=300s
-        kubectl get services -o wide

.github/workflows/nodejs.yml

@@ -2,7 +2,7 @@
 # This worklflow will perform following actions when the code is pushed to main branch.
 # - Run end to end test
 # - Test linting.
-# - Trigger release-please action to create release which needs e2etest & lint to pass first.
+# - Trigger release-please action to create release which needs e2e & lint to pass first.
 # 
 # Maintainers:
 #   - name: Nisha Sharma
@@ -16,15 +16,15 @@ on:
       - main
 
 jobs:
-  e2etest:
+  e2e:
     uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/e2e.yml@main 
 
   lint:
     uses: NFDI4Chem/nmrium-react-wrapper/.github/workflows/nodejs.yml@main 
 
   release-please:
     runs-on: ubuntu-latest
-    needs: ['lint', 'e2etest']
+    needs: ['lint', 'e2e']
     steps:
       - uses: google-github-actions/release-please-action@v3
         with:

.github/workflows/prod-build.yml

@@ -31,3 +31,5 @@ yarn.lock
 
 /test-results
 /playwright-report
+
+build/

.github/workflows/release-please.yml

@@ -0,0 +1,6 @@
+# Do not update to React 19 because some packages not compatible with React 19
+reject:
+  - react
+  - react-dom
+  - '@types/react'
+  - '@types/react-dom'