Sorting

backend/app/api/v1/commons/ocp.py

@@ -5,7 +5,12 @@
 
 
 async def getData(
-    start_datetime: date, end_datetime: date, size: int, offset: int, configpath: str
+    start_datetime: date,
+    end_datetime: date,
+    size: int,
+    offset: int,
+    sort: str,
+    configpath: str,
 ):
     query = {
         "size": size,
@@ -14,6 +19,9 @@ async def getData(
             "bool": {"filter": {"range": {"timestamp": {"format": "yyyy-MM-dd"}}}}
         },
     }
+    if sort:
+        key, direction = sort.split(":")
+        query["sort"] = [{key: {"order": direction}}]
 
     es = ElasticService(configpath=configpath)
     response = await es.post(

backend/app/api/v1/commons/quay.py

@@ -5,7 +5,7 @@
 
 
 async def getData(
-    start_datetime: date, end_datetime: date, size, offset, configpath: str
+    start_datetime: date, end_datetime: date, size, offset, sort: str, configpath: str
 ):
     query = {
         "size": size,
@@ -15,6 +15,10 @@ async def getData(
         },
     }
 
+    if sort:
+        key, direction = sort.split(":")
+        query["sort"] = [{key: {"order": direction}}]
+
     es = ElasticService(configpath=configpath)
     response = await es.post(
         query=query,

backend/app/api/v1/commons/telco.py

@@ -38,6 +38,8 @@ async def getData(
         "earliest_time": "{}T00:00:00".format(start_datetime.strftime("%Y-%m-%d")),
         "latest_time": "{}T23:59:59".format(end_datetime.strftime("%Y-%m-%d")),
         "output_mode": "json",
+        "sort_dir": "asc",
+        "sort_key": "test_type",
     }
     searchList = " OR ".join(
         ['test_type="{}"'.format(test_type) for test_type in test_types]

backend/app/api/v1/endpoints/ocp/ocpJobs.py

@@ -32,9 +32,16 @@ async def jobs(
         description="End date for searching jobs, format: 'YYYY-MM-DD'",
         examples=["2020-11-15"],
     ),
+<<<<<<< HEAD
     pretty: bool = Query(False, description="Output content in pretty format."),
     size: int = Query(None, description="Number of jobs to fetch"),
     offset: int = Query(None, description="Offset Number to fetch jobs from"),
+=======
+    pretty: bool = Query(False, description="Output contet in pretty format."),
+    size: int = Query(None, description="Number of jobs to fetch"),
+    offset: int = Query(None, description="Offset Number to fetch jobs from"),
+    sort: str = Query(None, descption="To sort fields on specified direction"),
+>>>>>>> bd597e7 (Sorting)
 ):
     if start_date is None:
         start_date = datetime.utcnow().date()
@@ -51,6 +58,7 @@ async def jobs(
             status_code=422,
         )
 
+<<<<<<< HEAD
     if offset and not size:
         raise HTTPException(400, f"offset {offset} specified without size")
     elif not offset and not size:
@@ -71,6 +79,38 @@ async def jobs(
         "total": results["total"],
         "offset": offset + size,
     }
+=======
+    if not offset:
+        offset = 0
+
+    if not size:
+        size = 10000
+        offset = 0
+
+    if not sort:
+        sort = None
+
+    results = await getData(
+        start_date, end_date, size, offset, sort, "ocp.elasticsearch"
+    )
+
+    if "data" in results and len(results["data"]) >= 1:
+        response = {
+            "startDate": start_date.__str__(),
+            "endDate": end_date.__str__(),
+            "results": results["data"].to_dict("records"),
+            "total": results["total"],
+            "offset": offset + size,
+        }
+    else:
+        response = {
+            "startDate": start_date.__str__(),
+            "endDate": end_date.__str__(),
+            "results": [],
+            "total": 0,
+            "offset": 0,
+        }
+>>>>>>> bd597e7 (Sorting)
 
     if pretty:
         json_str = json.dumps(response, indent=4)

backend/app/api/v1/endpoints/quay/quayJobs.py

@@ -32,9 +32,16 @@ async def jobs(
         description="End date for searching jobs, format: 'YYYY-MM-DD'",
         examples=["2020-11-15"],
     ),
+<<<<<<< HEAD
     pretty: bool = Query(False, description="Output content in pretty format."),
     size: int = Query(None, description="Number of jobs to fetch"),
     offset: int = Query(None, description="Offset Number to fetch jobs from"),
+=======
+    pretty: bool = Query(False, description="Output contet in pretty format."),
+    size: int = Query(None, description="Number of jobs to fetch"),
+    offset: int = Query(None, description="Offset Number to fetch jobs from"),
+    sort: str = Query(None, descption="To sort fields on specified direction"),
+>>>>>>> bd597e7 (Sorting)
 ):
     if start_date is None:
         start_date = datetime.utcnow().date()
@@ -51,6 +58,7 @@ async def jobs(
             status_code=422,
         )
 
+<<<<<<< HEAD
     if offset and not size:
         raise HTTPException(400, f"offset {offset} specified without size")
     elif not offset and not size:
@@ -72,6 +80,38 @@ async def jobs(
         "total": 0,
         "offset": 0,
     }
+=======
+    if not offset:
+        offset = 0
+
+    if not size:
+        size = 10000
+        offset = 0
+
+    if not sort:
+        sort = None
+
+    results = await getData(
+        start_date, end_date, size, offset, sort, "quay.elasticsearch"
+    )
+
+    if "data" in results and len(results["data"]) >= 1:
+        response = {
+            "startDate": start_date.__str__(),
+            "endDate": end_date.__str__(),
+            "results": results["data"].to_dict("records"),
+            "total": results["total"],
+            "offset": offset + size,
+        }
+    else:
+        response = {
+            "startDate": start_date.__str__(),
+            "endDate": end_date.__str__(),
+            "results": [],
+            "total": 0,
+            "offset": 0,
+        }
+>>>>>>> bd597e7 (Sorting)
 
     if pretty:
         json_str = json.dumps(response, indent=4)

backend/app/services/splunk.py

@@ -45,6 +45,8 @@ async def query(
         """
         query["count"] = size
         query["offset"] = offset
+        query["sort_dir"] = "asc"
+        query["sort_key"] = "test_type"
 
         # If additional search parameters are provided, include those in searchindex
         searchindex = (

frontend/src/actions/commonActions.js

@@ -6,69 +6,6 @@ import { setOCPCatFilters } from "./ocpActions";
 import { setQuayCatFilters } from "./quayActions";
 import { setTelcoCatFilters } from "./telcoActions";
 
-const getSortableRowValues = (result, tableColumns) => {
-  const tableKeys = tableColumns.map((item) => item.value);
-  return tableKeys.map((key) => result[key]);
-};
-
-export const sortTable = (currState) => (dispatch, getState) => {
-  const results = [...getState()[currState].filteredResults];
-  const { activeSortDir, activeSortIndex, tableColumns } =
-    getState()[currState];
-  try {
-    if (activeSortIndex !== null && typeof activeSortIndex !== "undefined") {
-      const sortedResults = results.sort((a, b) => {
-        const aValue = getSortableRowValues(a, tableColumns)[activeSortIndex];
-        const bValue = getSortableRowValues(b, tableColumns)[activeSortIndex];
-        if (typeof aValue === "number") {
-          if (activeSortDir === "asc") {
-            return aValue - bValue;
-          }
-          return bValue - aValue;
-        } else {
-          if (activeSortDir === "asc") {
-            return aValue.localeCompare(bValue);
-          }
-          return bValue.localeCompare(aValue);
-        }
-      });
-      dispatch(sortedTableRows(currState, sortedResults));
-    }
-  } catch (error) {
-    console.log(error);
-  }
-};
-
-const sortedTableRows = (currState, sortedResults) => (dispatch) => {
-  if (currState === "cpt") {
-    dispatch({
-      type: TYPES.SET_FILTERED_DATA,
-      payload: sortedResults,
-    });
-    return;
-  }
-  if (currState === "ocp") {
-    dispatch({
-      type: TYPES.SET_OCP_FILTERED_DATA,
-      payload: sortedResults,
-    });
-    return;
-  }
-  if (currState === "quay") {
-    dispatch({
-      type: TYPES.SET_QUAY_FILTERED_DATA,
-      payload: sortedResults,
-    });
-    return;
-  }
-  if (currState === "telco") {
-    dispatch({
-      type: TYPES.SET_TELCO_FILTERED_DATA,
-      payload: sortedResults,
-    });
-  }
-};
-
 const findItemCount = (data, key, value) => {
   return data.reduce(function (n, item) {
     return n + (item[key].toLowerCase() === value);
@@ -203,13 +140,15 @@ export const getSelectedFilter =
   };
 
 export const getRequestParams = (type) => (dispatch, getState) => {
-  const { start_date, end_date, size, offset } = getState()[type];
+  const { start_date, end_date, size, offset, sort } = getState()[type];
+  // const sortParam = `${activeSortIndex}:${activeSortDir}`;
   const params = {
     pretty: true,
     ...(start_date && { start_date }),
     ...(end_date && { end_date }),
     size: size,
     offset: offset,
+    ...(sort && { sort }),
   };
 
   return params;

frontend/src/actions/homeActions.js

@@ -9,7 +9,6 @@ import {
   getFilteredData,
   getRequestParams,
   getSelectedFilter,
-  sortTable,
 } from "./commonActions";
 
 import API from "@/utils/axiosInstance";
@@ -56,7 +55,6 @@ export const fetchOCPJobsData =
         });
 
         dispatch(applyFilters());
-        dispatch(sortTable("cpt"));
         dispatch(tableReCalcValues());
       }
     } catch (error) {

frontend/src/actions/ocpActions.js

@@ -9,7 +9,6 @@ import {
   getFilteredData,
   getRequestParams,
   getSelectedFilter,
-  sortTable,
 } from "./commonActions";
 
 import API from "@/utils/axiosInstance";
@@ -52,7 +51,6 @@ export const fetchOCPJobs = () => async (dispatch) => {
       });
 
       dispatch(applyFilters());
-      dispatch(sortTable("ocp"));
       dispatch(tableReCalcValues());
     }
   } catch (error) {

frontend/src/actions/sortingActions.js

@@ -1,9 +1,18 @@
+import * as TYPES from "@/actions/types.js";
+
+import { fetchOCPJobs, setOCPSortDir, setOCPSortIndex } from "./ocpActions";
+import {
+  fetchQuayJobsData,
+  setQuaySortDir,
+  setQuaySortIndex,
+} from "./quayActions";
+import {
+  fetchTelcoJobsData,
+  setTelcoSortDir,
+  setTelcoSortIndex,
+} from "./telcoActions";
 import { setCPTSortDir, setCPTSortIndex } from "./homeActions";
-import { setOCPSortDir, setOCPSortIndex } from "./ocpActions";
-import { setQuaySortDir, setQuaySortIndex } from "./quayActions";
-import { setTelcoSortDir, setTelcoSortIndex } from "./telcoActions";
 
-import { sortTable } from "./commonActions";
 import store from "@/store/store";
 
 const { dispatch } = store;
@@ -29,6 +38,56 @@ export const setActiveSortIndex = (index, currType) => {
     dispatch(setTelcoSortIndex(index));
   }
 };
-export const handleOnSort = (currType) => {
-  dispatch(sortTable(currType));
+export const handleOnSort = (colName, currType) => {
+  dispatch(sortTable(colName, currType));
+};
+
+const offsetActions = {
+  cpt: TYPES.SET_CPT_OFFSET,
+  ocp: TYPES.SET_OCP_OFFSET,
+  quay: TYPES.SET_QUAY_OFFSET,
+  telco: TYPES.SET_TELCO_OFFSET,
+};
+const fetchJobsMap = {
+  ocp: fetchOCPJobs,
+  quay: fetchQuayJobsData,
+  telco: fetchTelcoJobsData,
+};
+const sortObjActions = {
+  ocp: TYPES.SET_OCP_SORT_OBJ,
+  quay: TYPES.SET_QUAY_SORT_OBJ,
+};
+export const sortTable = (colName, currState) => (dispatch, getState) => {
+  const { activeSortDir, activeSortIndex } = getState()[currState];
+  const countObj = [
+    "masterNodesCount",
+    "workerNodesCount",
+    "infraNodesCount",
+    "totalNodesCount",
+    "startDate",
+    "endDate",
+  ];
+  try {
+    if (
+      typeof activeSortDir !== "undefined" &&
+      typeof activeSortIndex !== "undefined"
+    ) {
+      dispatch({ type: offsetActions[currState], payload: 0 });
+      let fieldName = countObj.includes(colName)
+        ? colName
+        : `${colName}.keyword`;
+      if (colName === "build") {
+        fieldName = "ocpVersion.keyword";
+      }
+
+      const sortParam = `${fieldName}:${activeSortDir}`;
+      dispatch({ type: sortObjActions[currState], payload: sortParam });
+      console.log(sortParam);
+      const isFromSorting = true;
+
+      dispatch(fetchJobsMap[currState](isFromSorting));
+    }
+  } catch (error) {
+    console.log(error);
+  }
 };