v1.0.2-hotfix2 404 error on filter reset and systems match bug fix

.github/workflows/deploy_dev.yml

@@ -1,18 +1,16 @@
 # This workflow build and push a Docker container to Google Artifact Registry
-# and deploy it on Cloud Run when a PR has been approved by a reviewer.
+# and deploy it on Cloud Run when a PR to 'main' has been approved by a reviewer.
 
 name: 'Build and Deploy to Cloud Run'
 on:
   pull_request_review:
-    branches:
-      - main
-    types: [submitted]
+    types: [submitted, edited] # submitted, reviewer edits the PR (ex comments)
 
 env:
 
   PROJECT_ID: ${{ secrets.PROJECT_ID }}
   REGION: ${{ secrets.REGION_LOC_1 }}
-  SERVICE: 'map-dragon'
+  SERVICE: 'mapdragon'
   IMAGE_NAME: 'map-dragon_img'
   GCP_CREDENTIALS:  ${{ secrets.GCP_CREDENTIALS }}
 
@@ -22,7 +20,8 @@ jobs:
   deploy:
     runs-on: 'ubuntu-latest'
 
-    if: github.event.review.state == 'approved'
+    # If PR is approved and the PR is for the 'main' branch
+    if: github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'main'
 
     environment:
       name: dev
@@ -41,11 +40,18 @@ jobs:
         with:
           credentials_json: '${{ env.GCP_CREDENTIALS }}'
 
+      - name: Extract Version from PR Number
+        id: extract_version
+        run: |
+          VERSION=${{ github.event.pull_request.number }} 
+          echo "Extracted Version: ${VERSION}"
+
       - name: Generate .env.dev file
         run: |
           echo "VITE_CLIENT_ID = ${{ secrets.VITE_CLIENT_ID }}" > .env.dev
           echo "VITE_SEARCH_ENDPOINT = ${{ secrets.VITE_SEARCH_ENDPOINT }}" >> .env.dev
           echo "VITE_VOCAB_ENDPOINT= ${{ secrets.VITE_VOCAB_ENDPOINT }}" >> .env.dev
+          echo "VITE_MAPDRAGON_VERSION=${VERSION}" >> .env.dev
 
       - name: 'Docker Auth'
         run: |-
@@ -54,17 +60,17 @@ jobs:
       - name: 'Build Docker Image' # New step to build the image
 
         run: |-
-          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
+          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-dev/${{ env.IMAGE_NAME }}:${{ github.sha }}"
           docker build -t "${DOCKER_TAG}" --build-arg ENV=dev .
 
       - name: 'Push Docker Image'
         run: |-
-          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
+          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-dev/${{ env.IMAGE_NAME }}:${{ github.sha }}"
           docker push "${DOCKER_TAG}"
 
       - name: 'Deploy to Cloud Run'
         uses: 'google-github-actions/deploy-cloudrun@v2'
         with:
-          service: '${{ env.SERVICE }}'
+          service: '${{ env.SERVICE }}-dev'
           region: '${{ env.REGION }}'
-          image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
+          image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-dev/${{ env.IMAGE_NAME }}:${{ github.sha }}"

.github/workflows/deploy_prod.yml

@@ -4,17 +4,16 @@
 name: 'Build and Deploy PROD to  Cloud Run'
 
 on:
-    pull_request:
-      branches:
-        - release
-      types:
-        - closed
+  pull_request:
+    branches:
+      - release
+    types: [closed, edited] # PR opened, edited(PR title, etc)
 
 env:
 
   PROJECT_ID: ${{ secrets.PROJECT_ID }}
   REGION: ${{ secrets.REGION_LOC_1 }}
-  SERVICE: 'map-dragon'
+  SERVICE: 'mapdragon'
   IMAGE_NAME: 'map-dragon_img'
   GCP_CREDENTIALS:  ${{ secrets.GCP_CREDENTIALS }}
 
@@ -24,7 +23,8 @@ jobs:
   deploy:
     runs-on: 'ubuntu-latest'
 
-
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'release'
+
     environment:
       name: prod
 
@@ -35,17 +35,27 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@v4'
+        with:
+          ref: release # release is deployed, not the default or working branch.
+
       - id: 'auth'
         name: 'Authenticate to Google Cloud'
         uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: '${{ env.GCP_CREDENTIALS }}'
 
