Merge pull request #112 from MVarshini/PANDA-445

Quay and Telco Tabs
cloud-bulldozer · Aug 30, 2024 · 685b6aa · 685b6aa
2 parents 8187c4a + e2efcd2
commit 685b6aa
Show file tree

Hide file tree

Showing 32 changed files with 1,691 additions and 347 deletions.
diff --git a/frontend/src/actions/commonActions.js b/frontend/src/actions/commonActions.js
@@ -1,7 +1,9 @@
 import * as TYPES from "@/actions/types.js";
 
-import { setCatFilters, sliceTableRows } from "./homeActions";
+import { setCPTCatFilters, sliceCPTTableRows } from "./homeActions";
 import { setOCPCatFilters, sliceOCPTableRows } from "./ocpActions";
+import { setQuayCatFilters, sliceQuayTableRows } from "./quayActions";
+import { setTelcoCatFilters, sliceTelcoTableRows } from "./telcoActions";
 
 import { DEFAULT_PER_PAGE } from "@/assets/constants/paginationConstants";
 import { cloneDeep } from "lodash";
@@ -45,7 +47,7 @@ const sortedTableRows = (currState, sortedResults) => (dispatch) => {
       type: TYPES.SET_FILTERED_DATA,
       payload: sortedResults,
     });
-    dispatch(sliceTableRows(0, DEFAULT_PER_PAGE));
+    dispatch(sliceCPTTableRows(0, DEFAULT_PER_PAGE));
     return;
   }
   if (currState === "ocp") {
@@ -54,6 +56,22 @@ const sortedTableRows = (currState, sortedResults) => (dispatch) => {
       payload: sortedResults,
     });
     dispatch(sliceOCPTableRows(0, DEFAULT_PER_PAGE));
+    return;
+  }
+  if (currState === "quay") {
+    dispatch({
+      type: TYPES.SET_QUAY_FILTERED_DATA,
+      payload: sortedResults,
+    });
+    dispatch(sliceQuayTableRows(0, DEFAULT_PER_PAGE));
+    return;
+  }
+  if (currState === "telco") {
+    dispatch({
+      type: TYPES.SET_TELCO_FILTERED_DATA,
+      payload: sortedResults,
+    });
+    dispatch(sliceTelcoTableRows(0, DEFAULT_PER_PAGE));
   }
 };
 
@@ -114,7 +132,19 @@ const setFilterData = (filterData, currState, activeFilter) => (dispatch) => {
       type: TYPES.SET_CPT_FILTER_DATA,
       payload: filterData,
     });
-    dispatch(setCatFilters(activeFilter));
+    dispatch(setCPTCatFilters(activeFilter));
+  } else if (currState === "quay") {
+    dispatch({
+      type: TYPES.SET_QUAY_FILTER_DATA,
+      payload: filterData,
+    });
+    dispatch(setQuayCatFilters(activeFilter));
+  } else if (currState === "telco") {
+    dispatch({
+      type: TYPES.SET_TELCO_FILTER_DATA,
+      payload: filterData,
+    });
+    dispatch(setTelcoCatFilters(activeFilter));
   }
 };
 

diff --git a/frontend/src/actions/filterActions.js b/frontend/src/actions/filterActions.js
@@ -0,0 +1,92 @@
+import {
+  removeCPTAppliedFilters,
+  setCPTAppliedFilters,
+  setCPTCatFilters,
+  setCPTDateFilter,
+  setCPTOtherSummaryFilter,
+} from "./homeActions";
+import {
+  removeOCPAppliedFilters,
+  setOCPAppliedFilters,
+  setOCPCatFilters,
+  setOCPDateFilter,
+  setOCPOtherSummaryFilter,
+} from "./ocpActions";
+import {
+  removeQuayAppliedFilters,
+  setQuayAppliedFilters,
+  setQuayCatFilters,
+  setQuayDateFilter,
+  setQuayOtherSummaryFilter,
+} from "./quayActions";
+import {
+  removeTelcoAppliedFilters,
+  setTelcoAppliedFilters,
+  setTelcoCatFilters,
+  setTelcoDateFilter,
+  setTelcoOtherSummaryFilter,
+} from "./telcoActions";
+
+import store from "@/store/store";
+
+const { dispatch } = store;
+
+export const setCatFilters = (category, currType) => {
+  if (currType === "cpt") {
+    dispatch(setCPTCatFilters(category));
+  } else if (currType === "ocp") {
+    dispatch(setOCPCatFilters(category));
+  } else if (currType === "quay") {
+    dispatch(setQuayCatFilters(category));
+  } else if (currType === "telco") {
+    dispatch(setTelcoCatFilters(category));
+  }
+};
+
+export const setAppliedFilters = (navigation, currType) => {
+  if (currType === "cpt") {
+    dispatch(setCPTAppliedFilters(navigation));
+  } else if (currType === "ocp") {
+    dispatch(setOCPAppliedFilters(navigation));
+  } else if (currType === "quay") {
+    dispatch(setQuayAppliedFilters(navigation));
+  } else if (currType === "telco") {
+    dispatch(setTelcoAppliedFilters(navigation));
+  }
+};
+
+export const removeAppliedFilters = (key, value, navigation, currType) => {
+  if (currType === "cpt") {
+    dispatch(removeCPTAppliedFilters(key, value, navigation));
+  } else if (currType === "ocp") {
+    dispatch(removeOCPAppliedFilters(key, value, navigation));
+  } else if (currType === "quay") {
+    dispatch(removeQuayAppliedFilters(key, value, navigation));
+  } else if (currType === "telco") {
+    dispatch(removeTelcoAppliedFilters(key, value, navigation));
+  }
+};
+
+export const setDateFilter = (date, key, navigation, currType) => {
+  if (currType === "cpt") {
+    dispatch(setCPTDateFilter(date, key, navigation));
+  } else if (currType === "ocp") {
+    dispatch(setOCPDateFilter(date, key, navigation));
+  } else if (currType === "quay") {
+    dispatch(setQuayDateFilter(date, key, navigation));
+  } else if (currType === "telco") {
+    dispatch(setTelcoDateFilter(date, key, navigation));
+  }
+};
+
+export const setOtherSummaryFilter = (currType) => {
+  if (currType === "cpt") {
+    dispatch(setCPTOtherSummaryFilter());
+  } else if (currType === "ocp") {
+    dispatch(setOCPOtherSummaryFilter());
+  } else if (currType === "quay") {
+    dispatch(setQuayOtherSummaryFilter());
+  } else if (currType === "telco") {
+    dispatch(setTelcoOtherSummaryFilter());
+  }
+};
diff --git a/frontend/src/actions/homeActions.js b/frontend/src/actions/homeActions.js
@@ -30,23 +30,26 @@ export const fetchOCPJobsData = () => async (dispatch, getState) => {
         ...(end_date && { end_date }),
       },
     });
