Skip to content

Commit

Permalink
Merge #255: Refactor frontend and add validation placeholder, support…
Browse files Browse the repository at this point in the history
… in depth form change (#262)

* fix(fe:FSADT1-539):
- refactor form section schemas, form initial data, functions into different folders
refs: #89

* refactor(fe:FSADT1-539):
- refactor the form data and update form value functions to be global states,
refs: #255

* refactor(fe:FSADT1-539):
- refactor some validation function
- update the validation result type
refs: #255

* feat/refactor(fe:FSADT1-539):
- design global state management
- rename type files
- add hardcode validation error display as example
- add hardcode validation error cleanup as example
refs: #255

* feat(fe:FSADT1-539)
- refactor the update form value functions
- update the way to display error message, create a error property and computed based on the validation result, compute fieldprops based on the error
- fix add row problem for table/group
refs: #255

* refactor(fe:FSADT1-539):
- improve structure of global state management
refs: #255

* fix(fe):
- fix form example to open next session

* feat(fe:FSADT1-539):
- add method to update form data when object depth increase, put as comment for now
refs: #255

* feat(fe:FSADT1-539):
- added in depth repeatable sections
- support in depth form value update for in depth repeatble sections
- fix test
refs: #255

* fix(fe:FSADT1-539):
- remove package installed by accident
refs: #255

* feat(fe:FSADT1-539):
- support display error message for in-depth form field
refs: #255

* feat(fe:FSADT1-539):
- support customized checking for required fields
refs: #255

* feat(fe:FSADT1-539):
- switch to use string path for form object
- add example to disable a field
refs: #255

* test(fe:FSADT1-539):
- add test for new disable and error display feature for form component option file
rfs: #255

* clean(pl):
- remove unused env vars
refs: #255

* feat(fe:FSADT1-539):
- update form content to the latest
refs: #255

* fix(pl):
- add env to read secrets for pr open
refs: #255

* clean(fe:FSADT1-539):
- remove unused file
refs: #255

Co-authored-by: Maria Martinez <[email protected]>
  • Loading branch information
MCatherine1994 and mamartinezmejia authored Jan 19, 2023
1 parent cc85d33 commit 46aafef
Show file tree
Hide file tree
Showing 41 changed files with 1,570 additions and 1,463 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/merge-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@ jobs:
parameters:
-p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}
-p PROMOTE=${{ github.repository }}/backend:${{ env.ZONE }}
-p NODE_ENV='development'
-p API_URL='https://nrfc-api-test.api.gov.bc.ca'
-p X_API_KEY=${{ secrets.GWA_X_API_KEY }}
-p CHES_CLIENT_ID=${{ secrets.CHES_CLIENT_ID }}
-p CHES_CLIENT_SECRET=${{ secrets.CHES_CLIENT_SECRET }}
-p CHES_TOKEN_URL='https://test.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token'
Expand Down Expand Up @@ -227,9 +224,6 @@ jobs:
parameters:
-p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}
-p PROMOTE=${{ github.repository }}/backend:${{ env.PREV }}
-p NODE_ENV='production'
-p API_URL='https://nrfc-api-prod.api.gov.bc.ca'
-p X_API_KEY=${{ secrets.GWA_X_API_KEY }}
-p CHES_CLIENT_ID=${{ secrets.CHES_CLIENT_ID }}
-p CHES_CLIENT_SECRET=${{ secrets.CHES_CLIENT_SECRET }}
-p CHES_TOKEN_URL='https://loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token'
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ jobs:
name: Deploy Init
needs:
- builds
environment: dev
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
Expand All @@ -137,6 +138,7 @@ jobs:
name: Deploy Database
needs:
- builds
environment: dev
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
Expand All @@ -156,6 +158,7 @@ jobs:
name: Deploy Backend
needs:
- builds
environment: dev
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
Expand All @@ -171,9 +174,6 @@ jobs:
parameters:
-p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }}
-p PROMOTE=${{ github.repository }}/backend:${{ github.event.number }}
-p NODE_ENV='development'
-p API_URL='https://nrfc-api-test.api.gov.bc.ca'
-p X_API_KEY=${{ secrets.GWA_X_API_KEY }}
-p CHES_CLIENT_ID=${{ secrets.CHES_CLIENT_ID }}
-p CHES_CLIENT_SECRET=${{ secrets.CHES_CLIENT_SECRET }}
-p CHES_TOKEN_URL='https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token'
Expand All @@ -183,6 +183,7 @@ jobs:
name: Deploy Frontend
needs:
- builds
environment: dev
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
Expand Down
18 changes: 0 additions & 18 deletions backend/openshift.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ parameters:
- name: PROMOTE
description: Image (namespace/name:tag) to promote/import
value: bcgov/nr-old-growth:prod-backend
- name: API_URL
description: URL for the forest client api
required: true
- name: X_API_KEY
description: Key to access to the forest client api
required: true
- name: CHES_CLIENT_ID
description: CHES service client id
required: true
Expand All @@ -42,9 +36,6 @@ parameters:
- name: CHES_API_URL
description: CHES service api url
required: true
- name: NODE_ENV
description: environment mode
required: true
- name: CPU_REQUEST
value: 75m
- name: CPU_LIMIT
Expand Down Expand Up @@ -113,19 +104,10 @@ objects:
imagePullPolicy: Always
name: ${NAME}
env:
- name: NODE_ENV
value: ${NODE_ENV}
- name: FRONTEND_URL
value: https://${NAME}-${ZONE}-frontend.${DOMAIN}
- name: BACKEND_URL
value: https://${NAME}-${ZONE}-backend.${DOMAIN}
- name: X_API_KEY
valueFrom:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: x-api-key
- name: API_URL
value: ${API_URL}
- name: CHES_CLIENT_ID
valueFrom:
secretKeyRef:
Expand Down
Loading

0 comments on commit 46aafef

Please sign in to comment.