839f893168
* Change public accounts pages to mount the web UI * Fix handling of remote usernames in routes - When logged in, serve web app - When logged out, redirect to permalink - Fix `app-body` class not being set sometimes due to name conflict * Fix missing `multiColumn` prop * Fix failing test * Use `discoverable` attribute to control indexing directives * Fix `<ColumnLoading />` not using `multiColumn` * Add `noindex` to accounts in REST API * Change noindex directive to not be rendered by default before a route is mounted * Add loading indicator for detailed status in web UI * Fix missing indicator appearing while account is loading in web UI
72 lines
1.9 KiB
JavaScript
72 lines
1.9 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { Switch, Route } from 'react-router-dom';
|
|
|
|
import ColumnLoading from '../components/column_loading';
|
|
import BundleColumnError from '../components/bundle_column_error';
|
|
import BundleContainer from '../containers/bundle_container';
|
|
|
|
// Small wrapper to pass multiColumn to the route components
|
|
export class WrappedSwitch extends React.PureComponent {
|
|
|
|
render () {
|
|
const { multiColumn, children } = this.props;
|
|
|
|
return (
|
|
<Switch>
|
|
{React.Children.map(children, child => React.cloneElement(child, { multiColumn }))}
|
|
</Switch>
|
|
);
|
|
}
|
|
|
|
}
|
|
|
|
WrappedSwitch.propTypes = {
|
|
multiColumn: PropTypes.bool,
|
|
children: PropTypes.node,
|
|
};
|
|
|
|
// Small Wrapper to extract the params from the route and pass
|
|
// them to the rendered component, together with the content to
|
|
// be rendered inside (the children)
|
|
export class WrappedRoute extends React.Component {
|
|
|
|
static propTypes = {
|
|
component: PropTypes.func.isRequired,
|
|
content: PropTypes.node,
|
|
multiColumn: PropTypes.bool,
|
|
componentParams: PropTypes.object,
|
|
};
|
|
|
|
static defaultProps = {
|
|
componentParams: {},
|
|
};
|
|
|
|
renderComponent = ({ match }) => {
|
|
const { component, content, multiColumn, componentParams } = this.props;
|
|
|
|
return (
|
|
<BundleContainer fetchComponent={component} loading={this.renderLoading} error={this.renderError}>
|
|
{Component => <Component params={match.params} multiColumn={multiColumn} {...componentParams}>{content}</Component>}
|
|
</BundleContainer>
|
|
);
|
|
}
|
|
|
|
renderLoading = () => {
|
|
const { multiColumn } = this.props;
|
|
|
|
return <ColumnLoading multiColumn={multiColumn} />;
|
|
}
|
|
|
|
renderError = (props) => {
|
|
return <BundleColumnError {...props} />;
|
|
}
|
|
|
|
render () {
|
|
const { component: Component, content, ...rest } = this.props;
|
|
|
|
return <Route {...rest} render={this.renderComponent} />;
|
|
}
|
|
|
|
}
|