+      - name: Extract Version from PR Title # Assumes PR title contains the tag. ex v0.0.0 or v0.0.0-abc
+        run: |
+          VERSION=$(echo "${{ github.event.pull_request.title }}" | grep -o 'v[0-9]\+\.[0-9]\+\.[0-9]\+\(-[a-zA-Z]*\)\?') 
+          echo "Extracted Version: ${VERSION}"
+
       - name: Generate .env.prod file
         run: |
           echo "VITE_CLIENT_ID = ${{ secrets.VITE_CLIENT_ID }}" > .env.prod
           echo "VITE_SEARCH_ENDPOINT = ${{ secrets.VITE_SEARCH_ENDPOINT }}" >> .env.prod
           echo "VITE_VOCAB_ENDPOINT= ${{ secrets.VITE_VOCAB_ENDPOINT }}" >> .env.prod
+          echo "VITE_MAPDRAGON_VERSION=${VERSION}" >> .env.prod
+
       - name: 'Docker Auth'
         run: |-
           gcloud auth configure-docker '${{ env.REGION }}-docker.pkg.dev'

.github/workflows/deploy_qa.yml

@@ -1,21 +1,20 @@
 # This workflow build and push a Docker container to Google Artifact Registry
 # and deploy it on Cloud Run when a PR to the `release` branch is made.
 
-name: 'Build and Deploy QA to Cloud Run'
+name: 'Build and Deploy UAT to Cloud Run'
 
 on:
   pull_request:
     branches:
       - release
-    types:
-      - closed
+    types: [opened, edited, synchronize] # PR opened, edited(PR title, etc), new commits are pushed.
 
 
 env:
 
   PROJECT_ID: ${{ secrets.PROJECT_ID }}
   REGION: ${{ secrets.REGION_LOC_1 }}
-  SERVICE: 'map-dragon'
+  SERVICE: 'mapdragon'
   IMAGE_NAME: 'map-dragon_img'
   GCP_CREDENTIALS:  ${{ secrets.GCP_CREDENTIALS }}
 
@@ -26,7 +25,7 @@ jobs:
     runs-on: 'ubuntu-latest'
 
     environment:
-      name: qa
+      name: uat
 
     permissions:
       contents: 'read'
@@ -43,29 +42,36 @@ jobs:
         with:
           credentials_json: '${{ env.GCP_CREDENTIALS }}'
 
-      - name: Generate .env.qa file
+      - name: Extract Version from PR Title # Assumes PR title contains the tag. ex v0.0.0 or v0.0.0-abc
         run: |
-          echo "VITE_CLIENT_ID = ${{ secrets.VITE_CLIENT_ID }}" > .env.qa
-          echo "VITE_SEARCH_ENDPOINT = ${{ secrets.VITE_SEARCH_ENDPOINT }}" >> .env.qa
-          echo "VITE_VOCAB_ENDPOINT= ${{ secrets.VITE_VOCAB_ENDPOINT }}" >> .env.qa
+          VERSION=$(echo "${{ github.event.pull_request.title }}" | grep -o 'v[0-9]\+\.[0-9]\+\.[0-9]\+\(-[a-zA-Z]*\)\?') 
+          echo "Extracted Version: ${VERSION}"
+
+      - name: Generate .env.uat file
+        run: |
+          echo "VITE_CLIENT_ID = ${{ secrets.VITE_CLIENT_ID }}" > .env.uat
+          echo "VITE_SEARCH_ENDPOINT = ${{ secrets.VITE_SEARCH_ENDPOINT }}" >> .env.uat
+          echo "VITE_VOCAB_ENDPOINT= ${{ secrets.VITE_VOCAB_ENDPOINT }}" >> .env.uat
+          echo "VITE_MAPDRAGON_VERSION=${VERSION}" >> .env.uat
+
 
       - name: 'Docker Auth'
         run: |-
           gcloud auth configure-docker '${{ env.REGION }}-docker.pkg.dev'
 
       - name: 'Build Docker Image' # New step to build the image
         run: |-
-          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
-          docker build -t "${DOCKER_TAG}" --build-arg ENV=qa .
+          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-uat/${{ env.IMAGE_NAME }}:${{ github.sha }}"
+          docker build -t "${DOCKER_TAG}" --build-arg ENV=uat .
 
       - name: 'Push Docker Image'
         run: |-
-          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
+          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-uat/${{ env.IMAGE_NAME }}:${{ github.sha }}"
           docker push "${DOCKER_TAG}"
 
       - name: 'Deploy to Cloud Run'
         uses: 'google-github-actions/deploy-cloudrun@v2'
         with:
-          service: '${{ env.SERVICE }}'
+          service: '${{ env.SERVICE }}-uat'
           region: '${{ env.REGION }}'
-          image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
+          image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-uat/${{ env.IMAGE_NAME }}:${{ github.sha }}"

.github/workflows/dispatch_deploy.yml

