Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -409,4 +409,5 @@ model_trainer/results
protected_configs/

./config.env
./constants.ini
./constants.ini
.qodo
2 changes: 2 additions & 0 deletions DSL/Resql/classifier/GET/empty.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- This is a empty sql for Buerokratt DSL delivery method
SELECT current_date;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file added DSL/Ruuter.private/class
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ check_for_cookie:
next: authenticate

authenticate:
template: check-user-authority
template: "[#CLASSIFIER_PROJECT_LAYER]/check-user-authority"
requestType: templates
headers:
cookie: ${incoming.headers.cookie}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ declaration:
method: post
accepts: json
returns: json
namespace: backoffice
namespace: classifier
allowlist:
headers:
- field: cookie
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ declaration:
method: get
accepts: json
returns: json
namespace: backoffice
namespace: classifier
allowlist:
headers:
- field: cookie
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ check_for_cookie:
next: authenticate

authenticate:
template: check-user-authority
template: "[#CLASSIFIER_PROJECT_LAYER]/check-user-authority"
requestType: templates
headers:
cookie: ${incoming.headers.cookie}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ check_for_cookie:
next: authenticate

authenticate:
template: check-user-authority-admin
template: "[#CLASSIFIER_PROJECT_LAYER]/check-user-authority-admin"
requestType: templates
headers:
cookie: ${incoming.headers.cookie}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ check_for_cookie:
next: authenticate

authenticate:
template: check-user-authority-admin
template: "[#CLASSIFIER_PROJECT_LAYER]/check-user-authority-admin"
requestType: templates
headers:
cookie: ${incoming.headers.cookie}
Expand Down
16 changes: 8 additions & 8 deletions GUI/src/utils/endpoints.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export const userManagementEndpoints = {
FETCH_USERS: (): string => `/accounts/users`,
ADD_USER: (): string => `/accounts/add`,
CHECK_ACCOUNT_AVAILABILITY: (): string => `/accounts/exists`,
EDIT_USER: (): string => `/accounts/edit`,
DELETE_USER: (): string => `/accounts/delete`,
FETCH_USER_ROLES: (): string => `/accounts/user-role`,
FETCH_USERS: (): string => `/classifier/accounts/users`,
ADD_USER: (): string => `/classifier/accounts/add`,
CHECK_ACCOUNT_AVAILABILITY: (): string => `/classifier/accounts/exists`,
EDIT_USER: (): string => `/classifier/accounts/edit`,
DELETE_USER: (): string => `/classifier/accounts/delete`,
FETCH_USER_ROLES: (): string => `/classifier/accounts/user-role`,
};

