Merge pull request #191 from zenml-io/QA-Fixes

talhainvenxion · web-flow · commit 58b51835928b · 2023-02-28T17:11:00.000+05:00
Qa fixes
diff --git a/src/ui/layouts/NonEditableConfig/useService.ts b/src/ui/layouts/NonEditableConfig/useService.ts
@@ -21,7 +21,7 @@ export const useService = ({ details }: { details: any }): ServiceInterface => {
     dispatch(
       flavorsActions.getType({
         type: details?.type,
-        name: details?.flavor.name,
+        name: details?.flavor,
         onSuccess: (res: any) => {
           setFlavor(res.items[0]);
         },
diff --git a/src/ui/layouts/common/PaginationWithPageSize/index.tsx b/src/ui/layouts/common/PaginationWithPageSize/index.tsx
@@ -53,7 +53,7 @@ export const PaginationWithPageSize: React.FC<Props> = ({
   );
 
   const DEFAULT_ITEMS_PER_PAGE = 10;
-  const itemPerPageOptions = [7, 10, 15, 20];
+  const itemPerPageOptions = [5, 10, 15, 20];
   // const itemPerPage = ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE;
   const [itemPerPage, setItemPerPage] = useState(
     ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,
diff --git a/src/ui/layouts/common/StackBox/index.tsx b/src/ui/layouts/common/StackBox/index.tsx
@@ -55,7 +55,7 @@ export const StackBox: React.FC<{
 
       <Box style={{ marginTop: '8px' }}>
         <Paragraph className={styles.stackName}>
-          {titleCase(stackName?.slice(0, 15))}
+          {titleCase(stackName?.slice(0, 17))}
         </Paragraph>
       </Box>
 
diff --git a/src/ui/layouts/stackComponents/RegisterComponents/ListForAll/index.tsx b/src/ui/layouts/stackComponents/RegisterComponents/ListForAll/index.tsx
@@ -20,11 +20,10 @@ import {
   FullWidthSpinner,
   Paragraph,
   SearchInputField,
-
-  Row
+  Row,
 } from '../../../../components';
 import { PaginationWithPageSize } from '../../../common/PaginationWithPageSize';
-import { FlavourBox } from '../../../common/FlavourBox';
+// import { FlavourBox } from '../../../common/FlavourBox';
 import { CustomFlavourBox } from '../../../common/CustomFlavourBox';
 import { callActionForFlavorsForPagination } from '../useService';
 import { SidePopup } from '../../../common/SidePopup';
@@ -99,26 +98,26 @@ export const ListForAll: React.FC<Props> = ({ type }: Props) => {
           <>
             <FlexBox>
               <Row>
-                <Box marginVertical={'sm'} style={{ marginLeft:"30px" }} >
+                {/* <Box marginVertical={'sm'} style={{ marginLeft:"30px" }} >
                   <FlavourBox
                     flavourDesc={'Configure and create a custom flavor'}
                     flavourName={'Create Custom Flavour'}
                   />
-                </Box>
+                </Box> */}
 
                 {allFlavors.map((item, index) => {
                   return (
-                      <Row key={index} style={{ marginLeft: '15px' }}>
-                        {console.log(item, 'item.nameitem.name')}
-                        <Box marginVertical={'sm'} marginHorizontal={'md'}>
-                          <CustomFlavourBox
-                            flavourDesc={item.configSchema.description}
-                            flavourName={item.name}
-                            logoUrl={item.logoUrl}
-                            onSelectFlavor={() => onSelectFlavor(item)}
-                          />
-                        </Box>
-                      </Row>
+                    <Row key={index} style={{ marginLeft: '15px' }}>
+                      {console.log(item, 'item.nameitem.name')}
+                      <Box marginVertical={'sm'} marginHorizontal={'md'}>
+                        <CustomFlavourBox
+                          flavourDesc={item.configSchema.description}
+                          flavourName={item.name}
+                          logoUrl={item.logoUrl}
+                          onSelectFlavor={() => onSelectFlavor(item)}
+                        />
+                      </Box>
+                    </Row>
                   );
                 })}
               </Row>
diff --git a/src/ui/layouts/stackComponents/RegisterComponents/useService.ts b/src/ui/layouts/stackComponents/RegisterComponents/useService.ts
@@ -37,7 +37,7 @@ export const useService = (): ServiceInterface => {
       dispatch(
         flavorsActions.getType({
           page: 1,
-          size: 8,
+          size: ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,
           type: locationPath.split('/')[4],
           onSuccess: () => setFetching(false),
           onFailure: () => setFetching(false),
diff --git a/src/ui/layouts/stacks/CreateStack/ListForAll/GetList/index.tsx b/src/ui/layouts/stacks/CreateStack/ListForAll/GetList/index.tsx
@@ -106,7 +106,7 @@ export const GetList: React.FC<Props> = ({
               );
             }}
           >
-            <StackBox stackName="Create" stackDesc="Create a stack" />
+            <StackBox stackName="Create Component" stackDesc="" />
           </div>
         </Box>
         {list?.map((item: any) => {
diff --git a/src/ui/layouts/stacks/CreateStack/ListForAll/index.tsx b/src/ui/layouts/stacks/CreateStack/ListForAll/index.tsx
@@ -77,7 +77,7 @@ export const ListForAll: React.FC<Props> = () => {
       setSelectedStackBox(null);
       return dispatch(
         showToasterAction({
-          description: 'Select Atleast one component from Orchestrator',
+          description: 'Select atleast one component from Orchestrator',
           type: toasterTypes.failure,
         }),
       );
@@ -87,7 +87,7 @@ export const ListForAll: React.FC<Props> = () => {
       setSelectedStackBox(null);
       return dispatch(
         showToasterAction({
-          description: 'Select Atleast one component from Artifact Store',
+          description: 'Select atleast one component from Artifact Store',
           type: toasterTypes.failure,
         }),
       );
diff --git a/src/ui/layouts/stacks/StackDetail/Configuration/index.tsx b/src/ui/layouts/stacks/StackDetail/Configuration/index.tsx
@@ -27,15 +27,25 @@ import { useService } from './useService';
 import { StackBox } from '../../../common/StackBox';
 import { SidePopup } from '../../CreateStack/ListForAll/SidePopup';
 import { NonEditableConfig } from '../../../NonEditableConfig';
-import { useDispatch, useSelector } from '../../../../hooks';
+import {
+  useDispatch,
+  useHistory,
+  useLocation,
+  useSelector,
+} from '../../../../hooks';
 import {
   sessionSelectors,
   userSelectors,
   workspaceSelectors,
 } from '../../../../../redux/selectors';
-import { showToasterAction, stacksActions } from '../../../../../redux/actions';
+import {
+  showToasterAction,
+  stackComponentsActions,
+  stacksActions,
+} from '../../../../../redux/actions';
 import { toasterTypes } from '../../../../../constants';
 import axios from 'axios';
+import { routePaths } from '../../../../../routes/routePaths';
 // import { SidePopup } from '../../../common/SidePopup';
 
 export const Configuration: React.FC<{
@@ -51,6 +61,9 @@ export const Configuration: React.FC<{
   const workspaces = useSelector(workspaceSelectors.myWorkspaces);
   const [loading, setLoading] = useState(false);
   const dispatch = useDispatch();
+  const locationPath = useLocation() as any;
+  // const { dispatchStackData } = callActionForStacksForPagination();
+  const history = useHistory();
   // const [hover, setHover] = useState(false);
   const [showPopup, setShowPopup] = useState<boolean>(false);
   const [selectedStackBox, setSelectedStackBox] = useState<any>();
@@ -199,6 +212,7 @@ export const Configuration: React.FC<{
             tiles.map((tile: any, index: number) => (
               <Box
                 key={index}
+                style={{ cursor: 'pointer' }}
                 className={styles.tile}
                 marginTop="md"
                 marginLeft="md"
@@ -233,7 +247,31 @@ export const Configuration: React.FC<{
           //   onCreateStack();
           // }}
           isCreate={false}
-          onSeeExisting={() => {}}
+          onSeeExisting={() => {
+            dispatch(
+              stackComponentsActions.getMy({
+                workspace: selectedWorkspace
+                  ? selectedWorkspace
+                  : locationPath.split('/')[2],
+                type: selectedStackBox.type,
+
+                page: 1,
+                size: 1,
+                id: selectedStackBox.id,
+                onSuccess: () => {
+                  // setFetching(false);
+                  history.push(
+                    routePaths.stackComponents.configuration(
+                      selectedStackBox.type,
+                      selectedStackBox.id,
+                      selectedWorkspace,
+                    ),
+                  );
+                },
+                onFailure: () => {},
+              }),
+            );
+          }}
           onClose={() => {
             setShowPopup(false);
             setSelectedStackBox(null);

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ export const GetList: React.FC<Props> = ({`
`106`	`106`	`);`
`107`	`107`	`}}`
`108`	`108`	`>`
`109`		`- <StackBox stackName="Create" stackDesc="Create a stack" />`
	`109`	`+ <StackBox stackName="Create Component" stackDesc="" />`
`110`	`110`	`</div>`
`111`	`111`	`</Box>`
`112`	`112`	`{list?.map((item: any) => {`