merging dev to test

DSL/Resql/users/POST/get-user-domains.sql

@@ -0,0 +1,7 @@
+SELECT DISTINCT ON (user_login)
+    user_login,
+    domain_id AS domains,
+    selected_domains as selected
+FROM user_widget_domains
+WHERE user_login = :user_login
+ORDER BY user_login, created DESC

DSL/Resql/users/POST/get-widget-domains.sql

@@ -0,0 +1,17 @@
+SELECT name,
+       url,
+       domain_id,
+       active
+FROM (
+         SELECT DISTINCT ON (domain_id)
+             name,
+             url,
+             domain_id,
+             active
+         FROM widget_domains
+         ORDER BY
+             domain_id,
+             created DESC,
+             id DESC
+     ) AS latest_per_domain
+WHERE active = TRUE;

DSL/Ruuter/services/GET/accounts/widget-data.yml

@@ -0,0 +1,49 @@
+declaration:
+  call: declare
+  version: 0.1
+  description: "Decription placeholder for 'WIDGET-DATA'"
+  method: get
+  accepts: json
+  returns: json
+  namespace: backoffice
+  allowlist:
+    params:
+      - field: user_id
+        type: string
+        description: "Body field 'user_id'"
+
+checkV:
+  log: ${incoming.params}
+
+extractRequestData:
+  assign:
+    user_id: ${incoming.params.user_id}
+
+getDomains:
+  call: http.post
+  args:
+    url: "[#SERVICE_USERS_RESQL]/get-widget-domains"
+  result: domains
+
+getUserDomains:
+  call: http.post
+  args:
+    url: "[#SERVICE_USERS_RESQL]/get-user-domains"
+    body:
+      user_login: ${user_id}
+  result: user_domains
+
+mapDomainsData:
+  call: http.post
+  args:
+    url: "[#SERVICE_DMAPPER]/utils/map-domains-data"
+    body:
+      domains: ${domains.response.body}
+      userDomains: ${user_domains.response.body[0]}
+  result: mappedDomains
+
+returnSuccess:
+  return: ${mappedDomains.response.body}
+  wrapper: false
+  next: end
+

GUI/.env.development

@@ -31,5 +31,6 @@ REACT_APP_PROJECT_LAYER=services
 REACT_APP_VALIDATIONS_ENABLED=FALSE
 REACT_APP_INTENT_CREATION_PATH=http://localhost:3001/training/training/intents
 REACT_APP_MULTI_CHOICE_QUESTION_MAX_BUTTONS=4
+REACT_APP_ENABLE_MULTI_DOMAIN=FALSE
 REACT_APP_CURRENT_VERSION=Version 1.0.0
 REACT_APP_MENU_JSON=[{"id":"conversations","label":{"et":"Vestlused","en":"Conversations"},"path":"/chat","children":[{"label":{"et":"Vastamata","en":"Unanswered"},"path":"/unanswered"},{"label":{"et":"Aktiivsed","en":"Active"},"path":"/active"},{"label":{"et":"Ootel","en":"Pending"},"path":"/pending"},{"label":{"et":"Ajalugu","en":"History"},"path":"/history"}]},{"id":"training","label":{"et":"Treening","en":"Training"},"path":"/training","children":[{"label":{"et":"Treening","en":"Training"},"path":"/training","children":[{"label":{"et":"Teemad","en":"Themes"},"path":"/training/intents"},{"label":{"et":"Avalikud teemad","en":"Public themes"},"path":"/training/common-intents"},{"label":{"et":"Teemade järeltreenimine","en":"Post training themes"},"path":"/training/intents-followup-training"},{"label":{"et":"Vastused","en":"Answers"},"path":"/training/responses"},{"label":{"et":"Reeglid","en":"Rules"},"path":"/training/rules"},{"label":{"et":"Konfiguratsioon","en":"Configuration"},"path":"/training/configuration"},{"label":{"et":"Vormid","en":"Forms"},"path":"/training/forms"},{"label":{"et":"Mälukohad","en":"Slots"},"path":"/training/slots"}]},{"label":{"et":"Ajaloolised vestlused","en":"Historical conversations"},"path":"/history","children":[{"label":{"et":"Ajalugu","en":"History"},"path":"/history/history"},{"label":{"et":"Pöördumised","en":"Appeals"},"path":"/history/appeal"}]},{"label":{"et":"Mudelipank ja analüütika","en":"Modelbank and analytics"},"path":"/analytics","children":[{"label":{"et":"Teemade ülevaade","en":"Overview of topics"},"path":"/analytics/overview"},{"label":{"et":"Mudelite võrdlus","en":"Comparison of models"},"path":"/analytics/models"},{"label":{"et":"Testlood","en":"testTracks"},"path":"/analytics/testcases"}]},{"label":{"et":"Treeni uus mudel","en":"Train new model"},"path":"/train-new-model"}]},{"id":"analytics","label":{"et":"Analüütika","en":"Analytics"},"path":"/analytics","children":[{"label":{"et":"Ülevaade","en":"Overview"},"path":"/overview"},{"label":{"et":"Vestlused","en":"Chats"},"path":"/chats"},{"label":{"et":"Tagasiside","en":"Feedback"},"path":"/feedback"},{"label":{"et":"Nõustajad","en":"Advisors"},"path":"/advisors"},{"label":{"et":"Avaandmed","en":"Reports"},"path":"/reports"}]},{"id":"services","label":{"et":"Teenused","en":"Services"},"path":"/services","children":[{"label":{"et":"Ülevaade","en":"Overview"},"path":"/overview"},{"label":{"et":"Uus teenus","en":"New Service"},"path":"/newService"},{"label":{"et":"API varamu","en":"API Registry"},"path":"/api-registry"},{"label":{"et":"Probleemsed teenused","en":"Faulty Services"},"path":"/faultyServices"}]},{"id":"settings","label":{"et":"Haldus","en":"Administration"},"path":"/settings","children":[{"label":{"et":"Kasutajad","en":"Users"},"path":"/users"},{"label":{"et":"Vestlusbot","en":"Chatbot"},"path":"/chatbot","children":[{"label":{"et":"Seaded","en":"Settings"},"path":"/chatbot/settings"},{"label":{"et":"Tervitussõnum","en":"Welcome message"},"path":"/chatbot/welcome-message"},{"label":{"et":"Välimus ja käitumine","en":"Appearance and behavior"},"path":"/chatbot/appearance"},{"label":{"et":"Erakorralised teated","en":"Emergency notices"},"path":"/chatbot/emergency-notices"},{"label":{"et":"Anonümiseerija","en":"Anonymizer"},"path":"/anonymizer"}]},{"label":{"et":"Asutuse tööaeg","en":"Office opening hours"},"path":"/working-time"},{"label":{"et":"Sessiooni pikkus","en":"Session length"},"path":"/session-length"}]},{"id":"monitoring","label":{"et":"Seire","en":"Monitoring"},"path":"/monitoring","children":[{"label":{"et":"Aktiivaeg","en":"Working hours"},"path":"/uptime"}]}]