Fix types

2025-11-09 15:05:44 +01:00 · 2020-05-30 20:55:02 +02:00
parent 751a2bfa9b
commit f48ee91776
3 changed files with 63 additions and 53 deletions
--- a/scm-ui/ui-components/src/repos/DiffExpander.test.ts
+++ b/scm-ui/ui-components/src/repos/DiffExpander.test.ts
@@ -23,8 +23,9 @@
 */
 import fetchMock from "fetch-mock";
 import DiffExpander from "./DiffExpander";
+import { File, Hunk } from "./DiffTypes";

-const HUNK_0 = {
+const HUNK_0: Hunk = {
  content: "@@ -1,8 +1,8 @@",
  oldStart: 1,
  newStart: 1,
@@ -44,7 +45,7 @@ const HUNK_0 = {
    { content: "line", type: "normal", oldLineNumber: 8, newLineNumber: 8, isNormal: true }
  ]
 };
-const HUNK_1 = {
+const HUNK_1: Hunk = {
  content: "@@ -14,6 +14,7 @@",
  oldStart: 14,
  newStart: 14,
@@ -60,7 +61,7 @@ const HUNK_1 = {
    { content: "line", type: "normal", oldLineNumber: 19, newLineNumber: 20, isNormal: true }
  ]
 };
-const HUNK_2 = {
+const HUNK_2: Hunk = {
  content: "@@ -21,7 +22,7 @@",
  oldStart: 21,
  newStart: 22,
@@ -77,7 +78,7 @@ const HUNK_2 = {
    { content: "line", type: "normal", oldLineNumber: 27, newLineNumber: 28, isNormal: true }
  ]
 };
-const HUNK_3 = {
+const HUNK_3: Hunk = {
  content: "@@ -33,6 +34,7 @@",
  oldStart: 33,
  newStart: 34,
@@ -93,16 +94,16 @@ const HUNK_3 = {
    { content: "line", type: "normal", oldLineNumber: 38, newLineNumber: 40, isNormal: true }
  ]
 };
-const TEST_CONTENT_WITH_HUNKS = {
-  oldPath: "src/main/js/CommitMessage.js",
-  newPath: "src/main/js/CommitMessage.js",
-  oldEndingNewLine: true,
+const TEST_CONTENT_WITH_HUNKS: File = {
+  hunks: [HUNK_0, HUNK_1, HUNK_2, HUNK_3],
  newEndingNewLine: true,
-  oldRevision: "e05c8495bb1dc7505d73af26210c8ff4825c4500",
+  newPath: "src/main/js/CommitMessage.js",
  newRevision: "4305a8df175b7bec25acbe542a13fbe2a718a608",
+  oldEndingNewLine: true,
+  oldPath: "src/main/js/CommitMessage.js",
+  oldRevision: "e05c8495bb1dc7505d73af26210c8ff4825c4500",
  type: "modify",
  language: "javascript",
-  hunks: [HUNK_0, HUNK_1, HUNK_2, HUNK_3],
  _links: {
    lines: {
      href: "http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start={start}&end={end}",
@@ -111,7 +112,7 @@ const TEST_CONTENT_WITH_HUNKS = {
  }
 };

-const TEST_CONTENT_WIT_NEW_BINARY_FILE = {
+const TEST_CONTENT_WIT_NEW_BINARY_FILE: File = {
  oldPath: "/dev/null",
  newPath: "src/main/fileUploadV2.png",
  oldEndingNewLine: true,
@@ -121,7 +122,7 @@ const TEST_CONTENT_WIT_NEW_BINARY_FILE = {
  type: "add"
 };

-const TEST_CONTENT_WITH_NEW_TEXT_FILE = {
+const TEST_CONTENT_WITH_NEW_TEXT_FILE: File = {
  oldPath: "/dev/null",
  newPath: "src/main/markdown/README.md",
  oldEndingNewLine: true,
@@ -150,7 +151,7 @@ const TEST_CONTENT_WITH_NEW_TEXT_FILE = {
  }
 };

-const TEST_CONTENT_WITH_DELETED_TEXT_FILE = {
+const TEST_CONTENT_WITH_DELETED_TEXT_FILE: File = {
  oldPath: "README.md",
  newPath: "/dev/null",
  oldEndingNewLine: true,
@@ -204,14 +205,14 @@ describe("with hunks the diff expander", () => {
  it("should expand hunk with new line from api client at the bottom", async () => {
    expect(diffExpander.getHunk(1).hunk.changes.length).toBe(7);
    fetchMock.get("http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start=20&end=21", "new line 1");
-    let newFile;
+    let newFile: File;
    diffExpander.getHunk(1).expandBottom(1, file => {
      newFile = file;
    });
    await fetchMock.flush(true);
    expect(fetchMock.done()).toBe(true);
-    expect(newFile.hunks[1].changes.length).toBe(8);
-    expect(newFile.hunks[1].changes[7].content).toBe("new line 1");
+    expect(newFile!.hunks![1].changes.length).toBe(8);
+    expect(newFile!.hunks![1].changes[7].content).toBe("new line 1");
  });
  it("should expand hunk with new line from api client at the top", async () => {
    expect(diffExpander.getHunk(1).hunk.changes.length).toBe(7);
@@ -219,49 +220,49 @@ describe("with hunks the diff expander", () => {
      "http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start=8&end=13",
      "new line 9\nnew line 10\nnew line 11\nnew line 12\nnew line 13"
    );
-    let newFile;
+    let newFile: File;
    diffExpander.getHunk(1).expandHead(5, file => {
      newFile = file;
    });
    await fetchMock.flush(true);
    expect(fetchMock.done()).toBe(true);
-    expect(newFile.hunks[1].changes.length).toBe(12);
-    expect(newFile.hunks[1].changes[0].content).toBe("new line 9");
-    expect(newFile.hunks[1].changes[0].oldLineNumber).toBe(9);
-    expect(newFile.hunks[1].changes[0].newLineNumber).toBe(9);
-    expect(newFile.hunks[1].changes[1].content).toBe("new line 10");
-    expect(newFile.hunks[1].changes[1].oldLineNumber).toBe(10);
-    expect(newFile.hunks[1].changes[1].newLineNumber).toBe(10);
-    expect(newFile.hunks[1].changes[4].content).toBe("new line 13");
-    expect(newFile.hunks[1].changes[4].oldLineNumber).toBe(13);
-    expect(newFile.hunks[1].changes[4].newLineNumber).toBe(13);
-    expect(newFile.hunks[1].changes[5].content).toBe("line");
-    expect(newFile.hunks[1].changes[5].oldLineNumber).toBe(14);
-    expect(newFile.hunks[1].changes[5].newLineNumber).toBe(14);
+    expect(newFile!.hunks![1].changes.length).toBe(12);
+    expect(newFile!.hunks![1].changes[0].content).toBe("new line 9");
+    expect(newFile!.hunks![1].changes[0].oldLineNumber).toBe(9);
+    expect(newFile!.hunks![1].changes[0].newLineNumber).toBe(9);
+    expect(newFile!.hunks![1].changes[1].content).toBe("new line 10");
+    expect(newFile!.hunks![1].changes[1].oldLineNumber).toBe(10);
+    expect(newFile!.hunks![1].changes[1].newLineNumber).toBe(10);
+    expect(newFile!.hunks![1].changes[4].content).toBe("new line 13");
+    expect(newFile!.hunks![1].changes[4].oldLineNumber).toBe(13);
+    expect(newFile!.hunks![1].changes[4].newLineNumber).toBe(13);
+    expect(newFile!.hunks![1].changes[5].content).toBe("line");
+    expect(newFile!.hunks![1].changes[5].oldLineNumber).toBe(14);
+    expect(newFile!.hunks![1].changes[5].newLineNumber).toBe(14);
  });
  it("should set fully expanded to true if expanded completely", async () => {
    fetchMock.get(
      "http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start=40&end=50",
      "new line 40\nnew line 41\nnew line 42"
    );
-    let newFile;
+    let newFile: File;
    diffExpander.getHunk(3).expandBottom(10, file => {
      newFile = file;
    });
    await fetchMock.flush(true);
-    expect(newFile.hunks[3].fullyExpanded).toBe(true);
+    expect(newFile!.hunks![3].fullyExpanded).toBe(true);
  });
  it("should set end to -1 if requested to expand to the end", async () => {
    fetchMock.get(
      "http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start=40&end=-1",
      "new line 40\nnew line 41\nnew line 42"
    );
-    let newFile;
+    let newFile: File;
    diffExpander.getHunk(3).expandBottom(-1, file => {
      newFile = file;
    });
    await fetchMock.flush(true);
-    expect(newFile.hunks[3].fullyExpanded).toBe(true);
+    expect(newFile!.hunks![3].fullyExpanded).toBe(true);
  });
 });

--- a/scm-ui/ui-components/src/repos/DiffExpander.ts
+++ b/scm-ui/ui-components/src/repos/DiffExpander.ts
@@ -24,6 +24,7 @@

 import { apiClient } from "@scm-manager/ui-components";
 import { Change, File, Hunk } from "./DiffTypes";
+import { Link } from "@scm-manager/ui-types/src";

 class DiffExpander {
  file: File;
@@ -67,9 +68,9 @@ class DiffExpander {
  };

  expandHead = (n: number, count: number, callback: (newFile: File) => void) => {
-    const lineRequestUrl = this.file._links.lines.href
-      .replace("{start}", this.minLineNumber(n) - Math.min(count, this.computeMaxExpandHeadRange(n)) - 1)
-      .replace("{end}", this.minLineNumber(n) - 1);
+    const lineRequestUrl = (this.file._links!.lines as Link).href
+      .replace("{start}", (this.minLineNumber(n) - Math.min(count, this.computeMaxExpandHeadRange(n)) - 1).toString())
+      .replace("{end}", (this.minLineNumber(n) - 1).toString());
    apiClient
      .get(lineRequestUrl)
      .then(response => response.text())
@@ -79,9 +80,17 @@ class DiffExpander {

  expandBottom = (n: number, count: number, callback: (newFile: File) => void) => {
    const maxExpandBottomRange = this.computeMaxExpandBottomRange(n);
-    const lineRequestUrl = this.file._links.lines.href
-      .replace("{start}", this.maxLineNumber(n))
-      .replace("{end}", count > 0 ? this.maxLineNumber(n) + Math.min(count, maxExpandBottomRange > 0? maxExpandBottomRange:Number.MAX_SAFE_INTEGER) : -1);
+    const lineRequestUrl = (this.file._links!.lines as Link).href
+      .replace("{start}", this.maxLineNumber(n).toString())
+      .replace(
+        "{end}",
+        count > 0
+          ? (
+              this.maxLineNumber(n) +
+              Math.min(count, maxExpandBottomRange > 0 ? maxExpandBottomRange : Number.MAX_SAFE_INTEGER)
+            ).toString()
+          : "-1"
+      );
    apiClient
      .get(lineRequestUrl)
      .then(response => response.text())
@@ -90,13 +99,13 @@ class DiffExpander {
  };

  expandHunkAtHead = (n: number, lines: string[], callback: (newFile: File) => void) => {
-    const hunk = this.file.hunks[n];
+    const hunk = this.file.hunks![n];
    if (lines[lines.length - 1] === "") {
      lines.pop();
    }
    const newChanges: Change[] = [];
-    let oldLineNumber = hunk.changes[0].oldLineNumber - lines.length;
-    let newLineNumber = hunk.changes[0].newLineNumber - lines.length;
+    let oldLineNumber = hunk!.changes![0]!.oldLineNumber! - lines.length;
+    let newLineNumber = hunk!.changes![0]!.newLineNumber! - lines.length;

    lines.forEach(line => {
      newChanges.push({
@@ -113,10 +122,10 @@ class DiffExpander {

    const newHunk = {
      ...hunk,
-      oldStart: hunk.oldStart - lines.length,
-      newStart: hunk.newStart - lines.length,
-      oldLines: hunk.oldLines + lines.length,
-      newLines: hunk.newLines + lines.length,
+      oldStart: hunk.oldStart! - lines.length,
+      newStart: hunk.newStart! - lines.length,
+      oldLines: hunk.oldLines! + lines.length,
+      newLines: hunk.newLines! + lines.length,
      changes: newChanges
    };
    const newHunks: Hunk[] = [];
@@ -137,8 +146,8 @@ class DiffExpander {
      lines.pop();
    }
    const newChanges = [...hunk.changes];
-    let oldLineNumber = newChanges[newChanges.length - 1].oldLineNumber;
-    let newLineNumber = newChanges[newChanges.length - 1].newLineNumber;
+    let oldLineNumber: number = newChanges[newChanges.length - 1].oldLineNumber!;
+    let newLineNumber: number = newChanges[newChanges.length - 1].newLineNumber!;

    lines.forEach(line => {
      oldLineNumber += 1;
@@ -154,13 +163,13 @@ class DiffExpander {

    const newHunk = {
      ...hunk,
-      oldLines: hunk.oldLines + lines.length,
-      newLines: hunk.newLines + lines.length,
+      oldLines: hunk.oldLines! + lines.length,
+      newLines: hunk.newLines! + lines.length,
      changes: newChanges,
      fullyExpanded: requestedLines < 0 || lines.length < requestedLines
    };
    const newHunks: Hunk[] = [];
-    this.file.hunks.forEach((oldHunk: Hunk, i: number) => {
+    this.file.hunks!.forEach((oldHunk: Hunk, i: number) => {
      if (i === n) {
        newHunks.push(newHunk);
      } else {
--- a/scm-ui/ui-components/src/repos/DiffTypes.ts
+++ b/scm-ui/ui-components/src/repos/DiffTypes.ts
@@ -47,7 +47,7 @@ export type File = {
  language?: string;
  // TODO does this property exists?
  isBinary?: boolean;
-  _links: Links;
+  _links?: Links;
 };

 export type Hunk = {