@scm-manager/ui-api 2.27.3-20211117-144126 → 2.27.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scm-manager/ui-api",
-  "version": "2.27.3-20211117-144126",
+  "version": "2.27.4",
   "description": "React hook api for the SCM-Manager backend",
   "main": "src/index.ts",
   "files": [
@@ -25,10 +25,10 @@
     "react-test-renderer": "^17.0.1"
   },
   "dependencies": {
-    "@scm-manager/ui-types": "^2.27.3-20211117-144126",
+    "@scm-manager/ui-types": "^2.27.4",
     "fetch-mock-jest": "^1.5.1",
     "gitdiff-parser": "^0.1.2",
-    "query-string": "6.14.1",
+    "query-string": "5",
     "react": "^17.0.1",
     "react-query": "^3.25.1"
   },

package/src/branches.test.ts

@@ -36,38 +36,36 @@ describe("Test branches hooks", () => {
     type: "hg",
     _links: {
       branches: {
-        href: "/hog/branches"
-      }
-    }
+        href: "/hog/branches",
+      },
+    },
   };
 
   const develop: Branch = {
     name: "develop",
     revision: "42",
-    lastCommitter: { name: "trillian" },
     _links: {
       delete: {
-        href: "/hog/branches/develop"
-      }
-    }
+        href: "/hog/branches/develop",
+      },
+    },
   };
 
   const feature: Branch = {
     name: "feature/something-special",
     revision: "42",
-    lastCommitter: { name: "trillian" },
     _links: {
       delete: {
-        href: "/hog/branches/feature%2Fsomething-special"
-      }
-    }
+        href: "/hog/branches/feature%2Fsomething-special",
+      },
+    },
   };
 
   const branches: BranchCollection = {
     _embedded: {
-      branches: [develop]
+      branches: [develop],
     },
-    _links: {}
+    _links: {},
   };
 
   const queryClient = createInfiniteCachingClient();
