Merge branch 'dev' into table-expand/collapse-flow-with-sorting

Author: talhainvenxion

src/ui/components/Filters/index.tsx

@@ -609,6 +609,24 @@ const FilterComponent = ({
     //     break;
     // }
   }
+  const authorOptions = members.map((item: any) => {
+    return {
+      label: item.name as string,
+      value: item.id as string,
+    };
+  }) as any;
+  const pipelinesOptions = pipelines.map((item: any) => {
+    return {
+      label: item.name as string,
+      value: item.id as string,
+    };
+  }) as any;
+  const stacksOptions = stacks.map((item: any) => {
+    return {
+      label: item.name as string,
+      value: item.id as string,
+    };
+  }) as any;
   const valueField = (filter: any) => {
     switch (filter?.contains.selectedValue.type) {
       case 'string':
@@ -958,14 +976,19 @@ const FilterComponent = ({
                       ) : // <></>
                       filter?.column?.selectedValue?.value === 'pipeline_id' ? (
                         <Select
-                          getOptionLabel={(option: any) => option.name}
-                          getOptionValue={(option: any) => option.id}
-                          options={pipelines as any}
+                          // getOptionLabel={(option: any) => option.name}
+                          // getOptionValue={(option: any) => option.id}
+                          options={pipelinesOptions}
+                          defaultValue={pipelinesOptions.filter((el: any) => {
+                            return filters.some((f: any) => {
+                              return f.filterValue === el.value;
+                            });
+                          })}
                           styles={selectStyles}
                           onInputChange={(e: any) => callActionForPipelines(e)}
                           onChange={(value: any) => {
                             if (value) {
-                              handleChangeForSearchable(filter, value.id);
+                              handleChangeForSearchable(filter, value.value);
                             }
                           }}
                           isClearable={true}
@@ -976,14 +999,19 @@ const FilterComponent = ({
                       ) : filter?.column?.selectedValue?.value ===
                         'stack_id' ? (
                         <Select
-                          getOptionLabel={(option: any) => option.name}
-                          getOptionValue={(option: any) => option.id}
-                          options={stacks as any}
+                          // getOptionLabel={(option: any) => option.name}
+                          // getOptionValue={(option: any) => option.id}
+                          options={stacksOptions}
+                          defaultValue={stacksOptions.filter((el: any) => {
+                            return filters.some((f: any) => {
+                              return f.filterValue === el.value;
+                            });
+                          })}
                           styles={selectStyles}
                           onInputChange={(e: any) => callActionForStacks(e)}
                           onChange={(value: any) => {
                             if (value) {
-                              handleChangeForSearchable(filter, value.id);
+                              handleChangeForSearchable(filter, value.value);
                             }
                           }}
                           isClearable={true}
@@ -993,14 +1021,19 @@ const FilterComponent = ({
                         />
                       ) : (
                         <Select
-                          getOptionLabel={(option: any) => option.name}
-                          getOptionValue={(option: any) => option.id}
-                          options={members as any}
+                          // getOptionLabel={(option: any) => option.name}
+                          // getOptionValue={(option: any) => option.id}
+                          options={authorOptions}
+                          defaultValue={authorOptions.filter((el: any) => {
+                            return filters.some((f: any) => {
+                              return f.filterValue === el.value;
+                            });
+                          })}
                           styles={selectStyles}
                           onInputChange={(e: any) => callActionForUsers(e)}
                           onChange={(value: any) => {
                             if (value) {
-                              handleChangeForSearchable(filter, value.id);
+                              handleChangeForSearchable(filter, value.value);
                             }
                           }}
                           isClearable={true}

src/ui/layouts/common/layouts/AuthenticatedLayout/AuthenticatedHeader.tsx

@@ -148,7 +148,7 @@ export const AuthenticatedHeader: React.FC<{
     );
     await dispatch(
       pipelinesActions.getMy({
-        sort_by: 'created',
+        sort_by: 'desc:created',
         logical_operator: 'and',
         page: 1,
         size: ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,

src/ui/layouts/pipelines/PipelineDetail/useService.ts

@@ -38,7 +38,7 @@ export const useService = (): ServiceInterface => {
     );
     dispatch(
       pipelinesActions.allRunsByPipelineId({
-        sort_by: 'created',
+        sort_by: 'desc:created',
         logical_operator: 'and',
         pipelineId: id,
         page: 1,

src/ui/layouts/pipelines/Pipelines/List/useService.ts

@@ -48,7 +48,7 @@ export const useService = (
   const [
     activeSortingDirection,
     setActiveSortingDirection,
-  ] = React.useState<SortingDirection | null>('ASC');
+  ] = React.useState<SortingDirection | null>('DESC');
 
   const dispatch = useDispatch();
 

src/ui/layouts/pipelines/Pipelines/useService.ts

@@ -30,7 +30,7 @@ export const useService = (): ServiceInterface => {
     setFetchingForAllRuns(true);
     dispatch(
       runsActions.allRuns({
-        sort_by: 'created',
+        sort_by: 'desc:created',
         logical_operator: 'and',
         project: selectedProject,
         page: 1,
@@ -41,7 +41,7 @@ export const useService = (): ServiceInterface => {
     );
     dispatch(
       pipelinesActions.getMy({
-        sort_by: 'created',
+        sort_by: 'desc:created',
         logical_operator: 'and',
         page: 1,
         size: ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,

src/ui/layouts/pipelines/RunsTable/useService.ts

@@ -46,7 +46,7 @@ export const useService = ({
   const [
     activeSortingDirection,
     setActiveSortingDirection,
-  ] = React.useState<SortingDirection | null>('ASC');
+  ] = React.useState<SortingDirection | null>('DESC');
   const [sortedRuns, setSortedRuns] = React.useState<TRun[]>([]);
 
   const runs = pipelineRuns

src/ui/layouts/runs/RunsTable/useService.ts

@@ -27,7 +27,7 @@ export const useService = ({ runIds }: { runIds: TId[] }): ServiceInterface => {
   const [
     activeSortingDirection,
     setActiveSortingDirection,
-  ] = React.useState<SortingDirection | null>('ASC');
+  ] = React.useState<SortingDirection | null>('DESC');
   const [sortedRuns, setSortedRuns] = React.useState<TRun[]>([]);
 
   const runs = useSelector(runSelectors.forRunIds(runIds));

src/ui/layouts/runs/Stacks/useService.ts

@@ -22,7 +22,7 @@ export const useService = (): ServiceInterface => {
     setFetching(true);
     dispatch(
       stacksActions.getMy({
-        sort_by: 'created',
+        sort_by: 'desc:created',
         logical_operator: 'and',
         page: 1,
         size: ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,

src/ui/layouts/settings/Organization/useService.ts

@@ -33,7 +33,7 @@ export const useService = (): ServiceInterface => {
   const [
     activeSortingDirection,
     setActiveSortingDirection,
-  ] = React.useState<SortingDirection | null>('ASC');
+  ] = React.useState<SortingDirection | null>('DESC');
   const dispatch = useDispatch();
 
   const members = useSelector(organizationSelectors.myMembers);

src/ui/layouts/stackComponents/RunsTable/useService.ts

@@ -43,7 +43,7 @@ export const useService = ({
   const [
     activeSortingDirection,
     setActiveSortingDirection,
-  ] = React.useState<SortingDirection | null>('ASC');
+  ] = React.useState<SortingDirection | null>('DESC');
   const [sortedRuns, setSortedRuns] = React.useState<TRun[]>([]);
 
   const runs = useSelector(runSelectors.forRunIds(runIds));