Skip to content

Commit c00ed0e

Browse files
danialraza03danialraza03
authored
Merge pull request #111 from zenml-io/dev
Dev
2 parents 54fc61a + 2c2d045 commit c00ed0e

File tree

10 files changed

+142
-103
lines changed

10 files changed

+142
-103
lines changed

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

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,12 @@ export const Pagination: React.FC<Props> = forwardRef((props, ref) => {
9292
componentName === 'components'
9393
? locationPath.pathname.split('/')[5]
9494
: locationPath.pathname.split('/')[4];
95-
// const isValidFilter = props.filters?.map((f) => f.value).join('');
96-
// const [fetchingMembers, setFetchingMembers] = useState(true);
95+
const isValidFilterFroValue: any = props.filters
96+
?.map((f) => f.value)
97+
.join('');
98+
const isValidFilterForCategory: any =
99+
isValidFilterFroValue && props.filters?.map((f) => f.type.value).join('');
100+
const checkValidFilter = isValidFilterFroValue + isValidFilterForCategory;
97101
useImperativeHandle(ref, () => ({
98102
callOnChange(page: number, size: number, filters: any, activeSorting: any) {
99103
props.setPageIndex(page - 1);
@@ -128,10 +132,21 @@ export const Pagination: React.FC<Props> = forwardRef((props, ref) => {
128132
switch (componentName) {
129133
case 'stacks':
130134
if (CheckIfRun) {
131-
dispatchStackRunsData(id, page, size, filters as any, activeSorting);
135+
dispatchStackRunsData(
136+
id,
137+
page,
138+
size,
139+
checkValidFilter.length ? (filters as any) : [],
140+
activeSorting,
141+
);
132142
break;
133143
} else {
134-
dispatchStackData(page, size, filters as any, activeSorting);
144+
dispatchStackData(
145+
page,
146+
size,
147+
checkValidFilter.length ? (filters as any) : [],
148+
activeSorting,
149+
);
135150
break;
136151
}
137152
case 'components':
@@ -140,15 +155,15 @@ export const Pagination: React.FC<Props> = forwardRef((props, ref) => {
140155
id,
141156
page,
142157
size,
143-
filters as any,
158+
checkValidFilter.length ? (filters as any) : [],
144159
activeSorting,
145160
);
146161
break;
147162
} else {
148163
dispatchStackComponentsData(
149164
page,
150165
size,
151-
filters as any,
166+
checkValidFilter.length ? (filters as any) : [],
152167
activeSorting,
153168
);
154169
break;
@@ -159,17 +174,26 @@ export const Pagination: React.FC<Props> = forwardRef((props, ref) => {
159174
id,
160175
page,
161176
size,
162-
filters as any,
177+
checkValidFilter.length ? (filters as any) : [],
163178
activeSorting,
164179
);
165180
break;
166181
} else {
167-
dispatchPipelineData(page, size, filters as any, activeSorting);
182+
dispatchPipelineData(
183+
page,
184+
size,
185+
checkValidFilter.length ? (filters as any) : [],
186+
activeSorting,
187+
);
168188
break;
169189
}
170190

171191
case 'all-runs':
172-
dispatchAllrunsData(page, size, filters as any);
192+
dispatchAllrunsData(
193+
page,
194+
size,
195+
checkValidFilter.length ? (filters as any) : [],
196+
);
173197
break;
174198

175199
default:

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

Lines changed: 85 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -191,84 +191,99 @@ export const Table: React.FC<TableProps> = ({
191191
: locationPath.pathname.split('/')[4];
192192
const checkForLocationPath = locationPath.pathname.split('/')[4];
193193
useEffect(() => {
194-
// console.log(locationPath.pathname.split('/')[4], 'locationPath1');
194+
// console.log(checkValidFilter, 'locationPath1');
195195
setItemPerPage(itemPerPage);
196196
if (filters) {
197197
setPageIndex(0);
198198
}
199-
if (checkValidFilter || activeSorting || checkForLocationPath) {
200-
switch (componentName) {
201-
case 'stacks':
202-
if (CheckIfRun) {
203-
dispatchStackRunsData(
204-
id,
205-
1,
206-
itemPerPage,
207-
filters as any,
208-
activeSorting,
209-
);
210-
break;
211-
} else {
212-
dispatchStackData(1, itemPerPage, filters as any, activeSorting);
213-
break;
214-
}
215-
case 'components':
216-
if (CheckIfRun) {
217-
dispatchStackComponentRunsData(
218-
id,
219-
1,
220-
itemPerPage,
221-
filters as any,
222-
activeSorting,
223-
);
224-
break;
225-
} else {
226-
dispatchStackComponentsData(
227-
1,
228-
itemPerPage,
229-
filters as any,
230-
activeSorting,
231-
);
232-
break;
233-
}
234-
case 'pipelines':
235-
if (CheckIfRun) {
236-
dispatchPipelineRunsData(
237-
id,
238-
1,
239-
itemPerPage,
240-
filters as any,
241-
activeSorting,
242-
);
243-
break;
244-
} else {
245-
console.log(itemPerPage, 'itemPerPage');
246-
if (!renderAfterRow) break;
247-
dispatchPipelineData(1, itemPerPage, filters as any, activeSorting);
248-
break;
249-
}
250-
251-
case 'all-runs':
252-
dispatchAllrunsData(1, itemPerPage, filters as any, activeSorting);
199+
// if (checkValidFilter || activeSorting) {
200+
switch (componentName) {
201+
case 'stacks':
202+
if (CheckIfRun) {
203+
dispatchStackRunsData(
204+
id,
205+
1,
206+
itemPerPage,
207+
checkValidFilter.length ? (filters as any) : [],
208+
activeSorting,
209+
);
253210
break;
254-
255-
default:
211+
} else {
212+
dispatchStackData(
213+
1,
214+
itemPerPage,
215+
checkValidFilter.length ? (filters as any) : [],
216+
activeSorting,
217+
);
218+
break;
219+
}
220+
case 'components':
221+
if (CheckIfRun) {
222+
dispatchStackComponentRunsData(
223+
id,
224+
1,
225+
itemPerPage,
226+
checkValidFilter.length ? (filters as any) : [],
227+
activeSorting,
228+
);
229+
break;
230+
} else {
231+
dispatchStackComponentsData(
232+
1,
233+
itemPerPage,
234+
checkValidFilter.length ? (filters as any) : [],
235+
activeSorting,
236+
);
237+
break;
238+
}
239+
case 'pipelines':
240+
if (CheckIfRun) {
241+
dispatchPipelineRunsData(
242+
id,
243+
1,
244+
itemPerPage,
245+
checkValidFilter.length ? (filters as any) : [],
246+
activeSorting,
247+
);
256248
break;
257-
}
258-
if (locationPath.pathname.split('/')[2] === 'organization') {
259-
// debugger;
260-
setFetchingMembers(true);
261-
dispatch(
262-
organizationActions.getMembers({
263-
page: 1,
264-
size: ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,
265-
sort_by: activeSorting,
266-
onSuccess: () => setFetchingMembers(false),
267-
onFailure: () => setFetchingMembers(false),
268-
}),
249+
} else {
250+
console.log(checkValidFilter, 'checkValidFilter');
251+
if (!renderAfterRow) break;
252+
dispatchPipelineData(
253+
1,
254+
itemPerPage,
255+
checkValidFilter.length ? (filters as any) : [],
256+
activeSorting,
257+
);
258+
break;
259+
}
260+
261+
case 'all-runs':
262+
dispatchAllrunsData(
263+
1,
264+
itemPerPage,
265+
checkValidFilter.length ? (filters as any) : [],
266+
activeSorting,
269267
);
270-
}
268+
break;
269+
270+
default:
271+
break;
272+
}
273+
if (locationPath.pathname.split('/')[2] === 'organization') {
274+
// debugger;
275+
setFetchingMembers(true);
276+
dispatch(
277+
organizationActions.getMembers({
278+
page: 1,
279+
size: ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,
280+
sort_by: activeSorting,
281+
onSuccess: () => setFetchingMembers(false),
282+
onFailure: () => setFetchingMembers(false),
283+
}),
284+
);
271285
}
286+
// }
272287

273288
// eslint-disable-next-line react-hooks/exhaustive-deps
274289
}, [checkForLocationPath, checkValidFilter, activeSorting]);

‎src/ui/layouts/pipelines/Pipelines/List/ForSorting/useServiceForSorting.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ export const useService = ({
9494
) => () => {
9595
if (sorting === activeSorting) {
9696
if (!!activeSortingDirection && activeSortingDirection === 'ASC') {
97-
sort && setFilteredPipelines(sort.desc(filteredPipelines));
97+
// sort && setFilteredPipelines(sort.desc(filteredPipelines));
9898
setActiveSortingDirection('DESC');
9999
} else if (
100100
!!activeSortingDirection &&
101101
activeSortingDirection === 'DESC'
102102
) {
103-
sort && setFilteredPipelines(sort.asc(filteredPipelines));
103+
// sort && setFilteredPipelines(sort.asc(filteredPipelines));
104104
setActiveSortingDirection('ASC');
105105
}
106106
} else {
107-
sort && setFilteredPipelines(sort.desc(filteredPipelines));
107+
// sort && setFilteredPipelines(sort.desc(filteredPipelines));
108108
setActiveSortingDirection('DESC');
109109
}
110110
setActiveSorting(sorting);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ export const useService = ({
7474
) => () => {
7575
if (sorting === activeSorting) {
7676
if (!!activeSortingDirection && activeSortingDirection === 'ASC') {
77-
sort && setRuns(sort.desc(runs));
77+
// sort && setRuns(sort.desc(runs));
7878
setActiveSortingDirection('DESC');
7979
} else if (
8080
!!activeSortingDirection &&
8181
activeSortingDirection === 'DESC'
8282
) {
83-
sort && setRuns(sort.asc(runs));
83+
// sort && setRuns(sort.asc(runs));
8484
setActiveSortingDirection('ASC');
8585
}
8686
} else {
87-
sort && setRuns(sort.desc(runs));
87+
// sort && setRuns(sort.desc(runs));
8888
setActiveSortingDirection('DESC');
8989
}
9090
setActiveSorting(sorting);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ export const useService = ({
7979
) => () => {
8080
if (sorting === activeSorting) {
8181
if (!!activeSortingDirection && activeSortingDirection === 'ASC') {
82-
sort && setRuns(sort.desc(runs));
82+
// sort && setRuns(sort.desc(runs));
8383
setActiveSortingDirection('DESC');
8484
} else if (
8585
!!activeSortingDirection &&
8686
activeSortingDirection === 'DESC'
8787
) {
88-
sort && setRuns(sort.asc(runs));
88+
// sort && setRuns(sort.asc(runs));
8989
setActiveSortingDirection('ASC');
9090
}
9191
} else {
92-
sort && setRuns(sort.desc(runs));
92+
// sort && setRuns(sort.desc(runs));
9393
setActiveSortingDirection('DESC');
9494
}
9595
setActiveSorting(sorting);

‎src/ui/layouts/settings/Organization/ForSorting/useServiceForSorting.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,17 @@ export const useService = ({
8888
) => () => {
8989
if (sorting === activeSorting) {
9090
if (!!activeSortingDirection && activeSortingDirection === 'ASC') {
91-
sort && setFilteredMembers(sort.desc(filteredMembers));
91+
// sort && setFilteredMembers(sort.desc(filteredMembers));
9292
setActiveSortingDirection('DESC');
9393
} else if (
9494
!!activeSortingDirection &&
9595
activeSortingDirection === 'DESC'
9696
) {
97-
sort && setFilteredMembers(sort.asc(filteredMembers));
97+
// sort && setFilteredMembers(sort.asc(filteredMembers));
9898
setActiveSortingDirection('ASC');
9999
}
100100
} else {
101-
sort && setFilteredMembers(sort.desc(filteredMembers));
101+
// sort && setFilteredMembers(sort.desc(filteredMembers));
102102
setActiveSortingDirection('DESC');
103103
}
104104
setActiveSorting(sorting);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ export const useService = ({
7979
) => () => {
8080
if (sorting === activeSorting) {
8181
if (!!activeSortingDirection && activeSortingDirection === 'ASC') {
82-
sort && setRuns(sort.desc(runs));
82+
// sort && setRuns(sort.desc(runs));
8383
setActiveSortingDirection('DESC');
8484
} else if (
8585
!!activeSortingDirection &&
8686
activeSortingDirection === 'DESC'
8787
) {
88-
sort && setRuns(sort.asc(runs));
88+
// sort && setRuns(sort.asc(runs));
8989
setActiveSortingDirection('ASC');
9090
}
9191
} else {
92-
sort && setRuns(sort.desc(runs));
92+
// sort && setRuns(sort.desc(runs));
9393
setActiveSortingDirection('DESC');
9494
}
9595
setActiveSorting(sorting);

‎src/ui/layouts/stackComponents/Stacks/List/ForSorting/useServiceForSorting.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,17 @@ export const useService = ({
8888
) => () => {
8989
if (sorting === activeSorting) {
9090
if (!!activeSortingDirection && activeSortingDirection === 'ASC') {
91-
sort && setFilteredStacks(sort.desc(filteredStacks));
91+
// sort && setFilteredStacks(sort.desc(filteredStacks));
9292
setActiveSortingDirection('DESC');
9393
} else if (
9494
!!activeSortingDirection &&
9595
activeSortingDirection === 'DESC'
9696
) {
97-
sort && setFilteredStacks(sort.asc(filteredStacks));
97+
// sort && setFilteredStacks(sort.asc(filteredStacks));
9898
setActiveSortingDirection('ASC');
9999
}
100100
} else {
101-
sort && setFilteredStacks(sort.desc(filteredStacks));
101+
// sort && setFilteredStacks(sort.desc(filteredStacks));
102102
setActiveSortingDirection('DESC');
103103
}
104104
setActiveSorting(sorting);

0 commit comments

Comments
 (0)