@@ -85,7 +83,7 @@ describe("Test branches hooks", () => {
       fetchMock.getOnce("/api/v2/hog/branches", branches);
 
       const { result, waitFor } = renderHook(() => useBranches(repository), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
       await waitFor(() => {
         return !!result.current.data;
@@ -106,7 +104,7 @@ describe("Test branches hooks", () => {
         "repository",
         "hitchhiker",
         "heart-of-gold",
-        "branches"
+        "branches",
       ]);
       expect(data).toEqual(branches);
     });
@@ -117,7 +115,7 @@ describe("Test branches hooks", () => {
       fetchMock.getOnce("/api/v2/hog/branches/" + encodeURIComponent(name), branch);
 
       const { result, waitFor } = renderHook(() => useBranch(repository, name), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       expect(result.error).toBeUndefined();
@@ -145,14 +143,14 @@ describe("Test branches hooks", () => {
       fetchMock.postOnce("/api/v2/hog/branches", {
         status: 201,
         headers: {
-          Location: "/hog/branches/develop"
-        }
+          Location: "/hog/branches/develop",
+        },
       });
 
       fetchMock.getOnce("/api/v2/hog/branches/develop", develop);
 
       const { result, waitForNextUpdate } = renderHook(() => useCreateBranch(repository), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await act(() => {
@@ -177,7 +175,7 @@ describe("Test branches hooks", () => {
         "hitchhiker",
         "heart-of-gold",
         "branch",
-        "develop"
+        "develop",
       ]);
       expect(branch).toEqual(develop);
     });
@@ -194,11 +192,11 @@ describe("Test branches hooks", () => {
   describe("useDeleteBranch tests", () => {
     const deleteBranch = async () => {
       fetchMock.deleteOnce("/api/v2/hog/branches/develop", {
-        status: 204
+        status: 204,
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useDeleteBranch(repository), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await act(() => {

package/src/branches.ts

@@ -21,35 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import {
-  Branch,
-  BranchCollection,
-  BranchCreation,
-  BranchDetails,
-  BranchDetailsCollection,
-  Link,
-  NamespaceAndName,
-  Repository
-} from "@scm-manager/ui-types";
+import { Branch, BranchCollection, BranchCreation, Link, Repository } from "@scm-manager/ui-types";
 import { requiredLink } from "./links";
-import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from "react-query";
+import { useMutation, useQuery, useQueryClient } from "react-query";
 import { ApiResult, ApiResultWithFetching } from "./base";
 import { branchQueryKey, repoQueryKey } from "./keys";
 import { apiClient } from "./apiclient";
 import { concat } from "./urls";
-import { useEffect } from "react";
 
 export const useBranches = (repository: Repository): ApiResult<BranchCollection> => {
-  const queryClient = useQueryClient();
   const link = requiredLink(repository, "branches");
   return useQuery<BranchCollection, Error>(
     repoQueryKey(repository, "branches"),
-    () => apiClient.get(link).then(response => response.json()),
-    {
-      onSuccess: () => {
-        return queryClient.invalidateQueries(branchQueryKey(repository, "details"));
-      }
-    }
+    () => apiClient.get(link).then((response) => response.json())
     // we do not populate the cache for a single branch,
     // because we have no pagination for branches and if we have a lot of them
     // the population slows us down
@@ -59,99 +43,22 @@ export const useBranches = (repository: Repository): ApiResult<BranchCollection>
 export const useBranch = (repository: Repository, name: string): ApiResultWithFetching<Branch> => {
   const link = requiredLink(repository, "branches");
   return useQuery<Branch, Error>(branchQueryKey(repository, name), () =>
-    apiClient.get(concat(link, encodeURIComponent(name))).then(response => response.json())
-  );
-};
-
-function chunkBranches(branches: Branch[]) {
-  const chunks: Branch[][] = [];
-  const chunkSize = 5;
-  let chunkIndex = 0;
-  for (const branch of branches) {
-    if (!chunks[chunkIndex]) {
-      chunks[chunkIndex] = [];
-    }
-    chunks[chunkIndex].push(branch);
-    if (chunks[chunkIndex].length >= chunkSize) {
-      chunkIndex = chunkIndex + 1;
-    }
-  }
-  return chunks;
-}
-
-const branchDetailsQueryKey = (
-  repository: NamespaceAndName,
-  branch: string | undefined = undefined
-) => {
-  let branchName;
-  if (!branch) {
-    branchName = "_";
-  } else {
-    branchName = branch;
-  }
-  return [...repoQueryKey(repository), "branch-details", branchName];
-};
-
-export const useBranchDetailsCollection = (repository: Repository, branches: Branch[]) => {
-  const link = requiredLink(repository, "branchDetailsCollection");
-  const chunks = chunkBranches(branches);
-  const queryClient = useQueryClient();
-
-  const { data, isLoading, error, fetchNextPage } = useInfiniteQuery<
-    BranchDetailsCollection,
-    Error,
-    BranchDetailsCollection
-  >(
-    branchDetailsQueryKey(repository),
-    ({ pageParam = 0 }) => {
-      const encodedBranches = chunks[pageParam]?.map(b => encodeURIComponent(b.name)).join("&branches=");
-      return apiClient.get(concat(link, `?branches=${encodedBranches}`)).then(response => response.json());
-    },
-    {
-      getNextPageParam: (lastPage, allPages) => {
-        if (allPages.length >= chunks.length) {
-          return undefined;
-        }
-        return allPages.length;
-      },
-      onSuccess: newData => {
-        newData.pages
-          .flatMap(d => d._embedded?.branchDetails)
-          .filter(d => !!d)
-          .forEach(d => queryClient.setQueryData(branchDetailsQueryKey(repository, d!.branchName), () => d));
-      }
-    }
+    apiClient.get(concat(link, encodeURIComponent(name))).then((response) => response.json())
   );
-
-  useEffect(() => {
-    fetchNextPage();
-  }, [data, fetchNextPage]);
-
-  return {
-    data: data?.pages?.map(d => d._embedded?.branchDetails).flat(1),
-    isLoading,
-    error
-  };
-};
-
-export const useBranchDetails = (repository: Repository, branch: Branch) => {
-  const link = (branch._links.details as Link).href;
-  const queryKey = branchDetailsQueryKey(repository, branch.name);
-  return useQuery<BranchDetails, Error>(queryKey, () => apiClient.get(link).then(response => response.json()));
 };
 
 const createBranch = (link: string) => {
   return (branch: BranchCreation) => {
     return apiClient
       .post(link, branch, "application/vnd.scmm-branchRequest+json;v=2")
-      .then(response => {
+      .then((response) => {
         const location = response.headers.get("Location");
         if (!location) {
           throw new Error("Server does not return required Location header");
         }
         return apiClient.get(location);
       })
-      .then(response => response.json());
+      .then((response) => response.json());
   };
 };
 
@@ -159,23 +66,23 @@ export const useCreateBranch = (repository: Repository) => {
   const queryClient = useQueryClient();
   const link = requiredLink(repository, "branches");
   const { mutate, isLoading, error, data } = useMutation<Branch, Error, BranchCreation>(createBranch(link), {
-    onSuccess: async branch => {
+    onSuccess: async (branch) => {
       queryClient.setQueryData(branchQueryKey(repository, branch), branch);
       await queryClient.invalidateQueries(repoQueryKey(repository, "branches"));
-    }
+    },
   });
   return {
     create: (branch: BranchCreation) => mutate(branch),
     isLoading,
     error,
-    branch: data
+    branch: data,
   };
 };
 
 export const useDeleteBranch = (repository: Repository) => {
   const queryClient = useQueryClient();
   const { mutate, isLoading, error, data } = useMutation<unknown, Error, Branch>(
-    branch => {
+    (branch) => {
       const deleteUrl = (branch._links.delete as Link).href;
       return apiClient.delete(deleteUrl);
     },
@@ -183,14 +90,14 @@ export const useDeleteBranch = (repository: Repository) => {
       onSuccess: async (_, branch) => {
         queryClient.removeQueries(branchQueryKey(repository, branch));
         await queryClient.invalidateQueries(repoQueryKey(repository, "branches"));
-      }
+      },
     }
   );
   return {
     remove: (branch: Branch) => mutate(branch),
     isLoading,
     error,
-    isDeleted: !!data
+    isDeleted: !!data,
   };
 };
 
@@ -199,6 +106,6 @@ type DefaultBranch = { defaultBranch: string };
 export const useDefaultBranch = (repository: Repository): ApiResult<DefaultBranch> => {
   const link = requiredLink(repository, "defaultBranch");
   return useQuery<DefaultBranch, Error>(branchQueryKey(repository, "__default-branch"), () =>
-    apiClient.get(link).then(response => response.json())
+    apiClient.get(link).then((response) => response.json())
   );
 };

package/src/changesets.test.ts

@@ -35,20 +35,19 @@ describe("Test changeset hooks", () => {
     type: "hg",
     _links: {
       changesets: {
-        href: "/r/c"
-      }
-    }
+        href: "/r/c",
+      },
+    },
   };
 
   const develop: Branch = {
     name: "develop",
     revision: "42",
-    lastCommitter: { name: "trillian" },
     _links: {
       history: {
-        href: "/r/b/c"
-      }
-    }
+        href: "/r/b/c",
+      },
+    },
   };
 
   const changeset: Changeset = {
@@ -56,19 +55,19 @@ describe("Test changeset hooks", () => {
     description: "Awesome change",
     date: new Date(),
     author: {
-      name: "Arthur Dent"
+      name: "Arthur Dent",
     },
     _embedded: {},
-    _links: {}
+    _links: {},
   };
 
   const changesets: ChangesetCollection = {
     page: 1,
     pageTotal: 1,
     _embedded: {
-      changesets: [changeset]
+      changesets: [changeset],
     },
-    _links: {}
+    _links: {},
   };
 
   const expectChangesetCollection = (result?: ChangesetCollection) => {
@@ -86,7 +85,7 @@ describe("Test changeset hooks", () => {
       const queryClient = createInfiniteCachingClient();
 
       const { result, waitFor } = renderHook(() => useChangesets(repository), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await waitFor(() => {
@@ -99,14 +98,14 @@ describe("Test changeset hooks", () => {
     it("should return changesets for page", async () => {
       fetchMock.getOnce("/api/v2/r/c", changesets, {
         query: {
-          page: 42
-        }
+          page: 42,
+        },
       });
 
       const queryClient = createInfiniteCachingClient();
 
       const { result, waitFor } = renderHook(() => useChangesets(repository, { page: 42 }), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await waitFor(() => {
@@ -122,7 +121,7 @@ describe("Test changeset hooks", () => {
       const queryClient = createInfiniteCachingClient();
 
       const { result, waitFor } = renderHook(() => useChangesets(repository, { branch: develop }), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await waitFor(() => {
@@ -138,7 +137,7 @@ describe("Test changeset hooks", () => {
       const queryClient = createInfiniteCachingClient();
 
       const { result, waitFor } = renderHook(() => useChangesets(repository), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await waitFor(() => {
@@ -150,7 +149,7 @@ describe("Test changeset hooks", () => {
         "hitchhiker",
         "heart-of-gold",
         "changeset",
-        "42"
+        "42",
       ]);
 
       expect(changeset?.id).toBe("42");
@@ -164,7 +163,7 @@ describe("Test changeset hooks", () => {
       const queryClient = createInfiniteCachingClient();
 
       const { result, waitFor } = renderHook(() => useChangeset(repository, "42"), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await waitFor(() => {

package/src/config.test.ts

@@ -50,7 +50,6 @@ describe("Test config hooks", () => {
     namespaceStrategy: "",
     emergencyContacts: [],
     pluginUrl: "",
-    pluginAuthUrl: "",
     proxyExcludes: [],
     proxyPassword: null,
     proxyPort: 0,

package/src/contentType.ts

@@ -28,9 +28,6 @@ import { ApiResultWithFetching } from "./base";
 export type ContentType = {
   type: string;
   language?: string;
-  aceMode?: string;
-  codemirrorMode?: string;
-  prismMode?: string;
 };
 
 function getContentType(url: string): Promise<ContentType> {
@@ -38,9 +35,6 @@ function getContentType(url: string): Promise<ContentType> {
     return {
       type: response.headers.get("Content-Type") || "application/octet-stream",
       language: response.headers.get("X-Programming-Language") || undefined,
-      aceMode: response.headers.get("X-Syntax-Mode-Ace") || undefined,
-      codemirrorMode: response.headers.get("X-Syntax-Mode-Codemirror") || undefined,
-      prismMode: response.headers.get("X-Syntax-Mode-Prism") || undefined,
     };
   });
 }

package/src/import.ts

@@ -30,12 +30,12 @@ import { requiredLink } from "./links";
 
 export const useImportLog = (logId: string): ApiResult<string> => {
   const link = useRequiredIndexLink("importLog").replace("{logId}", logId);
-  return useQuery<string, Error>(["importLog", logId], () => apiClient.get(link).then(response => response.text()));
+  return useQuery<string, Error>(["importLog", logId], () => apiClient.get(link).then((response) => response.text()));
 };
 
 export const useImportRepositoryFromUrl = (repositoryType: RepositoryType) => {
   const url = requiredLink(repositoryType, "import", "url");
-  const { isLoading, error, data, mutate } = useMutation<Repository, Error, RepositoryUrlImport>(repo =>
+  const { isLoading, error, data, mutate } = useMutation<Repository, Error, RepositoryUrlImport>((repo) =>
     apiClient
       .post(url, repo, "application/vnd.scmm-repository+json;v=2")
       .then(fetchResourceFromLocationHeader)
@@ -46,14 +46,14 @@ export const useImportRepositoryFromUrl = (repositoryType: RepositoryType) => {
     isLoading,
     error,
     importRepositoryFromUrl: (repository: RepositoryUrlImport) => mutate(repository),
-    importedRepository: data
+    importedRepository: data,
   };
 };
 
 const importRepository = (url: string, repository: RepositoryCreation, file: File, password?: string) => {
   return apiClient
-    .postBinary(url, formData => {
-      formData.append("bundle", file, file.name);
+    .postBinary(url, (formData) => {
+      formData.append("bundle", file, file?.name);
       formData.append("repository", JSON.stringify({ ...repository, password }));
     })
     .then(fetchResourceFromLocationHeader)
@@ -82,9 +82,9 @@ export const useImportRepositoryFromBundle = (repositoryType: RepositoryType) =>
         repository,
         file,
         compressed,
-        password
+        password,
       }),
-    importedRepository: data
+    importedRepository: data,
   };
 };
 
@@ -107,8 +107,8 @@ export const useImportFullRepository = (repositoryType: RepositoryType) => {
       mutate({
         repository,
         file,
-        password
+        password,
       }),
-    importedRepository: data
+    importedRepository: data,
   };
 };

package/src/index.ts

@@ -58,8 +58,6 @@ export * from "./history";
 export * from "./contentType";
 export * from "./annotations";
 export * from "./search";
-export * from "./loginInfo";
-export * from "./usePluginCenterAuthInfo";
 
 export { default as ApiProvider } from "./ApiProvider";
 export * from "./ApiProvider";

package/src/repositories.test.ts

@@ -37,7 +37,7 @@ import {
   useRepository,
   useRepositoryTypes,
   useUnarchiveRepository,
-  useUpdateRepository
+  useUpdateRepository,
 } from "./repositories";
 import { Repository } from "@scm-manager/ui-types";
 import { QueryClient } from "react-query";
@@ -50,25 +50,25 @@ describe("Test repository hooks", () => {
     type: "git",
     _links: {
       delete: {
-        href: "/r/spaceships/heartOfGold"
+        href: "/r/spaceships/heartOfGold",
       },
       update: {
-        href: "/r/spaceships/heartOfGold"
+        href: "/r/spaceships/heartOfGold",
       },
       archive: {
-        href: "/r/spaceships/heartOfGold/archive"
+        href: "/r/spaceships/heartOfGold/archive",
       },
       unarchive: {
-        href: "/r/spaceships/heartOfGold/unarchive"
-      }
-    }
+        href: "/r/spaceships/heartOfGold/unarchive",
+      },
+    },
   };
 
   const repositoryCollection = {
     _embedded: {
-      repositories: [heartOfGold]
+      repositories: [heartOfGold],
     },
-    _links: {}
+    _links: {},
   };
 
   afterEach(() => {
@@ -78,7 +78,7 @@ describe("Test repository hooks", () => {
   describe("useRepositories tests", () => {
     const expectCollection = async (queryClient: QueryClient, request?: UseRepositoriesRequest) => {
       const { result, waitFor } = renderHook(() => useRepositories(request), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
       await waitFor(() => {
         return !!result.current.data;
@@ -91,8 +91,8 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/repos");
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
-          sortBy: "namespaceAndName"
-        }
+          sortBy: "namespaceAndName",
+        },
       });
 
       await expectCollection(queryClient);
@@ -104,12 +104,12 @@ describe("Test repository hooks", () => {
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
           sortBy: "namespaceAndName",
-          page: "42"
-        }
+          page: "42",
+        },
       });
 
       await expectCollection(queryClient, {
-        page: 42
+        page: 42,
       });
     });
 
@@ -118,8 +118,8 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/repos");
       fetchMock.get("/api/v2/spaceships", repositoryCollection, {
         query: {
-          sortBy: "namespaceAndName"
-        }
+          sortBy: "namespaceAndName",
+        },
       });
 
       await expectCollection(queryClient, {
@@ -127,10 +127,10 @@ describe("Test repository hooks", () => {
           namespace: "spaceships",
           _links: {
             repositories: {
-              href: "/spaceships"
-            }
-          }
-        }
+              href: "/spaceships",
+            },
+          },
+        },
       });
     });
 
@@ -140,12 +140,12 @@ describe("Test repository hooks", () => {
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
           sortBy: "namespaceAndName",
-          q: "heart"
-        }
+          q: "heart",
+        },
       });
 
       await expectCollection(queryClient, {
-        search: "heart"
+        search: "heart",
       });
     });
 
@@ -154,8 +154,8 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/repos");
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
-          sortBy: "namespaceAndName"
-        }
+          sortBy: "namespaceAndName",
+        },
       });
 
       await expectCollection(queryClient);
@@ -168,7 +168,7 @@ describe("Test repository hooks", () => {
       const queryClient = createInfiniteCachingClient();
       setIndexLink(queryClient, "repositories", "/repos");
       const { result } = renderHook(() => useRepositories({ disabled: true }), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       expect(result.current.isLoading).toBe(false);
@@ -185,18 +185,19 @@ describe("Test repository hooks", () => {
       fetchMock.postOnce("/api/v2/r", {
         status: 201,
         headers: {
-          Location: "/r/spaceships/heartOfGold"
-        }
+          Location: "/r/spaceships/heartOfGold",
+        },
       });
 
       fetchMock.getOnce("/api/v2/r/spaceships/heartOfGold", heartOfGold);
 
       const { result, waitForNextUpdate } = renderHook(() => useCreateRepository(), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       const repository = {
-        ...heartOfGold
+        ...heartOfGold,
+        contextEntries: [],
       };
 
       await act(() => {
@@ -215,18 +216,19 @@ describe("Test repository hooks", () => {
       fetchMock.postOnce("/api/v2/r?initialize=true", {
         status: 201,
         headers: {
-          Location: "/r/spaceships/heartOfGold"
-        }
+          Location: "/r/spaceships/heartOfGold",
+        },
       });
 
       fetchMock.getOnce("/api/v2/r/spaceships/heartOfGold", heartOfGold);
 
       const { result, waitForNextUpdate } = renderHook(() => useCreateRepository(), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       const repository = {
-        ...heartOfGold
+        ...heartOfGold,
+        contextEntries: [],
       };
 
       await act(() => {
@@ -243,15 +245,16 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/r");
 
       fetchMock.postOnce("/api/v2/r", {
-        status: 201
+        status: 201,
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useCreateRepository(), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       const repository = {
-        ...heartOfGold
+        ...heartOfGold,
+        contextEntries: [],
       };
 
       await act(() => {
@@ -271,7 +274,7 @@ describe("Test repository hooks", () => {
       fetchMock.get("/api/v2/r/spaceships/heartOfGold", heartOfGold);
 
       const { result, waitFor } = renderHook(() => useRepository("spaceships", "heartOfGold"), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
       await waitFor(() => {
         return !!result.current.data;
@@ -290,15 +293,15 @@ describe("Test repository hooks", () => {
             {
               name: "git",
               displayName: "Git",
-              _links: {}
-            }
-          ]
+              _links: {},
+            },
+          ],
         },
-        _links: {}
+        _links: {},
       });
 
       const { result, waitFor } = renderHook(() => useRepositoryTypes(), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
       await waitFor(() => {
         return !!result.current.data;
@@ -319,11 +322,11 @@ describe("Test repository hooks", () => {
 
     const deleteRepository = async (options?: UseDeleteRepositoryOptions) => {
       fetchMock.deleteOnce("/api/v2/r/spaceships/heartOfGold", {
-        status: 204
+        status: 204,
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useDeleteRepository(options), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await act(() => {
@@ -368,9 +371,9 @@ describe("Test repository hooks", () => {
     it("should call onSuccess callback", async () => {
       let repo;
       await deleteRepository({
-        onSuccess: repository => {
+        onSuccess: (repository) => {
           repo = repository;
-        }
+        },
       });
       expect(repo).toEqual(heartOfGold);
     });
@@ -385,11 +388,11 @@ describe("Test repository hooks", () => {
 
     const updateRepository = async () => {
       fetchMock.putOnce("/api/v2/r/spaceships/heartOfGold", {
-        status: 204
+        status: 204,
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useUpdateRepository(), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await act(() => {
@@ -433,11 +436,11 @@ describe("Test repository hooks", () => {
 
     const archiveRepository = async () => {
       fetchMock.postOnce("/api/v2/r/spaceships/heartOfGold/archive", {
-        status: 204
+        status: 204,
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useArchiveRepository(), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await act(() => {
@@ -481,11 +484,11 @@ describe("Test repository hooks", () => {
 
     const unarchiveRepository = async () => {
       fetchMock.postOnce("/api/v2/r/spaceships/heartOfGold/unarchive", {
-        status: 204
+        status: 204,
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useUnarchiveRepository(), {
-        wrapper: createWrapper(undefined, queryClient)
+        wrapper: createWrapper(undefined, queryClient),
       });
 
       await act(() => {

package/src/urls.ts

@@ -84,13 +84,8 @@ function parsePageNumber(pageAsString: string) {
   return page;
 }
 
-export function getQueryStringFromLocation(location: { search?: string }): string | undefined {
-  if (location.search) {
-    const query = queryString.parse(location.search).q;
-    if (query && !Array.isArray(query)) {
-      return query;
-    }
-  }
+export function getQueryStringFromLocation(location: any) {
+  return location.search ? queryString.parse(location.search).q : undefined;
 }
 
 export function stripEndingSlash(url: string) {

package/src/loginInfo.ts

@@ -1,43 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-import { ApiResult, useIndexLink } from "./base";
-import { useQuery } from "react-query";
-import { LoginInfo } from "@scm-manager/ui-types";
-
-export const useLoginInfo = (disabled = false): ApiResult<LoginInfo> => {
-  const loginInfoLink = useIndexLink("loginInfo");
-  const { error, isLoading, data } = useQuery<LoginInfo, Error>(
-    ["loginInfo"],
-    () => fetch(loginInfoLink!).then(response => response.json()),
-    {
-      enabled: !disabled && !!loginInfoLink,
-      refetchOnWindowFocus: false
-    }
-  );
-  return {
-    data,
-    error,
-    isLoading
-  };
-};

package/src/usePluginCenterAuthInfo.ts

@@ -1,78 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020-present Cloudogu GmbH and Contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { ApiResult, useIndexLink } from "./base";
-import { Link, PluginCenterAuthenticationInfo } from "@scm-manager/ui-types";
-import { useMutation, useQuery, useQueryClient } from "react-query";
-import { apiClient } from "./apiclient";
-import { useLocation } from "react-router-dom";
-
-export const usePluginCenterAuthInfo = (): ApiResult<PluginCenterAuthenticationInfo> => {
-  const link = useIndexLink("pluginCenterAuth");
-  const location = useLocation();
-  return useQuery<PluginCenterAuthenticationInfo, Error>(
-    ["pluginCenterAuth"],
-    () => {
-      if (!link) {
-        throw new Error("no such plugin center auth link");
-      }
-      return apiClient
-        .get(link)
-        .then(response => response.json())
-        .then((result: PluginCenterAuthenticationInfo) => {
-          if (result._links?.login) {
-            (result._links.login as Link).href += `?source=${location.pathname}`;
-          }
-          return result;
-        });
-    },
-    {
-      enabled: !!link
-    }
-  );
-};
-
-export const usePluginCenterLogout = (authenticationInfo: PluginCenterAuthenticationInfo) => {
-  const queryClient = useQueryClient();
-  const { mutate, isLoading, error } = useMutation<unknown, Error>(
-    () => {
-      if (!authenticationInfo._links.logout) {
-        throw new Error("authenticationInfo has no logout link");
-      }
-      const logout = authenticationInfo._links.logout as Link;
-      return apiClient.delete(logout.href);
-    },
-    {
-      onSuccess: () => queryClient.invalidateQueries("pluginCenterAuth")
-    }
-  );
-
-  return {
-    logout: () => {
-      mutate();
-    },
-    isLoading,
-    error
-  };
-};