diff --git a/fhir-ig-importer/importer/docker-compose.config.yml b/fhir-ig-importer/importer/docker-compose.config.yml index 0d11921a..3447da3b 100644 --- a/fhir-ig-importer/importer/docker-compose.config.yml +++ b/fhir-ig-importer/importer/docker-compose.config.yml @@ -12,6 +12,7 @@ services: OPENHIM_API_PASSWORD: ${OPENHIM_PASSWORD} # Reject unauthorised is only needed if the OpenHIM's SSL is not setup NODE_TLS_REJECT_UNAUTHORIZED: 0 + OPENHIM_CONSOLE_BASE_URL: ${OPENHIM_CONSOLE_BASE_URL} command: sh -c "node openhimConfig.js" configs: - source: fhir-ig-importer-config-importer-openhimConfig.js diff --git a/fhir-ig-importer/importer/volume/ig-importer-app.json b/fhir-ig-importer/importer/volume/ig-importer-app.json index 4517c9b8..b4336fba 100644 --- a/fhir-ig-importer/importer/volume/ig-importer-app.json +++ b/fhir-ig-importer/importer/volume/ig-importer-app.json @@ -3,7 +3,7 @@ "description": "FHIR IG microfrontend app", "category": "HIE Configuration", "type": "esmodule", - "url": "https://openhimconsole./fhir-ig-importer", + "url": "/fhir-ig-importer", "showInPortal": true, "showInSideBar": true, "access_roles": ["admin"], diff --git a/fhir-ig-importer/importer/volume/openhimConfig.js b/fhir-ig-importer/importer/volume/openhimConfig.js index cae7a270..4a9b2ceb 100644 --- a/fhir-ig-importer/importer/volume/openhimConfig.js +++ b/fhir-ig-importer/importer/volume/openhimConfig.js @@ -43,6 +43,18 @@ const appJsonData = JSON.parse( fs.readFileSync(path.resolve(__dirname, "ig-importer-app.json")) ); +//Substitute the url with environ variable + +let url = appJsonData.url; +if (!process.env.OPENHIM_CONSOLE_BASE_URL) { + throw new Error("Environment variable OPENHIM_CONSOLE_BASE_URL is not set"); +} +let newUrl = url.replace( + "", + process.env.OPENHIM_CONSOLE_BASE_URL +); + +appJsonData.url = newUrl; const data = JSON.stringify(jsonData); const appData = JSON.stringify(appJsonData); diff --git a/fhir-ig-importer/package-metadata.json b/fhir-ig-importer/package-metadata.json index 4fb9e408..bed49d43 100644 --- a/fhir-ig-importer/package-metadata.json +++ b/fhir-ig-importer/package-metadata.json @@ -16,6 +16,7 @@ "FHIR_IG_IMPORTER_CORE_URL": "http://0.0.0.0:3001/fhir/ig/v1.0", "FHIR_IG_IMPORTER_UI_VERSION": "latest", "FHIR_IG_IMPORTER_CORE_VERSION": "latest", + "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000", "OPENHIM_API_USERNAME": "root@openhim.org", "OPENHIM_API_PASSWORD": "instant101" } diff --git a/kafka-mapper-consumer/consumer-ui-app.json b/kafka-mapper-consumer/consumer-ui-app.json index b6ac02d7..42d47345 100644 --- a/kafka-mapper-consumer/consumer-ui-app.json +++ b/kafka-mapper-consumer/consumer-ui-app.json @@ -3,7 +3,7 @@ "description": "Kafka mapper consumer microfrontends app", "category": "HIE Configuration", "type": "esmodule", - "url": "http://localhost:8091/jembi-kafka-mapper-consumer-ui.js", + "url": "/kafka-mapper-consumer-ui", "showInPortal": true, "showInSideBar": false, "access_roles": ["admin"], diff --git a/kafka-mapper-consumer/docker-compose.config.yml b/kafka-mapper-consumer/docker-compose.config.yml index 2e1b4db5..dd13d684 100644 --- a/kafka-mapper-consumer/docker-compose.config.yml +++ b/kafka-mapper-consumer/docker-compose.config.yml @@ -12,6 +12,7 @@ services: OPENHIM_API_PASSWORD: ${OPENHIM_PASSWORD} # Reject unauthorised is only needed if the OpenHIM's SSL is not setup NODE_TLS_REJECT_UNAUTHORIZED: 0 + OPENHIM_CONSOLE_BASE_URL: ${OPENHIM_CONSOLE_BASE_URL} command: sh -c "node openhimConfig.js" configs: - source: kafka-mapper-consumer-openhimConfig.js diff --git a/kafka-mapper-consumer/openhimConfig.js b/kafka-mapper-consumer/openhimConfig.js index a7868cde..c56379df 100644 --- a/kafka-mapper-consumer/openhimConfig.js +++ b/kafka-mapper-consumer/openhimConfig.js @@ -37,6 +37,20 @@ function makeRequest(options, data) { const appJsonData = JSON.parse( fs.readFileSync(path.resolve(__dirname, "consumer-ui-app.json")) ); +//Substitute the url with environ variable + +let url = appJsonData.url; + +if (!process.env.OPENHIM_CONSOLE_BASE_URL) { + throw new Error("Environment variable OPENHIM_CONSOLE_BASE_URL is not set"); +} + +let newUrl = url.replace( + "", + process.env.OPENHIM_CONSOLE_BASE_URL +); + +appJsonData.url = newUrl; const appData = JSON.stringify(appJsonData); const options = { diff --git a/kafka-mapper-consumer/package-metadata.json b/kafka-mapper-consumer/package-metadata.json index 0c0b17a9..9fa23ea9 100644 --- a/kafka-mapper-consumer/package-metadata.json +++ b/kafka-mapper-consumer/package-metadata.json @@ -17,7 +17,8 @@ "REGISTER_MEDIATOR": "true", "CLICKHOUSE_HOST": "analytics-datastore-clickhouse", "CLICKHOUSE_PORT": "8123", - "KAFKA_CONSUMER_MAPPER_MEDIATOR_VERSION": "jembi/kafka-mapper-consumer:v0.0.1", - "KAFKA_CONSUMER_MAPPER_UI_VERSION": "jembi/kafka-mapper-consumer-ui:v0.0.1" + "KAFKA_CONSUMER_MAPPER_MEDIATOR_VERSION": "jembi/kafka-mapper-consumer:latest", + "KAFKA_CONSUMER_MAPPER_UI_VERSION": "jembi/kafka-mapper-consumer-ui:latest", + "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000" } } diff --git a/reprocess-mediator/docker-compose.config.yml b/reprocess-mediator/docker-compose.config.yml index 1135b51e..6ed5fbb8 100644 --- a/reprocess-mediator/docker-compose.config.yml +++ b/reprocess-mediator/docker-compose.config.yml @@ -12,6 +12,7 @@ services: OPENHIM_API_PASSWORD: ${OPENHIM_PASSWORD} # Reject unauthorised is only needed if the OpenHIM's SSL is not setup NODE_TLS_REJECT_UNAUTHORIZED: 0 + OPENHIM_CONSOLE_BASE_URL: ${OPENHIM_CONSOLE_BASE_URL} command: sh -c "node openhimConfig.js" configs: - source: reprocess-openhimConfig.js diff --git a/reprocess-mediator/openhimConfig.js b/reprocess-mediator/openhimConfig.js index e5268dd9..d645c501 100644 --- a/reprocess-mediator/openhimConfig.js +++ b/reprocess-mediator/openhimConfig.js @@ -37,6 +37,19 @@ function makeRequest(options, data) { const appJsonData = JSON.parse( fs.readFileSync(path.resolve(__dirname, "reprocess-ui-app.json")) ); +//Substitute the url with environ variable + +let url = appJsonData.url; + +if (!process.env.OPENHIM_CONSOLE_BASE_URL) { + throw new Error("Environment variable OPENHIM_CONSOLE_BASE_URL is not set"); +} +let newUrl = url.replace( + "", + process.env.OPENHIM_CONSOLE_BASE_URL +); + +appJsonData.url = newUrl; const appData = JSON.stringify(appJsonData); const options = { diff --git a/reprocess-mediator/package-metadata.json b/reprocess-mediator/package-metadata.json index fa8c999d..049d2e32 100644 --- a/reprocess-mediator/package-metadata.json +++ b/reprocess-mediator/package-metadata.json @@ -12,10 +12,10 @@ "OPENHIM_PASSWORD": "instant101", "REGISTER_MEDIATOR": "true", "REPROCESSOR_API_BASE_URL": "http://reprocess-mediator:3000", - "REPROCESS_MEDIATOR_VERSION": "jembi/reprocess-mediator:v0.1.0", - "REPROCESS_MEDIATOR_UI_VERSION": "jembi/reprocess-mediator-ui:v0.1.0", + "REPROCESS_MEDIATOR_VERSION": "jembi/reprocess-mediator:latest", + "REPROCESS_MEDIATOR_UI_VERSION": "jembi/reprocess-mediator-ui:latest", "MONGODB_CONNECTION_STRING": "mongodb://mongo-1:27017/openhim", - "MONGODB_DIRECT_CONNECTION": false - + "MONGODB_DIRECT_CONNECTION": false, + "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000" } } diff --git a/reprocess-mediator/reprocess-ui-app.json b/reprocess-mediator/reprocess-ui-app.json index 840b037b..f89da247 100644 --- a/reprocess-mediator/reprocess-ui-app.json +++ b/reprocess-mediator/reprocess-ui-app.json @@ -3,7 +3,7 @@ "description": "Reprocess microfrontends app", "category": "HIE Configuration", "type": "esmodule", - "url": "http://localhost:3030/jembi-reprocessor-mediator-microfrontend.js", + "url": "/reprocess-mediator-ui", "showInPortal": true, "showInSideBar": false, "access_roles": ["admin"],