Merge branch 'dev' into personal_details_settings

Author: AhsanKhan7

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/stackComponents/getStackComponentListAction.ts

@@ -9,6 +9,7 @@ export const getStackComponentListAction = ({
   page,
   size,
   filtersParam,
+  id,
   onSuccess,
   onFailure,
 }: {
@@ -19,6 +20,7 @@ export const getStackComponentListAction = ({
   page: number;
   size: number;
   filtersParam?: object;
+  id?: any;
   onSuccess?: (res: any) => void;
   onFailure?: (res: any) => void;
 }): TRequestAction => ({
@@ -36,6 +38,7 @@ export const getStackComponentListAction = ({
       page,
       size,
       filtersParam,
+      id,
     },
     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.index,
-    size: pagination.max_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.index,
-    size: pagination.max_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/pipelinesReducer.ts

@@ -34,10 +34,10 @@ const newState = (
   ids: idsInsert(state.ids, pipelines),
   byId: byKeyInsert(state.byId, pipelines),
   paginated: {
-    page: pagination.index,
-    size: pagination.max_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/stackComponentsReducer.ts

@@ -32,10 +32,10 @@ const newState = (state: State, stacks: TStack[], pagination?: any): State => ({
   ids: idsInsert(state.ids, stacks),
   byId: byKeyInsert(state.byId, stacks),
   paginated: {
-    page: pagination.index,
-    size: pagination.max_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/stacksReducer.ts

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