refactoring

Author: pashidlos

src/components/TestDetailsModal.tsx

@@ -12,11 +12,7 @@ import {
 } from "@material-ui/core";
 import { TestRun } from "../types";
 import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
-import {
-  testsService,
-  testRunService,
-  testVariationService,
-} from "../services";
+import { testRunService, testVariationService } from "../services";
 import DrawArea from "./DrawArea";
 import { TestStatus } from "../types/testStatus";
 import { useHistory, Prompt } from "react-router-dom";
@@ -106,7 +102,7 @@ const TestDetailsModal: React.FunctionComponent<{
                 <Button
                   color="inherit"
                   onClick={() =>
-                    testsService.approve(testRun.id).then((testRun) => {
+                    testRunService.approve(testRun.id).then((testRun) => {
                       updateTestRun(testRun);
                     })
                   }
@@ -116,7 +112,7 @@ const TestDetailsModal: React.FunctionComponent<{
                 <Button
                   color="secondary"
                   onClick={() =>
-                    testsService
+                    testRunService
                       .reject(testRun.id)
                       .then((testRun) => updateTestRun(testRun))
                   }

src/pages/ProjectPage.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import { Grid, Dialog, IconButton, Box, Typography } from "@material-ui/core";
 import { useParams, useLocation, useHistory } from "react-router-dom";
 import { Build, TestRun } from "../types";
-import { projectsService, buildsService, testsService } from "../services";
+import { projectsService, buildsService, testRunService } from "../services";
 import BuildList from "../components/BuildList";
 import ProjectSelect from "../components/ProjectSelect";
 import qs from "qs";
@@ -150,7 +150,7 @@ const ProjectPage = () => {
               items={filteredTestRuns}
               selectedId={selectedTestdId}
               handleRemove={(id: string) =>
-                testsService.remove(id).then((isRemoved) => {
+                testRunService.remove(id).then((isRemoved) => {
                   if (isRemoved) {
                     setTestRuns(testRuns.filter((item) => item.id !== id));
                   }

src/services/index.ts

@@ -1,7 +1,6 @@
 export * from './users.service';
 export * from './projects.service'
 export * from './builds.service'
-export * from './tests.service'
 export * from './static.service'
 export * from './testVariation.service'
 export * from './testRun.service'

src/services/testRun.service.ts

@@ -6,9 +6,55 @@ import { IgnoreArea } from "../types/ignoreArea";
 const ENDPOINT_URL = "/test-runs"
 
 export const testRunService = {
-  setIgnoreAreas
+  get,
+  remove,
+  approve,
+  reject,
+  setIgnoreAreas,
 };
 
+function get(testId: string): Promise<TestRun> {
+  const requestOptions = {
+    method: "GET",
+    headers: authHeader(),
+  };
+
+  return fetch(`${API_URL}${ENDPOINT_URL}/${testId}`, requestOptions).then(
+    handleResponse
+  );
+}
+
+function remove(id: string): Promise<Number> {
+  const requestOptions = {
+    method: "DELETE",
+    headers: authHeader(),
+  };
+
+  return fetch(`${API_URL}${ENDPOINT_URL}/${id}`, requestOptions).then(handleResponse);
+}
+
+function approve(id: string): Promise<TestRun> {
+  const requestOptions = {
+    method: "GET",
+    headers: authHeader(),
+  };
+
+  return fetch(`${API_URL}${ENDPOINT_URL}/approve/${id}`, requestOptions).then(
+    handleResponse
+  );
+}
+
+function reject(id: string): Promise<TestRun> {
+  const requestOptions = {
+    method: "GET",
+    headers: authHeader(),
+  };
+
+  return fetch(`${API_URL}${ENDPOINT_URL}/reject/${id}`, requestOptions).then(
+    handleResponse
+  );
+}
+
 function setIgnoreAreas(
   id: string,
   ignoreAreas: IgnoreArea[]