Merge remote-tracking branch 'origin/UAT' into main

Author: htahir1

package.json

@@ -51,6 +51,7 @@
     "react-dom": "^16.13.1",
     "react-flow-renderer": "^10.3.16",
     "react-joyride": "^2.5.3",
+    "react-json-pretty": "^2.2.0",
     "react-outside-click-handler": "^1.3.0",
     "react-redux": "^7.2.1",
     "react-router-dom": "^5.2.0",
@@ -78,7 +79,6 @@
     "tslint": "tsc",
     "all": "eslint './src/**/*.ts*' & react-scripts test --all & tsc"
   },
- 
   "browserslist": {
     "production": [
       ">0.2%",

src/api/stackComponents/getStackComponentListApi.ts

@@ -11,6 +11,7 @@ const getMyStackComponentsApi = ({
   size,
   type,
   filtersParam,
+  id,
   workspace,
 }: {
   workspace: string;
@@ -19,12 +20,13 @@ const getMyStackComponentsApi = ({
   logical_operator: string;
   type: string;
   filtersParam?: object;
+  id?: any;
   page: number;
   size: number;
 }): Promise<TStack> =>
   fetchApiWithAuthRequest({
     url: apiUrl(endpoints.StackComponents.my(type, workspace)),
-    params: { sort_by, logical_operator, page, size, ...filtersParam },
+    params: { sort_by, logical_operator, page, size, ...filtersParam, id },
     method: httpMethods.get,
     authenticationToken,
   });

src/api/stacks/getMyStacksApi.ts

@@ -11,6 +11,7 @@ const getMyStacksApi = ({
   page,
   size,
   filtersParam,
+  id,
   authenticationToken,
 }: {
   component_id?: any;
@@ -20,6 +21,7 @@ const getMyStacksApi = ({
   page: number;
   size: number;
   filtersParam?: object;
+  id?: any;
   authenticationToken: string;
 }): Promise<TStack> =>
   fetchApiWithAuthRequest({
@@ -31,6 +33,7 @@ const getMyStacksApi = ({
       page,
       size,
       ...filtersParam,
+      id,
     },
     method: httpMethods.get,
     authenticationToken,

src/redux/actions/flavors/getFlavorTypeAction.ts

@@ -9,11 +9,11 @@ export const getFlavorTypeAction = ({
   onSuccess,
   onFailure,
 }: {
-  page: number;
-  size: number;
-  type: string;
+  page?: number;
+  size?: number;
+  type?: string;
   name?: string;
-  onSuccess?: () => void;
+  onSuccess?: (res: any) => void;
   onFailure?: () => void;
 }): TRequestAction => ({
   type: flavorActionTypes.getFlavorAll.request,

src/redux/actions/runs/getAllRunsAction.ts

@@ -26,7 +26,14 @@ export const getAllRunsAction = ({
     isAuthenticated: true,
     failureActionType: runActionTypes.getAllRuns.failure,
     successActionType: runActionTypes.getAllRuns.success,
-    params: { workspace, sort_by, logical_operator, page, size, filtersParam },
+    params: {
+      workspace,
+      sort_by,
+      logical_operator,
+      page,
+      size,
+      filtersParam,
+    },
     onSuccess,
     onFailure,
   },

src/redux/actions/stackComponents/getStackComponentListAction.ts

@@ -9,18 +9,20 @@ export const getStackComponentListAction = ({
   page,
   size,
   filtersParam,
+  id,
   onSuccess,
   onFailure,
 }: {
   workspace: string;
-  sort_by: string;
-  logical_operator: string;
+  sort_by?: string;
+  logical_operator?: string;
   type: TId;
   page: number;
   size: number;
   filtersParam?: object;
-  onSuccess?: () => void;
-  onFailure?: () => void;
+  id?: any;
+  onSuccess?: (res: any) => void;
+  onFailure?: (res: any) => void;
 }): TRequestAction => ({
   type: stackComponentActionTypes.getStackComponentList.request,
   payload: {
@@ -36,6 +38,7 @@ export const getStackComponentListAction = ({
       page,
       size,
       filtersParam,
+      id,
     },
     onSuccess,
     onFailure,

src/redux/actions/stacks/getAllRunsByStackId.ts

@@ -27,7 +27,14 @@ export const getAllRunsByStackId = ({
       isAuthenticated: true,
       failureActionType: stackActionTypes.getRunsByStackId.failure,
       successActionType: stackActionTypes.getRunsByStackId.success,
-      params: { sort_by, logical_operator, stackId, page, size, filtersParam },
+      params: {
+        sort_by,
+        logical_operator,
+        stackId,
+        page,
+        size,
+        filtersParam,
+      },
       onSuccess,
       onFailure,
     },

src/redux/actions/stacks/getMyStacksAction.ts

@@ -10,6 +10,7 @@ export const getMyStacksAction = ({
   name,
   size,
   filtersParam,
+  id,
   onSuccess,
   onFailure,
 }: {
@@ -21,6 +22,7 @@ export const getMyStacksAction = ({
   page?: number;
   size?: number;
   filtersParam?: object;
+  id?: any;
   onSuccess?: () => void;
   onFailure?: () => void;
 }): TRequestAction => ({
@@ -39,6 +41,7 @@ export const getMyStacksAction = ({
       page,
       size,
       filtersParam,
+      id,
     },
     onSuccess,
     onFailure,

src/redux/reducers/flavorsReducer.ts

@@ -32,10 +32,10 @@ const newState = (state: State, flavors: any[], pagination?: any): State => ({
   ids: idsInsert(state.ids, flavors),
   byId: byKeyInsert(state.byId, flavors),
   paginated: {
-    page: pagination.page,
-    size: pagination.size,
-    totalPages: pagination.total_pages,
-    totalitem: pagination.total,
+    page: pagination?.index,
+    size: pagination?.max_size,
+    totalPages: pagination?.total_pages,
+    totalitem: pagination?.total,
   },
 });
 

src/redux/reducers/organizationsReducer.ts

@@ -52,10 +52,10 @@ const newState = (
   ids: idsInsert(state.ids, organizations),
   byId: byKeyInsert(state.byId, organizations),
   paginated: {
-    page: pagination.page,
-    size: pagination.size,
-    totalPages: pagination.total_pages,
-    totalitem: pagination.total,
+    page: pagination?.index,
+    size: pagination?.max_size,
+    totalPages: pagination?.total_pages,
+    totalitem: pagination?.total,
   },
 });