@scm-manager/ui-components 4.0.0-REACT19-20250913-143258 → 4.0.0-REACT19-20250915-121549

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scm-manager/ui-components",
-  "version": "4.0.0-REACT19-20250913-143258",
+  "version": "4.0.0-REACT19-20250915-121549",
   "description": "UI Components for SCM-Manager and its plugins",
   "main": "src/index.ts",
   "files": [
@@ -37,10 +37,10 @@
     "@scm-manager/jest-preset": "^2.15.0-alpha1",
     "@scm-manager/prettier-config": "^2.12.0",
     "@scm-manager/tsconfig": "^2.13.0",
-    "@scm-manager/ui-shortcuts": "4.0.0-REACT19-20250913-143258",
-    "@scm-manager/ui-syntaxhighlighting": "4.0.0-REACT19-20250913-143258",
-    "@scm-manager/ui-text": "4.0.0-REACT19-20250913-143258",
-    "@scm-manager/ui-types": "4.0.0-REACT19-20250913-143258",
+    "@scm-manager/ui-shortcuts": "4.0.0-REACT19-20250915-121549",
+    "@scm-manager/ui-syntaxhighlighting": "4.0.0-REACT19-20250915-121549",
+    "@scm-manager/ui-text": "4.0.0-REACT19-20250915-121549",
+    "@scm-manager/ui-types": "4.0.0-REACT19-20250915-121549",
     "@storybook/addon-actions": "^9.0.8",
     "@storybook/addon-docs": "^9.1.5",
     "@storybook/addon-essentials": "^9.0.0-alpha.12",
@@ -67,15 +67,15 @@
     "storybook-addon-themes": "^6.1.0"
   },
   "dependencies": {
-    "@scm-manager/ui-api": "4.0.0-REACT19-20250913-143258",
-    "@scm-manager/ui-buttons": "4.0.0-REACT19-20250913-143258",
-    "@scm-manager/ui-core": "4.0.0-REACT19-20250913-143258",
-    "@scm-manager/ui-extensions": "4.0.0-REACT19-20250913-143258",
-    "@scm-manager/ui-layout": "4.0.0-REACT19-20250913-143258",
-    "@scm-manager/ui-overlays": "4.0.0-REACT19-20250913-143258",
+    "@scm-manager/ui-api": "4.0.0-REACT19-20250915-121549",
+    "@scm-manager/ui-buttons": "4.0.0-REACT19-20250915-121549",
+    "@scm-manager/ui-core": "4.0.0-REACT19-20250915-121549",
+    "@scm-manager/ui-extensions": "4.0.0-REACT19-20250915-121549",
+    "@scm-manager/ui-layout": "4.0.0-REACT19-20250915-121549",
+    "@scm-manager/ui-overlays": "4.0.0-REACT19-20250915-121549",
     "deepmerge": "^4.2.2",
     "hast-util-sanitize": "^3.0.2",
-    "react-diff-view": "^2.4.10",
+    "react-diff-view": "2.6.0",
     "react-error-boundary": "^6.0.0",
     "react-hook-form": "^7.33.1",
     "react-select": "^2.1.2",

package/src/config/ConfigurationBinder.tsx

@@ -19,13 +19,13 @@ import { binder, extensionPoints } from "@scm-manager/ui-extensions";
 import { NavLink } from "../navigation";
 import { Route } from "react-router-dom";
 import { useTranslation, WithTranslation, withTranslation } from "react-i18next";
-import { Link, Links, Namespace, Repository } from "@scm-manager/ui-types";
+import { Link, Links, Repository } from "@scm-manager/ui-types";
 import {
   TitledGlobalSettingComponent,
   TitledNamespaceSettingComponent,
   TitledRepositorySettingComponent,
 } from "./TitledSettings";
-import { NAMESPACE_SUB_ROUTES, useNamespaceFromParams } from "@scm-manager/ui-core";
+import { NAMESPACE_SUB_ROUTES, REPOSITORY_SUB_ROUTES } from "@scm-manager/ui-core";
 
 type GlobalRouteProps = {
   url: string;
@@ -37,7 +37,7 @@ type RepositoryRouteProps = {
   repository: Repository;
 };
 
-type RepositoryNavProps = WithTranslation & { url: string };
+type RepositoryNavProps = WithTranslation & { absoluteRepoUrl: string };
 
 type NamespaceNavProps = WithTranslation & { url: string };
 
@@ -119,8 +119,8 @@ class ConfigurationBinder {
     };
 
     // create NavigationLink with translated label
-    const RepoNavLink = withTranslation(this.i18nNamespace)(({ t, url }: RepositoryNavProps) => {
-      return this.navLink(url + to, labelI18nKey, t);
+    const RepoNavLink = withTranslation(this.i18nNamespace)(({ t, absoluteRepoUrl }: RepositoryNavProps) => {
+      return this.navLink(absoluteRepoUrl + to, labelI18nKey, t);
     });
 
     // bind navigation link to extension point
@@ -144,7 +144,7 @@ class ConfigurationBinder {
     to: string,
     labelI18nKey: string,
     linkName: string,
-    RepositoryComponent: any,
+    RepositoryComponent: ComponentType<object>,
     sortKey?: string,
   ) {
     // create predicate based on the link name of the current repository route
@@ -153,41 +153,37 @@ class ConfigurationBinder {
       return props.repository && props.repository._links && props.repository._links[linkName];
     };
 
+    const sanitizedTo = to.startsWith("/") ? to.substring(1) : to;
+
     // create NavigationLink with translated label
-    const RepoNavLink = withTranslation(this.i18nNamespace)(({ t, url }: RepositoryNavProps) => {
-      return this.navLink(url + "/settings" + to, labelI18nKey, t, { activeOnlyWhenExact: false });
+    const RepoNavLink = withTranslation(this.i18nNamespace)(({ t, absoluteRepoUrl }: RepositoryNavProps) => {
+      return this.navLink(`${absoluteRepoUrl}/${REPOSITORY_SUB_ROUTES.SETTINGS}/${sanitizedTo}`, labelI18nKey, t, {
+        activeOnlyWhenExact: false,
+      });
     });
 
     // bind navigation link to extension point
     binder.bind("repository.setting", RepoNavLink, repoPredicate, sortKey ?? linkName);
 
     // route for global configuration, passes the current repository to component
-    const RepoRoute = ({ repository, ...additionalProps }: RepositoryRouteProps) => {
-      const link = repository._links[linkName];
-
-      if (link) {
-        return this.route(
-          "settings" + to,
-          <TitledRepositorySettingComponent
-            i18nNamespace={this.i18nNamespace}
-            label={labelI18nKey}
-            repository={repository}
-          >
-            <RepositoryComponent repository={repository} link={(link as Link).href} {...additionalProps} />
-          </TitledRepositorySettingComponent>,
-        );
-      }
+    const RepoRoute = ({ ...additionalProps }: RepositoryRouteProps) => {
+      return this.route(
+        "settings" + to,
+        <TitledRepositorySettingComponent i18nNamespace={this.i18nNamespace} label={labelI18nKey}>
+          <RepositoryComponent {...additionalProps} />
+        </TitledRepositorySettingComponent>,
+      );
     };
 
     // bind config route to extension point
-    binder.bind("repository.route", RepoRoute, repoPredicate);
+    binder.bind("repository.route", RepoRoute);
   }
 
   bindNamespaceSetting(
     to: string,
     labelI18nKey: string,
     linkName: string,
-    ConfigurationComponent: ComponentType<{ link: string; namespace: Namespace }>,
+    ConfigurationComponent: ComponentType<object>,
   ) {
     const namespacePredicate = (props: extensionPoints.NamespaceSetting["props"]) =>
       props.namespace && props.namespace._links && props.namespace._links[linkName];
@@ -200,20 +196,12 @@ class ConfigurationBinder {
     binder.bind<extensionPoints.NamespaceSetting>("namespace.setting", NamespaceNavLink, namespacePredicate);
 
     const NamespaceRoute = ({ ...additionalProps }: NamespaceNavProps) => {
-      const namespace = useNamespaceFromParams();
-      if (namespace) {
-        const link = namespace._links[linkName];
-
-        if (link) {
-          return this.route(
-            NAMESPACE_SUB_ROUTES.SETTINGS + to,
-            <TitledNamespaceSettingComponent i18nNamespace={this.i18nNamespace} label={labelI18nKey}>
-              <ConfigurationComponent namespace={namespace} link={(link as Link).href} {...additionalProps} />
-            </TitledNamespaceSettingComponent>,
-          );
-        }
-      }
-      return null;
+      return this.route(
+        NAMESPACE_SUB_ROUTES.SETTINGS + to,
+        <TitledNamespaceSettingComponent i18nNamespace={this.i18nNamespace} label={labelI18nKey}>
+          <ConfigurationComponent {...additionalProps} />
+        </TitledNamespaceSettingComponent>,
+      );
     };
 
     binder.bind("namespace.route", NamespaceRoute);

package/src/config/TitledSettings.tsx

@@ -16,8 +16,12 @@
 
 import React, { FC, ReactNode } from "react";
 import { useTranslation } from "react-i18next";
-import { useDocumentTitle, useDocumentTitleForRepository, useNamespaceFromParams } from "@scm-manager/ui-core";
-import { Repository } from "@scm-manager/ui-types";
+import {
+  useDocumentTitle,
+  useDocumentTitleForRepository,
+  useNamespaceFromParams,
+  useRepositoryFromParams,
+} from "@scm-manager/ui-core";
 
 type GlobalProps = {
   i18nNamespace: string;
@@ -35,16 +39,11 @@ export const TitledGlobalSettingComponent: FC<GlobalProps> = ({ children, i18nNa
 type RepositoryProps = {
   i18nNamespace: string;
   label: string;
-  repository: Repository;
   children?: ReactNode;
 };
 
-export const TitledRepositorySettingComponent: FC<RepositoryProps> = ({
-  children,
-  i18nNamespace,
-  label,
-  repository,
-}) => {
+export const TitledRepositorySettingComponent: FC<RepositoryProps> = ({ children, i18nNamespace, label }) => {
+  const repository = useRepositoryFromParams();
   const [t] = useTranslation(i18nNamespace);
   const [commonTranslation] = useTranslation("commons");
   useDocumentTitleForRepository(repository, t(label), commonTranslation("documentTitle.repositoryConfiguration"));

package/src/repos/diff/DiffFileHunk.tsx

@@ -21,7 +21,7 @@ import { StyledHunk } from "./styledElements";
 import LastHunkFooter from "./LastHunkFooter";
 import { DiffExpandedCallback, DiffFileProps, ErrorHandler } from "./types";
 import HunkFooter from "./HunkFooter";
-// @ts-ignore react-diff-view does not provide types
+// @ts-expect-error react-diff-view does not provide types with v2
 import { Decoration, getChangeKey } from "react-diff-view";
 import { collectHunkAnnotations, markConflicts } from "./helpers";
 import HunkHeader from "./HunkHeader";
@@ -70,7 +70,7 @@ const DiffFileHunk: FC<Props> = ({
         onClick(context);
       }
     },
-    [file, onClick]
+    [file, onClick],
   );
 
   const gutterEvents = useMemo(
@@ -78,7 +78,7 @@ const DiffFileHunk: FC<Props> = ({
       onClick && {
         onClick: (event: ChangeEvent) => handleClickEvent(event.change, hunk),
       },
-    [handleClickEvent, hunk, onClick]
+    [handleClickEvent, hunk, onClick],
   );
 
   if (shouldMarkConflicts && hunk.changes) {
@@ -92,13 +92,13 @@ const DiffFileHunk: FC<Props> = ({
         expandableHunk={expandableHunk}
         diffExpanded={diffExpanded}
         diffExpansionFailed={diffExpansionFailed}
-      />
+      />,
     );
   } else if (i > 0) {
     items.push(
       <Decoration key={"decoration-" + hunk.content}>
         <hr className="my-2" />
-      </Decoration>
+      </Decoration>,
     );
   }
 
@@ -112,7 +112,11 @@ const DiffFileHunk: FC<Props> = ({
       icon={hunkGutterHoverIcon}
       actionable={!!gutterEvents}
       highlightLineOnHover={highlightLineOnHover}
-    />
+      selectedChanges={[]}
+      generateAnchorID={() => undefined}
+      // @ts-expect-error react-diff-view does not provide types with v2
+      renderGutter={({ renderDefault, wrapInAnchor }) => wrapInAnchor(renderDefault())}
+    />,
   );
   if (file._links?.lines) {
     if (i === (file.hunks ?? []).length - 1) {
@@ -122,7 +126,7 @@ const DiffFileHunk: FC<Props> = ({
           expandableHunk={expandableHunk}
           diffExpanded={diffExpanded}
           diffExpansionFailed={diffExpansionFailed}
-        />
+        />,
       );
     } else {
       items.push(
@@ -131,7 +135,7 @@ const DiffFileHunk: FC<Props> = ({
           expandableHunk={expandableHunk}
           diffExpanded={diffExpanded}
           diffExpansionFailed={diffExpansionFailed}
-        />
+        />,
       );
     }
   }

package/src/repos/diff/LazyDiffFile.tsx

@@ -77,7 +77,7 @@ const DiffFile: FC<Props> = ({
     () =>
       hasContent ||
       (["add", "modify", "delete"].includes(file.type) && canDisplayBinaryFile(oldContentType, newContentType)),
-    [file, hasContent, newContentType, oldContentType]
+    [file, hasContent, newContentType, oldContentType],
   );
   const canRenderSideBySide = useMemo(() => hasContent && file.type === "modify", [file, hasContent]);
 
@@ -126,7 +126,7 @@ const DiffFile: FC<Props> = ({
         }
       }
     },
-    [collapsed, file, canRenderContent, isCollapsedProp, onCollapseStateChange, stickyHeader]
+    [collapsed, file, canRenderContent, isCollapsedProp, onCollapseStateChange, stickyHeader],
   );
 
   const toggleSideBySide = useCallback((callback: () => void) => {
@@ -139,7 +139,7 @@ const DiffFile: FC<Props> = ({
       setWhitespace(!whitespace);
       callback();
     },
-    [whitespace]
+    [whitespace],
   );
 
   const sideBySideToggle = useMemo(
@@ -161,7 +161,7 @@ const DiffFile: FC<Props> = ({
           )}
         </MenuContext.Consumer>
       ),
-    [canRenderSideBySide, sideBySide, t, toggleSideBySide]
+    [canRenderSideBySide, sideBySide, t, toggleSideBySide],
   );
 
   const whitespaceToggle = useMemo(
@@ -183,7 +183,7 @@ const DiffFile: FC<Props> = ({
           )}
         </MenuContext.Consumer>
       ),
-    [hasContent, t, toggleWhiteSpace, whitespace]
+    [hasContent, t, toggleWhiteSpace, whitespace],
   );
 
   const errorModal = useMemo(
@@ -196,7 +196,7 @@ const DiffFile: FC<Props> = ({
           active={true}
         />
       ) : null,
-    [expansionError, t]
+    [expansionError, t],
   );
 
   const innerContent = useMemo(
@@ -253,7 +253,7 @@ const DiffFile: FC<Props> = ({
       sideBySide,
       whitespace,
       viewType,
-    ]
+    ],
   );
 
   const body = useMemo(() => (!isCollapsed ? innerContent : null), [innerContent, isCollapsed]);
@@ -266,7 +266,7 @@ const DiffFile: FC<Props> = ({
           modalBody={<MarginlessModalContent>{innerContent}</MarginlessModalContent>}
         />
       ) : null,
-    [canRenderContent, file, innerContent]
+    [canRenderContent, file, innerContent],
   );
 
   const collapseIcon = useMemo(
@@ -276,7 +276,7 @@ const DiffFile: FC<Props> = ({
       ) : (
         <Icon alt={t("diff.hideContent")}>angle-down</Icon>
       ),
-    [isCollapsed, t]
+    [isCollapsed, t],
   );
 
   return (