develop merge (#274)

.env-sample

@@ -19,14 +19,20 @@ [email protected]
 ## OPA
 OPA_URL=http://opa:8181/v1/data/wks/authz/allow
 
+## CASE PORTAL
+REACT_APP_KEYCLOAK_URL=http://localhost:8082
+REACT_APP_API_URL=http://localhost:8081
+REACT_APP_STORAGE_URL=http://localhost:8085
+
 ## CASE REST API
 WKS_CASE_API_URL=http://case-engine-rest-api:8081
 
 ## C7 EXTERNAL TASKS
 DISABLE_BACKOFF_STRATEGY=false
 
 ## MINIO
-MINIO_HOST=localhost
+MINIO_HOST_INTERNAL=minio
+MINIO_HOST_EXTERNAL=localhost
 MINIO_ROOT_USER=minio
 MINIO_ROOT_PASSWORD='#minio00#'
 

README.md

@@ -61,12 +61,13 @@ WKS Platform is designed as a multi-tenant solution, allowing multiple organizat
 
 ## Installation
 
-[https://www.wkspower.com/docs/instalation-guide/](https://www.wkspower.com/docs/Installation/)
+[https://www.wkspower.com/docs/instalation-guide/](https://doc.wkspower.com/docs/Installation/Option%201%20Pre-built%20Docker%20Images/)
 
 ## Diagrams 
 
 ### Architecture overview
-<img width="1507" alt="architecture-overview" src="https://github.com/wkspower/wks-platform/assets/85225281/fcd0718d-ea2a-4d05-91fa-8bcbbbb1a88b">
+<img width="840" alt="image" src="https://github.com/wkspower/wks-platform/assets/85225281/323e4811-2a44-4c23-9d38-1f99942dcae5">
+
 
 ### Case Definition structure
 <img width="1507" alt="case-definition-structure" src="https://github.com/wkspower/wks-platform/assets/85225281/d478345f-8192-4196-ae53-868151363cf1">

apps/java/services/storage-api/application.yml

@@ -19,7 +19,7 @@ keycloak.url: ${KEYCLOAK_URL:http://localhost:8082}
 
 # minio
 driver.storage.factoryclass: minio
-driver.storage.endpoint.url: ${MINIO_HOST:localhost}
+driver.storage.endpoint.url: ${MINIO_HOST_INTERNAL:localhost}
 driver.storage.endpoint.port: 9000
 driver.storage.endpoint.secure: false
 driver.storage.endpoint.signing.region: nyc3
@@ -28,7 +28,7 @@ driver.storage.accesskey: ${MINIO_ROOT_USER:minio}
 driver.storage.secretkey: ${MINIO_ROOT_PASSWORD:#minio00#}
 driver.storage.uploads.backend.protocol: http
 driver.storage.uploads.backend.port: 9000
-driver.storage.uploads.backend.url: ${MINIO_HOST:localhost}
+driver.storage.uploads.backend.url: ${MINIO_HOST_EXTERNAL:localhost}
 driver.storage.uploads.file.min.size:  1024
 driver.storage.uploads.file.max.size:  20000000
 

apps/react/docs/docs/02-Installation/02-Option 2 Local Development Setup/03-step-by-step-setup.mdx

@@ -36,9 +36,12 @@ Skip if you only intent to only use it on localhost
 - Copy settings from `/.env-sample` to `/.env` then updated the file to configure essential service URLs, Keycloak Realms, and operational flags:
     - `MONGO_DEMO_DATA_LOADER_DATABASE=subdomain`
     - `KEYCLOAK_TOKEN_URL=http://keycloak:8080/realms/subdomain/protocol/openid-connect/token`
+    - `REACT_APP_KEYCLOAK_URL=http://subdomain.domain.io:8082/`
+    - `REACT_APP_API_URL=http://subdomain.domain.io:8081/`
+    - `REACT_APP_STORAGE_URL=http://subdomain.domain.io:8085/`
     - `WEBSOCKET_ENABLED=true`
     - `WEBSOCKET_URL=ws://subdomain.domain.io:8484/`
-    - `MINIO_HOST=subdomain.domain.io`
+    - `MINIO_HOST_EXTERNAL=subdomain.domain.io`
     - Optional for novu notifications:
         - `NOVU_ENABLED=true`
         - `NOVU_PUBLISHER_API_URL=http://subdomain.domain.io:3002/`
@@ -55,11 +58,6 @@ Skip if you only intent to only use it on localhost
         - `MINIO_ROOT_USER=minio`
         - `MINIO_ROOT_PASSWORD='#minio00#'`
 
-- Update `docker-compose.portal.yaml:` to ensure front-end configuration aligns with backend services:
-    - `REACT_APP_KEYCLOAK_URL=http://subdomain.domain.io:8082/`
-    - `REACT_APP_API_URL=http://subdomain.domain.io:8081/`
-    - `REACT_APP_STORAGE_URL=http://subdomain.domain.io:8085/`
-
 ## Step 3: Deployment
 
 ### 🚀 Run Full Startup Shell Script
@@ -69,8 +67,5 @@ Skip if you only intent to only use it on localhost
 After successfully running the shell script to start all of the the Docker Compose configurations, it may take a while for all the web applications to finish their startup process.
 
 ## Step 4: Service Configuration
-:::note
-Skip if application domain havn't been customized
-:::
 
-Once the startup is complete, Manually replace wks-portal Keycloak Client's `Web origins` and `Valid redirect URIs` to match your domain.
+Once the startup is complete, Manually replace `wks-portal` Keycloak Client's `Web origins` and `Valid redirect URIs` to match your domain.

apps/react/docs/docusaurus.config.ts

@@ -5,7 +5,7 @@ import type * as Preset from "@docusaurus/preset-classic";
 const config: Config = {
   title: "WKS Platform",
   tagline: "Adaptive Case Management Platform",
-  url: "https://docs.wkspower.com",
+  url: "https://www.wkspower.com",
   baseUrl: "/",
   onBrokenLinks: "throw",
   onBrokenMarkdownLinks: "warn",

docker-compose.portal.yaml

@@ -6,9 +6,9 @@ services:
             context: apps/react/case-portal
             args:
                 GENERATE_SOURCEMAP: false
-                REACT_APP_KEYCLOAK_URL: http://localhost:8082
-                REACT_APP_API_URL: http://localhost:8081
-                REACT_APP_STORAGE_URL: http://localhost:8085
+                REACT_APP_KEYCLOAK_URL: ${REACT_APP_KEYCLOAK_URL}
+                REACT_APP_API_URL: ${REACT_APP_API_URL}
+                REACT_APP_STORAGE_URL: ${REACT_APP_STORAGE_URL}
                 REACT_APP_WEBSOCKETS_ENABLED: ${WEBSOCKET_ENABLED}
                 REACT_APP_WEBSOCKETS_URL: ${WEBSOCKET_URL}
                 REACT_APP_WEBSOCKETS_CASE_CREATED: ${KAFKA_TOPIC_CASE_CREATE}

docker-compose.yaml

@@ -70,7 +70,8 @@ services:
         environment:
             - OPA_URL=${OPA_URL}
             - KEYCLOAK_URL=${KEYCLOAK_URL}
-            - MINIO_HOST=${MINIO_HOST}
+            - MINIO_HOST_INTERNAL=${MINIO_HOST_INTERNAL}
+            - MINIO_HOST_EXTERNAL=${MINIO_HOST_EXTERNAL}
             - MINIO_ROOT_USER=${MINIO_ROOT_USER}
             - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}
         depends_on:

docker-servers-shutdown.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Run docker-compose with multiple files
-docker-compose -f docker-compose.yaml -f docker-compose.camunda7.yaml -f docker-compose.demo-data-loader.camunda7.yaml -f docker-compose.event-hub.yaml -f docker-compose.websocket.yaml -f docker-compose.novu.yaml -f docker-compose.email-sender.yaml down --remove-orphans -v "$@"
+docker-compose -f docker-compose.yaml -f docker-compose.camunda7.yaml -f docker-compose.demo-data-loader.camunda7.yaml -f docker-compose.event-hub.camunda7.yaml -f docker-compose.websocket.yaml -f docker-compose.novu.yaml -f docker-compose.email-sender.yaml down --remove-orphans -v "$@"

docker-servers-startup.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Run docker-compose with multiple files
-docker-compose -f docker-compose.yaml -f docker-compose.camunda7.yaml -f docker-compose.demo-data-loader.camunda7.yaml -f docker-compose.event-hub.yaml -f docker-compose.websocket.yaml -f docker-compose.novu.yaml -f docker-compose.email-sender.yaml up -d --build "$@"
+docker-compose -f docker-compose.yaml -f docker-compose.camunda7.yaml -f docker-compose.demo-data-loader.camunda7.yaml -f docker-compose.event-hub.camunda7.yaml -f docker-compose.websocket.yaml -f docker-compose.novu.yaml -f docker-compose.email-sender.yaml up -d --build "$@"