Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 06:25:45 +01:00
Code Issues Packages Projects Releases Activity

Add table to diff view

Browse Source 
Pushed-by: Florian Scholdei<florian.scholdei@cloudogu.com>
Pushed-by: Viktor Egorov<viktor.egorov-extern@cloudogu.com>
Pushed-by: k8s-git-ops<admin@cloudogu.com>
Committed-by: Thomas Zerr<thomas.zerr@cloudogu.com>
Co-authored-by: Viktor<viktor.egorov@triology.de>
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com>
Pushed-by: Thomas Zerr<thomas.zerr@cloudogu.com>
This commit is contained in:
Thomas Zerr
2024-09-16 17:52:10 +02:00
parent 96466807be
commit 8f0ed74b7a
18 changed files with 547 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
scm-ui/ui-components/src/repos/Diff.tsx
View File

@@ -21,20 +21,24 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import React, { FC, useState } from "react";
import React, { FC, useEffect, useState } from "react";
import DiffFile from "./DiffFile";
import { DiffObjectProps, FileControlFactory } from "./DiffTypes";
import { FileDiff } from "@scm-manager/ui-types";
import { escapeWhitespace } from "./diffs";
import { getAnchorSelector, getFileNameFromHash } from "./diffs";
import Notification from "../Notification";
import { useTranslation } from "react-i18next";
import { useLocation } from "react-router-dom";
import useScrollToElement from "../useScrollToElement";
import { getAnchorId } from "./diff/helpers";
type Props = DiffObjectProps & {
diff: FileDiff[];
fileControlFactory?: FileControlFactory;
ignoreWhitespace?: string;
fetchNextPage?: () => void;
isFetchingNextPage?: boolean;
isDataPartial?: boolean;
};
const createKey = (file: FileDiff, ignoreWhitespace?: string) => {
@@ -43,23 +47,59 @@ const createKey = (file: FileDiff, ignoreWhitespace?: string) => {
return `${file.oldPath}@${file.oldRevision}/${file.newPath}@${file.newRevision}?${ignoreWhitespace}`;
};
const getAnchorSelector = (uriHashContent: string) => {
return "#" + escapeWhitespace(decodeURIComponent(uriHashContent));
const getFile = (files: FileDiff[] | undefined, path: string): FileDiff | undefined => {
return files?.find((e) => (e.type !== "delete" && e.newPath === path) || (e.type === "delete" && e.oldPath === path));
};
const Diff: FC<Props> = ({ diff, ignoreWhitespace, ...fileProps }) => {
const selectFromHash = (hash: string) => {
const fileName = getFileNameFromHash(hash);
return fileName ? getAnchorSelector(fileName) : undefined;
};
const jumpToBottom = () => {
window.scrollTo(0, document.body.scrollHeight);
};
const Diff: FC<Props> = ({
diff,
ignoreWhitespace,
fetchNextPage,
isFetchingNextPage,
isDataPartial,
...fileProps
}) => {
const [t] = useTranslation("repos");
const [contentRef, setContentRef] = useState<HTMLElement | null>();
const { hash } = useLocation();
useEffect(() => {
if (isFetchingNextPage) {
jumpToBottom();
}
}, [isFetchingNextPage]);
useScrollToElement(
contentRef,
() => {
const match = hash.match(/^#diff-(.*)$/);
if (match) {
return getAnchorSelector(match[1]);
if (isFetchingNextPage === undefined || isDataPartial === undefined || fetchNextPage === undefined) {
return selectFromHash(hash);
}
const encodedFileName = getFileNameFromHash(hash);
if (!encodedFileName) {
return;
}
const selectedFile = getFile(diff, decodeURIComponent(encodedFileName));
if (selectedFile) {
return getAnchorSelector(getAnchorId(selectedFile));
}
if (isDataPartial && !isFetchingNextPage) {
fetchNextPage();
}
},
hash
[hash]
);
return (