|
@@ -7,6 +7,7 @@ import SplitButton from 'react-bootstrap/es/SplitButton';
|
|
|
import MenuItem from 'react-bootstrap/es/MenuItem';
|
|
import MenuItem from 'react-bootstrap/es/MenuItem';
|
|
|
|
|
|
|
|
import SlackNotification from './SlackNotification';
|
|
import SlackNotification from './SlackNotification';
|
|
|
|
|
+import PageTagForm from './PageTagForm';
|
|
|
import GrantSelector from './SavePageControls/GrantSelector';
|
|
import GrantSelector from './SavePageControls/GrantSelector';
|
|
|
|
|
|
|
|
class SavePageControls extends React.PureComponent {
|
|
class SavePageControls extends React.PureComponent {
|
|
@@ -28,8 +29,10 @@ class SavePageControls extends React.PureComponent {
|
|
|
|
|
|
|
|
getCurrentOptionsToSave() {
|
|
getCurrentOptionsToSave() {
|
|
|
const slackNotificationOptions = this.refs.slackNotification.getCurrentOptionsToSave();
|
|
const slackNotificationOptions = this.refs.slackNotification.getCurrentOptionsToSave();
|
|
|
|
|
+ // const pageTagOptions = this.refs.pageTagForm.getCurrentOptionsToSave();
|
|
|
|
|
+ const pageTagOptions = '';
|
|
|
const grantSelectorOptions = this.refs.grantSelector.getCurrentOptionsToSave();
|
|
const grantSelectorOptions = this.refs.grantSelector.getCurrentOptionsToSave();
|
|
|
- return Object.assign(slackNotificationOptions, grantSelectorOptions);
|
|
|
|
|
|
|
+ return Object.assign(slackNotificationOptions, pageTagOptions, grantSelectorOptions);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -58,6 +61,14 @@ class SavePageControls extends React.PureComponent {
|
|
|
|
|
|
|
|
return (
|
|
return (
|
|
|
<div className="d-flex align-items-center form-inline">
|
|
<div className="d-flex align-items-center form-inline">
|
|
|
|
|
+ <div className="mr-2">
|
|
|
|
|
+ <PageTagForm
|
|
|
|
|
+ ref='PageTagForm'
|
|
|
|
|
+ crowi={this.props.crowi}
|
|
|
|
|
+ pageId={this.props.pageId}
|
|
|
|
|
+ pagePath={this.props.pagePath}
|
|
|
|
|
+ pageTags={this.props.pageTags} />
|
|
|
|
|
+ </div>
|
|
|
<div className="mr-2">
|
|
<div className="mr-2">
|
|
|
<SlackNotification
|
|
<SlackNotification
|
|
|
ref='slackNotification'
|
|
ref='slackNotification'
|
|
@@ -102,6 +113,7 @@ SavePageControls.propTypes = {
|
|
|
// for SlackNotification
|
|
// for SlackNotification
|
|
|
pagePath: PropTypes.string,
|
|
pagePath: PropTypes.string,
|
|
|
slackChannels: PropTypes.string,
|
|
slackChannels: PropTypes.string,
|
|
|
|
|
+ pageTags: PropTypes.string,
|
|
|
// for GrantSelector
|
|
// for GrantSelector
|
|
|
grant: PropTypes.number,
|
|
grant: PropTypes.number,
|
|
|
grantGroupId: PropTypes.string,
|
|
grantGroupId: PropTypes.string,
|