fix(dashboard): l'ordre d'affichage de chaque champ dans les stats su…

…it l'ordre avec lequel on a fait le paramétrage (#1733)
SocialGouv · Nov 6, 2023 · 1794bb8 · 1794bb8
1 parent 3c6cfdc
commit 1794bb8
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 66 deletions.
diff --git a/dashboard/src/scenes/stats/CustomFieldsStats.js b/dashboard/src/scenes/stats/CustomFieldsStats.js
@@ -5,13 +5,6 @@ import { BlockDateWithTime, BlockTotal } from './Blocks';
 import Card from '../../components/Card';
 import { getMultichoiceBarData, getPieData } from './utils';
 
-function getColsSize(totalCols) {
-  if (totalCols === 1) return 'full';
-  if (totalCols === 2) return '1/2';
-  if (totalCols % 4 === 0) return '1/3';
-  return '1/4';
-}
-
 const CustomFieldsStats = ({ customFields, data, additionalCols = [], dataTestId = '', help, onSliceClick, totalTitleForMultiChoice }) => {
   const team = useRecoilValue(currentTeamState);
 
@@ -20,69 +13,63 @@ const CustomFieldsStats = ({ customFields, data, additionalCols = [], dataTestId
     .filter((f) => f.enabled || f.enabledTeams?.includes(team._id))
     .filter((f) => f.showInStats);
 
-  const customFieldsNumber = customFieldsInStats.filter((field) => ['number'].includes(field.type));
-  const customFieldsDate = customFieldsInStats.filter((field) => ['date', 'date-with-time'].includes(field.type));
-  const customFieldsResponsivePie = customFieldsInStats.filter((field) => ['boolean', 'yes-no', 'enum'].includes(field.type));
-  const customFieldsResponsiveBar = customFieldsInStats.filter((field) => ['multi-choice'].includes(field.type));
-
-  const totalCols = customFieldsNumber.length + customFieldsDate.length + additionalCols.length;
-
-  const colSize = getColsSize(totalCols);
-
   return (
     <>
-      {totalCols > 0 && (
-        <>
-          {/* tailwind doesn't comile dynamic classes, so we need to declare them */}
-          <div className="tw-hidden tw-basis-1/4 tw-basis-1/2 tw-basis-1/3 tw-basis-full" />
-          <div className="-tw-mx-4 tw-flex tw-flex-wrap">
-            {additionalCols.map((col) => (
-              <div className={`tw-px-4 tw-py-2 tw-basis-${colSize}`} key={col.title}>
-                {/* TODO: fix alignment. */}
-                <Card title={col.title} count={col.value} children={<div></div>} dataTestId={dataTestId} help={help?.(col.title.capitalize())} />
-              </div>
-            ))}
-            {customFieldsNumber.map((field) => (
-              <div className={`tw-px-4 tw-py-2 tw-basis-${colSize}`} key={field.name}>
+      <div className="-tw-mx-4 tw-flex tw-flex-wrap tw-justify-around">
+        {additionalCols.map((col) => (
+          <div className="tw-basis-1/4 tw-px-4 tw-py-2" key={col.title}>
+            {/* TODO: fix alignment. */}
+            <Card title={col.title} count={col.value} children={<div></div>} dataTestId={dataTestId} help={help?.(col.title.capitalize())} />
+          </div>
+        ))}
+        {customFieldsInStats.map((field) => {
+          if (['number'].includes(field.type)) {
+            return (
+              <div className="tw-basis-1/4 tw-px-4 tw-py-2" key={field.name}>
                 <BlockTotal title={field.label} data={data} field={field.name} help={help?.(field.label.capitalize())} />
               </div>
-            ))}
-            {customFieldsDate.map((field) => (
-              <div className={`tw-px-4 tw-py-2 tw-basis-${colSize}`} key={field.name}>
+            );
+          }
+          if (['date', 'date-with-time'].includes(field.type)) {
+            return (
+              <div className="tw-basis-1/4 tw-px-4 tw-py-2" key={field.name}>
                 <BlockDateWithTime data={data} field={field} help={help?.(field.label.capitalize())} />
               </div>
-            ))}
-          </div>
-        </>
-      )}
-      {customFieldsResponsivePie.map((field) => (
-        <CustomResponsivePie
-          title={field.label}
-          help={help?.(field.label.capitalize())}
-          onItemClick={onSliceClick ? (newSlice) => onSliceClick?.(newSlice, field.name) : undefined}
-          key={field.name}
-          data={getPieData(data, field.name, {
-            options: field.options,
-            isBoolean: field.type === 'boolean',
-          })}
-        />
-      ))}
-      {customFieldsResponsiveBar.map((field) => {
-        return (
-          <CustomResponsiveBar
-            title={field.label}
-            help={help?.(field.label.capitalize())}
-            onItemClick={onSliceClick ? (newSlice) => onSliceClick?.(newSlice, field.name) : undefined}
-            key={field.name}
-            isMultiChoice
-            axisTitleY="File active"
-            axisTitleX={field.name}
-            totalForMultiChoice={data.length}
-            totalTitleForMultiChoice={totalTitleForMultiChoice}
-            data={getMultichoiceBarData(data, field.name, { options: field.options })}
-          />
-        );
-      })}
+            );
+          }
+          if (['boolean', 'yes-no', 'enum'].includes(field.type)) {
+            return (
+              <CustomResponsivePie
+                title={field.label}
+                help={help?.(field.label.capitalize())}
+                onItemClick={onSliceClick ? (newSlice) => onSliceClick?.(newSlice, field.name) : undefined}
+                key={field.name}
+                data={getPieData(data, field.name, {
+                  options: field.options,
+                  isBoolean: field.type === 'boolean',
+                })}
+              />
+            );
+          }
+          if (['multi-choice'].includes(field.type)) {
+            return (
+              <CustomResponsiveBar
+                title={field.label}
+                help={help?.(field.label.capitalize())}
+                onItemClick={onSliceClick ? (newSlice) => onSliceClick?.(newSlice, field.name) : undefined}
+                key={field.name}
+                isMultiChoice
+                axisTitleY="File active"
+                axisTitleX={field.name}
+                totalForMultiChoice={data.length}
+                totalTitleForMultiChoice={totalTitleForMultiChoice}
+                data={getMultichoiceBarData(data, field.name, { options: field.options })}
+              />
+            );
+          }
+          return null;
+        })}
+      </div>
     </>
   );
 };

diff --git a/dashboard/src/scenes/stats/General.js b/dashboard/src/scenes/stats/General.js
@@ -19,7 +19,7 @@ const GeneralStats = ({
       <div className="tw-flex tw-basis-full tw-items-center">
         <Filters title="Filtrer par personnes suivies:" base={filterBase} filters={filterPersons} onChange={setFilterPersons} />
       </div>
-      <div className="-tw-mx-4 tw-flex tw-flex-wrap">
+      <div className="-tw-mx-4 tw-flex tw-flex-wrap tw-justify-around">
         <Block
           data={personsCreated}
           title="Nombre de personnes créées"

diff --git a/dashboard/src/scenes/stats/Persons.js b/dashboard/src/scenes/stats/Persons.js
@@ -65,7 +65,7 @@ const PersonStats = ({
     <>
       <h3 className="tw-my-5 tw-text-xl">Statistiques des {title}</h3>
       <Filters base={filterBase} filters={filterPersons} onChange={setFilterPersons} />
-      <div className="-tw-mx-4 tw-flex tw-flex-wrap">
+      <div className="-tw-mx-4 tw-flex tw-flex-wrap tw-justify-around">
         <Block data={personsForStats} title={`Nombre de ${title}`} help={firstBlockHelp} />
         <BlockCreatedAt persons={personsForStats} />
         <BlockWanderingAt persons={personsForStats} />