github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixing issue with cancel button on revert to basic license modal (#18718)

Browse source
This commit is contained in:
Bill McConaghy 2018-05-02 12:53:08 -04:00 • committed by GitHub
parent d77cc5676b
commit 411b2455d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.container.js
View file

@ -13,7 +13,7 @@ import {
shouldShowRevertToBasicLicense,
getStartBasicMessages
} from '../../../store/reducers/licenseManagement';
import { startBasicLicense } from '../../../store/actions/start_basic';
import { startBasicLicense, cancelStartBasicLicense } from '../../../store/actions/start_basic';
const mapStateToProps = state => {
return {
@ -25,7 +25,8 @@ const mapStateToProps = state => {
};
const mapDispatchToProps = {
startBasicLicense
startBasicLicense,
cancelStartBasicLicense
};
export const RevertToBasic = connect(mapStateToProps, mapDispatchToProps)(

3
x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js
View file

@ -26,6 +26,7 @@ export class RevertToBasic extends React.PureComponent {
needsAcknowledgement,
messages: [firstLine, ...messages] = [],
startBasicLicense,
cancelStartBasicLicense,
licenseType
} = this.props;
if (!needsAcknowledgement) {
@ -35,7 +36,7 @@ export class RevertToBasic extends React.PureComponent {
<EuiOverlayMask>
<EuiConfirmModal
title="Confirm Revert to Basic License"
onCancel={this.cancel}
onCancel={cancelStartBasicLicense}
onConfirm={() => startBasicLicense(licenseType, HTMLMarqueeElement)}
cancelButtonText="Cancel"
confirmButtonText="Confirm"

4
x-pack/plugins/license_management/public/store/actions/start_basic.js
View file

@ -12,6 +12,10 @@ export const startBasicLicenseStatus = createAction(
'LICENSE_MANAGEMENT_START_BASIC_LICENSE_STATUS'
);
export const cancelStartBasicLicense = createAction(
'LICENSE_MANAGEMENT_CANCEL_START_BASIC_LICENSE'
);
export const startBasicLicense = (currentLicenseType, ack) => async (
dispatch,
getState,

5
x-pack/plugins/license_management/public/store/reducers/start_basic_license_status.js
View file

@ -6,11 +6,14 @@
import { handleActions } from 'redux-actions';
import { startBasicLicenseStatus } from '../actions/start_basic';
import { startBasicLicenseStatus, cancelStartBasicLicense } from '../actions/start_basic';
export const startBasicStatus = handleActions({
[startBasicLicenseStatus](state, { payload }) {
return payload;
},
[cancelStartBasicLicense]() {
return {};
}
}, {});