CM-728: remove iso parse (#40)

* CM-728: remove iso parse * CM-728: order by dateCreated --------- Co-authored-by: Jan <[email protected]>
openimis · Mar 21, 2024 · 5159e73 · 5159e73
1 parent f894602
commit 5159e73
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -36,7 +36,7 @@ const TASK_FULL_PROJECTION = () => [
   'jsonExt',
 ];
 
-const TASK_PROJECTION = () => [ 
+const TASK_PROJECTION = () => [
   'id',
   'entityId',
   'entityString',
@@ -52,7 +52,7 @@ const TASK_PROJECTION = () => [
 ];
 
 const TASKS_FULL_PROJECTION = () => [
-  ...TASK_PROJECTION, 'businessEvent'
+  ...TASK_PROJECTION, 'businessEvent',
 ];
 
 export const formatTaskGroupGQL = (taskGroup) => {

diff --git a/src/components/TaskApprovementPanel.js b/src/components/TaskApprovementPanel.js
@@ -13,7 +13,7 @@ import CheckIcon from '@material-ui/icons/Check';
 import {
   APPROVED, EMPTY_STRING,
   FAILED, TASK_STATUS,
-  TASK_CONTRIBUTION_KEY
+  TASK_CONTRIBUTION_KEY,
 } from '../constants';
 import { resolveTask } from '../actions';
 
@@ -50,7 +50,6 @@ function TaskApprovementPanel({
   const [disable, setDisable] = useState(false);
   const task = { ...edited };
 
-
   useEffect(() => {
     if (task?.businessStatus && user) {
       const businesStatus = JSON.parse(task.businessStatus);
@@ -106,11 +105,13 @@ function TaskApprovementPanel({
       .find((c) => c.taskSource.includes(task.source));
 
     if (contrib?.confirmationPanel) {
-      return <contrib.confirmationPanel 
-        task
-        defaultAction={handleButtonClick}
-        defaultDisabled={disable}
-      />
+      return (
+        <contrib.confirmationPanel
+          task
+          defaultAction={handleButtonClick}
+          defaultDisabled={disable}
+        />
+      );
     }
   }
 

diff --git a/src/components/TaskSearcher.js b/src/components/TaskSearcher.js
@@ -140,7 +140,7 @@ function TaskSearcher({
       sorts={sorts}
       rowsPerPageOptions={ROWS_PER_PAGE_OPTIONS}
       defaultPageSize={DEFAULT_PAGE_SIZE}
-      defaultOrderBy="source"
+      defaultOrderBy="-dateCreated"
       rowIdentifier={rowIdentifier}
       onDoubleClick={onDoubleClick}
       defaultFilters={defaultFilters()}

diff --git a/src/index.js b/src/index.js
@@ -48,4 +48,4 @@ const DEFAULT_CONFIG = {
 
 export const TasksManagementModule = (cfg) => ({ ...DEFAULT_CONFIG, ...cfg });
 
-export { resolveTask };
+export { resolveTask };
diff --git a/src/reducer.js b/src/reducer.js
@@ -115,12 +115,7 @@ function reducer(
         task: parseData(action.payload.data.task)?.map((task) => ({
           ...task,
           id: decodeId(task.id),
-          businessData: parseTaskData(JSON.parse(task.businessData, (key, value) => {
-            if (['date_valid_to', 'date_valid_from'].includes(key)) {
-              return `${value} 00:00:00`;
-            }
-            return value;
-          })),
+          businessData: parseTaskData(JSON.parse(task.businessData)),
         }))?.[0],
         errorTask: null,
       };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,4 +48,4 @@ const DEFAULT_CONFIG = {

		export const TasksManagementModule = (cfg) => ({ ...DEFAULT_CONFIG, ...cfg });

		export { resolveTask };
		export { resolveTask };