Merge branch 'dev' into talha/feedback-fixes

Author: talhainvenxion

src/ui/components/Filters/index.tsx

@@ -40,7 +40,7 @@ export const getInitialFilterState = () => {
           type: 'boolean',
         },
         {
-          value: 'creationDate',
+          value: 'created',
           label: 'Created at',
           type: 'date',
         },
@@ -130,7 +130,7 @@ export const getInitialFilterStateForPipeline = () => {
         //   type: 'boolean',
         // },
         {
-          value: 'creationDate',
+          value: 'created',
           label: 'Created at',
           type: 'date',
         },
@@ -230,7 +230,7 @@ export const getInitialFilterStateForRuns = () => {
         //   type: 'boolean',
         // },
         {
-          value: 'creationDate',
+          value: 'created',
           label: 'Created at',
           type: 'date',
         },

src/ui/layouts/stacks/Stacks/List/useService.ts

@@ -44,7 +44,7 @@ export const useService = (
 
   useEffect(() => {
     let orderedStacks = _.sortBy(Stacks, (stack: TStack) =>
-      new Date(stack.creationDate).getTime(),
+      new Date(stack.created).getTime(),
     ).reverse();
 
     const isValidFilter = filter.map((f) => f.value).join('');

src/utils/tableFilters.ts

@@ -2,7 +2,58 @@ import { formatDateToDisplay } from './date';
 
 export const getFilteredDataForTable = (data: any, filter: any) => {
   filter.forEach((f: any) => {
-    if (f.column.type === 'string') {
+    // temporary because api format changed after filter implementation this need to be refactor
+    if (f.column.label === 'Owner' || f.column.label === 'Author') {
+      if (f.type.value === 'contains') {
+        data = data.filter((os: any) => {
+          if (f.column.value && f.value) {
+            return os.user.name.toLowerCase().includes(f.value.toLowerCase());
+          }
+          return true;
+        });
+      }
+
+      if (f.type.value === 'start_with') {
+        data = data.filter((os: any) => {
+          if (f.column.value && f.value) {
+            return os[f.column.value]
+              .toLowerCase()
+              .startsWith(f.value.toLowerCase());
+          }
+          return true;
+        });
+      }
+
+      if (f.type.value === 'end_with') {
+        data = data.filter((os: any) => {
+          if (f.column.value && f.value) {
+            return os[f.column.value]
+              .toLowerCase()
+              .endsWith(f.value.toLowerCase());
+          }
+          return true;
+        });
+      }
+
+      if (f.type.value === 'equal') {
+        data = data.filter((os: any) => {
+          if (f.column.value && f.value) {
+            return os[f.column.value].toLowerCase() === f.value.toLowerCase();
+          }
+          return true;
+        });
+      }
+      if (f.type.value === 'not_equal') {
+        data = data.filter((os: any) => {
+          if (f.column.value && f.value) {
+            return os[f.column.value].toLowerCase() !== f.value.toLowerCase();
+          }
+          return true;
+        });
+      }
+    }
+
+    if (f.column.type === 'string' && f.column.label !== 'Owner') {
       if (f.type.value === 'contains') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {