Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 15:05:44 +01:00
Code Issues Packages Projects Releases Activity

Fix types

Browse Source
This commit is contained in:
René Pfeuffer
2020-05-30 20:55:02 +02:00
parent 751a2bfa9b
commit f48ee91776
3 changed files with 63 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
scm-ui/ui-components/src/repos/DiffExpander.test.ts
View File

@@ -23,8 +23,9 @@
*/ */
import fetchMock from "fetch-mock"; import fetchMock from "fetch-mock";
import DiffExpander from "./DiffExpander"; import DiffExpander from "./DiffExpander";
import { File, Hunk } from "./DiffTypes";
const HUNK_0 = { const HUNK_0: Hunk = {
content: "@@ -1,8 +1,8 @@", content: "@@ -1,8 +1,8 @@",
oldStart: 1, oldStart: 1,
newStart: 1, newStart: 1,
@@ -44,7 +45,7 @@ const HUNK_0 = {
{ content: "line", type: "normal", oldLineNumber: 8, newLineNumber: 8, isNormal: true } { content: "line", type: "normal", oldLineNumber: 8, newLineNumber: 8, isNormal: true }
] ]
}; };
const HUNK_1 = { const HUNK_1: Hunk = {
content: "@@ -14,6 +14,7 @@", content: "@@ -14,6 +14,7 @@",
oldStart: 14, oldStart: 14,
newStart: 14, newStart: 14,
@@ -60,7 +61,7 @@ const HUNK_1 = {
{ content: "line", type: "normal", oldLineNumber: 19, newLineNumber: 20, isNormal: true } { content: "line", type: "normal", oldLineNumber: 19, newLineNumber: 20, isNormal: true }
] ]
}; };
const HUNK_2 = { const HUNK_2: Hunk = {
content: "@@ -21,7 +22,7 @@", content: "@@ -21,7 +22,7 @@",
oldStart: 21, oldStart: 21,
newStart: 22, newStart: 22,
@@ -77,7 +78,7 @@ const HUNK_2 = {
{ content: "line", type: "normal", oldLineNumber: 27, newLineNumber: 28, isNormal: true } { content: "line", type: "normal", oldLineNumber: 27, newLineNumber: 28, isNormal: true }
] ]
}; };
const HUNK_3 = { const HUNK_3: Hunk = {
content: "@@ -33,6 +34,7 @@", content: "@@ -33,6 +34,7 @@",
oldStart: 33, oldStart: 33,
newStart: 34, newStart: 34,
@@ -93,16 +94,16 @@ const HUNK_3 = {
{ content: "line", type: "normal", oldLineNumber: 38, newLineNumber: 40, isNormal: true } { content: "line", type: "normal", oldLineNumber: 38, newLineNumber: 40, isNormal: true }
] ]
}; };
const TEST_CONTENT_WITH_HUNKS = { const TEST_CONTENT_WITH_HUNKS: File = {
oldPath: "src/main/js/CommitMessage.js", hunks: [HUNK_0, HUNK_1, HUNK_2, HUNK_3],
newPath: "src/main/js/CommitMessage.js",
oldEndingNewLine: true,
newEndingNewLine: true, newEndingNewLine: true,
oldRevision: "e05c8495bb1dc7505d73af26210c8ff4825c4500", newPath: "src/main/js/CommitMessage.js",
newRevision: "4305a8df175b7bec25acbe542a13fbe2a718a608", newRevision: "4305a8df175b7bec25acbe542a13fbe2a718a608",
oldEndingNewLine: true,
oldPath: "src/main/js/CommitMessage.js",
oldRevision: "e05c8495bb1dc7505d73af26210c8ff4825c4500",
type: "modify", type: "modify",
language: "javascript", language: "javascript",
hunks: [HUNK_0, HUNK_1, HUNK_2, HUNK_3],
_links: { _links: {
lines: { lines: {
href: "http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start={start}&end={end}", 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", oldPath: "/dev/null",
newPath: "src/main/fileUploadV2.png", newPath: "src/main/fileUploadV2.png",
oldEndingNewLine: true, oldEndingNewLine: true,
@@ -121,7 +122,7 @@ const TEST_CONTENT_WIT_NEW_BINARY_FILE = {
type: "add" type: "add"
}; };
const TEST_CONTENT_WITH_NEW_TEXT_FILE = { const TEST_CONTENT_WITH_NEW_TEXT_FILE: File = {
oldPath: "/dev/null", oldPath: "/dev/null",
newPath: "src/main/markdown/README.md", newPath: "src/main/markdown/README.md",
oldEndingNewLine: true, 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", oldPath: "README.md",
newPath: "/dev/null", newPath: "/dev/null",
oldEndingNewLine: true, 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 () => { it("should expand hunk with new line from api client at the bottom", async () => {
expect(diffExpander.getHunk(1).hunk.changes.length).toBe(7); 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"); 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 => { diffExpander.getHunk(1).expandBottom(1, file => {
newFile = file; newFile = file;
}); });
await fetchMock.flush(true); await fetchMock.flush(true);
expect(fetchMock.done()).toBe(true); expect(fetchMock.done()).toBe(true);
expect(newFile.hunks[1].changes.length).toBe(8); expect(newFile!.hunks![1].changes.length).toBe(8);
expect(newFile.hunks[1].changes[7].content).toBe("new line 1"); 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 () => { it("should expand hunk with new line from api client at the top", async () => {
expect(diffExpander.getHunk(1).hunk.changes.length).toBe(7); 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", "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" "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 => { diffExpander.getHunk(1).expandHead(5, file => {
newFile = file; newFile = file;
}); });
await fetchMock.flush(true); await fetchMock.flush(true);
expect(fetchMock.done()).toBe(true); expect(fetchMock.done()).toBe(true);
expect(newFile.hunks[1].changes.length).toBe(12); 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].content).toBe("new line 9");
expect(newFile.hunks[1].changes[0].oldLineNumber).toBe(9); expect(newFile!.hunks![1].changes[0].oldLineNumber).toBe(9);
expect(newFile.hunks[1].changes[0].newLineNumber).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].content).toBe("new line 10");
expect(newFile.hunks[1].changes[1].oldLineNumber).toBe(10); expect(newFile!.hunks![1].changes[1].oldLineNumber).toBe(10);
expect(newFile.hunks[1].changes[1].newLineNumber).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].content).toBe("new line 13");
expect(newFile.hunks[1].changes[4].oldLineNumber).toBe(13); expect(newFile!.hunks![1].changes[4].oldLineNumber).toBe(13);
expect(newFile.hunks[1].changes[4].newLineNumber).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].content).toBe("line");
expect(newFile.hunks[1].changes[5].oldLineNumber).toBe(14); expect(newFile!.hunks![1].changes[5].oldLineNumber).toBe(14);
expect(newFile.hunks[1].changes[5].newLineNumber).toBe(14); expect(newFile!.hunks![1].changes[5].newLineNumber).toBe(14);
}); });
it("should set fully expanded to true if expanded completely", async () => { it("should set fully expanded to true if expanded completely", async () => {
fetchMock.get( fetchMock.get(
"http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start=40&end=50", "http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start=40&end=50",
"new line 40\nnew line 41\nnew line 42" "new line 40\nnew line 41\nnew line 42"
); );
let newFile; let newFile: File;
diffExpander.getHunk(3).expandBottom(10, file => { diffExpander.getHunk(3).expandBottom(10, file => {
newFile = file; newFile = file;
}); });
await fetchMock.flush(true); 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 () => { it("should set end to -1 if requested to expand to the end", async () => {
fetchMock.get( fetchMock.get(
"http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start=40&end=-1", "http://localhost:8081/scm/api/v2/content/abc/CommitMessage.js?start=40&end=-1",
"new line 40\nnew line 41\nnew line 42" "new line 40\nnew line 41\nnew line 42"
); );
let newFile; let newFile: File;
diffExpander.getHunk(3).expandBottom(-1, file => { diffExpander.getHunk(3).expandBottom(-1, file => {
newFile = file; newFile = file;
}); });
await fetchMock.flush(true); await fetchMock.flush(true);
expect(newFile.hunks[3].fullyExpanded).toBe(true); expect(newFile!.hunks![3].fullyExpanded).toBe(true);
}); });
}); });

