Skip to content

Commit a949750

Browse files
authored
Merge pull request #261 from zenml-io/UAT
Merge UAT into `main` prior to release
2 parents fedc597 + bf8edd0 commit a949750

File tree

137 files changed

+5680
-1858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+5680
-1858
lines changed

global.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ interface TUser {
4141
userName: string;
4242
email_opted_in: any;
4343
emailOptedIn: any;
44+
roles: Array<any>;
45+
created: any
4446
}
4547

4648
interface TOrganization {

src/api/flavors/getFlavorTypeApi.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ const getFlavorTypeApi = ({
99
page,
1010
size,
1111
name,
12+
sort_by,
1213
}: {
1314
page: number;
1415
size: number;
1516
type: string;
1617
name?: string;
18+
sort_by?: string;
1719
authenticationToken: string;
1820
}): Promise<TStack> =>
1921
fetchApiWithAuthRequest({
2022
url: apiUrl(endpoints.flavors.type),
21-
params: { type, page, size, name },
23+
params: { type, page, size, name, sort_by },
2224
method: httpMethods.get,
2325
authenticationToken,
2426
});

src/api/pipelines/getMyPipelinesApi.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const getMyPipelinesApi = ({
1010
logical_operator,
1111
page,
1212
size,
13+
name,
1314
filtersParam,
1415
}: {
1516
sort_by: string;
@@ -23,7 +24,7 @@ const getMyPipelinesApi = ({
2324
}): Promise<TPipeline> =>
2425
fetchApiWithAuthRequest({
2526
url: apiUrl(endpoints.pipelines.my(workspace)),
26-
params: { sort_by, logical_operator, page, size, ...filtersParam },
27+
params: { sort_by, logical_operator, page, size, ...filtersParam, name },
2728
method: httpMethods.get,
2829
authenticationToken,
2930
});

src/api/stackComponents/getStackComponentListApi.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ const getMyStackComponentsApi = ({
2626
}): Promise<TStack> =>
2727
fetchApiWithAuthRequest({
2828
url: apiUrl(endpoints.StackComponents.my(type, workspace)),
29-
params: { sort_by, logical_operator, page, size, ...filtersParam, id },
29+
params: {
30+
sort_by,
31+
logical_operator,
32+
page,
33+
size,
34+
...filtersParam,
35+
// ,id
36+
},
3037
method: httpMethods.get,
3138
authenticationToken,
3239
});

src/api/stacks/getMyStacksApi.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ const getMyStacksApi = ({
1010
logical_operator,
1111
page,
1212
size,
13+
name,
1314
filtersParam,
14-
id,
15+
// id,
1516
authenticationToken,
1617
}: {
1718
component_id?: any;
@@ -20,8 +21,9 @@ const getMyStacksApi = ({
2021
logical_operator: string;
2122
page: number;
2223
size: number;
24+
name?: string;
2325
filtersParam?: object;
24-
id?: any;
26+
// id?: any;
2527
authenticationToken: string;
2628
}): Promise<TStack> =>
2729
fetchApiWithAuthRequest({
@@ -32,8 +34,9 @@ const getMyStacksApi = ({
3234
logical_operator,
3335
page,
3436
size,
37+
name,
3538
...filtersParam,
36-
id,
39+
// id,
3740
},
3841
method: httpMethods.get,
3942
authenticationToken,

src/constants/icons.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export enum iconColors {
77
red = 'red',
88
orange = 'orange',
99
mustard = 'mustard',
10+
green = 'green',
1011
}
1112

1213
export enum iconSizes {
@@ -15,4 +16,5 @@ export enum iconSizes {
1516
sm = 'sm',
1617
md = 'md',
1718
xs = 'xs',
19+
sml = 'sml',
1820
}

src/redux/actions/flavors/getFlavorTypeAction.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ export const getFlavorTypeAction = ({
66
size,
77
type,
88
name,
9+
sort_by,
910
onSuccess,
1011
onFailure,
1112
}: {
1213
page?: number;
1314
size?: number;
1415
type?: string;
1516
name?: string;
17+
sort_by?: string;
1618
onSuccess?: (res: any) => void;
1719
onFailure?: () => void;
1820
}): TRequestAction => ({
@@ -27,6 +29,7 @@ export const getFlavorTypeAction = ({
2729
page,
2830
size,
2931
name,
32+
sort_by,
3033
},
3134
onSuccess,
3235
onFailure,

src/redux/actions/stackComponents/getStackComponentByIdAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const getStackComponentByIdAction = ({
88
onFailure,
99
}: {
1010
stackComponentId: TId;
11-
onSuccess?: () => void;
11+
onSuccess?: (res: any) => void;
1212
onFailure?: () => void;
1313
}): TRequestAction => ({
1414
type: stackComponentActionTypes.getStackComponentForId.request,

src/redux/actions/stacks/getMyStacksAction.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const getMyStacksAction = ({
1010
name,
1111
size,
1212
filtersParam,
13-
id,
13+
// id,
1414
onSuccess,
1515
onFailure,
1616
}: {
@@ -22,7 +22,7 @@ export const getMyStacksAction = ({
2222
page?: number;
2323
size?: number;
2424
filtersParam?: object;
25-
id?: any;
25+
// id?: any;
2626
onSuccess?: () => void;
2727
onFailure?: () => void;
2828
}): TRequestAction => ({
@@ -41,7 +41,7 @@ export const getMyStacksAction = ({
4141
page,
4242
size,
4343
filtersParam,
44-
id,
44+
// id,
4545
},
4646
onSuccess,
4747
onFailure,

src/redux/reducers/rolesReducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const newState = (roles: Roles[]): State => ({
2323
const rolesReducer = (state: State = initialState, action: Action): State => {
2424
switch (action.type) {
2525
case rolesActionTypes.getRoles.success: {
26-
const roles: Roles[] = camelCaseArray(action.payload as RolesPayload);
26+
const roles: Roles[] = camelCaseArray(action.payload?.items as RolesPayload);
2727

2828
return { ...newState(roles) };
2929
}

0 commit comments

Comments
 (0)