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

Filer repositories in UI by namespace

Browse Source
This commit is contained in:
René Pfeuffer
2020-09-04 17:13:25 +02:00
parent 12806c7602
commit 2cfdaf1b0b
6 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-ui/ui-webapp/src/containers/Main.tsx
View File

@@ -77,7 +77,8 @@ class Main extends React.Component<Props> {
<Redirect exact strict from="/repos" to="/repos/" />
<ProtectedRoute exact path="/repos/" component={Overview} authenticated={authenticated} />
<ProtectedRoute exact path="/repos/create" component={Create} authenticated={authenticated} />
<ProtectedRoute exact path="/repos/:page" component={Overview} authenticated={authenticated} />
<ProtectedRoute exact path="/repos/:namespace" component={Overview} authenticated={authenticated} />
<ProtectedRoute exact path="/repos/:namespace/:page" component={Overview} authenticated={authenticated} />
<ProtectedRoute path="/repo/:namespace/:name" component={RepositoryRoot} authenticated={authenticated} />
<Redirect exact strict from="/users" to="/users/" />
<ProtectedRoute exact path="/users/" component={Users} authenticated={authenticated} />

25
scm-ui/ui-webapp/src/repos/containers/Overview.tsx
View File

@@ -52,30 +52,33 @@ type Props = WithTranslation &
showCreateButton: boolean;
collection: RepositoryCollection;
page: number;
namespace: string;
reposLink: string;
// dispatched functions
fetchReposByPage: (link: string, page: number, filter?: string) => void;
fetchReposByPage: (link: string, page: number, namespace?: string, filter?: string) => void;
};
class Overview extends React.Component<Props> {
componentDidMount() {
const { fetchReposByPage, reposLink, page, location } = this.props;
fetchReposByPage(reposLink, page, urls.getQueryStringFromLocation(location));
const { fetchReposByPage, reposLink, namespace, page, location } = this.props;
fetchReposByPage(reposLink, page, namespace, urls.getQueryStringFromLocation(location));
}
componentDidUpdate = (prevProps: Props) => {
const { loading, collection, page, reposLink, location, fetchReposByPage } = this.props;
const { loading, collection, namespace, page, reposLink, location, fetchReposByPage } = this.props;
if (collection && page && !loading) {
const statePage: number = collection.page + 1;
if (page !== statePage || prevProps.location.search !== location.search) {
fetchReposByPage(reposLink, page, urls.getQueryStringFromLocation(location));
fetchReposByPage(reposLink, page, namespace, urls.getQueryStringFromLocation(location));
}
}
};
render() {
const { error, loading, showCreateButton, t } = this.props;
const { error, loading, showCreateButton, namespace, t } = this.props;
const link = namespace ? `repos/${namespace}` : "repos";
return (
<Page title={t("overview.title")} subtitle={t("overview.subtitle")} loading={loading} error={error}>
@@ -83,7 +86,7 @@ class Overview extends React.Component<Props> {
<PageActions>
<OverviewPageActions
showCreateButton={showCreateButton}
link="repos"
link={link}
label={t("overview.createButton")}
testId="repository-overview"
/>
@@ -133,7 +136,7 @@ const mapStateToProps = (state: any, ownProps: Props) => {
const collection = getRepositoryCollection(state);
const loading = isFetchReposPending(state);
const error = getFetchReposFailure(state);
const page = urls.getPageFromMatch(match);
const { namespace, page } = urls.getNamespaceAndPageFromMatch(match);
const showCreateButton = isAbleToCreateRepos(state);
const reposLink = getRepositoriesLink(state);
return {
@@ -141,6 +144,7 @@ const mapStateToProps = (state: any, ownProps: Props) => {
loading,
error,
page,
namespace,
showCreateButton,
reposLink
};
@@ -148,9 +152,10 @@ const mapStateToProps = (state: any, ownProps: Props) => {
const mapDispatchToProps = (dispatch: any) => {
return {
fetchReposByPage: (link: string, page: number, filter?: string) => {
dispatch(fetchReposByPage(link, page, filter));
fetchReposByPage: (link: string, page: number, namespace?: string, filter?: string) => {
dispatch(fetchReposByPage(link, page, namespace, filter));
}
};
};
export default connect(mapStateToProps, mapDispatchToProps)(withTranslation("repos")(withRouter(Overview)));

8
scm-ui/ui-webapp/src/repos/modules/repos.ts
View File

@@ -67,11 +67,13 @@ export function fetchRepos(link: string) {
return fetchReposByLink(link);
}
export function fetchReposByPage(link: string, page: number, filter?: string) {
export function fetchReposByPage(link: string, page: number, namespace?: string, filter?: string) {
const namespacePath = namespace ? `${namespace}/` : "";
const linkWithPage = `${link}${namespacePath}?page=${page - 1}`;
if (filter) {
return fetchReposByLink(`${link}?page=${page - 1}&q=${decodeURIComponent(filter)}`);
return fetchReposByLink(`${linkWithPage}}&q=${decodeURIComponent(filter)}`);
}
return fetchReposByLink(`${link}?page=${page - 1}`);
return fetchReposByLink(linkWithPage);
}
function appendSortByLink(url: string) {