From af35ab5ff8a12b4592c26025a384fbf07a7298a5 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Thu, 16 Dec 2021 15:47:01 +0100 Subject: [PATCH] Fix extension point "main.route" which was broken because the index links were no longer provided. This broke the activity plugin and maybe some other plugins too. --- gradle/changelog/fix_main_route.yaml | 2 ++ scm-ui/ui-webapp/src/containers/App.tsx | 2 +- scm-ui/ui-webapp/src/containers/Main.tsx | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 gradle/changelog/fix_main_route.yaml diff --git a/gradle/changelog/fix_main_route.yaml b/gradle/changelog/fix_main_route.yaml new file mode 100644 index 0000000000..60c7b8fdc9 --- /dev/null +++ b/gradle/changelog/fix_main_route.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Fix extension point "main.route" diff --git a/scm-ui/ui-webapp/src/containers/App.tsx b/scm-ui/ui-webapp/src/containers/App.tsx index 840fa8ad93..58a4ea3246 100644 --- a/scm-ui/ui-webapp/src/containers/App.tsx +++ b/scm-ui/ui-webapp/src/containers/App.tsx @@ -60,7 +60,7 @@ const App: FC = () => { } else if (error) { content = ; } else if (me) { - content =
; + content =
; } return ( diff --git a/scm-ui/ui-webapp/src/containers/Main.tsx b/scm-ui/ui-webapp/src/containers/Main.tsx index 91fa13f2e5..4cd43ea930 100644 --- a/scm-ui/ui-webapp/src/containers/Main.tsx +++ b/scm-ui/ui-webapp/src/containers/Main.tsx @@ -24,7 +24,7 @@ import React, { FC } from "react"; import { Redirect, Route, Switch } from "react-router-dom"; -import { Me } from "@scm-manager/ui-types"; +import { Links, Me } from "@scm-manager/ui-types"; import Overview from "../repos/containers/Overview"; import Users from "../users/containers/Users"; @@ -55,6 +55,7 @@ import ExternalError from "./ExternalError"; type Props = { me: Me; authenticated?: boolean; + links: Links; }; const Main: FC = props => {