Skip to content

411 CSA 0 charts display #417

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

Open
ExiRain wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

411 CSA 0 charts display #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion GUI/src/components/MetricsCharts/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@ type Props = {
endDate: string;
unit?: string;
groupByPeriod: GroupByPeriod;
filterEmpty?: boolean;
};

const MetricsCharts = ({ title, data, startDate, endDate, unit, groupByPeriod }: Props) => {
type DataItem = {
dateTime: number;
[key: string]: number;
};

const MetricsCharts = ({ title, data, startDate, endDate, unit, groupByPeriod, filterEmpty }: Props) => {
const { t } = useTranslation();

const charts: ChartType[] = [
Expand All @@ -41,7 +47,19 @@ const MetricsCharts = ({ title, data, startDate, endDate, unit, groupByPeriod }:
];
const [selectedChart, setSelectedChart] = useState<string>('barChart');

const filterChartsData = () => {
return data.chartData.map((obj : DataItem) => {
return Object.fromEntries(
Object.entries(obj).filter(([key, value]) => key === "dateTime" || value !== 0)
);
});
}

const buildChart = () => {
if(filterEmpty) {
data.chartData = filterChartsData();
}

if (selectedChart === 'pieChart') {
return (
<PieGraph
Expand Down
1 change: 1 addition & 0 deletions GUI/src/pages/FeedbackPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ const FeedbackPage: React.FC = () => {
{currentConfigs?.metric != 'negative_feedback' && (
<MetricsCharts
title={currentMetric}
filterEmpty={true}
data={chartData}
startDate={currentConfigs?.start ?? formatDate(new Date(), 'yyyy-MM-dd')}
endDate={currentConfigs?.end ?? formatDate(new Date(), 'yyyy-MM-dd')}
Expand Down