Merge branch 'fossology:main' into krishna9304/167/warning-in-delete-…

…user-page
fossology · Jun 7, 2022 · 6bdac2a · 6bdac2a
2 parents 785adc7 + e11ded8
commit 6bdac2a
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 69 deletions.
diff --git a/src/api/sendRequest.js b/src/api/sendRequest.js
@@ -26,7 +26,6 @@ import { getLocalStorage, setLocalStorage } from "shared/storageHelper";
 const sendRequest = ({
   url,
   method,
-  credentials = false,
   body,
   groupName,
   headers = {},
@@ -80,10 +79,6 @@ const sendRequest = ({
   } else {
     options.body = null;
   }
-
-  if (credentials) {
-    options.credentials = credentials;
-  }
   if (queryParams) {
     URL = `${url}?${stringify(queryParams)}`;
   }

diff --git a/src/api/sendRequest.test.js b/src/api/sendRequest.test.js
@@ -146,28 +146,6 @@ describe("sendRequest", () => {
     );
   });
 
-  test("sendRequest handles credentials", async () => {
-    defaultArgs.credentials = "user:password";
-    fetch.mockResponse(JSON.stringify({}));
-
-    await sendRequest(defaultArgs);
-
-    expect(fetch).toHaveBeenCalledWith(
-      defaultArgs.url,
-      expect.objectContaining({
-        body: defaultArgs.body,
-        credentials: defaultArgs.credentials,
-        headers: new Headers({
-          "content-type": "application/json",
-          accept: "application/json",
-          groupName: "myGroupName",
-          ...defaultArgs.headers,
-        }),
-        method: defaultArgs.method,
-      })
-    );
-  });
-
   test("sendRequest handles queryParams", async () => {
     defaultArgs.queryParams = {
       option1: "abc",

diff --git a/src/api/upload.js b/src/api/upload.js
@@ -60,7 +60,6 @@ export const createUploadVcsApi = (header, body) => {
   return sendRequest({
     url,
     method: "POST",
-    credentials: false,
     headers: {
       ...header,
       Authorization: getToken(),

diff --git a/src/api/upload.test.js b/src/api/upload.test.js
@@ -113,7 +113,6 @@ describe("upload", () => {
       expect.objectContaining({
         url,
         method: "POST",
-        credentials: false,
         headers: {
           ...header,
           Authorization: getToken(),

diff --git a/src/api/users.js b/src/api/users.js
@@ -43,7 +43,6 @@ export const getAllUsersApi = () => {
   return sendRequest({
     url,
     method: "GET",
-    credentials: "include",
     headers: {
       Authorization: getToken(),
     },
@@ -56,7 +55,6 @@ export const deleteUserApi = (id) => {
   return sendRequest({
     url,
     method: "DELETE",
-    credentials: "include",
     headers: {
       Authorization: getToken(),
     },

diff --git a/src/api/users.test.js b/src/api/users.test.js
@@ -47,7 +47,6 @@ describe("users", () => {
       expect.objectContaining({
         url,
         method: "GET",
-        credentials: "include",
         headers: {
           Authorization: getToken(),
         },
@@ -65,7 +64,6 @@ describe("users", () => {
       expect.objectContaining({
         url,
         method: "DELETE",
-        credentials: "include",
         headers: {
           Authorization: getToken(),
         },

diff --git a/src/constants/constants.js b/src/constants/constants.js
@@ -99,3 +99,38 @@ export const initialMessage = {
   type: "success",
   text: "",
 };
+
+export const initialState = {
+  searchType: "allfiles",
+  uploadId: "",
+  filename: "",
+  tag: "",
+  filesizemin: "",
+  filesizemax: "",
+  license: "",
+  copyright: "",
+  page: 1,
+  limit: 10,
+};
+export const initialMessageSearch = {
+  type: "danger",
+  text: "",
+};
+export const entriesOptionsSearch = [
+  {
+    id: 10,
+    entry: "10",
+  },
+  {
+    id: 25,
+    entry: "25",
+  },
+  {
+    id: 50,
+    entry: "50",
+  },
+  {
+    id: 100,
+    entry: "100",
+  },
+];
diff --git a/src/pages/Search/index.jsx b/src/pages/Search/index.jsx
@@ -27,41 +27,14 @@ import { Alert, Button, InputContainer, Spinner } from "components/Widgets";
 // Required functions for calling APIs
 import search from "services/search";
 
+// Required constants
+import {
+  initialState,
+  initialMessageSearch,
+  entriesOptionsSearch,
+} from "../../constants/constants";
+
 const Search = () => {
-  const initialState = {
-    searchType: "allfiles",
-    uploadId: "",
-    filename: "",
-    tag: "",
-    filesizemin: "",
-    filesizemax: "",
-    license: "",
-    copyright: "",
-    page: 1,
-    limit: 10,
-  };
-  const initialMessage = {
-    type: "danger",
-    text: "",
-  };
-  const entriesOptions = [
-    {
-      id: 10,
-      entry: "10",
-    },
-    {
-      id: 25,
-      entry: "25",
-    },
-    {
-      id: 50,
-      entry: "50",
-    },
-    {
-      id: 100,
-      entry: "100",
-    },
-  ];
   // Data for searching specific uploads
   const [searchData, setSearchData] = useState(initialState);
 
@@ -74,7 +47,7 @@ const Search = () => {
   // State Variables for handling Error Boundaries
   const [loading, setLoading] = useState(false);
   const [showMessage, setShowMessage] = useState(false);
-  const [message, setMessage] = useState(initialMessage);
+  const [message, setMessage] = useState(initialMessageSearch);
 
   const handleSubmit = (e) => {
     e.preventDefault();
@@ -146,7 +119,7 @@ const Search = () => {
                 name="limit"
                 type="select"
                 onChange={(e) => handleChange(e)}
-                options={entriesOptions}
+                options={entriesOptionsSearch}
                 property="entry"
               >
                 Show entries: