Merge pull request #153 from zenml-io/dev

Dev

Author: danialraza03

global.d.ts

@@ -67,7 +67,7 @@ interface TMember {
   created: Date;
   active: boolean;
   activation_token: string;
-  user: { 
+  user: {
     id: TId;
     organizationId: any;
     fullName: any;
@@ -76,13 +76,13 @@ interface TMember {
     created: Date;
     active: boolean;
     activation_token: any;
-  },
+  };
   roles: [
-   { 
-    id: string; 
-    name: string
-   } 
-  ]
+    {
+      id: string;
+      name: string;
+    },
+  ];
 }
 
 interface TWorkspace {
@@ -115,6 +115,7 @@ interface TPipeline {
   status: Array;
   configuration: object;
   spec?: any;
+  version: string;
 }
 interface TStack {
   id: TId;
@@ -128,7 +129,7 @@ interface TStack {
   userId: TId;
   createdAt: Date;
   type?: string;
-  flavor?: string;
+  flavor?: any;
   configuration?: any;
   workspace?: string;
   user?: any;

src/api/endpoints.ts

@@ -39,6 +39,11 @@ export const endpoints = {
       `/workspaces/${workspace}/components?scope_type=${type}`,
     get: (stackComponentId: TId): string => `/components/${stackComponentId}`,
   },
+  flavors: {
+    all: '/flavors?sort_by=type',
+    type: `/flavors`,
+    get: (stackComponentId: TId): string => `/components/${stackComponentId}`,
+  },
   runs: {
     pipeline: {
       get: (pipelineId: TId): string => `/runs?pipeline_id=${pipelineId}`,

src/api/flavors/getFlavorAllApi.ts

@@ -0,0 +1,32 @@
+import { fetchApiWithAuthRequest } from '../fetchApi';
+import { endpoints } from '../endpoints';
+import { httpMethods } from '../constants';
+import { apiUrl } from '../apiUrl';
+
+const getFlavorAllApi = ({
+  authenticationToken,
+  sort_by,
+  logical_operator,
+  page,
+  size,
+  type,
+  filtersParam,
+  workspace,
+}: {
+  workspace: string;
+  authenticationToken: string;
+  sort_by: string;
+  logical_operator: string;
+  type: string;
+  filtersParam?: object;
+  page: number;
+  size: number;
+}): Promise<TStack> =>
+  fetchApiWithAuthRequest({
+    url: apiUrl(endpoints.flavors.all),
+    params: { sort_by, logical_operator, page, size, ...filtersParam },
+    method: httpMethods.get,
+    authenticationToken,
+  });
+
+export default getFlavorAllApi;

src/api/flavors/getFlavorTypeApi.ts

@@ -0,0 +1,26 @@
+import { fetchApiWithAuthRequest } from '../fetchApi';
+import { endpoints } from '../endpoints';
+import { httpMethods } from '../constants';
+import { apiUrl } from '../apiUrl';
+
+const getFlavorTypeApi = ({
+  authenticationToken,
+  type,
+  page,
+  size,
+  name,
+}: {
+  page: number;
+  size: number;
+  type: string;
+  name?: string;
+  authenticationToken: string;
+}): Promise<TStack> =>
+  fetchApiWithAuthRequest({
+    url: apiUrl(endpoints.flavors.type),
+    params: { type, page, size, name },
+    method: httpMethods.get,
+    authenticationToken,
+  });
+
+export default getFlavorTypeApi;

src/constants/spacing.ts

@@ -3,12 +3,16 @@ export const spacings = {
   xs: 4,
   xs2: 6,
   sm: 8,
+  sm2: 10,
   md: 16,
   lg: 24,
   lg2: 28,
+  lg3: 30,
   xl: 32,
+  xl1: 34,
   xl2: 36,
   xxl: 40,
+  xxl2: 44,
   xxxl: 48,
   '4xl': 56,
   '5xl': 60,

src/redux/actionTypes/constants.ts

@@ -54,6 +54,14 @@ const stackComponentActionTypes = {
   RUNS_GET_STACKCOMPONENT_FOR_ID: 'RUNS_GET_STACKCOMPONENT_FOR_ID',
 };
 
+const flavorActionTypes = {
+  FLAVORS_GET_FLAVORS_ALL: 'FLAVORS_GET_FLAVORS_ALL',
+  FLAVORS_GET_FLAVORS_TYPE: 'FLAVORS_GET_FLAVORS_TYPE',
+  // STACKCOMPONENTS_GET_STACKCOMPONENT_FOR_ID:
+  //   'STACKCOMPONENTS_GET_STACKCOMPONENT_FOR_ID',
+  // RUNS_GET_STACKCOMPONENT_FOR_ID: 'RUNS_GET_STACKCOMPONENT_FOR_ID',
+};
+
 const runActionTypes = {
   RUNS_GET_ALL_RUNS: 'RUNS_GET_ALL_RUNS',
   RUNS_GET_RUN_FOR_ID: 'RUNS_GET_RUN_FOR_ID',
@@ -79,6 +87,11 @@ const stackComponentPagesActionTypes = {
     'STACKCOMPONENT_PAGES_SET_SELECTED_RUN_IDS',
   STACKCOMPONENT_PAGES_SET_FETCHING: 'STACKCOMPONENT_PAGES_SET_FETCHING',
 };
+const flavorPagesActionTypes = {
+  STACKCOMPONENT_PAGES_SET_SELECTED_RUN_IDS:
+    'STACKCOMPONENT_PAGES_SET_SELECTED_RUN_IDS',
+  FLAVOR_PAGES_SET_FETCHING: 'FLAVOR_PAGES_SET_FETCHING',
+};
 
 export const actionTypes = {
   SHOW_TOASTER: 'SHOW_TOASTER',
@@ -95,6 +108,8 @@ export const actionTypes = {
   ...stackPagesActionTypes,
   ...stackComponentPagesActionTypes,
   ...stackComponentActionTypes,
+  ...flavorActionTypes,
+  ...flavorPagesActionTypes,
 };
 
 export const REQUESTED = 'REQUESTED';

src/redux/actionTypes/flavors.ts

@@ -0,0 +1,13 @@
+import { actionTypes } from './constants';
+import { generateApiActionsTypes } from './generateApiActionsTypes';
+
+export const flavorActionTypes = {
+  getFlavorType: generateApiActionsTypes(actionTypes.FLAVORS_GET_FLAVORS_TYPE),
+  getFlavorAll: generateApiActionsTypes(actionTypes.FLAVORS_GET_FLAVORS_ALL),
+  // getStackComponentForId: generateApiActionsTypes(
+  //   actionTypes.STACKCOMPONENTS_GET_STACKCOMPONENT_FOR_ID,
+  // ),
+  // getRunsByStackComponentId: generateApiActionsTypes(
+  //   actionTypes.RUNS_GET_STACKCOMPONENT_FOR_ID,
+  // ),
+};

src/redux/actionTypes/flavorsPages.ts

@@ -0,0 +1,6 @@
+import { actionTypes } from './constants';
+
+export const flavorPagesActionTypes = {
+  setSelectedRunIds: actionTypes.STACKCOMPONENT_PAGES_SET_SELECTED_RUN_IDS,
+  setFetching: actionTypes.FLAVOR_PAGES_SET_FETCHING,
+};

src/redux/actionTypes/index.ts

@@ -14,5 +14,6 @@ export * from './roles';
 export * from './pipelinePages';
 export * from './stackPages';
 export * from './stackComponentPages';
-
+export * from './flavors';
+export * from './flavorsPages';
 export const SHOW_TOASTER_ACTION_TYPE = actionTypes.SHOW_TOASTER;

src/redux/actions/flavorPages/index.spec.ts

@@ -0,0 +1,28 @@
+import { pipelinePagesActionTypes } from '../../actionTypes';
+import { flavorPagesActions } from './index';
+
+describe(pipelinePagesActionTypes.setSelectedRunIds, () => {
+  const runIds = ['id'];
+
+  const onAction = () => flavorPagesActions.setSelectedRunIds({ runIds });
+
+  it('has correct type', () => {
+    expect(onAction().type).toEqual(pipelinePagesActionTypes.setSelectedRunIds);
+  });
+
+  it('has correct payload', () => {
+    expect(onAction().payload).toEqual({ runIds });
+  });
+});
+
+describe(pipelinePagesActionTypes.setFetching, () => {
+  const onAction = () => flavorPagesActions.setFetching({ fetching: true });
+
+  it('has correct type', () => {
+    expect(onAction().type).toEqual(pipelinePagesActionTypes.setFetching);
+  });
+
+  it('has correct payload', () => {
+    expect(onAction().payload).toEqual({ fetching: true });
+  });
+});