-    if (response?.data?.results?.length > 0) {
+    if (response.status === 200) {
       const startDate = response.data.startDate,
         endDate = response.data.endDate;
       //on initial load startDate and endDate are empty, so from response append to url
       appendDateFilter(startDate, endDate);
-
-      dispatch({
-        type: TYPES.SET_CPT_JOBS_DATA,
-        payload: response.data.results,
-      });
       dispatch({
         type: TYPES.SET_CPT_DATE_FILTER,
         payload: {
           start_date: startDate,
           end_date: endDate,
         },
       });
+    }
+
+    if (response?.data?.results?.length > 0) {
+      dispatch({
+        type: TYPES.SET_CPT_JOBS_DATA,
+        payload: response.data.results,
+      });
+
       dispatch(applyFilters());
       dispatch(sortTable("cpt"));
       dispatch(tableReCalcValues());
@@ -67,7 +70,7 @@ export const setCPTSortDir = (direction) => ({
   payload: direction,
 });
 
-export const sliceTableRows = (startIdx, endIdx) => (dispatch, getState) => {
+export const sliceCPTTableRows = (startIdx, endIdx) => (dispatch, getState) => {
   const results = [...getState().cpt.filteredResults];
 
   dispatch({
@@ -76,7 +79,7 @@ export const sliceTableRows = (startIdx, endIdx) => (dispatch, getState) => {
   });
 };
 
-export const setCatFilters = (category) => (dispatch, getState) => {
+export const setCPTCatFilters = (category) => (dispatch, getState) => {
   const filterData = [...getState().cpt.filterData];
   const options = filterData.filter((item) => item.name === category)[0].value;
   const list = options.map((item) => ({ name: item, value: item }));
@@ -112,7 +115,7 @@ export const setSelectedFilter =
     });
   };
 
-export const setAppliedFilters = (navigate) => (dispatch, getState) => {
+export const setCPTAppliedFilters = (navigate) => (dispatch, getState) => {
   const { selectedFilters, start_date, end_date } = getState().cpt;
 
   const appliedFilterArr = selectedFilters.filter((i) => i.value.length > 0);
@@ -130,7 +133,7 @@ export const setAppliedFilters = (navigate) => (dispatch, getState) => {
   dispatch(applyFilters());
 };
 
-export const setOtherSummaryFilter = () => (dispatch, getState) => {
+export const setCPTOtherSummaryFilter = () => (dispatch, getState) => {
   const filteredResults = [...getState().cpt.filteredResults];
   const keyWordArr = ["success", "failure"];
   const data = filteredResults.filter(
@@ -142,7 +145,7 @@ export const setOtherSummaryFilter = () => (dispatch, getState) => {
   });
   dispatch(tableReCalcValues());
 };
-export const removeAppliedFilters =
+export const removeCPTAppliedFilters =
   (filterKey, filterValue, navigate) => (dispatch, getState) => {
     const { start_date, end_date } = getState().cpt;
 
@@ -184,7 +187,7 @@ export const setFilterFromURL = (searchParams) => ({
   payload: searchParams,
 });
 
-export const setDateFilter =
+export const setCPTDateFilter =
   (start_date, end_date, navigate) => (dispatch, getState) => {
     const appliedFilters = getState().cpt.appliedFilters;
 
@@ -201,12 +204,12 @@ export const setDateFilter =
     dispatch(fetchOCPJobsData());
   };
 
-export const setPage = (pageNo) => ({
+export const setCPTPage = (pageNo) => ({
   type: TYPES.SET_PAGE,
   payload: pageNo,
 });
 
-export const setPageOptions = (page, perPage) => ({
+export const setCPTPageOptions = (page, perPage) => ({
   type: TYPES.SET_PAGE_OPTIONS,
   payload: { page, perPage },
 });
@@ -223,6 +226,6 @@ export const getCPTSummary = () => (dispatch, getState) => {
 
 export const tableReCalcValues = () => (dispatch) => {
   dispatch(getCPTSummary());
-  dispatch(setPageOptions(START_PAGE, DEFAULT_PER_PAGE));
-  dispatch(sliceTableRows(0, DEFAULT_PER_PAGE));
+  dispatch(setCPTPageOptions(START_PAGE, DEFAULT_PER_PAGE));
+  dispatch(sliceCPTTableRows(0, DEFAULT_PER_PAGE));
 };