From 8feccfed28259ae2fe22e18b07609ced73fa34e1 Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 13:22:19 +0300 Subject: [PATCH 1/9] chore(987): Modified translations and dark mode node selections --- .../components/FlowElementsPopup/index.tsx | 2 +- GUI/src/components/Toast/Toast.scss | 2 +- GUI/src/i18n/en/common.json | 12 ++--- GUI/src/i18n/et/common.json | 12 ++--- GUI/src/pages/ServiceFlowPage.scss | 48 ++++++++++++++----- 5 files changed, 49 insertions(+), 27 deletions(-) diff --git a/GUI/src/components/FlowElementsPopup/index.tsx b/GUI/src/components/FlowElementsPopup/index.tsx index 2c98dbcbe..6ccfba1d5 100644 --- a/GUI/src/components/FlowElementsPopup/index.tsx +++ b/GUI/src/components/FlowElementsPopup/index.tsx @@ -450,7 +450,7 @@ const FlowElementsPopup: React.FC = () => { {t('serviceFlow.tabs.setup')} - {!isReadonly && ( + {!isReadonly && (stepType === StepType.Textfield || stepType === StepType.OpenWebpage) && ( {t('serviceFlow.tabs.test')} diff --git a/GUI/src/components/Toast/Toast.scss b/GUI/src/components/Toast/Toast.scss index f39d9ac75..c168a7b1d 100644 --- a/GUI/src/components/Toast/Toast.scss +++ b/GUI/src/components/Toast/Toast.scss @@ -80,7 +80,7 @@ color: var(--dark-text-secondary); } - &__list { + &__list:not(:empty) { background-color: var(--dark-bg-extra-light); } diff --git a/GUI/src/i18n/en/common.json b/GUI/src/i18n/en/common.json index 406b9d6cd..a176f74a6 100644 --- a/GUI/src/i18n/en/common.json +++ b/GUI/src/i18n/en/common.json @@ -151,13 +151,13 @@ "edit": "Edit", "delete": "Delete", "cancel": "Cancel", - "importMany": "Import many", + "importMany": "Import", "import": { "importSuccess": "{{count}} service{{lengthCheck}} imported successfully", "importFailure": "Could not import the following files (Wrong format or corrupted): {{files}}", "failedToImport": "Failed to import services" }, - "exportMany": "Export many", + "exportMany": "Export", "exportAll": "Export All", "export": "Export", "exportAllConfirmation": "Are you sure you want to export all services?", @@ -247,7 +247,7 @@ "examples": { "title": "Examples", "placeholder": "Add examples of what the user could ask to start the service", - "tooltip": "Enter sample user questions that trigger this service (e.g., ‘When is Midsummer festival?’)" + "tooltip": "Enter sample user questions that trigger this service (e.g., ‘When is Midsummer festival?’), It is recommended to include at least 5 examples." }, "keywords": { "title": "Keywords", @@ -336,7 +336,7 @@ "chooseMemorySlots": "Choose memory slots" }, "serviceFlow": { - "serviceConfiguration": "Service Configuration", + "serviceConfiguration": "Settings", "element": { "taraAuthentication": "Tara authorization", "textfield": "Send message to client", @@ -394,7 +394,7 @@ "or": "OR", "not": "NOT", "addRule": "+ Rule", - "addElement": "+ Element", + "addElement": "+ New variable", "addGroup": "+ Group", "remove": "Remove", "signType": "Sign Type", @@ -408,7 +408,7 @@ "confirmImport": "The current service will be rewritten!" }, "previousVariables": { - "assignElements": "Assign Elements", + "assignElements": "Assigned Variables", "dateAndTime": { "title": "Date and time", "base": "Base", diff --git a/GUI/src/i18n/et/common.json b/GUI/src/i18n/et/common.json index 8f39f1da2..d030a230f 100644 --- a/GUI/src/i18n/et/common.json +++ b/GUI/src/i18n/et/common.json @@ -151,13 +151,13 @@ "edit": "Muuda", "delete": "Kustuta", "cancel": "Tühista", - "importMany": "Impordi mitu", + "importMany": "Impordi", "import": { "importSuccess": "{{count}} teenus{{lengthCheck}} edukalt imporditud", "importFailure": "Järgmisi faile ei õnnestunud importida (vale vorming või rikutud): {{files}}", "failedToImport": "Teenuste importimine ebaõnnestus" }, - "exportMany": "Ekspordi mitu", + "exportMany": "Ekspordi", "exportAll": "Ekspordi kõik", "export": "Ekspordi", "exportAllConfirmation": "Kas olete kindel, et soovite eksportida kõik teenused?", @@ -244,7 +244,7 @@ "examples": { "title": "Näidisküsimused", "placeholder": "Lisa näiteid, mida kasutaja võiks küsida, et teenus käivituks", - "tooltip": "Sisesta näidisküsimused, mille kaudu teenus käivitub (nt. ‘Millal on Jaanipäev?’)" + "tooltip": "Sisesta näidisküsimused, mille kaudu teenus käivitub (nt. ‘Millal on Jaanipäev?’), Soovituslik on lisada vähemalt 5 näidet." }, "keywords": { "title": "Märksõnad", @@ -336,7 +336,7 @@ "chooseMemorySlots": "Vali mälukohad" }, "serviceFlow": { - "serviceConfiguration": "Teenuse seaded", + "serviceConfiguration": "Seaded", "element": { "taraAuthentication": "TARA autentimine", "textfield": "Sõnum kliendile", @@ -394,7 +394,7 @@ "or": "VÕI", "not": "MITTE", "addRule": "+ Reegel", - "addElement": "+ Element", + "addElement": "+ Uus väärtus", "addGroup": "+ Grupp", "remove": "Eemalda", "signType": "Märgi tüüp", @@ -408,7 +408,7 @@ "confirmImport": "Teenus kirjutatakse üle!" }, "previousVariables": { - "assignElements": "Määra elemendid", + "assignElements": "Määratud Väärtused", "noName": "", "environmentVariables": { "title": "Keskkonnamuutujad" diff --git a/GUI/src/pages/ServiceFlowPage.scss b/GUI/src/pages/ServiceFlowPage.scss index cdf1d9c1c..8ba0e8b25 100644 --- a/GUI/src/pages/ServiceFlowPage.scss +++ b/GUI/src/pages/ServiceFlowPage.scss @@ -77,22 +77,28 @@ } &.selected { - border: dashed 1px get-color(black-coral-1); + border: dashed 2px get-color(black-coral-5); + box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.08); &.end { - border: 1px solid get-color(jasper-15); + border: 2px solid get-color(jasper-15); + box-shadow: 0 0 0 3px rgba(get-color(jasper-10), 0.25); } &.step { - border: 1px solid get-color(sapphire-blue-7); + border: 2px solid get-color(sapphire-blue-7); + box-shadow: 0 0 0 3px rgba(get-color(sapphire-blue-7), 0.2); } &.rule { - border: 1px solid get-color(black-coral-8); + border: 2px solid get-color(black-coral-8); + box-shadow: 0 0 0 3px rgba(get-color(black-coral-8), 0.2); } &.finishing-step { - border: 1px solid get-color(jasper-8); + border: 2px solid get-color(jasper-8); + box-shadow: 0 0 0 3px rgba(get-color(jasper-8), 0.2); } &.dynamic-choices { - border: 1px solid get-color(purple-8); + border: 2px solid get-color(purple-8); + box-shadow: 0 0 0 3px rgba(get-color(purple-8), 0.2); } } @@ -213,12 +219,6 @@ &__node { color: var(--dark-text-secondary); - &.selected { - &.step { - border: 1px solid get-color(sapphire-blue-2); - } - } - &.start, &.end { color: get-color(white); @@ -262,7 +262,29 @@ } &.selected { - border: dashed 1px get-color(black-coral-10); + border: dashed 2px get-color(black-coral-8); + box-shadow: 0 0 0 3px rgba(255, 255, 255, 0.08); + + &.end { + border: 2px solid get-color(jasper-11); + box-shadow: 0 0 0 3px rgba(200, 60, 60, 0.25); + } + &.step { + border: 2px solid get-color(sapphire-blue-2); + box-shadow: 0 0 0 3px rgba(80, 140, 220, 0.25); + } + &.rule { + border: 2px solid get-color(black-coral-8); + box-shadow: 0 0 0 3px rgba(150, 150, 160, 0.25); + } + &.finishing-step { + border: 2px solid get-color(jasper-11); + box-shadow: 0 0 0 3px rgba(200, 60, 60, 0.25); + } + &.dynamic-choices { + border: 2px solid get-color(purple-11); + box-shadow: 0 0 0 3px rgba(140, 80, 200, 0.25); + } } } From cd1ff0f37180875a0e4c080515645dae142bfbf1 Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 13:37:15 +0300 Subject: [PATCH 2/9] fix(987): Fixed Date & time / Separator dropdown going out of bounds --- GUI/src/components/Collapsible/Collapsible.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GUI/src/components/Collapsible/Collapsible.scss b/GUI/src/components/Collapsible/Collapsible.scss index cbff36533..2e47cec93 100644 --- a/GUI/src/components/Collapsible/Collapsible.scss +++ b/GUI/src/components/Collapsible/Collapsible.scss @@ -39,6 +39,10 @@ background-color: get-color(white); border-radius: 0 0 4px 4px; overflow: hidden; + + &[data-state='open'] { + overflow: visible; + } } } From a84d34a8deb993a0cc654505659b0d44dc88fdad Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 13:47:49 +0300 Subject: [PATCH 3/9] fix(987): Chat widget dark mode text color --- GUI/src/components/chat/chat.module.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GUI/src/components/chat/chat.module.scss b/GUI/src/components/chat/chat.module.scss index b7fc359ce..bfe842a8a 100644 --- a/GUI/src/components/chat/chat.module.scss +++ b/GUI/src/components/chat/chat.module.scss @@ -381,6 +381,7 @@ &.client { .content { background-color: #764ca0; + color: white; } } @@ -388,7 +389,7 @@ .main { .content { background-color: get-color(sapphire-blue-12); - color: var(--dark-bg-extra-light); + color: white; a { color: #a8d4ff; @@ -404,18 +405,17 @@ } [data-theme='dark'] .system { + color: white; + &.success { - color: get-color(sea-green-11); background: get-color(sea-green-6); } - &.error { - color: get-color(jasper-11); + &.error { background: get-color(jasper-6); } &.info { - color: get-color(sapphire-blue-11); background: get-color(sapphire-blue-6); } From 697cf07349abd853b3e15094bbb63207e740a150 Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 13:53:29 +0300 Subject: [PATCH 4/9] fix(987): Remove test tab from nodes --- GUI/src/components/FlowElementsPopup/index.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/GUI/src/components/FlowElementsPopup/index.tsx b/GUI/src/components/FlowElementsPopup/index.tsx index 6ccfba1d5..7b64f69e4 100644 --- a/GUI/src/components/FlowElementsPopup/index.tsx +++ b/GUI/src/components/FlowElementsPopup/index.tsx @@ -450,11 +450,6 @@ const FlowElementsPopup: React.FC = () => { {t('serviceFlow.tabs.setup')} - {!isReadonly && (stepType === StepType.Textfield || stepType === StepType.OpenWebpage) && ( - - {t('serviceFlow.tabs.test')} - - )} {stepType === StepType.Textfield && ( From 0a92a89291f989c5d2ca60e8129abef92c975014 Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 14:04:21 +0300 Subject: [PATCH 5/9] chore(987): Modified translations --- GUI/src/i18n/en/common.json | 2 +- GUI/src/i18n/et/common.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GUI/src/i18n/en/common.json b/GUI/src/i18n/en/common.json index a176f74a6..5f29867e7 100644 --- a/GUI/src/i18n/en/common.json +++ b/GUI/src/i18n/en/common.json @@ -247,7 +247,7 @@ "examples": { "title": "Examples", "placeholder": "Add examples of what the user could ask to start the service", - "tooltip": "Enter sample user questions that trigger this service (e.g., ‘When is Midsummer festival?’), It is recommended to include at least 5 examples." + "tooltip": "Enter sample user questions that trigger this service (e.g. ‘When is Midsummer festival?’). It is recommended to include at least 5 examples" }, "keywords": { "title": "Keywords", diff --git a/GUI/src/i18n/et/common.json b/GUI/src/i18n/et/common.json index d030a230f..240270766 100644 --- a/GUI/src/i18n/et/common.json +++ b/GUI/src/i18n/et/common.json @@ -244,7 +244,7 @@ "examples": { "title": "Näidisküsimused", "placeholder": "Lisa näiteid, mida kasutaja võiks küsida, et teenus käivituks", - "tooltip": "Sisesta näidisküsimused, mille kaudu teenus käivitub (nt. ‘Millal on Jaanipäev?’), Soovituslik on lisada vähemalt 5 näidet." + "tooltip": "Sisesta näidisküsimused, mille kaudu teenus käivitub (nt. ‘Millal on Jaanipäev?’). Soovituslik on lisada vähemalt 5 näidet." }, "keywords": { "title": "Märksõnad", From 6c5fefffb29179a169c3872732035c922fe14ad5 Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 14:09:35 +0300 Subject: [PATCH 6/9] chore(987): make edge selection more visible --- GUI/src/pages/ServiceFlowPage.scss | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/GUI/src/pages/ServiceFlowPage.scss b/GUI/src/pages/ServiceFlowPage.scss index 8ba0e8b25..8b85694fd 100644 --- a/GUI/src/pages/ServiceFlowPage.scss +++ b/GUI/src/pages/ServiceFlowPage.scss @@ -190,6 +190,19 @@ stroke: get-color(black-coral-10); stroke-width: 1.5px; } + +} + +[data-theme='light'] .react-flow { + &__edge { + &.selected { + .react-flow__edge-path { + stroke: get-color(sapphire-blue-9); + stroke-width: 2.5px; + filter: drop-shadow(0 0 4px rgba(23, 105, 171, 0.2)); + } + } + } } .edge-button { @@ -289,9 +302,19 @@ } &__edge-path { - stroke: get-color(black-coral-10); + stroke: get-color(black-coral-6); stroke-width: 1.5px; } + + &__edge { + &.selected { + .react-flow__edge-path { + stroke: get-color(sapphire-blue-4); + stroke-width: 2.5px; + filter: drop-shadow(0 0 5px rgba(139, 180, 213, 0.2)); + } + } + } } [data-theme='dark'] .edge-button { From df7e1838999aa7db926f8f8ed08e49bb0b400430 Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 14:13:13 +0300 Subject: [PATCH 7/9] chore(987): Removed chat content height --- GUI/src/components/chat/chat.module.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/GUI/src/components/chat/chat.module.scss b/GUI/src/components/chat/chat.module.scss index bfe842a8a..8321933aa 100644 --- a/GUI/src/components/chat/chat.module.scss +++ b/GUI/src/components/chat/chat.module.scss @@ -79,7 +79,6 @@ overflow-y: auto; overflow-x: hidden; margin-bottom: auto; - height: 20em; } .message { From 7732a9eef4b9ffddfb355c74774c47f1f0a28b95 Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 14:16:49 +0300 Subject: [PATCH 8/9] chore(987): Aligned examples and keywords value fields spacing --- GUI/src/components/DynamicList/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUI/src/components/DynamicList/index.tsx b/GUI/src/components/DynamicList/index.tsx index 1813ef57e..f10a16150 100644 --- a/GUI/src/components/DynamicList/index.tsx +++ b/GUI/src/components/DynamicList/index.tsx @@ -15,7 +15,7 @@ type DynamicListProps = { tooltipText?: string; }; -const DynamicList: FC = ({ label, labelWidth = 120, value, onChange, placeholder, tooltipText }) => { +const DynamicList: FC = ({ label, labelWidth = 170, value, onChange, placeholder, tooltipText }) => { const { t } = useTranslation(); const items = value?.length > 0 ? value : ['']; From 99c214001407fe545391247d4d7e0333030c4168 Mon Sep 17 00:00:00 2001 From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com> Date: Wed, 20 May 2026 14:17:45 +0300 Subject: [PATCH 9/9] chore(987): Fixed format --- GUI/src/components/chat/chat.module.scss | 2 +- GUI/src/pages/ServiceFlowPage.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/GUI/src/components/chat/chat.module.scss b/GUI/src/components/chat/chat.module.scss index 8321933aa..fb0c137e7 100644 --- a/GUI/src/components/chat/chat.module.scss +++ b/GUI/src/components/chat/chat.module.scss @@ -410,7 +410,7 @@ background: get-color(sea-green-6); } - &.error { + &.error { background: get-color(jasper-6); } diff --git a/GUI/src/pages/ServiceFlowPage.scss b/GUI/src/pages/ServiceFlowPage.scss index 8b85694fd..5a7821063 100644 --- a/GUI/src/pages/ServiceFlowPage.scss +++ b/GUI/src/pages/ServiceFlowPage.scss @@ -190,7 +190,6 @@ stroke: get-color(black-coral-10); stroke-width: 1.5px; } - } [data-theme='light'] .react-flow {