-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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
Introduce Clone feature in view mode #10925
Changes from all commits
45a2aa6
09da364
ee4d32e
a73c4f5
dc601c4
a7256da
3bbd73b
694c5bf
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
// Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
||
exports[`renders DashboardCloneModal 1`] = ` | ||
<div | ||
class="kuiModalOverlay" | ||
> | ||
<div | ||
aria-label="Clone a dashboard" | ||
class="kuiModal dashboardCloneModal" | ||
data-tests-subj="dashboardCloneModal" | ||
> | ||
<div | ||
class="kuiModalHeader" | ||
> | ||
<div | ||
class="kuiModalHeader__title" | ||
> | ||
Clone Dashboard | ||
</div> | ||
</div> | ||
<div | ||
class="kuiModalBody" | ||
> | ||
<div | ||
class="kuiModalBodyText kuiVerticalRhythm" | ||
> | ||
Please enter a new name for your dashboard. | ||
</div> | ||
<div | ||
class="kuiModalBodyText kuiVerticalRhythm" | ||
> | ||
<input | ||
class="kuiTextInput kuiTextInput--large" | ||
data-test-subj="clonedDashboardTitle" | ||
value="dash title" | ||
/> | ||
</div> | ||
</div> | ||
<div | ||
class="kuiModalFooter" | ||
> | ||
<button | ||
class="kuiButton kuiButton--hollow" | ||
data-test-subj="cloneCancelButton" | ||
> | ||
<span | ||
class="kuiButton__inner" | ||
> | ||
<span> | ||
Cancel | ||
</span> | ||
</span> | ||
</button> | ||
<button | ||
class="kuiButton kuiButton--primary" | ||
data-test-subj="cloneConfirmButton" | ||
> | ||
<span | ||
class="kuiButton__inner" | ||
> | ||
<span> | ||
Confirm Clone | ||
</span> | ||
</span> | ||
</button> | ||
</div> | ||
</div> | ||
</div> | ||
`; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
|
||
import { | ||
KuiModal, | ||
KuiModalHeader, | ||
KuiModalHeaderTitle, | ||
KuiModalBody, | ||
KuiModalBodyText, | ||
KuiModalFooter, | ||
KuiButton, | ||
KuiModalOverlay | ||
} from 'ui_framework/components'; | ||
|
||
export class DashboardCloneModal extends React.Component { | ||
constructor(props) { | ||
super(props); | ||
|
||
this.state = { | ||
newDashboardName: props.title | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you want the default value to cause a name collision with the existing dashboard title? Maybe There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yea, I originally had it with 'Copy' appended, wasn't sure which version I liked better. I can bring that back. |
||
}; | ||
} | ||
|
||
cloneDashboard = () => { | ||
this.props.onClone(this.state.newDashboardName); | ||
}; | ||
|
||
onInputChange = (event) => { | ||
this.setState({ newDashboardName: event.target.value }); | ||
}; | ||
|
||
onKeyDown = (event) => { | ||
if (event.keyCode === 27) { // ESC key | ||
this.props.onClose(); | ||
} | ||
}; | ||
|
||
render() { | ||
return ( | ||
<KuiModalOverlay> | ||
<KuiModal | ||
data-tests-subj="dashboardCloneModal" | ||
aria-label="Clone a dashboard" | ||
className="dashboardCloneModal" | ||
onKeyDown={ this.onKeyDown } | ||
> | ||
<KuiModalHeader> | ||
<KuiModalHeaderTitle> | ||
Clone Dashboard | ||
</KuiModalHeaderTitle> | ||
</KuiModalHeader> | ||
<KuiModalBody> | ||
<KuiModalBodyText className="kuiVerticalRhythm"> | ||
Please enter a new name for your dashboard. | ||
</KuiModalBodyText> | ||
<KuiModalBodyText className="kuiVerticalRhythm"> | ||
<input | ||
autoFocus | ||
data-test-subj="clonedDashboardTitle" | ||
className="kuiTextInput kuiTextInput--large" | ||
value={ this.state.newDashboardName } | ||
onChange={ this.onInputChange } /> | ||
</KuiModalBodyText> | ||
</KuiModalBody> | ||
|
||
<KuiModalFooter> | ||
<KuiButton | ||
type="hollow" | ||
data-test-subj="cloneCancelButton" | ||
onClick={ this.props.onClose } | ||
> | ||
Cancel | ||
</KuiButton> | ||
<KuiButton | ||
type="primary" | ||
data-test-subj="cloneConfirmButton" | ||
onClick={ this.cloneDashboard } | ||
> | ||
Confirm Clone | ||
</KuiButton> | ||
</KuiModalFooter> | ||
</KuiModal> | ||
</KuiModalOverlay> | ||
); | ||
} | ||
} | ||
|
||
DashboardCloneModal.propTypes = { | ||
onClone: PropTypes.func, | ||
onClose: PropTypes.func, | ||
title: PropTypes.string | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
import React from 'react'; | ||
import sinon from 'sinon'; | ||
import { mount, render } from 'enzyme'; | ||
|
||
import { | ||
DashboardCloneModal, | ||
} from '../top_nav/clone_modal'; | ||
|
||
let onClone; | ||
let onClose; | ||
|
||
beforeEach(() => { | ||
onClone = sinon.spy(); | ||
onClose = sinon.spy(); | ||
}); | ||
|
||
test('renders DashboardCloneModal', () => { | ||
const component = render(<DashboardCloneModal | ||
title="dash title" | ||
onClose={onClose} | ||
onClone={onClone} | ||
/>); | ||
expect(component).toMatchSnapshot(); // eslint-disable-line | ||
}); | ||
|
||
test('onClone', () => { | ||
const component = mount(<DashboardCloneModal | ||
title="dash title" | ||
onClose={onClose} | ||
onClone={onClone} | ||
/>); | ||
component.find('[data-test-subj="cloneConfirmButton"]').simulate('click'); | ||
sinon.assert.calledWith(onClone, 'dash title'); | ||
sinon.assert.notCalled(onClose); | ||
}); | ||
|
||
test('onClose', () => { | ||
const component = mount(<DashboardCloneModal | ||
title="dash title" | ||
onClose={onClose} | ||
onClone={onClone} | ||
/>); | ||
component.find('[data-test-subj="cloneCancelButton"]').simulate('click'); | ||
sinon.assert.calledOnce(onClose); | ||
sinon.assert.notCalled(onClone); | ||
}); | ||
|
||
test('title', () => { | ||
const component = mount(<DashboardCloneModal | ||
title="dash title" | ||
onClose={onClose} | ||
onClone={onClone} | ||
/>); | ||
const event = { target: { value: 'a' } }; | ||
component.find('input').simulate('change', event); | ||
component.find('[data-test-subj="cloneConfirmButton"]').simulate('click'); | ||
sinon.assert.calledWith(onClone, 'a'); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { DashboardCloneModal } from './clone_modal'; | ||
import React from 'react'; | ||
import ReactDOM from 'react-dom'; | ||
|
||
export function showCloneModal(onClone, title) { | ||
const container = document.createElement('div'); | ||
const closeModal = () => { | ||
document.body.removeChild(container); | ||
}; | ||
|
||
const onCloneConfirmed = (newTitle) => { | ||
onClone(newTitle).then(id => { | ||
if (id) { | ||
closeModal(); | ||
} | ||
}); | ||
}; | ||
document.body.appendChild(container); | ||
const element = ( | ||
<DashboardCloneModal onClone={onCloneConfirmed} onClose={closeModal} title={title + ' Copy'}></DashboardCloneModal> | ||
); | ||
ReactDOM.render(element, container); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the switch to $injector.get()?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@spalger's preference for injector over multiline argument lists. :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.