@scm-manager/ui-api 2.29.1 → 2.29.2-20220018-094807

package/package.json

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

package/src/index.ts

@@ -36,6 +36,7 @@ export * from "./users";
 export * from "./suggestions";
 export * from "./userSuggestions";
 export * from "./groupSuggestions";
+export * from "./namespaceSuggestions";
 export * from "./repositories";
 export * from "./namespaces";
 export * from "./branches";

package/src/namespaceSuggestions.ts

@@ -0,0 +1,32 @@
+/*
+ * 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 { Link } from "@scm-manager/ui-types";
+import { useIndexLinks } from "./base";
+import { useSuggestions } from "./suggestions";
+
+export const useNamespaceSuggestions = () => {
+  const indexLinks = useIndexLinks();
+  const autocompleteLink = (indexLinks.autocomplete as Link[]).find((i) => i.name === "namespaces");
+  return useSuggestions(autocompleteLink?.href);
+};

package/src/repositories.test.ts

@@ -89,11 +89,7 @@ describe("Test repository hooks", () => {
     it("should return repositories", async () => {
       const queryClient = createInfiniteCachingClient();
       setIndexLink(queryClient, "repositories", "/repos");
-      fetchMock.get("/api/v2/repos", repositoryCollection, {
-        query: {
-          sortBy: "namespaceAndName"
-        }
-      });
+      fetchMock.get("/api/v2/repos", repositoryCollection);
 
       await expectCollection(queryClient);
     });
@@ -103,7 +99,6 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/repos");
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
-          sortBy: "namespaceAndName",
           page: "42"
         }
       });
@@ -116,11 +111,7 @@ describe("Test repository hooks", () => {
     it("should use repository from namespace", async () => {
       const queryClient = createInfiniteCachingClient();
       setIndexLink(queryClient, "repositories", "/repos");
-      fetchMock.get("/api/v2/spaceships", repositoryCollection, {
-        query: {
-          sortBy: "namespaceAndName"
-        }
-      });
+      fetchMock.get("/api/v2/spaceships", repositoryCollection);
 
       await expectCollection(queryClient, {
         namespace: {
@@ -139,7 +130,6 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/repos");
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
-          sortBy: "namespaceAndName",
           q: "heart"
         }
       });
@@ -152,11 +142,7 @@ describe("Test repository hooks", () => {
     it("should update repository cache", async () => {
       const queryClient = createInfiniteCachingClient();
       setIndexLink(queryClient, "repositories", "/repos");
-      fetchMock.get("/api/v2/repos", repositoryCollection, {
-        query: {
-          sortBy: "namespaceAndName"
-        }
-      });
+      fetchMock.get("/api/v2/repos", repositoryCollection);
 
       await expectCollection(queryClient);
 

package/src/repositories.ts

@@ -30,7 +30,7 @@ import {
   Repository,
   RepositoryCollection,
   RepositoryCreation,
-  RepositoryTypeCollection,
+  RepositoryTypeCollection
 } from "@scm-manager/ui-types";
 import { useMutation, useQuery, useQueryClient } from "react-query";
 import { apiClient } from "./apiclient";
@@ -55,9 +55,7 @@ export const useRepositories = (request?: UseRepositoriesRequest): ApiResult<Rep
   const namespaceLink = (request?.namespace?._links.repositories as Link)?.href;
   const link = namespaceLink || indexLink;
 
-  const queryParams: Record<string, string> = {
-    sortBy: "namespaceAndName",
-  };
+  const queryParams: Record<string, string> = {};
   if (request?.search) {
     queryParams.q = request.search;
   }
@@ -66,7 +64,7 @@ export const useRepositories = (request?: UseRepositoriesRequest): ApiResult<Rep
   }
   return useQuery<RepositoryCollection, Error>(
     ["repositories", request?.namespace?.namespace, request?.search || "", request?.page || 0],
-    () => apiClient.get(`${link}?${createQueryString(queryParams)}`).then((response) => response.json()),
+    () => apiClient.get(`${link}?${createQueryString(queryParams)}`).then(response => response.json()),
     {
       enabled: !request?.disabled,
       onSuccess: (repositories: RepositoryCollection) => {
@@ -74,7 +72,7 @@ export const useRepositories = (request?: UseRepositoriesRequest): ApiResult<Rep
         repositories._embedded?.repositories.forEach((repository: Repository) => {
           queryClient.setQueryData(["repository", repository.namespace, repository.name], repository);
         });
-      },
+      }
     }
   );
 };
@@ -92,14 +90,14 @@ const createRepository = (link: string) => {
     }
     return apiClient
       .post(createLink, request.repository, "application/vnd.scmm-repository+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());
   };
 };
 
@@ -111,10 +109,10 @@ export const useCreateRepository = () => {
   const { mutate, data, isLoading, error } = useMutation<Repository, Error, CreateRepositoryRequest>(
     createRepository(link),
     {
-      onSuccess: (repository) => {
+      onSuccess: repository => {
         queryClient.setQueryData(["repository", repository.namespace, repository.name], repository);
         return queryClient.invalidateQueries(["repositories"]);
-      },
+      }
     }
   );
   return {
@@ -123,7 +121,7 @@ export const useCreateRepository = () => {
     },
     isLoading,
     error,
-    repository: data,
+    repository: data
   };
 };
 
@@ -133,7 +131,7 @@ export const useRepositoryTypes = () => useIndexJsonResource<RepositoryTypeColle
 export const useRepository = (namespace: string, name: string): ApiResult<Repository> => {
   const link = useRequiredIndexLink("repositories");
   return useQuery<Repository, Error>(["repository", namespace, name], () =>
-    apiClient.get(concat(link, namespace, name)).then((response) => response.json())
+    apiClient.get(concat(link, namespace, name)).then(response => response.json())
   );
 };
 
@@ -144,7 +142,7 @@ export type UseDeleteRepositoryOptions = {
 export const useDeleteRepository = (options?: UseDeleteRepositoryOptions) => {
   const queryClient = useQueryClient();
   const { mutate, isLoading, error, data } = useMutation<unknown, Error, Repository>(
-    (repository) => {
+    repository => {
       const link = requiredLink(repository, "delete");
       return apiClient.delete(link);
     },
@@ -153,23 +151,23 @@ export const useDeleteRepository = (options?: UseDeleteRepositoryOptions) => {
         if (options?.onSuccess) {
           options.onSuccess(repository);
         }
-        await queryClient.removeQueries(repoQueryKey(repository));
+        queryClient.removeQueries(repoQueryKey(repository));
         await queryClient.invalidateQueries(["repositories"]);
-      },
+      }
     }
   );
   return {
     remove: (repository: Repository) => mutate(repository),
     isLoading,
     error,
-    isDeleted: !!data,
+    isDeleted: !!data
   };
 };
 
 export const useUpdateRepository = () => {
   const queryClient = useQueryClient();
   const { mutate, isLoading, error, data } = useMutation<unknown, Error, Repository>(
-    (repository) => {
+    repository => {
       const link = requiredLink(repository, "update");
       return apiClient.put(link, repository, "application/vnd.scmm-repository+json;v=2");
     },
@@ -177,21 +175,21 @@ export const useUpdateRepository = () => {
       onSuccess: async (_, repository) => {
         await queryClient.invalidateQueries(repoQueryKey(repository));
         await queryClient.invalidateQueries(["repositories"]);
-      },
+      }
     }
   );
   return {
     update: (repository: Repository) => mutate(repository),
     isLoading,
     error,
-    isUpdated: !!data,
+    isUpdated: !!data
   };
 };
 
 export const useArchiveRepository = () => {
   const queryClient = useQueryClient();
   const { mutate, isLoading, error, data } = useMutation<unknown, Error, Repository>(
-    (repository) => {
+    repository => {
       const link = requiredLink(repository, "archive");
       return apiClient.post(link);
     },
@@ -199,21 +197,21 @@ export const useArchiveRepository = () => {
       onSuccess: async (_, repository) => {
         await queryClient.invalidateQueries(repoQueryKey(repository));
         await queryClient.invalidateQueries(["repositories"]);
-      },
+      }
     }
   );
   return {
     archive: (repository: Repository) => mutate(repository),
     isLoading,
     error,
-    isArchived: !!data,
+    isArchived: !!data
   };
 };
 
 export const useUnarchiveRepository = () => {
   const queryClient = useQueryClient();
   const { mutate, isLoading, error, data } = useMutation<unknown, Error, Repository>(
-    (repository) => {
+    repository => {
       const link = requiredLink(repository, "unarchive");
       return apiClient.post(link);
     },
@@ -221,35 +219,35 @@ export const useUnarchiveRepository = () => {
       onSuccess: async (_, repository) => {
         await queryClient.invalidateQueries(repoQueryKey(repository));
         await queryClient.invalidateQueries(["repositories"]);
-      },
+      }
     }
   );
   return {
     unarchive: (repository: Repository) => mutate(repository),
     isLoading,
     error,
-    isUnarchived: !!data,
+    isUnarchived: !!data
   };
 };
 
 export const useRunHealthCheck = () => {
   const queryClient = useQueryClient();
   const { mutate, isLoading, error, data } = useMutation<unknown, Error, Repository>(
-    (repository) => {
+    repository => {
       const link = requiredLink(repository, "runHealthCheck");
       return apiClient.post(link);
     },
     {
       onSuccess: async (_, repository) => {
         await queryClient.invalidateQueries(repoQueryKey(repository));
-      },
+      }
     }
   );
   return {
     runHealthCheck: (repository: Repository) => mutate(repository),
     isLoading,
     error,
-    isRunning: !!data,
+    isRunning: !!data
   };
 };
 
@@ -258,7 +256,7 @@ export const useExportInfo = (repository: Repository): ApiResultWithFetching<Exp
   //TODO Refetch while exporting to update the page
   const { isLoading, isFetching, error, data } = useQuery<ExportInfo, Error>(
     ["repository", repository.namespace, repository.name, "exportInfo"],
-    () => apiClient.get(link).then((response) => response.json()),
+    () => apiClient.get(link).then(response => response.json()),
     {}
   );
 
@@ -266,7 +264,7 @@ export const useExportInfo = (repository: Repository): ApiResultWithFetching<Exp
     isLoading,
     isFetching,
     error: error instanceof NotFoundError ? null : error,
-    data,
+    data
   };
 };
 
@@ -309,14 +307,14 @@ export const useExportRepository = () => {
             const id = setInterval(() => {
               apiClient
                 .get(infolink)
-                .then((r) => r.json())
+                .then(r => r.json())
                 .then((info: ExportInfo) => {
                   if (info._links.download) {
                     clearInterval(id);
                     resolve(info);
                   }
                 })
-                .catch((e) => {
+                .catch(e => {
                   clearInterval(id);
                   reject(e);
                 });
@@ -329,21 +327,21 @@ export const useExportRepository = () => {
       onSuccess: async (_, { repository }) => {
         await queryClient.invalidateQueries(repoQueryKey(repository));
         await queryClient.invalidateQueries(["repositories"]);
-      },
+      }
     }
   );
   return {
     exportRepository: (repository: Repository, options: ExportOptions) => mutate({ repository, options }),
     isLoading,
     error,
-    data,
+    data
   };
 };
 
 export const usePaths = (repository: Repository, revision: string): ApiResult<Paths> => {
   const link = requiredLink(repository, "paths").replace("{revision}", revision);
   return useQuery<Paths, Error>(repoQueryKey(repository, "paths", revision), () =>
-    apiClient.get(link).then((response) => response.json())
+    apiClient.get(link).then(response => response.json())
   );
 };
 
@@ -364,7 +362,7 @@ export const useRenameRepository = (repository: Repository) => {
   const { mutate, isLoading, error, data } = useMutation<unknown, Error, RenameRepositoryRequest>(
     ({ name, namespace }) => apiClient.post(url, { namespace, name }, "application/vnd.scmm-repository+json;v=2"),
     {
-      onSuccess: () => queryClient.removeQueries(repoQueryKey(repository)),
+      onSuccess: () => queryClient.removeQueries(repoQueryKey(repository))
     }
   );
 
@@ -372,6 +370,6 @@ export const useRenameRepository = (repository: Repository) => {
     renameRepository: (namespace: string, name: string) => mutate({ namespace, name }),
     isLoading,
     error,
-    isRenamed: !!data,
+    isRenamed: !!data
   };
 };