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

chore: fixing cors issue #473

Merged
merged 9 commits into from
Nov 18, 2024
Merged

chore: fixing cors issue #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
95f0962
chore: fixing cors issue
paulushcgcj Nov 18, 2024
4c15c06
fix: fixing wrong param passed
paulushcgcj Nov 18, 2024
f7cb2c7
fix: fixing wrong parameter
paulushcgcj Nov 18, 2024
44f292f
fix: making ALLOWED_ORIGINS required without a default value
paulushcgcj Nov 18, 2024
98b4ba0
chore: forcing new build
paulushcgcj Nov 18, 2024
efaf6ca
chore: forcing new build
paulushcgcj Nov 18, 2024
0507b37
Merge branch 'main' into fix/cors
paulushcgcj Nov 18, 2024
4bbce49
env.domain
DerekRoberts Nov 18, 2024
66adb59
env.domain
DerekRoberts Nov 18, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
-p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
-p DASHBOARD_JOB_IDIR_USERS=${{ vars.DASHBOARD_JOB_IDIR_USERS }}
-p WMS_LAYERS_WHITELIST_USERS=${{ vars.WMS_LAYERS_WHITELIST_USERS }}
-p ALLOWED_ORIGINS=https://silva-test.nrs.gov.bc.ca/
- name: frontend
file: frontend/openshift.deploy.yml
overwrite: true
Expand Down Expand Up @@ -153,6 +154,7 @@ jobs:
-p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
-p DASHBOARD_JOB_IDIR_USERS=${{ vars.DASHBOARD_JOB_IDIR_USERS }}
-p WMS_LAYERS_WHITELIST_USERS=${{ vars.WMS_LAYERS_WHITELIST_USERS }}
-p ALLOWED_ORIGINS=https://silva.nrs.gov.bc.ca/
- name: frontend
file: frontend/openshift.deploy.yml
overwrite: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-open.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ jobs:
-p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
-p DASHBOARD_JOB_IDIR_USERS=${{ vars.DASHBOARD_JOB_IDIR_USERS }}
-p WMS_LAYERS_WHITELIST_USERS=${{ vars.WMS_LAYERS_WHITELIST_USERS }}
-p ALLOWED_ORIGINS=https://${{ github.event.repository.name }}-${{ needs.init.outputs.route }}-frontend.apps.silver.devops.gov.bc.ca
- name: frontend
file: frontend/openshift.deploy.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ our [CONTRIBUTING](CONTRIBUTING.md) guide.

As mentioned, we're here to help. Feel free to reach out and
start a conversation on Rocket chat, you can search for
`@jazz.grewal` or `@ricardo.campos`.
`@jazz.grewal` or `@paulushcgcj`.
2 changes: 1 addition & 1 deletion backend/openshift.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ parameters:
required: true
- name: ALLOWED_ORIGINS
description: Sets all the allowed request origins
value: "http://localhost:300*,https://*.apps.silver.devops.gov.bc.ca"
required: true
- name: WMS_LAYERS_WHITELIST_USERS
description: List of users that can see active layers on the map view
required: true
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/FriendlyDate/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const FriendlyDate: React.FC<FriendlyDateProps> = ({ date }) => {
const formattedDate = isFuture(parsedDate)
? formatFutureDateAtlassianStyle(parsedDate)
: formatDateAtlassianStyle(parsedDate);

return (
<>
{(cleanDate === formattedDate) ? (<span>{formattedDate}</span>) : (
Expand Down
Loading