@@ -0,0 +1,91 @@
+# This workflow build and push a Docker container to Google Artifact Registry
+# and deploy it on Cloud Run when manually triggered.
+
+name: 'Dispatch Deploy'
+
+on:
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: 'Deployment environment (e.g., dev, uat, prod, alpha)'
+        required: true
+        type: string
+        default: 'dev'
+      version:
+        description: 'Optional version for the deployment'
+        required: true
+        type: string
+        default: 'v0.0.0-env'
+      deploy_branch:
+        description: 'Branch to deploy to the environment'
+        required: true
+        type: string
+        default: 'main'
+
+env:
+
+  PROJECT_ID: ${{ secrets.PROJECT_ID }}
+  REGION: ${{ secrets.REGION_LOC_1 }}
+  SERVICE: 'mapdragon'
+  IMAGE_NAME: 'map-dragon_img'
+  GCP_CREDENTIALS:  ${{ secrets.GCP_CREDENTIALS }}
+
+
+jobs:
+
+  deploy:
+    runs-on: 'ubuntu-latest'
+
+    environment:
+      name: ${{ github.event.inputs.environment }}
+
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@v4'
+        with:
+          ref: ${{ github.event.inputs.deploy_branch }} # This branch is deployed
+
+      - id: 'auth'
+        name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          credentials_json: '${{ env.GCP_CREDENTIALS }}'
+
+      - name: Generate .env.${{ github.event.inputs.environment }} file
+        run: |
+          echo "VITE_CLIENT_ID = ${{ secrets.VITE_CLIENT_ID }}" > .env.${{ github.event.inputs.environment }}
+          echo "VITE_SEARCH_ENDPOINT = ${{ secrets.VITE_SEARCH_ENDPOINT }}" >> .env.${{ github.event.inputs.environment }}
+          echo "VITE_VOCAB_ENDPOINT= ${{ secrets.VITE_VOCAB_ENDPOINT }}" >> .env.${{ github.event.inputs.environment }}
+          echo "VITE_MAPDRAGON_VERSION= ${{ github.event.inputs.version }}" >> .env.${{ github.event.inputs.environment }}
+      - name: 'Docker Auth'
+        run: |-
+          gcloud auth configure-docker '${{ env.REGION }}-docker.pkg.dev'
+
+      - name: 'Build Docker Image'
+        run: |-
+          if [[ "${{ github.event.inputs.environment }}" == "prod" ]]; then
+            SERVICE="${{ env.SERVICE }}"
+          else 
+            SERVICE="${{ env.SERVICE }}-${{ github.event.inputs.environment }}"
+          fi
+          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${SERVICE}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
+
+          echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV 
+          echo "SERVICE=${SERVICE}" >> $GITHUB_ENV 
+
+          docker build -t "${DOCKER_TAG}" --build-arg ENV=${{ github.event.inputs.environment }} .
+
+      - name: 'Push Docker Image'
+        run: |-
+          docker push "${DOCKER_TAG}"
+
+      - name: 'Deploy to Cloud Run'
+        uses: 'google-github-actions/deploy-cloudrun@v2'
+        with:
+          service: ${{ env.SERVICE }}
+          region: '${{ env.REGION }}'
+          image: ${{ env.DOCKER_TAG }}

.gitignore

@@ -25,5 +25,6 @@ dist-ssr
 
 # Environment variables
 .env.local
-.env.qa
+.env.uat
 .env.dev
+.env

docs/README.md

@@ -0,0 +1,45 @@
+# Map Dragon
+This application will support several user groups in submitting and validating their data, managing and tracking data definitions, and aligning data to standardized terms. 
+
+## Getting Started
+### Vite React App
+
+This is a React application bootstrapped with Vite. 
+
+### Prerequisites
+
+Make sure you have Node.js and npm installed on your machine.
+
+### Installation
+
+1. Clone the repository:
+
+   ```sh
+   git clone git@github.com:NIH-NCPI/map-dragon.git
+
+2. Navigate into the project directory:
+
+   ```sh
+   cd map-dragon
+3. Install dependencies
+
+   ```sh
+   npm i
+
+### Development
+1. To start the development server, run:
+   ```sh
+   npm run dev
+
+### Dependencies
+This project utilizes the following dependencies:
+
++ React: A JavaScript library for building user interfaces  
++ Vite: A front-end tooling for web development  
++ Ant Design: A design component library
++ Sass: A CSS preprocessor
++ React OAuth2 | Google: A React library for Google OAuth
++ jwt-decode: A JWT decoder
++ Papa Parse: A CSV parser
+
+

docs/_navbar.md

@@ -0,0 +1,4 @@
+* Map Dragon
+  * [Map Dragon Local Installation Directions](https://github.com/NIH-NCPI/map-dragon)
+* File Formats
+  * [Loading a Data Dictionary](datadictionary.md)