dev pull

Author: AhsanKhan7

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

src/ui/layouts/common/Pagination/index.tsx

@@ -1,7 +1,4 @@
-import React, {
-  forwardRef,
-  useImperativeHandle,
-} from 'react';
+import React, { forwardRef, useImperativeHandle } from 'react';
 import { FlexBox, Box, icons } from '../../../components';
 import styles from './index.module.scss';
 import { joinClassNames, addStyle } from '../../../../utils';
@@ -30,7 +27,10 @@ const PaginationItem = (props: {
       addStyle(props.isActive, styles.active),
     )}
   >
-    <span className={styles.paginationText} style={{ color: props.isActive ? '#fff' : '#333' }} >
+    <span
+      className={styles.paginationText}
+      style={{ color: props.isActive ? '#fff' : '#333' }}
+    >
       {props.index}
     </span>
   </div>
@@ -51,7 +51,7 @@ const PaginationNavigationItem = (props: {
       addStyle(!props.hasNext, styles.hidden),
     )}
   >
-      <props.icon color="black" size="sml" />
+    <props.icon color="black" size="sml" />
   </div>
 );
 
@@ -200,21 +200,20 @@ export const Pagination: React.FC<Props> = forwardRef((props, ref) => {
             </Box>
           ))}
         </FlexBox>
-        
-     
+
         <PaginationNavigationItem
-            hasNext={props.pageIndex + 1 < props.totalOfPages}
-            onClick={() => {
-              onChange(
-                props.pageIndex + 2,
-                props.itemPerPage,
-                componentName,
-                props.filters,
-              );
-              props.setPageIndex(props.pageIndex + 1);
-            }}
-            icon={icons.paginationNext}
-          />
+          hasNext={props.pageIndex + 1 < props.totalOfPages}
+          onClick={() => {
+            onChange(
+              props.pageIndex + 2,
+              props.itemPerPage,
+              componentName,
+              props.filters,
+            );
+            props.setPageIndex(props.pageIndex + 1);
+          }}
+          icon={icons.paginationNext}
+        />
         <PaginationNavigationItem
           hasNext={props.pageIndex + 1 < props.totalOfPages}
           onClick={() => {