-
-
Notifications
You must be signed in to change notification settings - Fork 317
Add the ability to duplicate a dashboard #2912
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
Open
Pierre-Gilles
wants to merge
4
commits into
master
Choose a base branch
from
claude/dashboard-duplicate
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0c1b368
Add the ability to duplicate a dashboard
claude ae47f44
fix: address review feedback on dashboard duplication
claude c9a4a04
fix(front): keep the dashboard edit footer from overflowing on mobile
claude 41d1f48
fix(front): keep accessible names on the dashboard edit action buttons
claude File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
front/src/routes/dashboard/duplicate-dashboard/DuplicateDashboardPage.jsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| import { Text, Localizer } from 'preact-i18n'; | ||
| import cx from 'classnames'; | ||
| import get from 'get-value'; | ||
|
|
||
| import { RequestStatus } from '../../../utils/consts'; | ||
| import style from './style.css'; | ||
|
|
||
| const DuplicateDashboardPage = ({ children, ...props }) => ( | ||
| <div class={cx('container', style.containerWithMargin)}> | ||
| <button onClick={props.goBack} class="btn btn-secondary btn-sm"> | ||
| <Text id="global.backButton" /> | ||
| </button> | ||
|
|
||
| <div class="row"> | ||
| <div class="col col-login mx-auto"> | ||
| <form onSubmit={props.duplicateDashboard} class="card"> | ||
| <div class={props.loading ? 'dimmer active' : 'dimmer'}> | ||
| <div class="loader" /> | ||
| <div class="dimmer-content"> | ||
| <div class="card-body p-6"> | ||
| <div class="card-title"> | ||
| <Text id="duplicateDashboard.cardTitle" fields={{ name: props.sourceDashboard.name }} /> | ||
| </div> | ||
| <div class="alert alert-info"> | ||
| <Text id="duplicateDashboard.savedVersionInfo" /> | ||
| </div> | ||
| {props.duplicateDashboardStatus === RequestStatus.ConflictError && ( | ||
| <div class="alert alert-danger"> | ||
| <Text id="duplicateDashboard.dashboardAlreadyExist" /> | ||
| </div> | ||
| )} | ||
| {props.duplicateDashboardStatus === RequestStatus.Error && ( | ||
| <div class="alert alert-danger"> | ||
| <Text id="duplicateDashboard.unknownError" /> | ||
| </div> | ||
| )} | ||
| <div class="form-group"> | ||
| <label class="form-label"> | ||
| <Text id="duplicateDashboard.nameLabel" /> | ||
| </label> | ||
| <Localizer> | ||
| <input | ||
| type="text" | ||
| class={cx('form-control', { | ||
| 'is-invalid': get(props, 'duplicateDashboardErrors.name') | ||
| })} | ||
| disabled={props.loading} | ||
| placeholder={<Text id="duplicateDashboard.namePlaceholder" />} | ||
| value={get(props, 'dashboard.name')} | ||
| onInput={props.updateDuplicateDashboardName} | ||
| /> | ||
| </Localizer> | ||
| <div class="invalid-feedback"> | ||
| <Text id="duplicateDashboard.invalidName" /> | ||
| </div> | ||
| </div> | ||
| <div class="form-footer"> | ||
| <button | ||
| onClick={props.duplicateDashboard} | ||
| class="btn btn-primary btn-block" | ||
| disabled={props.duplicateDashboardStatus === RequestStatus.Getting} | ||
| > | ||
| <Text id="duplicateDashboard.duplicateDashboardButton" /> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
|
|
||
| export default DuplicateDashboardPage; |
130 changes: 130 additions & 0 deletions
130
front/src/routes/dashboard/duplicate-dashboard/index.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| import { Component } from 'preact'; | ||
| import { connect } from 'unistore/preact'; | ||
| import { route } from 'preact-router'; | ||
| import get from 'get-value'; | ||
|
|
||
| import DuplicateDashboardPage from './DuplicateDashboardPage'; | ||
| import { RequestStatus } from '../../../utils/consts'; | ||
| import withIntlAsProp from '../../../utils/withIntlAsProp'; | ||
|
|
||
| class DuplicateDashboard extends Component { | ||
| goBack = () => { | ||
| route(`/dashboard/${this.props.dashboardSelector}/edit`); | ||
| }; | ||
|
|
||
| getSourceDashboard = async () => { | ||
| try { | ||
| const sourceDashboard = await this.props.httpClient.get(`/api/v1/dashboard/${this.props.dashboardSelector}`); | ||
| this.setState({ | ||
| sourceDashboard, | ||
| loading: false, | ||
| dashboard: { | ||
| name: get(this.props.intl.dictionary, 'duplicateDashboard.nameAfterCopy').replace( | ||
| '{{name}}', | ||
| sourceDashboard.name | ||
| ) | ||
| } | ||
| }); | ||
| } catch (e) { | ||
| console.error(e); | ||
| this.setState({ | ||
| loading: false, | ||
| duplicateDashboardStatus: RequestStatus.Error | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| checkErrors = (name = this.state.dashboard.name) => { | ||
| const duplicateDashboardErrors = {}; | ||
| if (!name) { | ||
| duplicateDashboardErrors.name = true; | ||
| } | ||
| this.setState({ | ||
| duplicateDashboardErrors | ||
| }); | ||
| return Object.keys(duplicateDashboardErrors).length > 0; | ||
| }; | ||
|
|
||
| updateDuplicateDashboardName = e => { | ||
| const { value } = e.target; | ||
| this.setState({ | ||
| dashboard: { | ||
| name: value | ||
| } | ||
| }); | ||
| if (this.state.duplicateDashboardErrors) { | ||
| // setState is asynchronous, so we validate the new value directly | ||
| this.checkErrors(value); | ||
| } | ||
| }; | ||
|
|
||
| duplicateDashboard = async e => { | ||
| e.preventDefault(); | ||
| // if errored, we don't continue | ||
| if (this.checkErrors()) { | ||
| return; | ||
| } | ||
| this.setState({ | ||
| duplicateDashboardStatus: RequestStatus.Getting | ||
| }); | ||
| try { | ||
| const duplicatedDashboard = await this.props.httpClient.post( | ||
| `/api/v1/dashboard/${this.props.dashboardSelector}/duplicate`, | ||
| this.state.dashboard | ||
| ); | ||
| this.setState({ | ||
| duplicateDashboardStatus: RequestStatus.Success | ||
| }); | ||
| route(`/dashboard/${duplicatedDashboard.selector}/edit`); | ||
| } catch (e) { | ||
| console.error(e); | ||
| const status = get(e, 'response.status'); | ||
| if (status === 409) { | ||
| this.setState({ | ||
| duplicateDashboardStatus: RequestStatus.ConflictError | ||
| }); | ||
| } else { | ||
| this.setState({ | ||
| duplicateDashboardStatus: RequestStatus.Error | ||
| }); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
| this.state = { | ||
| dashboard: { | ||
| name: '' | ||
| }, | ||
| sourceDashboard: { | ||
| name: '' | ||
| }, | ||
| loading: true, | ||
| duplicateDashboardErrors: null, | ||
| duplicateDashboardStatus: null | ||
| }; | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| this.getSourceDashboard(); | ||
| } | ||
|
|
||
| render(props, { dashboard, sourceDashboard, loading, duplicateDashboardErrors, duplicateDashboardStatus }) { | ||
| return ( | ||
| <DuplicateDashboardPage | ||
| {...props} | ||
| goBack={this.goBack} | ||
| dashboard={dashboard} | ||
| sourceDashboard={sourceDashboard} | ||
| loading={loading} | ||
| updateDuplicateDashboardName={this.updateDuplicateDashboardName} | ||
| duplicateDashboard={this.duplicateDashboard} | ||
| duplicateDashboardErrors={duplicateDashboardErrors} | ||
| duplicateDashboardStatus={duplicateDashboardStatus} | ||
| /> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default withIntlAsProp(connect('httpClient', {})(DuplicateDashboard)); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .containerWithMargin { | ||
| margin-top: 3rem; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.