Skip to content

merging dev to test #665

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 3 commits into from
Feb 26, 2026
+70 −57
Merged

merging dev to test #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7753d5
chore(653): Added total to Completed statuses / number of conversations
1AhmedYasser Feb 25, 2026
dca9b08
fix(639): Added missing status adder translation
1AhmedYasser Feb 26, 2026
eb0a392
Merge pull request #664 from 1AhmedYasser/fix-added-status-adder-tran…
ffrose Feb 26, 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
1 change: 1 addition & 0 deletions GUI/src/i18n/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@
"feedback": "Feedback",
"chosenCsa": "Chosen csa(s)",
"chosenColumn": "Chosen column(s)",
"statusAdder": "Status adder",
"statusAddedDate": "Status added date"
},
"plainEvents": {
Expand Down
1 change: 1 addition & 0 deletions GUI/src/i18n/et/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@
"chosenCsa": "Valitud nõustaja(d)",
"chosenColumn": "Valitud tulba(d)",
"feedback": "Tagasiside",
"statusAdder": "Staatuse lisaja",
"statusAddedDate": "Staatuse lisamise kuupäev"
},
"plainEvents": {
Expand Down
125 changes: 68 additions & 57 deletions GUI/src/pages/FeedbackPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,49 +88,52 @@ const FeedbackPage: React.FC = () => {
}, [chartData, unit]);

const [feedbackMetrics, setFeedbackMetrics] = useState<Option[]>([
{
id: 'statuses',
labelKey: 'feedback.statuses',
subOptions: statusOptions.map((id) => ({
id,
labelKey: `feedback.status_options.${id.toLowerCase()}`,
color: randomColor(),
isSelected: true,
})),
unit: t('units.chats') ?? 'chats',
},
{
id: 'burokratt_chats',
labelKey: 'feedback.burokratt_chats',
unit: t('units.nps') ?? 'nps',
subRadioOptions: [
{
id: 'NPS',
labelKey: 'feedback.status_options.nps',
color: randomColor(),
},
{
id: 'AVG',
labelKey: 'feedback.status_options.average',
color: randomColor(),
},
],
},
{
id: 'advisor_chats',
labelKey: 'feedback.advisor_chats',
unit: t('units.nps') ?? 'nps',
},
{
id: 'selected_advisor_chats',
labelKey: 'feedback.selected_advisor_chats',
unit: t('units.nps') ?? 'nps',
},
{
id: 'negative_feedback',
labelKey: 'feedback.negative_feedback',
unit: t('units.feedback') ?? 'feedback',
},
{
id: 'statuses',
labelKey: 'feedback.statuses',
subOptions: [
...statusOptions.map((id) => ({
id,
labelKey: `feedback.status_options.${id.toLowerCase()}`,
color: randomColor(),
isSelected: true,
})),
{ id: 'total', labelKey: 'chats.totalCount', color: '#008000', isSelected: true },
],
unit: t('units.chats') ?? 'chats',
},
{
id: 'burokratt_chats',
labelKey: 'feedback.burokratt_chats',
unit: t('units.nps') ?? 'nps',
subRadioOptions: [
{
id: 'NPS',
labelKey: 'feedback.status_options.nps',
color: randomColor(),
},
{
id: 'AVG',
labelKey: 'feedback.status_options.average',
color: randomColor(),
},
],
},
{
id: 'advisor_chats',
labelKey: 'feedback.advisor_chats',
unit: t('units.nps') ?? 'nps',
},
{
id: 'selected_advisor_chats',
labelKey: 'feedback.selected_advisor_chats',
unit: t('units.nps') ?? 'nps',
},
{
id: 'negative_feedback',
labelKey: 'feedback.negative_feedback',
unit: t('units.feedback') ?? 'feedback',
},
]);

const showNegativeChart = currentConfigs?.metric === 'negative_feedback';
Expand Down Expand Up @@ -184,7 +187,8 @@ const FeedbackPage: React.FC = () => {
const fetchChatsStatuses = async (config: MetricOptionsState) => {
setShowSelectAll(false);
let chartData = {};
const events = config.options;
const events = (config.options || []).filter((e: string) => e !== 'total');
const eventsForApi = events.length > 0 ? events : statusOptions;
try {
const result: any = await request({
url: getChatsStatuses(),
Expand All @@ -194,8 +198,8 @@ const FeedbackPage: React.FC = () => {
metric: config?.groupByPeriod ?? 'day',
start_date: config?.start,
end_date: config?.end,
events: events.length > 0 ? events : [],
csa_events: events.length > 0 ? events : [],
events: eventsForApi,
csa_events: eventsForApi,
urls: getDomainsArray(),
showTest: getShowTestData()
},
Expand All @@ -209,25 +213,32 @@ const FeedbackPage: React.FC = () => {
}))
.reduce((a: any, b: any) => {
const dateRow = a.find((i: any) => i[chartDataKey] === b[chartDataKey]);
const key = t(`feedback.plain_status_options.${b[t('chart.event')].toLowerCase()}`);
if (dateRow) {
dateRow[t(`feedback.plain_status_options.${b[t('chart.event')].toLowerCase()}`)] = b[t('chart.count')];
dateRow[key] = b[t('chart.count')];
} else {
a.push({
[chartDataKey]: b[chartDataKey],
[t(`feedback.plain_status_options.${b[t('chart.event')].toLowerCase()}`)]: b[t('chart.count')],
});
a.push({ [chartDataKey]: b[chartDataKey], [key]: b[t('chart.count')] });
}
return a;
}, []);

const totalLabel = t('chats.totalCount');
if ((config.options || []).includes('total')) {
response.forEach((row: any) => {
row[totalLabel] = Object.keys(row).reduce(
(sum, k) => sum + (k === chartDataKey ? 0 : (row[k] || 0)),
0
);
});
}

const subOpts = feedbackMetrics[0].subOptions!;
chartData = {
chartData: response,
colors: feedbackMetrics[0].subOptions!.map(({id, color}) => {
return {
id: t(`feedback.plain_status_options.${id.toLowerCase()}`),
color,
};
}),
colors: subOpts.map(({ id, color }) => ({
id: id === 'total' ? totalLabel : t(`feedback.plain_status_options.${id.toLowerCase()}`),
color,
})),
};
} catch (err) {
console.error("Failed: ", err)
Expand Down
Loading