Skip to content

Commit

Permalink
Merge pull request #75 from gabrielmscampos/fix/react-ace-worker-java…
Browse files Browse the repository at this point in the history
…scipt-and-missing-env-var

fix: add missing dummy variables to setup-django-production script + OC secrets template and tweak AceEditor to ignore worker
  • Loading branch information
gabrielmscampos authored Aug 21, 2024
2 parents 71f8061 + 92f1644 commit 84495b4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 2 additions & 0 deletions backend/scripts/setup-django-production.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@ export "DJANGO_KEYCLOAK_API_CLIENTS={}"
export "DJANGO_REDIS_URL=dummy"
export "DJANGO_OMS_SSO_CLIENT_ID=dummy"
export "DJANGO_OMS_SSO_CLIENT_SECRET=dummy"
export "DJANGO_KEYTAB_USR=dummy"
export "DJANGO_KEYTAB_PWD=dummy"

python manage.py collectstatic --noinput
12 changes: 10 additions & 2 deletions frontend/src/views/machineLearning/jsonPortal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,7 @@ const JsonPortal = () => {
) {
if (activeModels.length === 0) {
setMLGoldenJson({})
}
else {
} else {
fetchMLJson(brilRuns)
}
}
Expand Down Expand Up @@ -314,6 +313,9 @@ const JsonPortal = () => {
fontSize={15}
wrapEnabled={true}
value={JSON.stringify(goldenJson.content)}
setOptions={{
useWorker: false
}}
/>
)}
</div>
Expand Down Expand Up @@ -351,6 +353,9 @@ const JsonPortal = () => {
fontSize={15}
wrapEnabled={true}
value={JSON.stringify(dcsJson.content)}
setOptions={{
useWorker: false
}}
/>
)}
</div>
Expand Down Expand Up @@ -416,6 +421,9 @@ const JsonPortal = () => {
fontSize={15}
wrapEnabled={true}
value={JSON.stringify(mlGoldenJson)}
setOptions={{
useWorker: false
}}
/>
)}
</div>
Expand Down
4 changes: 4 additions & 0 deletions oc/prod/secrets/backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ data:
DJANGO_KEYCLOAK_CONFIDENTIAL_CLIENT_ID:
DJANGO_KEYCLOAK_CONFIDENTIAL_SECRET_KEY:
DJANGO_KEYCLOAK_API_CLIENTS:
DJANGO_OMS_SSO_CLIENT_ID:
DJANGO_OMS_SSO_CLIENT_SECRET:
DJANGO_KEYTAB_PWD:
DJANGO_KEYTAB_USR:

0 comments on commit 84495b4

Please sign in to comment.