Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix dashboard refresh button behaviour #5971

Merged
merged 8 commits into from
Jan 26, 2022
Merged

Fix dashboard refresh button behaviour #5971

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f10bb5
improve dashboard refresh button
Dagobert42 Jan 19, 2022
7d1578c
[optional] set button disabled when loading/checking
Dagobert42 Jan 19, 2022
615c188
[optional] add context-dependant tooltip
Dagobert42 Jan 20, 2022
61b5ce6
Merge branch 'master' into fix-dashboard-refresh-button-behaviour
Dagobert42 Jan 20, 2022
5953eee
Merge branch 'master' into fix-dashboard-refresh-button-behaviour
Dagobert42 Jan 24, 2022
a253ced
add review changes
Dagobert42 Jan 24, 2022
b4eb219
Merge branch 'master' into fix-dashboard-refresh-button-behaviour
philippotto Jan 25, 2022
f7c16af
Merge branch 'master' into fix-dashboard-refresh-button-behaviour
philippotto Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions frontend/javascripts/dashboard/dataset/dataset_cache_provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type Options = {
type Context = {
datasets: Array<APIMaybeUnimportedDataset>,
isLoading: boolean,
isChecking: boolean,
checkDatasets: () => Promise<void>,
fetchDatasets: (options?: Options) => Promise<void>,
reloadDataset: (
Expand Down Expand Up @@ -54,6 +55,7 @@ export const datasetCache = {
export const DatasetCacheContext = createContext<Context>({
datasets: [],
isLoading: false,
isChecking: false,
fetchDatasets: async () => {},
checkDatasets: async () => {},
reloadDataset: async () => {},
Expand All @@ -63,6 +65,7 @@ export const DatasetCacheContext = createContext<Context>({
export default function DatasetCacheProvider({ children }: { children: Node }) {
const [datasets, setDatasets] = useState(datasetCache.get());
const [isLoading, setIsLoading] = useState(false);
const [isChecking, setIsChecking] = useState(false);
const [pendingDatasetUpdates, setPendingDatasetUpdates] = useState<{
[string]: Promise<APIDataset>,
}>({});
Expand Down Expand Up @@ -105,6 +108,7 @@ export default function DatasetCacheProvider({ children }: { children: Node }) {
if (isLoading) return;
try {
setIsLoading(true);
setIsChecking(true);
const datastores = await getDatastores();
await Promise.all(
datastores
Expand All @@ -117,10 +121,12 @@ export default function DatasetCacheProvider({ children }: { children: Node }) {
),
);
await fetchDatasets({ isCalledFromCheckDatasets: true });
setIsChecking(false);
} catch (error) {
handleGenericError(error);
} finally {
setIsLoading(false);
setIsChecking(false);
}
}

Expand Down Expand Up @@ -208,6 +214,7 @@ export default function DatasetCacheProvider({ children }: { children: Node }) {
value={{
datasets,
isLoading,
isChecking,
checkDatasets,
fetchDatasets,
reloadDataset,
Expand Down
22 changes: 16 additions & 6 deletions frontend/javascripts/dashboard/dataset_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,17 +337,27 @@ function DatasetView(props: Props) {
searchBox
);

const showLoadingIndicator =
(context.datasets.length === 0 && context.isLoading) || context.isChecking;
const adminHeader = (
<div className="pull-right" style={{ display: "flex" }}>
{isUserAdminOrDatasetManagerOrTeamManager ? (
<React.Fragment>
<Button
icon={context.isLoading ? <LoadingOutlined /> : <ReloadOutlined />}
style={margin}
onClick={context.checkDatasets}
<Tooltip
title={
showLoadingIndicator
? "Refreshing the dataset list."
: "Search for new datasets on disk."
}
>
Refresh
</Button>
<Button
icon={showLoadingIndicator ? <LoadingOutlined /> : <ReloadOutlined />}
style={margin}
onClick={context.checkDatasets}
>
Refresh
</Button>
</Tooltip>
<Link to="/datasets/upload" style={margin}>
<Button type="primary" icon={<PlusOutlined />}>
Add Dataset
Expand Down