refactor backend for modifyCommand / add sourceExtension for plugins

This commit is contained in:
Eduard Heimbuch
2019-10-30 12:59:54 +01:00
parent 48154cce0f
commit 4f17bc6b1c
7 changed files with 121 additions and 10 deletions

View File

@@ -20,6 +20,7 @@ import PermissionsNavLink from "../components/PermissionsNavLink";
import Sources from "../sources/containers/Sources";
import RepositoryNavLink from "../components/RepositoryNavLink";
import { getLinks, getRepositoriesLink } from "../../modules/indexResource";
import SourceExtensions from "../sources/containers/SourceExtensions";
type Props = WithTranslation & {
namespace: string;
@@ -120,6 +121,15 @@ class RepositoryRoot extends React.Component<Props> {
path={`${url}/sources/:revision/:path*`}
render={() => <Sources repository={repository} baseUrl={`${url}/sources`} />}
/>
<Route
path={`${url}/sourceext/:extension`}
exact={true}
render={() => <SourceExtensions repository={repository} />}
/>
<Route
path={`${url}/sourceext/:extension/:revision/:path*`}
render={() => <SourceExtensions repository={repository} />}
/>
<Route
path={`${url}/changesets`}
render={() => (

View File

@@ -75,7 +75,7 @@ class Content extends React.Component<Props, State> {
};
showHeader() {
const { file, revision } = this.props;
const { repository, file, revision } = this.props;
const { showHistory, collapsed } = this.state;
const icon = collapsed ? "angle-right" : "angle-down";
@@ -99,6 +99,7 @@ class Content extends React.Component<Props, State> {
<ExtensionPoint
name="repos.sources.content.actionbar"
props={{
repository,
file,
revision,
handleExtensionError: this.handleExtensionError

View File

@@ -0,0 +1,98 @@
import React from "react";
import { Repository, File } from "@scm-manager/ui-types";
import { withRouter, RouteComponentProps } from "react-router-dom";
import { ExtensionPoint, binder } from "@scm-manager/ui-extensions";
import {
fetchSources,
getFetchSourcesFailure,
getSources,
isFetchSourcesPending
} from "../modules/sources";
import { connect} from "react-redux";
import { Loading, ErrorNotification } from "@scm-manager/ui-components";
import Notification from "@scm-manager/ui-components/src/Notification";
type Props = RouteComponentProps & {
repository: Repository;
// url params
extension: string;
revision?: string;
path?: string;
// redux state
loading: boolean;
error?: Error | null;
sources?: File | null;
// dispatch props
fetchSources: (repository: Repository, revision: string, path: string) => void;
};
const extensionPointName = "repos.sources.extensions";
class SourceExtensions extends React.Component<Props> {
componentDidMount() {
const { fetchSources, repository, revision, path } = this.props;
// TODO get typing right
fetchSources(repository, revision || "", path || "");
}
render() {
const { loading, error, repository, extension, revision, path, sources } = this.props;
if (error) {
return <ErrorNotification error={error} />;
}
if (loading) {
return <Loading />;
}
const extprops = { extension, repository, revision, path, sources };
if (!binder.hasExtension(extensionPointName, extprops)) {
// TODO i18n
return <Notification type="warning">No extension bound</Notification>;
}
return <ExtensionPoint name={extensionPointName} props={extprops} />;
}
}
const mapStateToProps = (state: any, ownProps: Props): Partial<Props> => {
const { repository, match } = ownProps;
// TODO add query-string v6
// see : https://www.pluralsight.com/guides/react-router-typescript
// @ts-ignore
const revision: string = match.params.revision;
// @ts-ignore
const path: string = match.params.path;
// @ts-ignore
const extension: string = match.params.extension;
const decodedRevision = revision ? decodeURIComponent(revision) : undefined;
const loading = isFetchSourcesPending(state, repository, revision, path);
const error = getFetchSourcesFailure(state, repository, revision, path);
const sources = getSources(state, repository, revision, path);
return {
repository,
extension,
revision: decodedRevision,
path,
loading,
error,
sources
};
};
const mapDispatchToProps = (dispatch: any) => {
return {
fetchSources: (repository: Repository, revision: string, path: string) => {
dispatch(fetchSources(repository, revision, path));
}
};
};
export default withRouter(connect(
mapStateToProps,
mapDispatchToProps
)(SourceExtensions));

View File

@@ -149,11 +149,12 @@ class Sources extends React.Component<Props, State> {
};
renderBreadcrumb = () => {
const { revision, path, baseUrl, branches, sources } = this.props;
const { revision, path, baseUrl, branches, sources, repository } = this.props;
const { selectedBranch } = this.state;
return (
<Breadcrumb
repository={repository}
revision={revision}
path={path}
baseUrl={baseUrl}