Merge branch 'dev' of https://github.com/zenml-io/zenml-dashboard into feat/ahsan-v2

Author: AhsanKhan7

src/ui/components/Filters/index.tsx

@@ -692,13 +692,12 @@ const FilterComponent = ({
             className="text-muted h5"
           >
             {/* Filter your stack */}
-            {!applyFilter && !filters[0]?.column?.selectedValue?.label ? (
+            {!applyFilter && !filters[0]?.filterValue ? (
               <Paragraph className={styles.filterplaceholder}>
                 Filter list
+                {console.log(filters, 'filters1')}
               </Paragraph>
-            ) : filters[0]?.column?.selectedValue.label &&
-              !applyFilter &&
-              !searchText ? (
+            ) : filters[0]?.filterValue && !applyFilter && !searchText ? (
               filters.map((filter: any, index: number) => {
                 return (
                   <FlexBox.Row key={index} className={styles.tile}>
@@ -730,8 +729,7 @@ const FilterComponent = ({
                 Filter list
               </Paragraph>
             )}
-            {!applyFilter &&
-            !filters[0]?.column?.selectedValue?.label ? null : filters[0]
+            {!applyFilter && !filters[0]?.filterValue ? null : filters[0]
                 ?.column?.selectedValue.label &&
               !applyFilter &&
               !searchText ? (

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

@@ -183,42 +183,63 @@ export const Table: React.FC<TableProps> = ({
   // console.log(check, '333');
   useEffect(() => {
     // console.log(locationPath.pathname.split('/')[4], 'locationPath1');
-    setItemPerPage(DEFAULT_ITEMS_PER_PAGE);
+    setItemPerPage(itemPerPage);
+    if (filters) {
+      setPageIndex(0);
+    }
     switch (componentName) {
       case 'stacks':
         if (CheckIfRun) {
-          dispatchStackRunsData(id, 1, 5, filters as any, activeSorting);
+          dispatchStackRunsData(
+            id,
+            1,
+            itemPerPage,
+            filters as any,
+            activeSorting,
+          );
           break;
         } else {
-          dispatchStackData(1, 5, filters as any, activeSorting);
+          dispatchStackData(1, itemPerPage, filters as any, activeSorting);
           break;
         }
       case 'components':
         if (CheckIfRun) {
           dispatchStackComponentRunsData(
             id,
             1,
-            5,
+            itemPerPage,
             filters as any,
             activeSorting,
           );
           break;
         } else {
-          dispatchStackComponentsData(1, 5, filters as any, activeSorting);
+          dispatchStackComponentsData(
+            1,
+            itemPerPage,
+            filters as any,
+            activeSorting,
+          );
           break;
         }
       case 'pipelines':
         if (CheckIfRun) {
-          dispatchPipelineRunsData(id, 1, 5, filters as any, activeSorting);
+          dispatchPipelineRunsData(
+            id,
+            1,
+            itemPerPage,
+            filters as any,
+            activeSorting,
+          );
           break;
         } else {
+          console.log(itemPerPage, 'itemPerPage');
           if (!renderAfterRow) break;
-          dispatchPipelineData(1, 5, filters as any, activeSorting);
+          dispatchPipelineData(1, itemPerPage, filters as any, activeSorting);
           break;
         }
 
       case 'all-runs':
-        dispatchAllrunsData(1, 5, filters as any, activeSorting);
+        dispatchAllrunsData(1, itemPerPage, filters as any, activeSorting);
         break;
 
       default:
@@ -252,7 +273,7 @@ export const Table: React.FC<TableProps> = ({
                 <tr className={showHeader ? styles.tableHeaderRow : ''}>
                   {headerCols.map((headerCol: HeaderCol, index: number, i) => (
                     <th
-                      className={styles.tableHeadingTh}                
+                      className={styles.tableHeadingTh}
                       style={{
                         width: headerCol.width,
                         color: '#424240',
@@ -261,8 +282,12 @@ export const Table: React.FC<TableProps> = ({
                       }}
                       key={index}
                     >
-                      <Box style={{ backgroundColor: '#f6f67' }} paddingVertical={showHeader ? 'sm' : null} paddingLeft="lg">
-                          {headerCol.render && headerCol.render()}
+                      <Box
+                        style={{ backgroundColor: '#f6f67' }}
+                        paddingVertical={showHeader ? 'sm' : null}
+                        paddingLeft="lg"
+                      >
+                        {headerCol.render && headerCol.render()}
                       </Box>
                     </th>
                   ))}
@@ -284,7 +309,9 @@ export const Table: React.FC<TableProps> = ({
                         styles.tableRow,
                         trOnClick && styles.clickableTableRow,
                       )}
-                      style={{ backgroundColor: index % 2 !== 0 ? '#F5F3F9' : 'white' }}
+                      style={{
+                        backgroundColor: index % 2 !== 0 ? '#F5F3F9' : 'white',
+                      }}
                       key={index}
                     >
                       {headerCols.map((headerCol: HeaderCol, index: number) => (
@@ -295,7 +322,7 @@ export const Table: React.FC<TableProps> = ({
                         >
                           <Box paddingVertical="sm" paddingLeft="lg">
                             <Truncate maxLines={1}>
-                                {headerCol.renderRow(headerRow)}
+                              {headerCol.renderRow(headerRow)}
                             </Truncate>
                           </Box>
                         </td>

src/ui/layouts/pipelines/RunsTable/index.tsx

@@ -69,7 +69,9 @@ export const RunsTable: React.FC<{
   });
 
   useEffect(() => {
-    getSorted(activeSorting, activeSortingDirection);
+    if (getSorted) {
+      getSorted(activeSorting, activeSortingDirection);
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [getSorted]);