[INV-3528] Refactor** activities batch

app/src/UI/Overlay/Batch/batch-upload/BatchCreate.tsx

@@ -5,20 +5,19 @@ import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { useSelector } from 'utils/use_selector';
 import { selectBatch } from 'state/reducers/batch';
-import { BATCH_CREATE_REQUEST_WITH_CALLBACK, BATCH_TEMPLATE_LIST_REQUEST } from 'state/actions';
 import Spinner from 'UI/Spinner/Spinner';
 import { selectAuth } from 'state/reducers/auth';
+import BatchActions from 'state/actions/batch/BatchActions';
 
 const BatchCreate = () => {
   const dispatch = useDispatch();
-
   const history = useHistory();
 
   const [data, setData] = useState(null);
   const [selectedTemplate, setSelectedTemplate] = useState<string>();
   const [ready, setReady] = useState<boolean>(false);
 
-  const { working, templates, item } = useSelector(selectBatch);
+  const { working, templates } = useSelector(selectBatch);
   const authState = useSelector(selectAuth);
 
   useEffect(() => {
@@ -29,8 +28,7 @@ const BatchCreate = () => {
     if (!authState?.authenticated) {
       return;
     }
-
-    dispatch({ type: BATCH_TEMPLATE_LIST_REQUEST });
+    dispatch(BatchActions.templateList());
   }, [authState?.authenticated]);
 
   const acceptData = (d) => {
@@ -39,15 +37,14 @@ const BatchCreate = () => {
 
   const doUpload = () => {
     new Promise((resolve, reject) => {
-      dispatch({
-        type: BATCH_CREATE_REQUEST_WITH_CALLBACK,
-        payload: {
+      dispatch(
+        BatchActions.createWithCallback({
           csvData: data,
           template: selectedTemplate,
           resolve,
           reject
-        }
-      });
+        })
+      );
     }).then((batchId) => {
       history.push(`/Batch/list/${batchId}`);
     });

app/src/UI/Overlay/Batch/batch-upload/BatchDetail.tsx

@@ -7,7 +7,7 @@ import BatchFileComponent from './BatchFileComponent';
 import { useSelector } from 'utils/use_selector';
 import { selectBatch } from 'state/reducers/batch';
 import Spinner from 'UI/Spinner/Spinner';
-import { BATCH_EXECUTE_REQUEST, BATCH_RETRIEVE_REQUEST, BATCH_UPDATE_REQUEST } from 'state/actions';
+import BatchActions from 'state/actions/batch/BatchActions';
 
 const StyledSelect = {
   width: '70pt',
@@ -30,34 +30,32 @@ const BatchMetadata = ({ batch }) => {
   }
 
   function uploadRevisedData() {
-    dispatch({
-      type: BATCH_UPDATE_REQUEST,
-      payload: {
+    dispatch(
+      BatchActions.update({
         id: batch.id,
-        csvData: fileData
-      }
-    });
+        csvData: fileData ?? ''
+      })
+    );
   }
 
   function doBatchExec() {
-    dispatch({
-      type: BATCH_EXECUTE_REQUEST,
-      payload: {
+    dispatch(
+      BatchActions.execute({
         id: batch.id,
         desiredActivityState: execFinalState,
         treatmentOfErrorRows: execErrorRowsTreatment
-      }
-    });
+      })
+    );
   }
 
-  const [fileData, setFileData] = useState(null);
+  const [fileData, setFileData] = useState<string>();
   const [uploadReady, setUploadReady] = useState(false);
 
   const [execFinalState, setExecFinalState] = useState('');
   const [execErrorRowsTreatment, setExecErrorRowsTreatment] = useState('');
 
   useEffect(() => {
-    setUploadReady(fileData !== null);
+    setUploadReady(fileData != null);
   }, [fileData]);
 
   const acceptFileData = (d) => {
@@ -164,7 +162,7 @@ const BatchDetail = ({ id }) => {
   const dispatch = useDispatch();
 
   useEffect(() => {
-    dispatch({ type: BATCH_RETRIEVE_REQUEST, payload: { id } });
+    dispatch(BatchActions.retrieve(id));
   }, [id]);
 
   function renderContent() {

app/src/UI/Overlay/Batch/batch-upload/BatchUploadList.tsx

@@ -1,14 +1,14 @@
 import { Box, Paper, Typography } from '@mui/material';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { Error } from '@mui/icons-material';
 import { Link } from 'react-router-dom';
 import { selectUserSettings } from 'state/reducers/userSettings';
 import { useSelector } from 'utils/use_selector';
 import { selectBatch } from 'state/reducers/batch';
-import { BATCH_DELETE_REQUEST, BATCH_LIST_REQUEST } from 'state/actions';
 import Spinner from 'UI/Spinner/Spinner';
 import { selectAuth } from 'state/reducers/auth';
+import BatchActions from 'state/actions/batch/BatchActions';
 
 const BatchUploadList = () => {
   const { working, error, list, templates, errorMessage } = useSelector(selectBatch);
@@ -22,11 +22,11 @@ const BatchUploadList = () => {
       return;
     }
 
-    dispatch({ type: BATCH_LIST_REQUEST });
+    dispatch(BatchActions.list());
   }, [serial, authState?.authenticated]);
 
   function deleteBatch(batchId) {
-    dispatch({ type: BATCH_DELETE_REQUEST, payload: { id: batchId } });
+    dispatch(BatchActions.delete(batchId));
   }
 
   function renderError() {

app/src/UI/Overlay/Batch/batch-upload/TemplateDownloadList.tsx

@@ -1,12 +1,12 @@
 import { Typography } from '@mui/material';
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import TemplatePreview from './TemplatePreview';
 import { useDispatch } from 'react-redux';
 import { useSelector } from 'utils/use_selector';
 import { selectBatch } from 'state/reducers/batch';
-import { BATCH_TEMPLATE_LIST_REQUEST } from 'state/actions';
 import Spinner from 'UI/Spinner/Spinner';
 import { selectAuth } from 'state/reducers/auth';
+import BatchActions from 'state/actions/batch/BatchActions';
 
 const TemplateDownloadList = () => {
   const dispatch = useDispatch();
@@ -17,8 +17,7 @@ const TemplateDownloadList = () => {
     if (!authState?.authenticated) {
       return;
     }
-
-    dispatch({ type: BATCH_TEMPLATE_LIST_REQUEST });
+    dispatch(BatchActions.templateList());
   }, [authState?.authenticated]);
 
   if (working) {

app/src/UI/Overlay/Batch/batch-upload/TemplatePreview.tsx

@@ -1,5 +1,5 @@
 import { Accordion, AccordionDetails, AccordionSummary, Box, Button, Typography } from '@mui/material';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 
 import { CodeTableReference } from './CodeTableReference';
 import { useDispatch } from 'react-redux';
@@ -8,8 +8,8 @@ import { Download } from '@mui/icons-material';
 import { selectUserSettings } from 'state/reducers/userSettings';
 import { useSelector } from 'utils/use_selector';
 import { selectBatch } from 'state/reducers/batch';
-import { BATCH_TEMPLATE_DOWNLOAD_CSV_REQUEST, BATCH_TEMPLATE_DOWNLOAD_REQUEST } from 'state/actions';
 import Spinner from 'UI/Spinner/Spinner';
+import BatchActions from 'state/actions/batch/BatchActions';
 
 const TemplatePreview = ({ name, id }) => {
   const dispatch = useDispatch();
@@ -23,12 +23,7 @@ const TemplatePreview = ({ name, id }) => {
 
   useEffect(() => {
     if (expanded && !detail) {
-      dispatch({
-        type: BATCH_TEMPLATE_DOWNLOAD_REQUEST,
-        payload: {
-          key: id
-        }
-      });
+      dispatch(BatchActions.downloadTemplate(id));
     }
   }, [id, expanded]);
 
@@ -44,13 +39,12 @@ const TemplatePreview = ({ name, id }) => {
 
   const downloadTemplate = (key: string) => {
     new Promise((resolve, reject) => {
-      dispatch({
-        type: BATCH_TEMPLATE_DOWNLOAD_CSV_REQUEST,
-        payload: {
+      dispatch(
+        BatchActions.downloadTemplateCsv({
           key: id,
           resolve
-        }
-      });
+        })
+      );
     }).then((data) => {
       const dataUrl = `data:text/csv;base64,${btoa(data as string)}`;
       const downloadLink = document.createElement('a');

app/src/state/actions.tsx

@@ -207,32 +207,6 @@ export const CUSTOM_LAYER_DRAWN = 'CUSTOM_LAYER_DRAWN';
 export const REMOVE_CLIENT_BOUNDARY = 'REMOVE_CLIENT_BOUNDARY';
 export const REMOVE_SERVER_BOUNDARY = 'REMOVE_SERVER_BOUNDARY';
 
-export const BATCH_LIST_REQUEST = 'BATCH_LIST_REQUEST';
-export const BATCH_LIST_SUCCESS = 'BATCH_LIST_SUCCESS';
-export const BATCH_LIST_ERROR = 'BATCH_LIST_ERROR';
-export const BATCH_RETRIEVE_REQUEST = 'BATCH_RETRIEVE_REQUEST';
-export const BATCH_RETRIEVE_SUCCESS = 'BATCH_RETRIEVE_SUCCESS';
-export const BATCH_RETRIEVE_ERROR = 'BATCH_RETRIEVE_ERROR';
-export const BATCH_CREATE_REQUEST = 'BATCH_CREATE_REQUEST';
-export const BATCH_CREATE_REQUEST_WITH_CALLBACK = 'BATCH_CREATE_REQUEST_WITH_CALLBACK';
-export const BATCH_CREATE_SUCCESS = 'BATCH_CREATE_SUCCESS';
-export const BATCH_CREATE_ERROR = 'BATCH_CREATE_ERROR';
-export const BATCH_UPDATE_REQUEST = 'BATCH_UPDATE_REQUEST';
-export const BATCH_UPDATE_SUCCESS = 'BATCH_UPDATE_SUCCESS';
-export const BATCH_UPDATE_ERROR = 'BATCH_UPDATE_ERROR';
-export const BATCH_DELETE_REQUEST = 'BATCH_DELETE_REQUEST';
-export const BATCH_DELETE_SUCCESS = 'BATCH_DELETE_SUCCESS';
-export const BATCH_DELETE_ERROR = 'BATCH_DELETE_ERROR';
-export const BATCH_EXECUTE_REQUEST = 'BATCH_EXECUTE_REQUEST';
-export const BATCH_EXECUTE_SUCCESS = 'BATCH_EXECUTE_SUCCESS';
-export const BATCH_EXECUTE_ERROR = 'BATCH_EXECUTE_ERROR';
-export const BATCH_TEMPLATE_LIST_REQUEST = 'BATCH_TEMPLATE_LIST_REQUEST';
-export const BATCH_TEMPLATE_LIST_SUCCESS = 'BATCH_TEMPLATE_LIST_SUCCESS';
-export const BATCH_TEMPLATE_LIST_ERROR = 'BATCH_TEMPLATE_LIST_ERROR';
-export const BATCH_TEMPLATE_DOWNLOAD_REQUEST = 'BATCH_TEMPLATE_DOWNLOAD_REQUEST';
-export const BATCH_TEMPLATE_DOWNLOAD_SUCCESS = 'BATCH_TEMPLATE_DOWNLOAD_SUCCESS';
-export const BATCH_TEMPLATE_DOWNLOAD_ERROR = 'BATCH_TEMPLATE_DOWNLOAD_ERROR';
-export const BATCH_TEMPLATE_DOWNLOAD_CSV_REQUEST = 'BATCH_TEMPLATE_DOWNLOAD_CSV_REQUEST';
 export const CSV_LINK_CLICKED = 'CSV_LINK_CLICKED';
 
 export const EXPORT_CONFIG_LOAD_REQUEST = 'EXPORT_CONFIG_LOAD_REQUEST';

app/src/state/actions/batch/BatchActions.ts

@@ -0,0 +1,71 @@
+import { createAction } from '@reduxjs/toolkit';
+import { DeepBatch, DeepTemplate, ShallowBatch } from 'state/reducers/batch';
+
+interface IBatchCreateWithCallback {
+  csvData: Record<string, any> | null;
+  template?: string;
+  resolve: Function;
+  reject: Function;
+}
+
+export interface IBatchSuccess extends DeepBatch {
+  batchId: string;
+}
+export interface IBatchUpdate {
+  id: string;
+  csvData: string;
+}
+export interface IBatchExecute {
+  id: string;
+  desiredActivityState: string;
+  treatmentOfErrorRows: string;
+}
+
+export interface IBatchListTemplate {
+  name: string;
+  key: string;
+}
+
+export interface IBatchDownloadTemplate {
+  key: string;
+  data: DeepTemplate;
+}
+
+export interface IBatchDownloadTemplateCsv {
+  key: string;
+  resolve: any;
+}
+class BatchActions {
+  private static readonly PREFIX = 'Batch';
+
+  static readonly list = createAction(`${this.PREFIX}/list`);
+  static readonly listSuccess = createAction<ShallowBatch[]>(`${this.PREFIX}/listSuccess`);
+
+  static readonly retrieve = createAction<string>(`${this.PREFIX}/retrieve`);
+  static readonly retrieveSuccess = createAction<DeepBatch>(`${this.PREFIX}/retrieveSuccess`);
+
+  static readonly createWithCallback = createAction<IBatchCreateWithCallback>(`${this.PREFIX}/createWithCallback`);
+  static readonly createSuccess = createAction<IBatchSuccess>(`${this.PREFIX}/create`);
+
+  static readonly update = createAction<IBatchUpdate>(`${this.PREFIX}/update`);
+  static readonly updateSuccess = createAction<IBatchSuccess>(`${this.PREFIX}/updateSuccess`);
+
+  static readonly delete = createAction<string>(`${this.PREFIX}/delete`);
+  static readonly deleteSuccess = createAction(`${this.PREFIX}/deleteSuccess`);
+  static readonly deleteError = createAction(`${this.PREFIX}/deleteError`);
+
+  static readonly execute = createAction<IBatchExecute>(`${this.PREFIX}/execute`);
+  static readonly executeSuccess = createAction<DeepBatch>(`${this.PREFIX}/executeSuccess`);
+  static readonly executeError = createAction<string>(`${this.PREFIX}/executeError`);
+
+  static readonly templateList = createAction(`${this.PREFIX}/templateList`);
+  static readonly templateListSuccess = createAction<IBatchListTemplate[]>(`${this.PREFIX}/templateListSuccess`);
+
+  static readonly downloadTemplate = createAction<string>(`${this.PREFIX}/downloadTemplate`);
+  static readonly downloadTemplateSuccess = createAction<IBatchDownloadTemplate>(
+    `${this.PREFIX}/downloadTemplateSuccess`
+  );
+  static readonly downloadTemplateCsv = createAction<IBatchDownloadTemplateCsv>(`${this.PREFIX}/downloadTemplateCsv`);
+}
+
+export default BatchActions;