Skip to content

merging dev to test #599

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 9 commits into from
Dec 29, 2025
Merged

merging dev to test #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4aed5ac
chore(1674): Bumped Version
1AhmedYasser Dec 19, 2025
48a6f74
debuging UI
ExiRain Dec 19, 2025
8b853ba
Refactired domains processing
ExiRain Dec 22, 2025
8e9232f
Removed console log
ExiRain Dec 29, 2025
9e1e463
Merge pull request #596 from 1AhmedYasser/Fix-History-view-mark-test
ffrose Dec 29, 2025
1e36842
Merge branch 'dev' into 595-Feedback-filtering
ExiRain Dec 29, 2025
404e36c
Removed console log from dsl
ExiRain Dec 29, 2025
8699de2
Merge remote-tracking branch 'origin/595-Feedback-filtering' into 595…
ExiRain Dec 29, 2025
92a925c
Merge pull request #597 from ExiRain/595-Feedback-filtering
ffrose Dec 29, 2025
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
4 changes: 0 additions & 4 deletions DSL/Ruuter/analytics/POST/accounts/edit-user-domains.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ declaration:
type: string
description: "Body field 'selectedDomains'"


checkV:
log: ${incoming.body}

extractRequestData:
assign:
userId: ${incoming.body.userId}
Expand Down
2 changes: 1 addition & 1 deletion GUI/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@buerokratt-ria/menu": "^0.2.9",
"@buerokratt-ria/header": "^0.1.46",
"@buerokratt-ria/styles": "^0.0.1",
"@buerokratt-ria/common-gui-components": "^0.0.30",
"@buerokratt-ria/common-gui-components": "^0.0.33",
"@fontsource/roboto": "^4.5.8",
"@formkit/auto-animate": "^1.0.0-beta.6",
"@hookform/resolvers": "^2.9.11",
Expand Down
24 changes: 17 additions & 7 deletions GUI/src/pages/AdvisorsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
translateChartKeys,
} from '../util/charts-utils';
import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators';
import { Subject } from 'rxjs';
import {BehaviorSubject} from 'rxjs';
import {
getAvgCsaPresent,
getAvgPickTime,
Expand Down Expand Up @@ -76,13 +76,20 @@ const AdvisorsPage: React.FC = () => {
const multiDomainEnabled = import.meta.env.REACT_APP_ENABLE_MULTI_DOMAIN?.toLowerCase() === 'true';


if(multiDomainEnabled) {
useStore.subscribe((state, prevState) => {
if(JSON.stringify(state.userDomains) !== JSON.stringify(prevState.userDomains)) {
setUpdateKey(prevState => prevState + 1);
useEffect(() => {
if (!multiDomainEnabled) return;

const unsubscribe = useStore.subscribe((state, prevState) => {
if (
JSON.stringify(state.userDomains) !==
JSON.stringify(prevState.userDomains)
) {
setUpdateKey((v) => v + 1);
}
});
}

return () => unsubscribe();
}, [multiDomainEnabled, useStore]);

useEffect(() => {
setAdvisorsList(advisors.current);
Expand All @@ -98,7 +105,10 @@ const AdvisorsPage: React.FC = () => {
}
}, [currentConfigs]);

const [configsSubject] = useState(() => new Subject());
const [configsSubject] = useState(
() => new BehaviorSubject<any>(null)
);

useEffect(() => {
const subscription = configsSubject
.pipe(
Expand Down
17 changes: 12 additions & 5 deletions GUI/src/pages/BurokrattPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,20 @@ const BurokrattPage: React.FC = () => {
const [updateKey, setUpdateKey] = useState<number>(0)
const multiDomainEnabled = import.meta.env.REACT_APP_ENABLE_MULTI_DOMAIN?.toLowerCase() === 'true';

if (multiDomainEnabled) {
useStore.subscribe((state, prevState) => {
if (JSON.stringify(state.userDomains) !== JSON.stringify(prevState.userDomains)) {
setUpdateKey(prevState => prevState + 1);
useEffect(() => {
if (!multiDomainEnabled) return;

const unsubscribe = useStore.subscribe((state, prevState) => {
if (
JSON.stringify(state.userDomains) !==
JSON.stringify(prevState.userDomains)
) {
setUpdateKey((v) => v + 1);
}
});
}

return () => unsubscribe();
}, [multiDomainEnabled, useStore]);

const [configsSubject] = useState(() => new Subject())
useEffect(() => {
Expand Down
24 changes: 17 additions & 7 deletions GUI/src/pages/FeedbackPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
translateChartKeys,
} from '../util/charts-utils';
import {debounceTime, distinctUntilChanged, switchMap} from 'rxjs/operators';
import {Subject} from 'rxjs';
import {BehaviorSubject} from 'rxjs';
import {Methods, request} from '../util/axios-client';
import withAuthorization, {ROLES} from '../hoc/with-authorization';
import useStore from '../store/user/store';
Expand Down Expand Up @@ -64,13 +64,20 @@ const FeedbackPage: React.FC = () => {
const multiDomainEnabled = import.meta.env.REACT_APP_ENABLE_MULTI_DOMAIN?.toLowerCase() === 'true';


if(multiDomainEnabled) {
useStore.subscribe((state, prevState) => {
if(JSON.stringify(state.userDomains) !== JSON.stringify(prevState.userDomains)) {
setUpdateKey(prevState => prevState + 1);
useEffect(() => {
if (!multiDomainEnabled) return;

const unsubscribe = useStore.subscribe((state, prevState) => {
if (
JSON.stringify(state.userDomains) !==
JSON.stringify(prevState.userDomains)
) {
setUpdateKey((v) => v + 1);
}
});
}

return () => unsubscribe();
}, [multiDomainEnabled, useStore]);

useEffect(() => {
setAdvisorsList(advisors.current);
Expand Down Expand Up @@ -128,7 +135,10 @@ const FeedbackPage: React.FC = () => {

const showNegativeChart = currentConfigs?.metric === 'negative_feedback';

const [configsSubject] = useState(() => new Subject());
const [configsSubject] = useState(
() => new BehaviorSubject<any>(null)
);

useEffect(() => {
const subscription = configsSubject
.pipe(
Expand Down
17 changes: 12 additions & 5 deletions GUI/src/pages/OverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,20 @@ const OverviewPage: React.FC = () => {
const multiDomainEnabled = import.meta.env.REACT_APP_ENABLE_MULTI_DOMAIN?.toLowerCase() === 'true';


if(multiDomainEnabled) {
useStore.subscribe((state, prevState) => {
if(JSON.stringify(state.userDomains) !== JSON.stringify(prevState.userDomains)) {
setUpdateKey(prevState => prevState + 1);
useEffect(() => {
if (!multiDomainEnabled) return;

const unsubscribe = useStore.subscribe((state, prevState) => {
if (
JSON.stringify(state.userDomains) !==
JSON.stringify(prevState.userDomains)
) {
setUpdateKey((v) => v + 1);
}
});
}

return () => unsubscribe();
}, [multiDomainEnabled, useStore]);

const { t } = useTranslation();

Expand Down
Loading