Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-03 19:00:52 +01:00
Code Issues Packages Projects Releases Activity

Fix broken compare view due to missing export (#2105)

Browse Source
This commit is contained in:
Florian Scholdei
2022-08-16 13:03:21 +02:00
committed by GitHub
parent 6224d4a16d
commit 279c3e2b75
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/fix_paging_compareview.yaml Normal file
View File

@@ -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))

4
scm-ui/ui-webapp/src/repos/compare/CompareView.tsx
View File

@@ -57,10 +57,10 @@ const CompareRoutes: FC<Props> = ({ repository, baseUrl }) => {
<LoadingDiff url={createDiffUrl(repository, source, target) + "?format=GIT"} />
</Route>
<Route path={`${baseUrl}/:sourceType/:sourceName/:targetType/:targetName/changesets/`} exact>
<IncomingChangesets repository={repository} source={source} target={target} />
<IncomingChangesets repository={repository} source={source} target={target} url={`${url}/changesets`} />
</Route>
<Route path={`${baseUrl}/:sourceType/:sourceName/:targetType/:targetName/changesets/:page`} exact>
<IncomingChangesets repository={repository} source={source} target={target} />
<IncomingChangesets repository={repository} source={source} target={target} url={`${url}/changesets`} />
</Route>
</Switch>
);

5
scm-ui/ui-webapp/src/repos/compare/IncomingChangesets.tsx
View File

@@ -31,13 +31,14 @@ type Props = {
repository: Repository;
source: string;
target: string;
url: string;
};
const IncomingChangesets: FC<Props> = ({ repository, source, target }) => {
const IncomingChangesets: FC<Props> = ({ repository, source, target, url }) => {
const page = usePage();
const { data, error, isLoading } = useIncomingChangesets(repository, source, target, { page: page - 1, limit: 25 });
return <ChangesetsPanel repository={repository} error={error} isLoading={isLoading} data={data} />;
return <ChangesetsPanel repository={repository} error={error} isLoading={isLoading} data={data} url={url} />;
};
export default IncomingChangesets;

15
scm-ui/ui-webapp/src/repos/containers/Changesets.tsx
View File

@@ -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<Props> = ({ repository, branch, url }) => {
const page = usePage();
const { isLoading, error, data } = useChangesets(repository, { branch, page: page - 1 });
return <ChangesetsPanel repository={repository} error={error} isLoading={isLoading} data={data} url={url} />;
};
type ChangesetsPanelProps = Props & {
error: Error | null;
isLoading: boolean;
data?: ChangesetCollection;
};
export const ChangesetsPanel: FC<ChangesetsPanelProps> = ({ repository, error, isLoading, data, url }) => {
const page = usePage();
const [t] = useTranslation("repos");
const changesets = data?._embedded?.changesets;