Revert "TestRuns. Add pagination"

This reverts commit 7d4fe0a.

Author: pashidlos

src/contexts/testRun.context.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { PaginatedData, TestRun } from "../types";
+import { TestRun } from "../types";
 import { testRunService } from "../services";
 
 interface IRequestAction {
@@ -9,7 +9,7 @@ interface IRequestAction {
 
 interface IGetAction {
   type: "get";
-  payload: PaginatedData<TestRun>;
+  payload: TestRun[];
 }
 
 interface ISelectAction {
@@ -63,9 +63,6 @@ type State = {
   selectedTestRunId: string | undefined;
   selectedTestRunIndex: number | undefined;
   testRuns: TestRun[];
-  total: number;
-  take: number;
-  skip: number;
   loading: boolean;
 };
 
@@ -80,9 +77,6 @@ const initialState: State = {
   selectedTestRunId: undefined,
   selectedTestRunIndex: undefined,
   testRuns: [],
-  take: 10,
-  skip: 0,
-  total: 0,
   loading: false,
 };
 
@@ -107,13 +101,9 @@ function testRunReducer(state: State, action: IAction): State {
         loading: true,
       };
     case "get":
-      const { data, take, skip, total } = action.payload;
       return {
         ...state,
-        testRuns: data,
-        take,
-        skip,
-        total,
+        testRuns: action.payload,
         loading: false,
       };
     case "delete":
@@ -173,18 +163,12 @@ function useTestRunDispatch() {
   return context;
 }
 
-async function getTestRunList(
-  dispatch: Dispatch,
-  buildId: string,
-  page: number
-): Promise<void> {
+async function getTestRunList(dispatch: Dispatch, buildId: string) {
   dispatch({ type: "request" });
 
-  return testRunService
-    .getList(buildId, initialState.take, initialState.take * (page - 1))
-    .then((response) => {
-      dispatch({ type: "get", payload: response });
-    });
+  return testRunService.getList(buildId).then((items) => {
+    dispatch({ type: "get", payload: items });
+  });
 }
 
 async function deleteTestRun(dispatch: Dispatch, id: string) {

src/pages/ProjectPage.tsx

@@ -58,12 +58,7 @@ const ProjectPage = () => {
   const buildDispatch = useBuildDispatch();
   const { selectedProjectId } = useProjectState();
   const projectDispatch = useProjectDispatch();
-  const {
-    testRuns,
-    selectedTestRunIndex,
-    total: testRunTotal,
-    take: testRunTake,
-  } = useTestRunState();
+  const { testRuns, selectedTestRunIndex } = useTestRunState();
   const testRunDispatch = useTestRunDispatch();
 
   // filter
@@ -86,6 +81,16 @@ const ProjectPage = () => {
     }
   }, [projectId, projectDispatch]);
 
+  useEffect(() => {
+    if (selectedBuildId) {
+      getTestRunList(testRunDispatch, selectedBuildId).catch((err) =>
+        enqueueSnackbar(err, {
+          variant: "error",
+        })
+      );
+    }
+  }, [selectedBuildId, testRunDispatch, enqueueSnackbar]);
+
   useEffect(() => {
     if (queryParams.buildId) {
       selectBuild(buildDispatch, queryParams.buildId);
@@ -112,18 +117,6 @@ const ProjectPage = () => {
     );
   }, [query, os, device, browser, viewport, testStatus, testRuns]);
 
-  const getTestRunListCalback: any = React.useCallback(
-    (page: number) =>
-      selectedBuildId &&
-      getTestRunList(testRunDispatch, selectedBuildId, page).catch(
-        (err: string) =>
-          enqueueSnackbar(err, {
-            variant: "error",
-          })
-      ),
-    [testRunDispatch, enqueueSnackbar, selectedBuildId]
-  );
-
   const getBuildListCalback: any = React.useCallback(
     (page: number) =>
       selectedProjectId &&
@@ -136,10 +129,6 @@ const ProjectPage = () => {
     [buildDispatch, enqueueSnackbar, selectedProjectId]
   );
 
-  React.useEffect(() => {
-    getTestRunListCalback(1);
-  }, [getTestRunListCalback]);
-
   React.useEffect(() => {
     getBuildListCalback(1);
   }, [getBuildListCalback]);
@@ -173,19 +162,9 @@ const ProjectPage = () => {
           viewportState={[viewport, setViewport]}
           testStatusState={[testStatus, setTestStatus]}
         />
-        <Box height="70%" my={0.5}>
+        <Box height="75%">
           <TestRunList items={filteredTestRuns} />
         </Box>
-        <Grid container justify="center">
-          <Grid item>
-            <Pagination
-              size="small"
-              defaultPage={1}
-              count={Math.ceil(testRunTotal / testRunTake)}
-              onChange={(event, page) => getTestRunListCalback(page)}
-            />
-          </Grid>
-        </Grid>
 
         {selectedTestRunIndex !== undefined && testRuns[selectedTestRunIndex] && (
           <Dialog open={true} fullScreen className={classes.modal}>

src/services/testRun.service.ts

@@ -1,22 +1,18 @@
-import { PaginatedData, TestRun } from "../types";
+import { TestRun } from "../types";
 import { handleResponse, authHeader } from "../_helpers/service.helpers";
 import { API_URL } from "../_config/env.config";
 import { IgnoreArea } from "../types/ignoreArea";
 
 const ENDPOINT_URL = "/test-runs";
 
-async function getList(
-  buildId: string,
-  take: number,
-  skip: number
-): Promise<PaginatedData<TestRun>> {
+async function getList(buildId: string): Promise<TestRun[]> {
   const requestOptions = {
     method: "GET",
     headers: authHeader(),
   };
 
   return fetch(
-    `${API_URL}${ENDPOINT_URL}?buildId=${buildId}&take=${take}&skip=${skip}`,
+    `${API_URL}${ENDPOINT_URL}?buildId=${buildId}`,
     requestOptions
   ).then(handleResponse);
 }