Centrelize source and report status as constant

Terralego · Dec 4, 2023 · 0efb222 · 0efb222
1 parent 74762df
commit 0efb222
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 28 deletions.
diff --git a/src/modules/RA/DataSource/components/DataSourceStatus.js b/src/modules/RA/DataSource/components/DataSourceStatus.js
@@ -24,3 +24,10 @@ export const sourceStatus = {
   2: 'done',
   3: 'inProgress',
 };
+
+export const reportStatus = {
+  0: 'success',
+  1: 'error',
+  2: 'warning',
+  3: 'pending',
+};
diff --git a/src/modules/RA/DataSource/components/ReportTab.js b/src/modules/RA/DataSource/components/ReportTab.js
@@ -22,7 +22,7 @@ import {
   Description as DescriptionIcon,
 } from '@material-ui/icons';
 
-import STATUS from './DataSourceStatus';
+import STATUS, { reportStatus } from './DataSourceStatus';
 
 const useStyles = makeStyles(theme => ({
   container: {
@@ -77,15 +77,7 @@ const ReportTab = ({ report, translate }) => {
     </ListItem>
   ), [report, classes.errorItemEven, classes.errorItemOdd]);
 
-  const status = React.useMemo(() => {
-    const statusChoices = {
-      0: 'success',
-      1: 'error',
-      2: 'warning',
-      3: 'pending',
-    };
-    return statusChoices[report.status];
-  }, [report.status]);
+  const status = React.useMemo(() => reportStatus[report.status], [report.status]);
   const statusKey = STATUS[status];
 
   return (

diff --git a/src/modules/RA/DataSource/components/StatusChip/Tooltip.js b/src/modules/RA/DataSource/components/StatusChip/Tooltip.js
@@ -20,6 +20,8 @@ import {
   DoneAllOutlined as DoneAllOutlinedIcon,
 } from '@material-ui/icons';
 
+import { reportStatus } from '../DataSourceStatus';
+
 const useStyles = makeStyles(theme => ({
   nested: {
     paddingLeft: theme.spacing(6),
@@ -55,19 +57,13 @@ const Tooltip = ({
     ? `${translate('datasource.tooltip.finished')} ${endingDate.toLocaleString()}`
     : translate('datasource.tooltip.notFinished');
 
-  const statusChoices = {
-    0: 'success',
-    1: 'error',
-    2: 'warning',
-    3: 'pending',
-  };
 
   return (
     <div>
       <List disablePadding dense>
         <ListItem>
           <ListItemIcon><FlashOnOutlinedIcon fontSize="small" /></ListItemIcon>
-          <ListItemText primary={status && translate(`datasource.refreshStatus.${statusChoices[status]}`)} />
+          <ListItemText primary={status && translate(`datasource.refreshStatus.${reportStatus[status]}`)} />
         </ListItem>
 
         <Divider variant="middle" />

diff --git a/src/modules/RA/DataSource/components/StatusChip/index.js b/src/modules/RA/DataSource/components/StatusChip/index.js
@@ -13,12 +13,12 @@ import WarningIcon from '@material-ui/icons/Warning';
 
 import TooltipStatus from './Tooltip';
 
-import {
-  SYNC_NEEDED,
+import STATUS, {
   PENDING,
   DONE,
   NOT_NEEDED,
   IN_PROGRESS,
+  sourceStatus,
 } from '../DataSourceStatus';
 
 const useStyles = makeStyles({
@@ -70,14 +70,8 @@ const StatusChip = ({
   const translate = useTranslate();
   const classes = useStyles();
   const stateKey = React.useMemo(() => {
-    const choices = {
-      0: SYNC_NEEDED,
-      1: PENDING,
-      2: DONE,
-      3: IN_PROGRESS,
-      default: NOT_NEEDED,
-    };
-    return choices[state] || choices.default;
+    const statusName = sourceStatus[state];
+    return STATUS[statusName] || NOT_NEEDED;
   }, [state]);
 
   const redirectToReport = React.useCallback(e => {
@@ -97,7 +91,7 @@ const StatusChip = ({
 
   return (
     <Tooltip
-      title={report && <TooltipStatus translate={translate} {...status} />}
+      title={report && <TooltipStatus translate={translate} {...report} />}
       disableHoverListener={!report}
     >
       <Chip