45
scm-ui/ui-components/src/repos/DiffExpander.ts
View File

@@ -24,6 +24,7 @@
import { apiClient } from "@scm-manager/ui-components"; import { apiClient } from "@scm-manager/ui-components";
import { Change, File, Hunk } from "./DiffTypes"; import { Change, File, Hunk } from "./DiffTypes";
import { Link } from "@scm-manager/ui-types/src";
class DiffExpander { class DiffExpander {
file: File; file: File;
@@ -67,9 +68,9 @@ class DiffExpander {
}; };
expandHead = (n: number, count: number, callback: (newFile: File) => void) => { expandHead = (n: number, count: number, callback: (newFile: File) => void) => {
const lineRequestUrl = this.file._links.lines.href const lineRequestUrl = (this.file._links!.lines as Link).href
.replace("{start}", this.minLineNumber(n) - Math.min(count, this.computeMaxExpandHeadRange(n)) - 1) .replace("{start}", (this.minLineNumber(n) - Math.min(count, this.computeMaxExpandHeadRange(n)) - 1).toString())
.replace("{end}", this.minLineNumber(n) - 1); .replace("{end}", (this.minLineNumber(n) - 1).toString());
apiClient apiClient
.get(lineRequestUrl) .get(lineRequestUrl)
.then(response => response.text()) .then(response => response.text())
@@ -79,9 +80,17 @@ class DiffExpander {
expandBottom = (n: number, count: number, callback: (newFile: File) => void) => { expandBottom = (n: number, count: number, callback: (newFile: File) => void) => {
const maxExpandBottomRange = this.computeMaxExpandBottomRange(n); const maxExpandBottomRange = this.computeMaxExpandBottomRange(n);
const lineRequestUrl = this.file._links.lines.href const lineRequestUrl = (this.file._links!.lines as Link).href
.replace("{start}", this.maxLineNumber(n)) .replace("{start}", this.maxLineNumber(n).toString())
.replace("{end}", count > 0 ? this.maxLineNumber(n) + Math.min(count, maxExpandBottomRange > 0? maxExpandBottomRange:Number.MAX_SAFE_INTEGER) : -1); .replace(
"{end}",
count > 0
? (
this.maxLineNumber(n) +
Math.min(count, maxExpandBottomRange > 0 ? maxExpandBottomRange : Number.MAX_SAFE_INTEGER)
).toString()
: "-1"
);
apiClient apiClient
.get(lineRequestUrl) .get(lineRequestUrl)
.then(response => response.text()) .then(response => response.text())
@@ -90,13 +99,13 @@ class DiffExpander {
}; };
expandHunkAtHead = (n: number, lines: string[], callback: (newFile: File) => void) => { 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] === "") { if (lines[lines.length - 1] === "") {
lines.pop(); lines.pop();
} }
const newChanges: Change[] = []; const newChanges: Change[] = [];
let oldLineNumber = hunk.changes[0].oldLineNumber - lines.length; let oldLineNumber = hunk!.changes![0]!.oldLineNumber! - lines.length;
let newLineNumber = hunk.changes[0].newLineNumber - lines.length; let newLineNumber = hunk!.changes![0]!.newLineNumber! - lines.length;
lines.forEach(line => { lines.forEach(line => {
newChanges.push({ newChanges.push({
@@ -113,10 +122,10 @@ class DiffExpander {
const newHunk = { const newHunk = {
...hunk, ...hunk,
oldStart: hunk.oldStart - lines.length, oldStart: hunk.oldStart! - lines.length,
newStart: hunk.newStart - lines.length, newStart: hunk.newStart! - lines.length,
oldLines: hunk.oldLines + lines.length, oldLines: hunk.oldLines! + lines.length,
newLines: hunk.newLines + lines.length, newLines: hunk.newLines! + lines.length,
changes: newChanges changes: newChanges
}; };
const newHunks: Hunk[] = []; const newHunks: Hunk[] = [];
@@ -137,8 +146,8 @@ class DiffExpander {
lines.pop(); lines.pop();
} }
const newChanges = [...hunk.changes]; const newChanges = [...hunk.changes];
let oldLineNumber = newChanges[newChanges.length - 1].oldLineNumber; let oldLineNumber: number = newChanges[newChanges.length - 1].oldLineNumber!;
let newLineNumber = newChanges[newChanges.length - 1].newLineNumber; let newLineNumber: number = newChanges[newChanges.length - 1].newLineNumber!;
lines.forEach(line => { lines.forEach(line => {
oldLineNumber += 1; oldLineNumber += 1;
@@ -154,13 +163,13 @@ class DiffExpander {
const newHunk = { const newHunk = {
...hunk, ...hunk,
oldLines: hunk.oldLines + lines.length, oldLines: hunk.oldLines! + lines.length,
newLines: hunk.newLines + lines.length, newLines: hunk.newLines! + lines.length,
changes: newChanges, changes: newChanges,
fullyExpanded: requestedLines < 0 || lines.length < requestedLines fullyExpanded: requestedLines < 0 || lines.length < requestedLines
}; };
const newHunks: Hunk[] = []; const newHunks: Hunk[] = [];
this.file.hunks.forEach((oldHunk: Hunk, i: number) => { this.file.hunks!.forEach((oldHunk: Hunk, i: number) => {
if (i === n) { if (i === n) {
newHunks.push(newHunk); newHunks.push(newHunk);
} else { } else {

2
scm-ui/ui-components/src/repos/DiffTypes.ts
View File

@@ -47,7 +47,7 @@ export type File = {
language?: string; language?: string;
// TODO does this property exists? // TODO does this property exists?
isBinary?: boolean; isBinary?: boolean;
_links: Links; _links?: Links;
}; };
export type Hunk = { export type Hunk = {