@scm-manager/ui-api 2.30.2-20220115-125803 → 2.30.2-20220117-100916

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scm-manager/ui-api",
-  "version": "2.30.2-20220115-125803",
+  "version": "2.30.2-20220117-100916",
   "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.30.2-20220115-125803",
+    "@scm-manager/ui-types": "^2.30.2-20220117-100916",
     "fetch-mock-jest": "^1.5.1",
     "gitdiff-parser": "^0.1.2",
     "query-string": "6.14.1",

package/src/sources.test.ts

@@ -126,7 +126,7 @@ describe("Test sources hooks", () => {
   describe("useSources tests", () => {
     it("should return root directory", async () => {
       const queryClient = createInfiniteCachingClient();
-      fetchMock.getOnce("/api/v2/src", rootDirectory);
+      fetchMock.getOnce("/api/v2/src?collapse=true", rootDirectory);
       const { result, waitFor } = renderHook(() => useSources(puzzle42), {
         wrapper: createWrapper(undefined, queryClient),
       });
@@ -136,7 +136,7 @@ describe("Test sources hooks", () => {
 
     it("should return file from url with revision and path", async () => {
       const queryClient = createInfiniteCachingClient();
-      fetchMock.getOnce("/api/v2/src/abc/README.md", readmeMd);
+      fetchMock.getOnce("/api/v2/src/abc/README.md?collapse=true", readmeMd);
       const { result, waitFor } = renderHook(() => useSources(puzzle42, { revision: "abc", path: "README.md" }), {
         wrapper: createWrapper(undefined, queryClient),
       });
@@ -146,7 +146,7 @@ describe("Test sources hooks", () => {
 
     it("should fetch next page", async () => {
       const queryClient = createInfiniteCachingClient();
-      fetchMock.getOnce("/api/v2/src", mainDirectoryTruncated);
+      fetchMock.getOnce("/api/v2/src?collapse=true", mainDirectoryTruncated);
       fetchMock.getOnce("/api/v2/src/2", mainDirectory);
       const { result, waitFor, waitForNextUpdate } = renderHook(() => useSources(puzzle42), {
         wrapper: createWrapper(undefined, queryClient),
@@ -168,7 +168,7 @@ describe("Test sources hooks", () => {
     it("should refetch if partial files exists", async () => {
       const queryClient = createInfiniteCachingClient();
       fetchMock.get(
-        "/api/v2/src",
+        "/api/v2/src?collapse=true",
         {
           ...mainDirectory,
           _embedded: {
@@ -180,7 +180,7 @@ describe("Test sources hooks", () => {
         }
       );
       fetchMock.get(
-        "/api/v2/src",
+        "/api/v2/src?collapse=true",
         {
           ...mainDirectory,
           _embedded: {
@@ -206,9 +206,9 @@ describe("Test sources hooks", () => {
 
     it("should not refetch if computation is aborted", async () => {
       const queryClient = createInfiniteCachingClient();
-      fetchMock.getOnce("/api/v2/src/abc/main/special.md", sepecialMdComputationAborted, { repeat: 1 });
+      fetchMock.getOnce("/api/v2/src/abc/main/special.md?collapse=true", sepecialMdComputationAborted, { repeat: 1 });
       // should never be called
-      fetchMock.getOnce("/api/v2/src/abc/main/special.md", sepecialMd, {
+      fetchMock.getOnce("/api/v2/src/abc/main/special.md?collapse=true", sepecialMd, {
         repeat: 1,
         overwriteRoutes: false,
       });

package/src/sources.ts

@@ -28,17 +28,20 @@ import * as urls from "./urls";
 import { useInfiniteQuery } from "react-query";
 import { repoQueryKey } from "./keys";
 import { useEffect } from "react";
+import { createQueryString } from "./utils";
 
 export type UseSourcesOptions = {
   revision?: string;
   path?: string;
   refetchPartialInterval?: number;
   enabled?: boolean;
+  collapse?: boolean;
 };
 
 const UseSourcesDefaultOptions: UseSourcesOptions = {
   enabled: true,
   refetchPartialInterval: 3000,
+  collapse: true
 };
 
 export const useSources = (repository: Repository, opts: UseSourcesOptions = UseSourcesDefaultOptions) => {
@@ -48,7 +51,7 @@ export const useSources = (repository: Repository, opts: UseSourcesOptions = Use
   };
   const link = createSourcesLink(repository, options);
   const { isLoading, error, data, isFetchingNextPage, fetchNextPage, refetch } = useInfiniteQuery<File, Error, File>(
-    repoQueryKey(repository, "sources", options.revision || "", options.path || ""),
+    repoQueryKey(repository, "sources", options.revision || "", options.path || "", options.collapse ? "collapse" : ""),
     ({ pageParam }) => {
       return apiClient.get(pageParam || link).then((response) => response.json());
     },
@@ -93,6 +96,9 @@ const createSourcesLink = (repository: Repository, options: UseSourcesOptions) =
       link = urls.concat(link, options.path);
     }
   }
+  if (options.collapse) {
+    return `${link}?${createQueryString({ collapse: "true" })}`;
+  }
   return link;
 };