Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge #255: Refactor frontend and add validation placeholder, support in depth form change #262

Merged
merged 23 commits into from
Jan 19, 2023
Merged

Merge #255: Refactor frontend and add validation placeholder, support in depth form change #262

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
69a80c2
fix(fe:FSADT1-539):
MCatherine1994 Jan 16, 2023
22ff2f0
refactor(fe:FSADT1-539):
MCatherine1994 Jan 16, 2023
d60cf47
refactor(fe:FSADT1-539):
MCatherine1994 Jan 16, 2023
e16b57e
feat/refactor(fe:FSADT1-539):
MCatherine1994 Jan 17, 2023
58afe02
feat(fe:FSADT1-539)
MCatherine1994 Jan 17, 2023
c3886be
Merge branch 'main' of https://github.com/bcgov/nr-forest-client into…
MCatherine1994 Jan 17, 2023
57330d8
refactor(fe:FSADT1-539):
MCatherine1994 Jan 17, 2023
ee52b83
fix(fe):
MCatherine1994 Jan 17, 2023
20194f6
feat(fe:FSADT1-539):
MCatherine1994 Jan 18, 2023
bae743f
feat(fe:FSADT1-539):
MCatherine1994 Jan 18, 2023
000bcfe
fix(fe:FSADT1-539):
MCatherine1994 Jan 18, 2023
4e45328
feat(fe:FSADT1-539):
MCatherine1994 Jan 18, 2023
5a5185d
feat(fe:FSADT1-539):
MCatherine1994 Jan 18, 2023
c8c7302
feat(fe:FSADT1-539):
MCatherine1994 Jan 18, 2023
11c7050
test(fe:FSADT1-539):
MCatherine1994 Jan 19, 2023
96cc46b
clean(pl):
MCatherine1994 Jan 19, 2023
45a6e6d
Merge branch 'main' into feat/fe/validation-placeholder
mamartinezmejia Jan 19, 2023
d4a7c38
Merge branch 'main' into feat/fe/validation-placeholder
mamartinezmejia Jan 19, 2023
95a1fbc
feat(fe:FSADT1-539):
MCatherine1994 Jan 19, 2023
c7cc4ba
fix(pl):
MCatherine1994 Jan 19, 2023
77d0c02
Merge branch 'main' of https://github.com/bcgov/nr-forest-client into…
MCatherine1994 Jan 19, 2023
698650e
Merge branch 'feat/fe/validation-placeholder' of https://github.com/b…
MCatherine1994 Jan 19, 2023
96392a2
clean(fe:FSADT1-539):
MCatherine1994 Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/merge-main.yml
View file
Open in desktop
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
3 changes: 0 additions & 3 deletions .github/workflows/pr-open.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,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 Down
18 changes: 0 additions & 18 deletions backend/openshift.deploy.yml
View file
Open in desktop
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