modify filter object for status, created and is_shared

talhainvenxion · talhainvenxion · commit 84d6b86c8e98 · 2023-01-13T01:46:29.000+05:00
diff --git a/src/ui/components/Filters/index.tsx b/src/ui/components/Filters/index.tsx
@@ -41,7 +41,7 @@ export const getInitialFilterState = () => {
           type: 'string',
         },
         {
-          value: 'isShared',
+          value: 'is_shared',
           label: 'Shared',
           type: 'boolean',
         },
@@ -81,18 +81,28 @@ export const getInitialFilterState = () => {
           type: 'string',
         },
         {
-          value: 'greater',
+          value: 'gt',
           label: 'Greater than',
           type: 'date',
         },
         {
-          value: 'less',
+          value: 'lt',
           label: 'Less than',
           type: 'date',
         },
+        {
+          value: 'gte',
+          label: 'Greater than and Equal',
+          type: 'date',
+        },
+        {
+          value: 'lte',
+          label: 'Less than and Equal',
+          type: 'date',
+        },
         {
           value: 'equal_date',
-          label: 'Equal',
+          label: 'Equals',
           type: 'date',
         },
         {
@@ -185,9 +195,19 @@ export const getInitialFilterStateForPipeline = () => {
           label: 'Less than',
           type: 'date',
         },
+        {
+          value: 'gte',
+          label: 'Greater than and Equal',
+          type: 'date',
+        },
+        {
+          value: 'lte',
+          label: 'Less than and Equal',
+          type: 'date',
+        },
         {
           value: 'equal_date',
-          label: 'equals',
+          label: 'Equals',
           type: 'date',
         },
         {
@@ -330,18 +350,28 @@ export const getInitialFilterStateForRuns = () => {
           type: 'string',
         },
         {
-          value: 'greater',
+          value: 'gt',
           label: 'Greater than',
           type: 'date',
         },
         {
-          value: 'less',
+          value: 'lt',
           label: 'Less than',
           type: 'date',
         },
+        {
+          value: 'gte',
+          label: 'Greater than and Equal',
+          type: 'date',
+        },
+        {
+          value: 'lte',
+          label: 'Less than and Equal',
+          type: 'date',
+        },
         {
           value: 'equal_date',
-          label: 'Equal',
+          label: 'Equals',
           type: 'date',
         },
         {
@@ -490,7 +520,9 @@ const FilterComponent = ({
           <Box style={{ width: '146px' }}>
             <DatePicker
               selected={filter.filterValue}
-              onChange={(value: any) => handleValueFieldChange(filter, value)}
+              onChange={(value: any) => {
+                handleValueFieldChange(filter, value);
+              }}
               customInput={<ExampleCustomInput />}
             />
           </Box>
@@ -662,7 +694,7 @@ const FilterComponent = ({
                       />
                     </FlexBox.Row>
                   </>
-                ) : filter?.column?.selectedValue?.value === 'isShared' ? (
+                ) : filter?.column?.selectedValue?.value === 'is_shared' ? (
                   <>
                     <FlexBox.Row className="mb-1">
                       <FormTextField
diff --git a/src/ui/layouts/pipelines/PipelineDetail/useService.ts b/src/ui/layouts/pipelines/PipelineDetail/useService.ts
@@ -11,6 +11,7 @@ import { useDispatch } from 'react-redux';
 import { pipelinePagesActions } from '../../../../redux/actions';
 import { useEffect } from 'react';
 import { sign } from 'crypto';
+import { filterObjectForParam } from '../../../../utils';
 
 interface ServiceInterface {
   pipeline: TPipeline;
@@ -61,14 +62,7 @@ export const callActionForPipelineRunsForPagination = () => {
     size: number,
     filters?: any[],
   ) {
-    let filtersParam = filters?.reduce(
-      (obj, item) =>
-        Object.assign(obj, {
-          [item.column.value]: item.type.value + ':' + item.value,
-        }),
-      {},
-    );
-
+    let filtersParam = filterObjectForParam(filters);
     // console.log('aaaa', filters);
     setFetching(true);
     dispatch(
diff --git a/src/ui/layouts/pipelines/Pipelines/useService.ts b/src/ui/layouts/pipelines/Pipelines/useService.ts
@@ -12,6 +12,7 @@ import { projectSelectors } from '../../../../redux/selectors';
 
 import { useDispatch, useSelector } from '../../../hooks';
 
+import { filterObjectForParam } from '../../../../utils';
 interface ServiceInterface {
   setFetchingForPipeline: (arg: boolean) => void;
   setFetchingForAllRuns: (arg: boolean) => void;
@@ -62,15 +63,7 @@ export const callActionForPipelinesForPagination = () => {
   const selectedProject = useSelector(projectSelectors.selectedProject);
 
   function dispatchPipelineData(page: number, size: number, filters?: any[]) {
-    let filtersParam = filters?.reduce(
-      (obj, item) =>
-        Object.assign(obj, {
-          [item.column.value]: item.type.value + ':' + item.value,
-        }),
-      {},
-    );
-
-    // console.log('aaaa', filters);
+    let filtersParam = filterObjectForParam(filters);
     setFetchingForPipeline(true);
     dispatch(
       pipelinesActions.getMy({
@@ -100,15 +93,8 @@ export const callActionForAllrunsForPagination = () => {
   const selectedProject = useSelector(projectSelectors.selectedProject);
 
   function dispatchAllrunsData(page: number, size: number, filters?: any[]) {
-    let filtersParam = filters?.reduce(
-      (obj, item) =>
-        Object.assign(obj, {
-          [item.column.value]: item.type.value + ':' + item.value,
-        }),
-      {},
-    );
+    let filtersParam = filterObjectForParam(filters);
 
-    // console.log('aaaa', filters);
     setFetchingForAllRuns(true);
     dispatch(
       runsActions.allRuns({
diff --git a/src/ui/layouts/runs/StackDetail/useService.ts b/src/ui/layouts/runs/StackDetail/useService.ts
@@ -16,18 +16,18 @@ export const useService = (): ServiceInterface => {
   const dispatch = useDispatch();
   const { id } = useParams<StackDetailRouteParams>();
 
-  useEffect(() => {
-    setFetching(true);
-    // Legacy: previously runs was in pipeline
-
-    dispatch(
-      stacksActions.allRunsByStackId({
-        stackId: id,
-        onSuccess: () => setFetching(false),
-        onFailure: () => setFetching(false),
-      }),
-    );
-  }, [id]);
+  // useEffect(() => {
+  //   setFetching(true);
+  //   // Legacy: previously runs was in pipeline
+
+  //   dispatch(
+  //     stacksActions.allRunsByStackId({
+  //       stackId: id,
+  //       onSuccess: () => setFetching(false),
+  //       onFailure: () => setFetching(false),
+  //     }),
+  //   );
+  // }, [id]);
 
   const setFetching = (fetching: boolean) => {
     dispatch(stackPagesActions.setFetching({ fetching }));
diff --git a/src/ui/layouts/stackComponents/StackDetail/useService.ts b/src/ui/layouts/stackComponents/StackDetail/useService.ts
@@ -14,6 +14,7 @@ import { useParams, useSelector } from '../../../hooks';
 import { useDispatch } from 'react-redux';
 import { stackPagesActions } from '../../../../redux/actions';
 import { useEffect } from 'react';
+import { filterObjectForParam } from '../../../../utils';
 
 interface ServiceInterface {
   stackComponent: TStack;
@@ -65,13 +66,7 @@ export const callActionForStackComponentRunsForPagination = () => {
     size: number,
     filters?: any[],
   ) {
-    let filtersParam = filters?.reduce(
-      (obj, item) =>
-        Object.assign(obj, {
-          [item.column.value]: item.type.value + ':' + item.value,
-        }),
-      {},
-    );
+    let filtersParam = filterObjectForParam(filters);
 
     // debugger;
     setFetching(true);
diff --git a/src/ui/layouts/stackComponents/Stacks/useService.ts b/src/ui/layouts/stackComponents/Stacks/useService.ts
@@ -9,6 +9,7 @@ import {
 import { useDispatch, useLocationPath, useSelector } from '../../../hooks';
 import { DEFAULT_PROJECT_NAME } from '../../../../constants';
 import { projectSelectors } from '../../../../redux/selectors';
+import { filterObjectForParam } from '../../../../utils';
 
 interface ServiceInterface {
   setFetching: (arg: boolean) => void;
@@ -56,13 +57,7 @@ export const callActionForStackComponentsForPagination = () => {
     size: number,
     filters?: any[],
   ) {
-    let filtersParam = filters?.reduce(
-      (obj, item) =>
-        Object.assign(obj, {
-          [item.column.value]: item.type.value + ':' + item.value,
-        }),
-      {},
-    );
+    let filtersParam = filterObjectForParam(filters);
     setFetching(true);
     dispatch(
       stackComponentsActions.getMy({
diff --git a/src/ui/layouts/stacks/StackDetail/useService.ts b/src/ui/layouts/stacks/StackDetail/useService.ts
@@ -11,6 +11,7 @@ import { useParams, useSelector } from '../../../hooks';
 import { useDispatch } from 'react-redux';
 import { stackPagesActions } from '../../../../redux/actions';
 import { useEffect } from 'react';
+import { filterObjectForParam } from '../../../../utils';
 
 interface ServiceInterface {
   stack: TStack;
@@ -61,13 +62,7 @@ export const callActionForStackRunsForPagination = () => {
     size: number,
     filters?: any[],
   ) {
-    let filtersParam = filters?.reduce(
-      (obj, item) =>
-        Object.assign(obj, {
-          [item.column.value]: item.type.value + ':' + item.value,
-        }),
-      {},
-    );
+    let filtersParam = filterObjectForParam(filters);
 
     console.log('aaaa', filters);
     setFetching(true);
diff --git a/src/ui/layouts/stacks/Stacks/useService.ts b/src/ui/layouts/stacks/Stacks/useService.ts
@@ -4,6 +4,7 @@ import { useEffect } from 'react';
 import { stackPagesActions, stacksActions } from '../../../../redux/actions';
 import { projectSelectors } from '../../../../redux/selectors';
 import { useDispatch, useSelector, useLocationPath } from '../../../hooks';
+import { filterObjectForParam } from '../../../../utils';
 
 interface ServiceInterface {
   setFetching: (arg: boolean) => void;
@@ -44,13 +45,7 @@ export const callActionForStacksForPagination = () => {
   const selectedProject = useSelector(projectSelectors.selectedProject);
 
   function dispatchStackData(page: number, size: number, filters?: any[]) {
-    let filtersParam = filters?.reduce(
-      (obj, item) =>
-        Object.assign(obj, {
-          [item.column.value]: item.type.value + ':' + item.value,
-        }),
-      {},
-    );
+    let filtersParam = filterObjectForParam(filters);
 
     setFetching(true);
     dispatch(
diff --git a/src/utils/filterObjectForParam.ts b/src/utils/filterObjectForParam.ts
@@ -0,0 +1,24 @@
+import moment from 'moment';
+export const filterObjectForParam = (filters: any): object => {
+  console.log(filters, 'filterObjectForParam');
+  const UTCformatter = (preDate: any) => moment.utc(preDate).toDate();
+  return filters?.reduce(
+    (obj: any, item: any) =>
+      Object.assign(obj, {
+        // [item.column.value]: item.column.value === 'created'  ? item.type.value + ':' + item.value,
+        [item.column.value]:
+          item.column.value === 'created'
+            ? item.type.value === 'equal_date'
+              ? 'equals' +
+                ':' +
+                moment(UTCformatter(item.value)).format('YYYY-MM-DD HH:mm:ss')
+              : item.type.value +
+                ':' +
+                moment(UTCformatter(item.value)).format('YYYY-MM-DD HH:mm:ss')
+            : item.type.type === 'status' || item.type.type === 'boolean'
+            ? item.type.value
+            : item.type.value + ':' + item.value,
+      }),
+    {},
+  );
+};
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -8,4 +8,5 @@ export * from './validations';
 export * from './date';
 export * from './runs';
 export * from './money';
+export * from './filterObjectForParam';
 export * from './string';
