From 28f06a5b729bfcabb22f688f93f93b2b3263b812 Mon Sep 17 00:00:00 2001 From: Peter Muriuki Date: Wed, 27 Nov 2024 14:41:33 +0300 Subject: [PATCH] Update web helm chart --- charts/opensrp-web/Chart.yaml | 4 ++-- charts/opensrp-web/README.md | 14 ++++++++++---- charts/opensrp-web/values.yaml | 17 ++++++++++------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/charts/opensrp-web/Chart.yaml b/charts/opensrp-web/Chart.yaml index f666416..5adb949 100644 --- a/charts/opensrp-web/Chart.yaml +++ b/charts/opensrp-web/Chart.yaml @@ -19,10 +19,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v2.3.9" +appVersion: "v3.2.2" diff --git a/charts/opensrp-web/README.md b/charts/opensrp-web/README.md index a2202b7..7fc9933 100644 --- a/charts/opensrp-web/README.md +++ b/charts/opensrp-web/README.md @@ -148,6 +148,10 @@ The following table lists the configurable parameters of the Opensrp-web chart a | `containerEnvironmentVariables.EXPRESS_REDIS_SENTINEL_CONFIG` | this env is only injected if .Values.express.redisSentinelConfig is defined. Not injected by default | | | `containerEnvironmentVariables.EXPRESS_CONTENT_SECURITY_POLICY_CONFIG`| | `"(.Values.express.csp \| toJson)"` | | `containerEnvironmentVariables.EXPRESS_OPENSRP_SCOPES` | | `"openid,profile"` | +| `containerEnvironmentVariables.NODE_ENV` | | `"production"` | +| `containerEnvironmentVariables.EXPRESS_TEMP_CSV_FILE_STORAGE` | | `"/tmp/csvUploads"` | +| `containerEnvironmentVariables.EXPRESS_PYTHON_INTERPRETER_PATH` | | `"/usr/local/bin/python"` | +| `containerEnvironmentVariables.EXPRESS_BULK_UPLOAD_REDIS_QUEUE` | | `null` | | `reactEnvironmentVariables.REACT_APP_DOMAIN_NAME` | | `"https://{{ .sharedVars.appDomainName }}"` | | `reactEnvironmentVariables.REACT_APP_EXPRESS_OAUTH_GET_STATE_URL` | | `"https://{{ .sharedVars.appDomainName }}/oauth/state"` | | `reactEnvironmentVariables.REACT_APP_EXPRESS_OAUTH_LOGOUT_URL` | | `"https://{{ .sharedVars.appDomainName }}/logout"` | @@ -165,16 +169,15 @@ The following table lists the configurable parameters of the Opensrp-web chart a | `reactEnvironmentVariables.REACT_APP_DISABLE_LOGIN_PROTECTION` | | `"false"` | | `reactEnvironmentVariables.REACT_APP_ENABLE_OPENSRP_OAUTH` | | `"true"` | | `reactEnvironmentVariables.REACT_APP_WEBSITE_NAME` | | `"opensrp-web"` | -| `reactEnvironmentVariables.REACT_APP_MAIN_LOGO_SRC` | | `"https://github.com/OpenSRP/web/raw/master/app/src/assets/images/opensrp-logo-color.png"` | +| `reactEnvironmentVariables.REACT_APP_MAIN_LOGO_SRC` | | `"https://raw.githubusercontent.com/onaio/fhir-web/{{ .Values.image.tag }}/app/src/assets/images/opensrp2-logo.png"` | | `reactEnvironmentVariables.REACT_APP_DATE_FORMAT` | | `"yyyy-mm-dd"` | | `reactEnvironmentVariables.REACT_APP_ENABLE_TEAMS_ASSIGNMENT_MODULE` | | `"false"` | | `reactEnvironmentVariables.SKIP_PREFLIGHT_CHECK` | | `"true"` | -| `reactEnvironmentVariables.REACT_APP_PROJECT_LANGUAGE_CODE` | | `"core"` | +| `reactEnvironmentVariables.REACT_APP_PROJECT_CODE` | | `"core"` | | `reactEnvironmentVariables.REACT_APP_LANGUAGE_CODE` | | `"en"` | -| `reactEnvironmentVariables.REACT_APP_SUPPORTED_LANGUAGES` | | `"en"` | +| `reactEnvironmentVariables.REACT_APP_SUPPORTED_LANGUAGES` | | `"en,fr"` | | `reactEnvironmentVariables.REACT_APP_ENABLE_LANGUAGE_SWITCHER` | | `"false"` | | `reactEnvironmentVariables.REACT_APP_ENABLE_FHIR_HEALTHCARE_SERVICES` | | `"false"` | -| `reactEnvironmentVariables.REACT_APP_ENABLE_USER_MANAGEMENT` | | `"false"` | | `reactEnvironmentVariables.REACT_APP_ENABLE_FHIR_USER_MANAGEMENT` | | `"false"` | | `reactEnvironmentVariables.REACT_APP_FHIR_PATIENT_BUNDLE_SIZE` | | `"1000"` | | `reactEnvironmentVariables.REACT_APP_DEFAULTS_TABLE_PAGE_SIZE` | | `"10"` | @@ -185,6 +188,9 @@ The following table lists the configurable parameters of the Opensrp-web chart a | `reactEnvironmentVariables.REACT_APP_OPENSRP_OAUTH_SCOPES` | | `"openid,profile"` | | `reactEnvironmentVariables.REACT_APP_ENABLE_FHIR_COMMODITY` | | `"false"` | | `reactEnvironmentVariables.REACT_APP_COMMODITIES_LIST_RESOURCE_ID` | | `""` | +| `reactEnvironmentVariables.REACT_APP_FHIR_INVENTORY_LIST_ID` | | `""` | +| `reactEnvironmentVariables.REACT_APP_PRACTITIONER_TO_ORG_ASSIGNMENT_STRATEGY` | | `"ONE_TO_MANY"` | +| `reactEnvironmentVariables.REACT_APP_COLLAPSED_LOGO_SRC` | | `"https://github.com/OpenSRP/web/raw/main/app/src/assets/images/opensrp2-logo-small.png"` | | `sharedVars.keycloakUrl` | | `""` | | `sharedVars.appDomainName` | | `""` | | `sharedVars.opensrpClientId` | | `""` | diff --git a/charts/opensrp-web/values.yaml b/charts/opensrp-web/values.yaml index 54ffeaf..9d84c6e 100644 --- a/charts/opensrp-web/values.yaml +++ b/charts/opensrp-web/values.yaml @@ -102,6 +102,9 @@ containerEnvironmentVariables: EXPRESS_CONTENT_SECURITY_POLICY_CONFIG: "{{ (tpl (.Values.express.cspHeaderConfig | toJson) .) }}" EXPRESS_OPENSRP_SCOPES: "openid,profile" NODE_ENV: "{{ .Values.express.nodeEnv }}" + EXPRESS_TEMP_CSV_FILE_STORAGE: "/tmp/csvUploads" + EXPRESS_PYTHON_INTERPRETER_PATH: "/usr/local/bin/python" + EXPRESS_BULK_UPLOAD_REDIS_QUEUE: null # The react app environment variables reactEnvironmentVariables: @@ -125,7 +128,7 @@ reactEnvironmentVariables: REACT_APP_KEYCLOAK_LOGOUT_URL: "https://{{ .Values.sharedVars.keycloakUrl }}/auth/realms/{{ .Values.sharedVars.keycloakRealm }}/protocol/openid-connect/logout" REACT_APP_KEYCLOAK_USERS_PAGE_SIZE: "20" REACT_APP_LANGUAGE_CODE: "en" - REACT_APP_MAIN_LOGO_SRC: "https://github.com/onaio/fhir-web/raw/{{ .Values.image.tag }}/app/src/assets/images/fhir-web-logo.png" + REACT_APP_MAIN_LOGO_SRC: "https://raw.githubusercontent.com/onaio/fhir-web/{{ .Values.image.tag }}/app/src/assets/images/opensrp2-logo.png" REACT_APP_OPENSRP_ACCESS_TOKEN_URL: "https://{{ .Values.sharedVars.keycloakUrl }}/auth/realms/{{ .Values.sharedVars.keycloakRealm }}/protocol/openid-connect/token" REACT_APP_OPENSRP_API_BASE_URL: "https://{{ .Values.sharedVars.opensrpServer }}/opensrp/rest/" REACT_APP_OPENSRP_API_V2_BASE_URL: "https://{{ .Values.sharedVars.opensrpServer }}/opensrp/rest/v2/" @@ -138,24 +141,24 @@ reactEnvironmentVariables: REACT_APP_OPENSRP_USER_URL: "{{ tpl .Values.sharedVars.userDetailsUrl . }}" REACT_APP_OPENSRP_WEB_VERSION: "{{ .Values.image.tag }}" REACT_APP_PAGINATION_SIZE: "1000" - REACT_APP_PROJECT_LANGUAGE_CODE: "core" - REACT_APP_SUPPORTED_LANGUAGES: "en" - REACT_APP_USER_FORM_HIDDEN_FIELDS: "" - REACT_APP_USER_FORM_RENDER_FIELDS: "" + REACT_APP_PROJECT_CODE: "core" + REACT_APP_SUPPORTED_LANGUAGES: "en,fr" REACT_APP_WEBSITE_NAME: "opensrp-web" SKIP_PREFLIGHT_CHECK: "true" GENERATE_SOURCEMAP: "false" INLINE_RUNTIME_CHUNK: "false" IMAGE_INLINE_SIZE_LIMIT: "0" REACT_APP_ENABLE_FHIR_HEALTHCARE_SERVICES: "false" - REACT_APP_ENABLE_USER_MANAGEMENT: "false" REACT_APP_ENABLE_FHIR_USER_MANAGEMENT: "false" REACT_APP_FHIR_PATIENT_BUNDLE_SIZE: "1000" REACT_APP_ENABLE_FHIR_LOCATIONS: "false" REACT_APP_FHIR_ROOT_LOCATION_ID: "" REACT_APP_ENABLE_FHIR_GROUP: "false" REACT_APP_ENABLE_FHIR_COMMODITY: "false" - REACT_APP_COMMODITIES_LIST_RESOURCE_ID: "" + REACT_APP_COMMODITIES_LIST_RESOURCE_ID: null + REACT_APP_FHIR_INVENTORY_LIST_ID: null + REACT_APP_PRACTITIONER_TO_ORG_ASSIGNMENT_STRATEGY: "ONE_TO_MANY" + REACT_APP_COLLAPSED_LOGO_SRC: "https://raw.githubusercontent.com/onaio/fhir-web/{{ .Values.image.tag }}/app/src/assets/images/opensrp2-logo-small.png" sharedVars: keycloakUrl: ""