export const integrationsEndPoints = {
Expand Down Expand Up @@ -49,8 +49,8 @@ export const correctedTextEndpoints = {
};

export const authEndpoints = {
GET_EXTENDED_COOKIE: () :string => `/auth/jwt/extend`,
LOGOUT: (): string => `/accounts/logout`
GET_EXTENDED_COOKIE: () :string => `/classifier/auth/jwt/extend`,
LOGOUT: (): string => `/classifier/accounts/logout`
}

export const dataModelsEndpoints = {
Expand Down
2 changes: 1 addition & 1 deletion GUI/src/utils/queryKeys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const stopWordsQueryKeys = {
};

export const authQueryKeys = {
USER_DETAILS: () => ['auth/jwt/userinfo', 'prod'],
USER_DETAILS: () => ['classifier/auth/jwt/userinfo', 'prod'],
};

export const dataModelsQueryKeys = {
Expand Down
346 changes: 173 additions & 173 deletions GUI/translations/et/common.json

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions constants.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[DSL]

CLASSIFIER_RUUTER_PUBLIC=http://ruuter-public:8086
CLASSIFIER_RUUTER_PRIVATE=http://ruuter-private:8088
CLASSIFIER_RUUTER_PUBLIC_INTERNAL=http://localhost:8086
CLASSIFIER_DMAPPER=http://data-mapper:3000
CLASSIFIER_RESQL=http://resql:8082
CLASSIFIER_RUUTER_PUBLIC=http://ruuter-public:8086/classifier
CLASSIFIER_RUUTER_PRIVATE=http://ruuter-private:8088/classifier
CLASSIFIER_RUUTER_PUBLIC_INTERNAL=http://localhost:8086/classifier
CLASSIFIER_DMAPPER=http://data-mapper:3000/hbs/classifier
CLASSIFIER_RESQL=http://resql:8082/classifier
CLASSIFIER_PROJECT_LAYER=classifier
CLASSIFIER_TIM=http://tim:8085
CLASSIFIER_CRON_MANAGER=http://cron-manager:9010
CLASSIFIER_FILE_HANDLER=http://file-handler:8000
Expand All @@ -21,5 +22,5 @@ JIRA_WEBHOOK_SECRET=value
OUTLOOK_CLIENT_ID=value
OUTLOOK_SECRET_KEY=value
OUTLOOK_REFRESH_KEY=value
OUTLOOK_SCOPE=User.Read Mail.ReadWrite MailboxSettings.ReadWrite offline_access
DB_PASSWORD=value
OUTLOOK_SCOPE=value
DB_PASSWORD=value
47 changes: 24 additions & 23 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ services:
image: ruuter
environment:
- application.cors.allowedOrigins=http://localhost:8086,http://localhost:3001,http://localhost:3003,http://localhost:3004,http://localhost:8080,http://localhost:8000
- application.httpCodesAllowList=200,201,202,204,400,401,403,404,500
- application.internalRequests.allowedIPs=127.0.0.1,172.25.0.7,172.25.0.21,172.25.0.22
- application.httpCodesAllowList=200,201,202,204,400,401,403,500
- application.internalRequests.allowedIPs=127.0.0.1
- application.logging.displayRequestContent=true
- application.incomingRequests.allowedMethodTypes=POST,GET,PUT
- application.logging.displayResponseContent=true
- application.logging.printStackTrace=true
- application.internalRequests.disabled=true
- server.port=8086
volumes:
- ./DSL/Ruuter.public/DSL:/DSL
- ./DSL/Ruuter.public:/DSL
- ./constants.ini:/app/constants.ini
ports:
- 8086:8086
Expand All @@ -26,15 +27,15 @@ services:
image: ruuter
environment:
- application.cors.allowedOrigins=http://localhost:3001,http://localhost:8088,http://localhost:3002,http://localhost:3004,http://localhost:8000
- application.httpCodesAllowList=200,201,202,204,400,401,403,404,500
- application.httpCodesAllowList=200,201,202,400,401,403,500
- application.internalRequests.allowedIPs=127.0.0.1
- application.logging.displayRequestContent=true
- application.incomingRequests.allowedMethodTypes=POST,GET,PUT
- application.logging.displayResponseContent=true
- application.logging.printStackTrace=true
- application.internalRequests.disabled=true
- server.port=8088
volumes:
- ./DSL/Ruuter.private/DSL:/DSL
- ./DSL/Ruuter.private:/DSL
- ./constants.ini:/app/constants.ini
ports:
- 8088:8088
Expand All @@ -52,9 +53,9 @@ services:
- CONTENT_FOLDER=/data
volumes:
- ./DSL:/data
- ./DSL/DMapper/hbs:/workspace/app/views/classifier
- ./DSL/DMapper/js:/workspace/app/js/classifier
- ./DSL/DMapper/lib:/workspace/app/lib
- ./DSL/DMapper/classifier/hbs:/workspace/app/views/classifier
- ./DSL/DMapper/classifier/js:/workspace/app/js/classifier
# - ./DSL/DMapper/lib:/workspace/app/lib
ports:
- 3000:3000
networks:
Expand Down Expand Up @@ -139,7 +140,7 @@ services:
depends_on:
- users_db
environment:
- sqlms.datasources.[0].name=classifier
- sqlms.datasources.[0].name=byk
- sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://users_db:5432/classifier #For LocalDb Use
# sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5433/byk?sslmode=require
- sqlms.datasources.[0].username=postgres
Expand All @@ -148,7 +149,7 @@ services:
ports:
- 8082:8082
volumes:
- ./DSL/Resql:/workspace/app/templates/classifier
- ./DSL/Resql:/DSL
networks:
bykstack:
ipv4_address: 172.25.0.9
Expand Down Expand Up @@ -483,17 +484,17 @@ services:


# Uncomment below container if you wish to debug progress bar sessions in opensearch dashboard
opensearch-dashboards:
image: opensearchproject/opensearch-dashboards:2.11.1
container_name: opensearch-dashboards
environment:
- OPENSEARCH_HOSTS=http://opensearch-node:9200
- DISABLE_SECURITY_DASHBOARDS_PLUGIN=true
ports:
- 5601:5601
networks:
bykstack:
ipv4_address: 172.25.0.24
# opensearch-dashboards:
# image: opensearchproject/opensearch-dashboards:2.11.1
# container_name: opensearch-dashboards
# environment:
# - OPENSEARCH_HOSTS=http://opensearch-node:9200
# - DISABLE_SECURITY_DASHBOARDS_PLUGIN=true
# ports:
# - 5601:5601
# networks:
# bykstack:
# ipv4_address: 172.25.0.24



Expand Down
Loading