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.

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

NickAkhmetov/CAT-925 ensure visualizations for support image pyramid datasets use parent dataset UUID for notebooks #3570

Merged
merged 2 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG-cat-925.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Ensure visualizations for image pyramids use parent UUID to fetch notebooks.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect } from 'react';
import React, { useEffect, useMemo } from 'react';
import { Vitessce } from 'vitessce';

import Paper from '@mui/material/Paper';
Expand Down Expand Up @@ -98,6 +98,19 @@ function Visualization({

const isMultiDataset = Array.isArray(vitessceConfig);

// Find parent UUID for the visualization if present
const parentUuid: string | undefined = useMemo(() => {
if (Array.isArray(vitData)) {
const vitDataArray = vitData as object[];
const found = vitDataArray.find((data) => 'parentUuid' in data) as { parentUuid: string } | undefined;
return found?.parentUuid;
}
if ('parentUuid' in vitData) {
return (vitData as { parentUuid: string }).parentUuid;
}
return undefined;
}, [vitData]);

if (!vitessceConfig) {
return null;
}
Expand All @@ -119,7 +132,7 @@ function Visualization({
buttons={
<Stack direction="row" spacing={1}>
{hasNotebook && <VisualizationWorkspaceButton uuid={uuid} />}
<VisualizationDownloadButton uuid={uuid} hasNotebook={hasNotebook} />
<VisualizationDownloadButton uuid={uuid} hasNotebook={hasNotebook} parentUuid={parentUuid} />
<VisualizationShareButton />
<VisualizationThemeSwitch />
<SecondaryBackgroundTooltip title="Switch to Fullscreen">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,24 @@ const tooltip = 'Download Jupyter Notebook';
interface VisualizationDownloadButtonProps {
uuid?: string;
hasNotebook?: boolean;
parentUuid?: string;
}

function VisualizationDownloadButton({ uuid, hasNotebook }: VisualizationDownloadButtonProps) {
function VisualizationDownloadButton({ uuid, hasNotebook, parentUuid }: VisualizationDownloadButtonProps) {
const trackEntityPageEvent = useTrackEntityPageEvent();
const { toastError } = useSnackbarActions();

const downloadNotebook = useCallback(() => {
trackEntityPageEvent({ action: `Vitessce / ${tooltip}` });
postAndDownloadFile({
url: `/notebooks/entities/dataset/${uuid}.ws.ipynb`,
url: `/notebooks/entities/dataset/${parentUuid ?? uuid}.ws.ipynb`,
body: {},
})
.then()
.catch(() => {
toastError('Failed to download Jupyter Notebook');
});
}, [uuid, toastError, trackEntityPageEvent]);
}, [parentUuid, uuid, toastError, trackEntityPageEvent]);

if (!uuid || !hasNotebook) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function VisualizationWrapper({
}),
[isPublicationPage, shouldDisplayHeader, uuid],
);

return (
<VizContainerStyleContext.Provider value={containerStyles}>
<VisualizationErrorBoundary>
Expand Down
6 changes: 5 additions & 1 deletion context/app/static/js/pages/Dataset/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,13 @@ export function useVitessceConf(uuid: string, parentUuid?: string) {
if (parentUuid) {
urlParams.set('parent', parentUuid);
}
return useSWR<VitessceConf>(getVitessceConfKey(uuid, groupsToken), (_key: unknown) =>
const swr = useSWR<VitessceConf>(getVitessceConfKey(uuid, groupsToken), (_key: unknown) =>
fetcher({ url: `${base}?${urlParams.toString()}`, requestInit: { headers: getAuthHeader(groupsToken) } }),
);
if (parentUuid) {
return { ...swr, data: { ...swr.data, parentUuid } };
}
return swr;
}

function useProcessedDatasets(includeComponents?: boolean) {
Expand Down
Loading