fix comments

data-for-change · Nov 12, 2024 · 4ec182d · 4ec182d
1 parent c456f45
commit 4ec182d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/src/components/molecules/GenericBarChart.tsx b/src/components/molecules/GenericBarChart.tsx
@@ -35,7 +35,7 @@ interface ISingleBarChartProps extends IBarChartBaseProps {}
 
 interface IMultiBarChartProps extends IBarChartBaseProps {
   isStacked: boolean;
-  yLabels?: string[];
+  customYLabels?: string[];
   editorBarOptions?: Record<number, boolean>;
 }
 
@@ -107,16 +107,16 @@ const MultiBarChart: FC<IMultiBarChartProps> = ({
   isStacked,
   textLabel,
   subtitle,
-  yLabels,
+  customYLabels,
   editorBarOptions,
 }) => {
   const theme = useTheme();
   const colors = (theme.palette.primary as ColorScheme).barChartColors;
 
   const defaultYLabels = data ? Object.keys(data[0]) : [];
-  const customYLabels = yLabels || defaultYLabels.slice(1);
+  const yLabels= customYLabels  || defaultYLabels.slice(1);
 
-  const maxBarsNum = customYLabels.length;
+  const maxBarsNum = yLabels.length;
   const filteredColors: Record<string, any> =
     editorBarOptions && Object.keys(editorBarOptions).length !== 0
       ? Object.values(editorBarOptions)
@@ -150,14 +150,14 @@ const MultiBarChart: FC<IMultiBarChartProps> = ({
             key={i}
             stackId={isStacked ? 'stack_1' : undefined}
             fill={filteredColors[i]}
-            dataKey={customYLabels[i]}
+            dataKey={yLabels[i]}
             style={barStyle}
             isAnimationActive={false}
           >
             {!isStacked && (
               <LabelList
                 content={<CustomizedLabel isPercentage={isPercentage} isStacked={isStacked} />}
-                dataKey={customYLabels[i]}
+                dataKey={yLabels[i]}
               />
             )}
           </Bar>

diff --git a/src/components/molecules/widgets/KilledAndInjuredCountPerAgeGroupStackedWidget.tsx b/src/components/molecules/widgets/KilledAndInjuredCountPerAgeGroupStackedWidget.tsx
@@ -11,11 +11,10 @@ interface IProps {
 
 const KilledAndInjuredCountPerAgeGroupStackedWidget: FC<IProps> = ({ data, editorBarOptions }) => {
   const { text } = data;
-  debugger;
   const multiBarSeries = createBarWidget(data, editorBarOptions);
   return <MultiBarChart isStacked={true} isPercentage={false} data={multiBarSeries}
                         textLabel={text.title}
-                        yLabels={Object.values(text.labels_map)}
+                        customYLabels={Object.values(text.labels_map)}
                         subtitle={text.subtitle}
                         editorBarOptions={editorBarOptions} />;
 };

diff --git a/src/const/cards.const.ts b/src/const/cards.const.ts
@@ -18,7 +18,7 @@ export const operationalCards: WidgetName[] = [
   // WidgetName.accident_count_by_driver_type,
   WidgetName.killed_and_injured_count_per_age_group,
   WidgetName.accident_count_by_day_night,
-  WidgetName.killed_and_injured_count_per_age_group_stacked
+  WidgetName.killed_and_injured_count_per_age_group_stacked,
 ];
 
 export type OrgLogoData =  {key : string, path:string} ;

diff --git a/src/models/WidgetData.ts b/src/models/WidgetData.ts
@@ -197,4 +197,4 @@ export interface IWidgetKilledAndInjuredCountPerAgeGroup extends IWidgetDataBase
     subtitle?: string;
     title?: string;
   };
-}
+}
diff --git a/src/services/widgets.data.service.ts b/src/services/widgets.data.service.ts
@@ -47,6 +47,7 @@ export const fetchWidgets = async ({
 }: IWidgetInput): Promise<ILocationData | undefined> => {
   try {
     const widgetsUrl = getWidgetUrl({ lang, newsId, yearAgo, gpsId, city, street });
+    console.log(widgetsUrl);
     const response = await axios.get(widgetsUrl);
     return processWidgetsFetchResponse(response);
   } catch (error) {

diff --git a/src/utils/barChart.utils.ts b/src/utils/barChart.utils.ts
@@ -10,7 +10,7 @@ export const barsWidgetsLabels: Record<string, Array<string>> = {
     ['textView.fatal.plural', 'textView.severe.plural', 'textView.light.plural'],
   'injured_count_by_accident_year':
     ['textView.killed.plural', 'textView.severeInjured.plural', 'textView.lightInjured.plural'],
-  }
+}
 
 export const barsWidgetsTitle: Record<string, string> = {
   'accident_count_by_accident_year': 'cardEditor.showAccidents',
@@ -75,7 +75,6 @@ export function createBarWidget (
   data: IWidgetMultiBarData,
   editorBarOptions: Record<number, boolean>
 ): BarDataMap[] {
-  debugger
   const { items, text } = data;
   const excludeList = (Object.keys(editorBarOptions).length !== 0) ?
     Object.values(editorBarOptions).map((include: any, index: number) => {