merge with 2.0.0-m3 branch

This commit is contained in:
Sebastian Sdorra
2018-08-30 11:28:26 +02:00
72 changed files with 3308 additions and 437 deletions

View File

@@ -0,0 +1,56 @@
import React from "react";
import { translate } from "react-i18next";
import { Route } from "react-router";
import { Page } from "../../components/layout";
import { Navigation, NavLink, Section } from "../../components/navigation";
import GlobalConfig from "./GlobalConfig";
import type { History } from "history";
type Props = {
// context objects
t: string => string,
match: any,
history: History
};
class Config extends React.Component<Props> {
stripEndingSlash = (url: string) => {
if (url.endsWith("/")) {
return url.substring(0, url.length - 2);
}
return url;
};
matchedUrl = () => {
return this.stripEndingSlash(this.props.match.url);
};
render() {
const { t } = this.props;
const url = this.matchedUrl();
return (
<Page>
<div className="columns">
<div className="column is-three-quarters">
<Route path={url} exact component={GlobalConfig} />
</div>
<div className="column">
<Navigation>
<Section label={t("config.navigation-title")}>
<NavLink
to={`${url}`}
label={t("global-config.navigation-label")}
/>
</Section>
</Navigation>
</div>
</div>
</Page>
);
}
}
export default translate("config")(Config);

View File

@@ -0,0 +1,109 @@
// @flow
import React from "react";
import { translate } from "react-i18next";
import Title from "../../components/layout/Title";
import {
fetchConfig,
getFetchConfigFailure,
isFetchConfigPending,
getConfig,
modifyConfig,
isModifyConfigPending,
getConfigUpdatePermission,
getModifyConfigFailure,
modifyConfigReset
} from "../modules/config";
import { connect } from "react-redux";
import ErrorPage from "../../components/ErrorPage";
import type { Config } from "../types/Config";
import ConfigForm from "../components/form/ConfigForm";
import Loading from "../../components/Loading";
type Props = {
loading: boolean,
error: Error,
config: Config,
configUpdatePermission: boolean,
// dispatch functions
modifyConfig: (config: Config, callback?: () => void) => void,
fetchConfig: void => void,
configReset: void => void,
// context objects
t: string => string
};
class GlobalConfig extends React.Component<Props> {
componentDidMount() {
this.props.configReset();
this.props.fetchConfig();
}
modifyConfig = (config: Config) => {
this.props.modifyConfig(config);
};
render() {
const { t, error, loading, config, configUpdatePermission } = this.props;
if (error) {
return (
<ErrorPage
title={t("global-config.error-title")}
subtitle={t("global-config.error-subtitle")}
error={error}
configUpdatePermission={configUpdatePermission}
/>
);
}
if (loading) {
return <Loading />;
}
return (
<div>
<Title title={t("global-config.title")} />
<ConfigForm
submitForm={config => this.modifyConfig(config)}
config={config}
loading={loading}
configUpdatePermission={configUpdatePermission}
/>
</div>
);
}
}
const mapDispatchToProps = dispatch => {
return {
fetchConfig: () => {
dispatch(fetchConfig());
},
modifyConfig: (config: Config, callback?: () => void) => {
dispatch(modifyConfig(config, callback));
},
configReset: () => {
dispatch(modifyConfigReset());
}
};
};
const mapStateToProps = state => {
const loading = isFetchConfigPending(state) || isModifyConfigPending(state);
const error = getFetchConfigFailure(state) || getModifyConfigFailure(state);
const config = getConfig(state);
const configUpdatePermission = getConfigUpdatePermission(state);
return {
loading,
error,
config,
configUpdatePermission
};
};
export default connect(
mapStateToProps,
mapDispatchToProps
)(translate("config")(GlobalConfig));