-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Migrate AddToDashboard dialog #4408
Merged
kravets-levko
merged 5 commits into
master
from
migrate-add-visualization-to-dashboard-dialog
Dec 4, 2019
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
eaf43c2
Migrate AddToDashboard dialog to React
kravets-levko c9a427f
AddToDashboard dialog: add dashboard link to notification
kravets-levko fe636fc
Fix error messages when creating new dashboard
kravets-levko 08ab2ba
Show spinner when loading search results
kravets-levko 40d5aa9
Remove search term limit
kravets-levko 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 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 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,110 @@ | ||
import { isString } from 'lodash'; | ||
import React, { useState, useEffect } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import Modal from 'antd/lib/modal'; | ||
import Input from 'antd/lib/input'; | ||
import List from 'antd/lib/list'; | ||
import Icon from 'antd/lib/icon'; | ||
import { wrap as wrapDialog, DialogPropType } from '@/components/DialogWrapper'; | ||
import { QueryTagsControl } from '@/components/tags-control/TagsControl'; | ||
import { Dashboard } from '@/services/dashboard'; | ||
import notification from '@/services/notification'; | ||
import useSearchResults from '@/lib/hooks/useSearchResults'; | ||
|
||
import './add-to-dashboard-dialog.less'; | ||
|
||
function AddToDashboardDialog({ dialog, visualization }) { | ||
const [searchTerm, setSearchTerm] = useState(''); | ||
|
||
const [doSearch, dashboards, isLoading] = useSearchResults((term) => { | ||
if (isString(term) && (term !== '')) { | ||
return Dashboard.get({ q: term }).$promise.then(results => results.results); | ||
} | ||
return Promise.resolve([]); | ||
}, { initialResults: [] }); | ||
|
||
const [selectedDashboard, setSelectedDashboard] = useState(null); | ||
|
||
const [saveInProgress, setSaveInProgress] = useState(false); | ||
|
||
useEffect(() => { doSearch(searchTerm); }, [doSearch, searchTerm]); | ||
|
||
function addWidgetToDashboard() { | ||
// Load dashboard with all widgets | ||
Dashboard.get({ slug: selectedDashboard.slug }).$promise | ||
.then((dashboard) => { | ||
dashboard.addWidget(visualization); | ||
return dashboard; | ||
}) | ||
.then((dashboard) => { | ||
dialog.close(); | ||
const key = `notification-${Math.random().toString(36).substr(2, 10)}`; | ||
notification.success('Widget added to dashboard', ( | ||
<React.Fragment> | ||
<a href={`dashboard/${dashboard.slug}`} onClick={() => notification.close(key)}>{dashboard.name}</a> | ||
<QueryTagsControl isDraft={dashboard.is_draft} tags={dashboard.tags} /> | ||
</React.Fragment> | ||
), { key }); | ||
}) | ||
.catch(() => { notification.error('Widget not added.'); }) | ||
.finally(() => { setSaveInProgress(false); }); | ||
} | ||
|
||
const items = selectedDashboard ? [selectedDashboard] : dashboards; | ||
|
||
return ( | ||
<Modal | ||
{...dialog.props} | ||
title="Add to Dashboard" | ||
okButtonProps={{ disabled: !selectedDashboard || saveInProgress, loading: saveInProgress }} | ||
cancelButtonProps={{ disabled: saveInProgress }} | ||
onOk={addWidgetToDashboard} | ||
> | ||
<label htmlFor="add-to-dashboard-dialog-dashboard">Choose the dashboard to add this query to:</label> | ||
|
||
{!selectedDashboard && ( | ||
<Input | ||
id="add-to-dashboard-dialog-dashboard" | ||
className="w-100" | ||
autoComplete="off" | ||
autoFocus | ||
placeholder="Search a dashboard by name" | ||
value={searchTerm} | ||
onChange={event => setSearchTerm(event.target.value)} | ||
suffix={( | ||
<Icon type="close" className={(searchTerm === '') ? 'hidden' : null} onClick={() => setSearchTerm('')} /> | ||
)} | ||
/> | ||
)} | ||
|
||
{((items.length > 0) || isLoading) && ( | ||
<List | ||
className={selectedDashboard ? 'add-to-dashboard-dialog-selection' : 'add-to-dashboard-dialog-search-results'} | ||
bordered | ||
itemLayout="horizontal" | ||
loading={isLoading} | ||
dataSource={items} | ||
renderItem={d => ( | ||
<List.Item | ||
key={`dashboard-${d.id}`} | ||
actions={selectedDashboard ? [<Icon type="close" onClick={() => setSelectedDashboard(null)} />] : []} | ||
onClick={selectedDashboard ? null : () => setSelectedDashboard(d)} | ||
> | ||
<div className="add-to-dashboard-dialog-item-content"> | ||
{d.name} | ||
<QueryTagsControl isDraft={d.is_draft} tags={d.tags} /> | ||
</div> | ||
</List.Item> | ||
)} | ||
/> | ||
)} | ||
</Modal> | ||
); | ||
} | ||
|
||
AddToDashboardDialog.propTypes = { | ||
dialog: DialogPropType.isRequired, | ||
visualization: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types | ||
}; | ||
|
||
export default wrapDialog(AddToDashboardDialog); |
37 changes: 37 additions & 0 deletions
37
client/app/components/queries/add-to-dashboard-dialog.less
This file contains 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,37 @@ | ||
@import (reference, less) '~@/assets/less/main.less'; | ||
|
||
.ant-list { | ||
&.add-to-dashboard-dialog-search-results { | ||
margin-top: 15px; | ||
|
||
.ant-list-items { | ||
max-height: 300px; | ||
overflow: auto; | ||
} | ||
|
||
.ant-list-item { | ||
padding: 12px; | ||
cursor: pointer; | ||
|
||
&:hover, &:active { | ||
@table-row-hover-bg: fade(@redash-gray, 5%); | ||
background-color: @table-row-hover-bg; | ||
} | ||
} | ||
} | ||
|
||
&.add-to-dashboard-dialog-selection { | ||
.ant-list-item { | ||
padding: 12px; | ||
|
||
.add-to-dashboard-dialog-item-content { | ||
flex: 1 1 auto; | ||
} | ||
|
||
.ant-list-item-action li { | ||
margin: 0; | ||
padding: 0; | ||
} | ||
} | ||
} | ||
} |
This file contains 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,33 @@ | ||
import { useState, useEffect } from 'react'; | ||
import { useDebouncedCallback } from 'use-debounce'; | ||
|
||
export default function useSearchResults( | ||
fetch, | ||
{ initialResults = null, debounceTimeout = 200 } = {}, | ||
) { | ||
const [result, setResult] = useState(initialResults); | ||
const [isLoading, setIsLoading] = useState(false); | ||
|
||
let currentSearchTerm = null; | ||
let isDestroyed = false; | ||
|
||
const [doSearch] = useDebouncedCallback((searchTerm) => { | ||
setIsLoading(true); | ||
currentSearchTerm = searchTerm; | ||
fetch(searchTerm) | ||
.catch(() => null) | ||
.then((data) => { | ||
if ((searchTerm === currentSearchTerm) && !isDestroyed) { | ||
setResult(data); | ||
setIsLoading(false); | ||
} | ||
}); | ||
}, debounceTimeout); | ||
|
||
useEffect(() => ( | ||
// ignore all requests after component destruction | ||
() => { isDestroyed = true; } | ||
), []); | ||
|
||
return [doSearch, result, isLoading]; | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains 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
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.
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.
Cool 👍, I will keep it in mind for next search uses