Skip to content

Commit ba03519

Browse files
committed
Disable "Cancel" button during/after import
1 parent c4e2237 commit ba03519

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,10 @@ describe('Flyout', () => {
267267

268268
expect(component.state('status')).toBe('success');
269269
expect(component.find('EuiFlyout ImportSummary')).toMatchSnapshot();
270+
const cancelButton = await component.find(
271+
'EuiButtonEmpty[data-test-subj="importSavedObjectsCancelBtn"]'
272+
);
273+
expect(cancelButton.prop('disabled')).toBe(true);
270274
});
271275
});
272276

src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
756756
}
757757

758758
renderFooter() {
759-
const { status } = this.state;
759+
const { isLegacyFile, status } = this.state;
760760
const { done, close } = this.props;
761761

762762
let confirmButton;
@@ -773,7 +773,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
773773
} else if (this.hasUnmatchedReferences) {
774774
confirmButton = (
775775
<EuiButton
776-
onClick={this.state.isLegacyFile ? this.confirmLegacyImport : this.resolveImportErrors}
776+
onClick={isLegacyFile ? this.confirmLegacyImport : this.resolveImportErrors}
777777
size="s"
778778
fill
779779
isLoading={status === 'loading'}
@@ -788,7 +788,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
788788
} else {
789789
confirmButton = (
790790
<EuiButton
791-
onClick={this.state.isLegacyFile ? this.legacyImport : this.import}
791+
onClick={isLegacyFile ? this.legacyImport : this.import}
792792
size="s"
793793
fill
794794
isLoading={status === 'loading'}
@@ -805,7 +805,12 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
805805
return (
806806
<EuiFlexGroup justifyContent="spaceBetween">
807807
<EuiFlexItem grow={false}>
808-
<EuiButtonEmpty onClick={close} size="s">
808+
<EuiButtonEmpty
809+
onClick={close}
810+
size="s"
811+
disabled={status === 'loading' || (isLegacyFile === false && status === 'success')}
812+
data-test-subj="importSavedObjectsCancelBtn"
813+
>
809814
<FormattedMessage
810815
id="savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel"
811816
defaultMessage="Cancel"

0 commit comments

Comments
 (0)