这是indexloc提供的服务，不要输入任何密码
Skip to content

update advanced settings in create trigger page (close #654) #868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 27, 2018
Merged

update advanced settings in create trigger page (close #654) #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4147836
Removes insert/update from advanced settings, changes advanced settin…
karthikvt26 Oct 26, 2018
557545c
Add version check to show columns update change on event trigger crea…
karthikvt26 Oct 26, 2018
5cf0419
Merge branch 'master' into issue-654
praveenweb Oct 27, 2018
122d619
Merge branch 'master' into issue-654
karthikvt26 Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 131 additions & 76 deletions console/src/components/Services/EventTrigger/Add/AddTrigger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,58 @@ import { showErrorNotification } from '../Notification';
import { createTrigger } from './AddActions';
import { fetchTableListBySchema } from './AddActions';

import semverCheck from '../../../../helpers/semver';

class AddTrigger extends Component {
constructor(props) {
super(props);
this.props.dispatch(fetchTableListBySchema('public'));
this.state = { advancedExpanded: false };
this.state = {
advancedExpanded: false,
supportColumnChangeFeature: false,
};
}
componentDidMount() {
// set defaults
this.props.dispatch(setDefaults());
if (this.props.serverVersion) {
this.checkSemVer(this.props.serverVersion);
}
}
componentWillReceiveProps(nextProps) {
if (nextProps.serverVersion !== this.props.serverVersion) {
this.checkSemVer(nextProps.serverVersion);
}
}
componentWillUnmount() {
// set defaults
this.props.dispatch(setDefaults());
}

checkSemVer(version) {
try {
const supportColumnChangeFeature = semverCheck(
'supportColumnChangeTrigger',
version
);
if (supportColumnChangeFeature) {
this.updateSupportColumnChangeFeature(true);
} else {
this.updateSupportColumnChangeFeature(false);
}
} catch (e) {
this.updateSupportColumnChangeFeature(false);
console.error(e);
}
}

updateSupportColumnChangeFeature(val) {
this.setState({
...this.state,
supportColumnChangeFeature: val,
});
}

submitValidation(e) {
// validations
e.preventDefault();
Expand Down Expand Up @@ -136,6 +173,9 @@ class AddTrigger extends Component {
internalError,
headers,
} = this.props;

const { supportColumnChangeFeature } = this.state;

const styles = require('../TableCommon/Table.scss');
let createBtnText = 'Create';
if (ongoingRequest) {
Expand Down Expand Up @@ -216,6 +256,94 @@ class AddTrigger extends Component {
return null;
};

const advancedColumnSection = supportColumnChangeFeature ? (
<div>
<h4 className={styles.subheading_text}>
Listen columns for update &nbsp; &nbsp;
<OverlayTrigger
placement="right"
overlay={tooltip.advancedOperationDescription}
>
<i className="fa fa-question-circle" aria-hidden="true" />
</OverlayTrigger>{' '}
</h4>
{selectedOperations.update ? (
<div>{getColumnList('update')}</div>
) : (
<div>
<div
className={styles.display_inline + ' ' + styles.add_mar_right}
style={{
marginTop: '10px',
marginBottom: '10px',
}}
>
Applicable to update operation only.
</div>
</div>
)}
</div>
) : (
<div>
<h4 className={styles.subheading_text}>
Advanced - Operation/Columns &nbsp; &nbsp;
<OverlayTrigger
placement="right"
overlay={tooltip.advancedOperationDescription}
>
<i className="fa fa-question-circle" aria-hidden="true" />
</OverlayTrigger>{' '}
</h4>
<div>
<div>
<label>
<input
onChange={handleOperationSelection}
className={styles.display_inline + ' ' + styles.add_mar_right}
type="checkbox"
value="insert"
checked={selectedOperations.insert}
/>
Insert
</label>
</div>
{getColumnList('insert')}
</div>
<hr />
<div>
<div>
<label>
<input
onChange={handleOperationSelection}
className={styles.display_inline + ' ' + styles.add_mar_right}
type="checkbox"
value="update"
checked={selectedOperations.update}
/>
Update
</label>
</div>
{getColumnList('update')}
</div>
<hr />
<div>
<div>
<label>
<input
onChange={handleOperationSelection}
className={styles.display_inline + ' ' + styles.add_mar_right}
type="checkbox"
value="delete"
checked={selectedOperations.delete}
/>
Delete
</label>
</div>
{getColumnList('delete')}
</div>
</div>
);

const heads = headers.map((header, i) => {
let removeIcon;
if (i + 1 === headers.length) {
Expand Down Expand Up @@ -485,81 +613,7 @@ class AddTrigger extends Component {
styles.add_mar_top
}
>
{tableName ? (
<div>
<h4 className={styles.subheading_text}>
Advanced - Operation/Columns &nbsp; &nbsp;
<OverlayTrigger
placement="right"
overlay={tooltip.advancedOperationDescription}
>
<i
className="fa fa-question-circle"
aria-hidden="true"
/>
</OverlayTrigger>{' '}
</h4>
<div>
<div>
<label>
<input
onChange={handleOperationSelection}
className={
styles.display_inline +
' ' +
styles.add_mar_right
}
type="checkbox"
value="insert"
checked={selectedOperations.insert}
/>
Insert
</label>
</div>
{getColumnList('insert')}
</div>
<hr />
<div>
<div>
<label>
<input
onChange={handleOperationSelection}
className={
styles.display_inline +
' ' +
styles.add_mar_right
}
type="checkbox"
value="update"
checked={selectedOperations.update}
/>
Update
</label>
</div>
{getColumnList('update')}
</div>
<hr />
<div>
<div>
<label>
<input
onChange={handleOperationSelection}
className={
styles.display_inline +
' ' +
styles.add_mar_right
}
type="checkbox"
value="delete"
checked={selectedOperations.delete}
/>
Delete
</label>
</div>
{getColumnList('delete')}
</div>
</div>
) : null}
{tableName ? advancedColumnSection : null}
<div
className={styles.add_mar_bottom + ' ' + styles.add_mar_top}
>
Expand Down Expand Up @@ -652,6 +706,7 @@ const mapStateToProps = state => {
return {
...state.addTrigger,
schemaList: state.tables.schemaList,
serverVersion: state.main.serverVersion ? state.main.serverVersion : '',
};
};

Expand Down
3 changes: 2 additions & 1 deletion console/src/components/Services/EventTrigger/Add/Tooltips.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export const webhookUrlDescription = (

export const advancedOperationDescription = (
<Tooltip id="tooltip-advanced-operation-description">
Columns to be sent in the payload of webhook
For update triggers, webhook will be triggered only when selected columns
are modified
</Tooltip>
);

Expand Down
1 change: 1 addition & 0 deletions console/src/helpers/semver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const componentsSemver = {
eventRedeliver: '1.0.0-alpha17',
sqlAnalyze: '1.0.0-alpha25',
aggregationPerm: '1.0.0-alpha26',
supportColumnChangeTrigger: '1.0.0-alpha26',
analyzeApiChange: '1.0.0-alpha26',
insertPrefix: '1.0.0-alpha26',
};
Expand Down