diff --git a/gradle/changelog/fix_paging_compareview.yaml b/gradle/changelog/fix_paging_compareview.yaml new file mode 100644 index 0000000000..f9401a5a89 --- /dev/null +++ b/gradle/changelog/fix_paging_compareview.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Fix broken compare view due to missing export ([#2105](https://github.com/scm-manager/scm-manager/pull/2105)) diff --git a/scm-ui/ui-webapp/src/repos/compare/CompareView.tsx b/scm-ui/ui-webapp/src/repos/compare/CompareView.tsx index 2c1c2cbce4..8c8b512664 100644 --- a/scm-ui/ui-webapp/src/repos/compare/CompareView.tsx +++ b/scm-ui/ui-webapp/src/repos/compare/CompareView.tsx @@ -57,10 +57,10 @@ const CompareRoutes: FC = ({ repository, baseUrl }) => { - + - + ); diff --git a/scm-ui/ui-webapp/src/repos/compare/IncomingChangesets.tsx b/scm-ui/ui-webapp/src/repos/compare/IncomingChangesets.tsx index 4ae6463493..f35eb948f1 100644 --- a/scm-ui/ui-webapp/src/repos/compare/IncomingChangesets.tsx +++ b/scm-ui/ui-webapp/src/repos/compare/IncomingChangesets.tsx @@ -31,13 +31,14 @@ type Props = { repository: Repository; source: string; target: string; + url: string; }; -const IncomingChangesets: FC = ({ repository, source, target }) => { +const IncomingChangesets: FC = ({ repository, source, target, url }) => { const page = usePage(); const { data, error, isLoading } = useIncomingChangesets(repository, source, target, { page: page - 1, limit: 25 }); - return ; + return ; }; export default IncomingChangesets; diff --git a/scm-ui/ui-webapp/src/repos/containers/Changesets.tsx b/scm-ui/ui-webapp/src/repos/containers/Changesets.tsx index 99aeb5705c..6266fdbea0 100644 --- a/scm-ui/ui-webapp/src/repos/containers/Changesets.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/Changesets.tsx @@ -25,7 +25,7 @@ import React, { FC } from "react"; import { Redirect, useRouteMatch } from "react-router-dom"; import { useTranslation } from "react-i18next"; import { useChangesets } from "@scm-manager/ui-api"; -import { Branch, Repository } from "@scm-manager/ui-types"; +import { Branch, ChangesetCollection, Repository } from "@scm-manager/ui-types"; import { ChangesetList, ErrorNotification, @@ -48,7 +48,20 @@ type Props = { const Changesets: FC = ({ repository, branch, url }) => { const page = usePage(); + const { isLoading, error, data } = useChangesets(repository, { branch, page: page - 1 }); + + return ; +}; + +type ChangesetsPanelProps = Props & { + error: Error | null; + isLoading: boolean; + data?: ChangesetCollection; +}; + +export const ChangesetsPanel: FC = ({ repository, error, isLoading, data, url }) => { + const page = usePage(); const [t] = useTranslation("repos"); const changesets = data?._embedded?.changesets;