Merge pull request #49 from zenml-io/talha/feedback-fixes

Talha/feedback fixes

Author: danialraza03

src/api/runs/getGraphRunByIdApi.ts

@@ -2,7 +2,6 @@ import { fetchApiWithAuthRequest } from '../fetchApi';
 import { endpoints } from '../endpoints';
 import { httpMethods } from '../constants';
 import { apiUrl } from '../apiUrl';
-import mockApi from '../mockApiData';
 
 const getGraphRunByIdApi = ({
   authenticationToken,
@@ -15,13 +14,6 @@ const getGraphRunByIdApi = ({
     url: apiUrl(endpoints.runs.graphById.get(runId)),
     method: httpMethods.get,
     authenticationToken,
-  }).catch((res) => {
-    if (process.env.REACT_APP_MOCKAPI_RESPONSE) {
-      res = {
-        data: mockApi.runByIdMockResponse,
-      };
-    }
-    return res;
   });
 };
 

src/redux/actionTypes/constants.ts

@@ -10,7 +10,7 @@ const userActionTypes = {
   USERS_GET_MY_USER: 'USERS_GET_MY_USER',
   USERS_GET_USER_FOR_ID: 'USERS_GET_USER_FOR_ID',
   UPDATE_USER_EMAIL: 'UPDATE_USER_EMAIL',
-  SAVE_USER_EMAIL: 'SAVE_USER_EMAIL'
+  SAVE_USER_EMAIL: 'SAVE_USER_EMAIL',
 };
 
 const organizationActionTypes = {
@@ -56,7 +56,7 @@ const stackComponentActionTypes = {
 const runActionTypes = {
   RUNS_GET_ALL_RUNS: 'RUNS_GET_ALL_RUNS',
   RUNS_GET_RUN_FOR_ID: 'RUNS_GET_RUN_FOR_ID',
-  GRAPH_FOR_RUN_ID: 'RUNS_GET_RUN_FOR_ID',
+  GRAPH_FOR_RUN_ID: 'GRAPH_FOR_RUN_ID',
 };
 
 const billingActionTypes = {
@@ -78,7 +78,7 @@ const pipelinePagesActionTypes = {
   PIPELINE_PAGES_SET_FETCHING: 'PIPELINE_PAGES_SET_FETCHING',
 };
 
-const runsPagesActionTypes = {
+const runPagesActionTypes = {
   RUNS_PAGES_SET_FETCHING: 'RUNS_PAGES_SET_FETCHING',
 };
 
@@ -109,7 +109,7 @@ export const actionTypes = {
   ...pipelineActionTypes,
   ...stackActionTypes,
   ...runActionTypes,
-  ...runsPagesActionTypes,
+  ...runPagesActionTypes,
   ...billingActionTypes,
   ...pipelinePagesActionTypes,
   ...stackPagesActionTypes,

src/redux/actionTypes/index.ts

@@ -8,6 +8,7 @@ export * from './pipelines';
 export * from './stacks';
 export * from './stackComponents';
 export * from './runs';
+export * from './runPages';
 export * from './billing';
 export * from './pipelinePages';
 export * from './stackPages';

src/redux/actionTypes/runPages.ts

@@ -0,0 +1,7 @@
+import { actionTypes } from './constants';
+
+export const runPagesActionTypes = {
+  setCurrentWorkspace: actionTypes.PIPELINE_PAGES_SET_CURRENT_WORKSPACE,
+  setSelectedRunIds: actionTypes.PIPELINE_PAGES_SET_SELECTED_RUN_IDS,
+  setFetching: actionTypes.PIPELINE_PAGES_SET_FETCHING,
+};

src/redux/actions/index.ts

@@ -7,6 +7,7 @@ export * from './pipelines';
 export * from './stacks';
 export * from './stackComponents';
 export * from './runs';
+export * from './runPages';
 export * from './billing';
 export * from './pipelinePages';
 export * from './stackPages';

src/redux/actions/runPages/index.ts

@@ -0,0 +1,32 @@
+import { runPagesActionTypes } from '../../actionTypes';
+
+const setCurrentWorkspaceAction = ({
+  workspace,
+}: {
+  workspace: TWorkspace | null;
+}): TAction => ({
+  type: runPagesActionTypes.setCurrentWorkspace,
+  payload: {
+    workspace,
+  },
+});
+
+const setSelectedRunIdsAction = ({ runIds }: { runIds: TId[] }): TAction => ({
+  type: runPagesActionTypes.setSelectedRunIds,
+  payload: {
+    runIds,
+  },
+});
+
+const setFetchingAction = ({ fetching }: { fetching: boolean }): TAction => ({
+  type: runPagesActionTypes.setFetching,
+  payload: {
+    fetching,
+  },
+});
+
+export const runPagesActions = {
+  setCurrentWorkspace: setCurrentWorkspaceAction,
+  setSelectedRunIds: setSelectedRunIdsAction,
+  setFetching: setFetchingAction,
+};

src/redux/persistedReducers.spec.ts

@@ -10,6 +10,7 @@ import stackComponentReducer from './reducers/stackComponentsReducer';
 import runsReducer from './reducers/runsReducer';
 import billingReducer from './reducers/billingReducer';
 import pipelinePagesReducer from './reducers/pipelinePagesReducer';
+import runPagesReducer from './reducers/runPagesReducer';
 import stackPagesReducer from './reducers/stackPagesReducer';
 
 jest.mock('redux', () => ({
@@ -33,6 +34,7 @@ describe('expect to map keys', () => {
   expectToMap('stacks', stacksReducer);
   expectToMap('stackComponents', stackComponentReducer);
   expectToMap('runs', runsReducer);
+  expectToMap('run', runPagesReducer);
   expectToMap('billing', billingReducer);
   expectToMap('pipelinePages', pipelinePagesReducer);
   expectToMap('stackPages', stackPagesReducer);

src/redux/persistedReducers.ts

@@ -41,6 +41,10 @@ import pipelinePagesReducer, {
   initialState as pipelinePagesInitialState,
 } from './reducers/pipelinePagesReducer';
 
+import runPagesReducer, {
+  initialState as runPagesInitialState,
+} from './reducers/runPagesReducer';
+
 import stackPagesReducer, {
   initialState as stackPagesInitialState,
 } from './reducers/stackPagesReducer';
@@ -58,6 +62,7 @@ const initialState = {
   stacks: stacksInitialState,
   stackComponents: stackComponentsInitialState,
   runs: runsInitialState,
+  runPages: runPagesInitialState,
   billing: billingInitialState,
   pipelinePages: pipelinePagesInitialState,
   stacksPages: stackPagesInitialState,
@@ -73,6 +78,7 @@ export const persisted = combineReducers({
   stacks: stacksReducer,
   stackComponents: stackComponentsReducer,
   runs: runsReducer,
+  runPages: runPagesReducer,
   billing: billingReducer,
   pipelinePages: pipelinePagesReducer,
   stackPages: stackPagesReducer,

src/redux/reducers/runPagesReducer.ts

@@ -0,0 +1,64 @@
+import { pipelinePagesActionTypes, runPagesActionTypes } from '../actionTypes';
+
+export interface State {
+  currentWorkspace: TWorkspace | null;
+  selectedRunIds: TId[];
+  fetching: boolean;
+}
+
+export const initialState: State = {
+  currentWorkspace: null,
+  selectedRunIds: [],
+  fetching: false,
+};
+
+export type Action = {
+  type: string;
+  payload: {
+    workspace?: TWorkspace | null;
+    runIds?: TId[];
+    fetching?: boolean;
+  };
+};
+
+const runPagesReducer = (
+  state: State = initialState,
+  action: Action,
+): State => {
+  switch (action.type) {
+    case pipelinePagesActionTypes.setCurrentWorkspace: {
+      const currentWorkspace = action.payload.workspace;
+
+      if (currentWorkspace === undefined) {
+        return state;
+      }
+
+      return { ...state, currentWorkspace };
+    }
+
+    case pipelinePagesActionTypes.setSelectedRunIds: {
+      const selectedRunIds = action.payload.runIds;
+
+      if (selectedRunIds === undefined) {
+        return state;
+      }
+
+      return { ...state, selectedRunIds };
+    }
+
+    case runPagesActionTypes.setFetching: {
+      const fetching = action.payload.fetching;
+
+      if (fetching === undefined) {
+        return state;
+      }
+
+      return { ...state, fetching };
+    }
+
+    default:
+      return state;
+  }
+};
+
+export default runPagesReducer;

src/redux/reducers/runsReducer.ts

@@ -60,10 +60,10 @@ const newState = (state: State, runs: TRun[]): State => ({
   ids: idsInsert(state.ids, runs),
   byId: byKeyInsert(state.byId, runs),
 });
-// const newStateForGraph = (state: State, graph: any): State => ({
-//   ...state,
-//   graph: graph,
-// });
+const newStateForGraph = (state: State, graph: any): State => ({
+  ...state,
+  graphForRunId: graph,
+});
 
 const runsReducer = (state: State = initialState, action: Action): State => {
   switch (action.type) {
@@ -120,8 +120,7 @@ const runsReducer = (state: State = initialState, action: Action): State => {
       const graph: any = camelCaseObject(graphFromRun);
 
       return {
-        ...(state.graphForRunId = graph),
-        ...newState(state, graph),
+        ...newStateForGraph(state, graph),
       };
       // const run = camelCaseObject({
       //   ...payload,