Skip to content

merging dev to test #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ffrose merged 2 commits into from
Feb 19, 2026
+9 −22
Merged

merging dev to test #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1378e6
chore(1806): Showed both 5 and 10 rating scale
1AhmedYasser Feb 19, 2026
8716157
Merge pull request #1103 from 1AhmedYasser/Feedback-in-historical-cha…
ffrose Feb 19, 2026
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
27 changes: 7 additions & 20 deletions DSL/Resql/users/POST/get-cs-all-ended-chats.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ SELECT
ContactsMessage.content AS contacts_message,
m.updated AS last_message_timestamp,
c.feedback_text,
COALESCE(c.feedback_rating_five, c.feedback_rating) AS feedback_rating,
CASE
WHEN (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config)
THEN c.feedback_rating_five
ELSE c.feedback_rating
END AS feedback_rating,
is_five_rating_scale,
WHEN c.feedback_rating_five IS NOT NULL THEN 'true'
WHEN c.feedback_rating IS NOT NULL THEN 'false'
ELSE NULL
END AS is_five_rating_scale,
c.test as isTest,
nps,
CSAFullNames.all_csa_names AS all_csa,
Expand All @@ -228,7 +228,6 @@ LEFT JOIN ContactsMessage ON ContactsMessage.chat_base_id = c.base_id
LEFT JOIN CSAFullNames ON CSAFullNames.base_id = c.base_id
CROSS JOIN TitleVisibility
CROSS JOIN NPS
CROSS JOIN rating_config rc
WHERE (
(
COALESCE(:customerSupportIds, '') = ''
Expand Down Expand Up @@ -298,20 +297,8 @@ ORDER BY
ELSE m.event
END
END DESC NULLS LAST,
CASE WHEN :sorting = 'feedbackRating desc' THEN
CASE
WHEN rc.is_five_rating_scale = 'true'
THEN c.feedback_rating_five
ELSE c.feedback_rating
END
END DESC NULLS LAST,
CASE WHEN :sorting = 'feedbackRating asc' THEN
CASE
WHEN rc.is_five_rating_scale = 'true'
THEN c.feedback_rating_five
ELSE c.feedback_rating
END
END ASC NULLS LAST,
CASE WHEN :sorting = 'feedbackRating desc' THEN COALESCE(c.feedback_rating_five, c.feedback_rating) END DESC NULLS LAST,
CASE WHEN :sorting = 'feedbackRating asc' THEN COALESCE(c.feedback_rating_five, c.feedback_rating) END ASC NULLS LAST,
CASE WHEN :sorting = 'customerSupportFullName asc' THEN
COALESCE(
NULLIF(array_to_string(CSAFullNames.all_csa_names, ', '), ''),
Expand Down
2 changes: 1 addition & 1 deletion GUI/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
REACT_APP_API_URL=http://localhost:8080/training
REACT_APP_RUUTER_API_URL=http://localhost:8080/training
REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost:8080/training
REACT_APP_RUUTER_PRIVATE_ENDED_API_URL=http://localhost:8088/training
REACT_APP_RUUTER_PRIVATE_ENDED_API_URL=http://localhost:8080/training
REACT_APP_RUUTER_V2_ANALYTICS_API_URL=http://localhost:3002/training/api
REACT_APP_BUEROKRATT_CHATBOT_URL=http://buerokratt-chat:8080
REACT_APP_OPENSEARCH_DASHBOARD_URL=https://opensearch.org/
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ services:
- REACT_APP_NOTIFICATION_NODE_URL=http://localhost:4040
- REACT_APP_CSP=upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' http://localhost:8080 http://localhost:8085 http://localhost:4040 https://admin.dev.buerokratt.ee/chat/menu.json;
- REACT_APP_ENABLE_HIDDEN_FEATURES=TRUE
- REACT_APP_RUUTER_PRIVATE_ENDED_API_URL=http://localhost:8088/training
- REACT_APP_RUUTER_PRIVATE_ENDED_API_URL=http://localhost:8080/training
- REACT_APP_VALIDATIONS_ENABLED=FALSE
- REACT_APP_ENABLE_MULTI_DOMAIN=TRUE
- REACT_APP_SHOW_TEST_MESSAGE=TRUE
Expand Down
Loading