Skip to content

Commit

Permalink
Merge pull request #312 from jembi/CU-86byxfvwm_IG-Importer-doesnt-load
Browse files Browse the repository at this point in the history
IG Importer doesn't load
  • Loading branch information
drizzentic authored Jul 4, 2024
2 parents 674e4a5 + 94c734b commit e3267d6
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 28 deletions.
66 changes: 42 additions & 24 deletions .env.remote
Original file line number Diff line number Diff line change
@@ -1,33 +1,51 @@
# Test environment vars for remote deployment - change the values below to point to your deployed instances
# General

CLUSTERED_MODE=true
CLUSTERED_MODE=false

OPENHIM_CORE_SERVICE_NAME=<openhim_hostname>
OPENHIM_TRANSACTION_API_PORT=<port>
OPENHIM_MEDIATOR_API_PORT=<OPENHIM_MEDIATOR_API_PORT>
MOCK_SERVER_HOST=<mock_service_hostname>
MOCK_SERVER_PORT=<port>
# Log

# Analytics Datastore - Elastic Search
ES_HOSTS="\"analytics-datastore-elastic-search-01:9200","analytics-datastore-elastic-search-02:9200","analytics-datastore-elastic-search-03:9200\""
DEBUG=0
BASHLOG_FILE=0
BASHLOG_FILE_PATH=platform.log

# Analytics Datastore - Clickhouse
CLICKHOUSE_HOST=analytics-datastore-clickhouse-01
# Data Mapper - Logstash

# FHIR Datastore - HAPI FHIR
HAPI_FHIR_INSTANCES=3
HF_MAX_POOL_SIZE=30
REPMGR_PARTNER_NODES=postgres-1,postgres-2,postgres-3
POSTGRES_REPLICA_SET=postgres-1:5432,postgres-2:5432,postgres-3:5432
HAPI_DB_SET=postgres-1:5432,postgres-2:5432,postgres-3:5432
LOGSTASH_DEV_MOUNT=false
LOGSTASH_PACKAGE_PATH=

# Interoperability Layer - OpenHIM
MONGO_SET_COUNT=3
OPENHIM_MONGO_URL=mongodb://mongo-1:27017,mongo-2:27017,mongo-3:27017/openhim?replicaSet=mongo-set
OPENHIM_MONGO_ATNAURL=mongodb://mongo-1:27017,mongo-2:27017,mongo-3:27017/openhim?replicaSet=mongo-set
# Dashboard Visualiser - JS Report

## !NOTE: MAKE SURE YOU HAVE RUN 'set-permissions.sh' SCRIPT BEFORE AND AFTER RUNNING JS REPORT
JS_REPORT_DEV_MOUNT=false
JS_REPORT_PACKAGE_PATH=

# Message Bus - Kafka
# Topics should comma seperated, optional include partion and repliction values
# e.g. <topic>:<partions>:<replicationFactor> -> test:3:2 (defaults to <topics>:3:1)
KAFKA_TOPICS=2xx,reprocess,3xx,metrics:3:1

# !NOTE: Topics should comma seperated, optional include partion and repliction values
# e.g. <topic>:<partions>:<replicationFactor> -> test:3:2 (defaults to <topics>:3:1)
# KAFKA_TOPICS=2xx,reprocess,3xx,metrics:3:1
KAFKA_TOPICS=2xx,2xx-async,reprocess,3xx,metrics:3:3,patient,observation

OPENHIM_CORE_MEDIATOR_HOSTNAME=openhimcomms.<domain>
OPENHIM_MEDIATOR_API_PORT=443

# Reverse Proxy - Nginx
REVERSE_PROXY_INSTANCES=1
DOMAIN_NAME=<domain>
SUBDOMAINS=openhimcomms.<domain>,openhimcore.<domain>,openhimconsole.<domain>,kibana.<domain>,reports.<domain>,santewww.<domain>,santempi.<domain>,superset.<domain>,keycloak.<domain>,grafana.<domain>,minio.<domain>,jempi-web.<domain>,jempi-api.<domain>
STAGING=false
INSECURE=false

# Identity Access Manager - Keycloak
KC_FRONTEND_URL=https://keycloak.<domain>
KC_GRAFANA_ROOT_URL=https://grafana.<domain>
KC_JEMPI_ROOT_URL=https://jempi-web.<domain>
KC_SUPERSET_ROOT_URL=https://superset.<domain>
KC_OPENHIM_ROOT_URL=https://openhimconsole.<domain>
GF_SERVER_DOMAIN=grafana.<domain>

REACT_APP_JEMPI_BASE_API_HOST=https://jempi-api.<domain>
REACT_APP_JEMPI_BASE_API_PORT=443
OPENHIM_CONSOLE_BASE_URL=https://openhimconsole.<domain>
OPENHIM_API_HOST=https://openhimcore.<domain>
OPENHIM_API_PORT=443
2 changes: 1 addition & 1 deletion fhir-ig-importer/importer/volume/ig-importer-app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "FHIR IG microfrontend app",
"category": "HIE Configuration",
"type": "esmodule",
"url": "http://localhost:3334/jembi-fhir-ig-importer.js",
"url": "https://openhimconsole.<domain>/fhir-ig-importer",
"showInPortal": true,
"showInSideBar": true,
"access_roles": ["admin"],
Expand Down
4 changes: 2 additions & 2 deletions fhir-ig-importer/package-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"FHIR_IG_IMPORTER_CORE_PORT": 3001,
"FHIR_IG_IMPORTER_CORE_HOST": "0.0.0.0",
"FHIR_IG_IMPORTER_CORE_URL": "http://0.0.0.0:3001/fhir/ig/v1.0",
"FHIR_IG_IMPORTER_UI_VERSION": "v1.0.0",
"FHIR_IG_IMPORTER_CORE_VERSION": "v1.0.0"
"FHIR_IG_IMPORTER_UI_VERSION": "latest",
"FHIR_IG_IMPORTER_CORE_VERSION": "latest"
}
}
2 changes: 2 additions & 0 deletions interoperability-layer-openhim/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ services:
KC_FRONTEND_URL: ${KC_FRONTEND_URL}
OPENHIM_CONSOLE_SHOW_LOGIN: ${OPENHIM_CONSOLE_SHOW_LOGIN}
REACT_APP_OPENHIM_API_BASE_URL: ${OPENHIM_API_BASE_URL}
OPENHIM_API_HOST: ${OPENHIM_API_HOST}
OPENHIM_API_PORT: ${OPENHIM_API_PORT}
NODE_TLS_REJECT_UNAUTHORIZED: 0
networks:
reverse-proxy:
Expand Down
4 changes: 3 additions & 1 deletion interoperability-layer-openhim/package-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
"KC_OPENHIM_CLIENT_SECRET": "tZKfEbWf0Ka5HBNZwFrdSyQH2xT1sNMR",
"KC_OPENHIM_ROOT_URL": "http://localhost:9000",
"KC_API_URL": "http://identity-access-manager-keycloak:8080",
"OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000"
"OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000",
"OPENHIM_API_HOST": "localhost",
"OPENHIM_API_PORT": "5001"
}
}

0 comments on commit e3267d6

Please sign in to comment.