Skip to content
Open
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useAppSelector } from 'app/store/storeHooks';
import { openMediaInNewTab } from 'features/auth/hooks/useMediaCookieRefresh';
import { openMediaInNewTab } from 'common/util/openMediaInNewTab';
import { selectSystemShouldUseMiddleClickToOpenInNewTab } from 'features/system/store/systemSlice';
import type { RefObject } from 'react';
import { useEffect } from 'react';
Expand Down
3 changes: 0 additions & 3 deletions invokeai/frontend/web/src/common/util/openImageInNewTab.ts

This file was deleted.

37 changes: 37 additions & 0 deletions invokeai/frontend/web/src/common/util/openMediaInNewTab.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { readFileSync } from 'node:fs';
import { fileURLToPath } from 'node:url';

import { afterEach, describe, expect, it, vi } from 'vitest';

import { openMediaInNewTab } from './openMediaInNewTab';

const readSource = (relativePath: string) =>
readFileSync(fileURLToPath(new URL(relativePath, import.meta.url)), 'utf8');

describe('openMediaInNewTab', () => {
afterEach(() => {
vi.unstubAllGlobals();
});

it('opens the media URL directly in a new tab', () => {
const open = vi.fn(() => null);
vi.stubGlobal('window', { open });

openMediaInNewTab('api/v1/images/i/test.png/full');

expect(open).toHaveBeenCalledWith('api/v1/images/i/test.png/full', '_blank', 'noopener,noreferrer');
});

it('does not use an about:blank intermediary', () => {
const source = readSource('./openMediaInNewTab.ts');

expect(source).not.toContain('about:blank');
});

it('keeps middle-click opening on the shared direct opener', () => {
const source = readSource('../hooks/useMiddleClickOpenInNewTab.ts');

expect(source).toContain("from 'common/util/openMediaInNewTab'");
expect(source).not.toContain('useMediaCookieRefresh');
});
});
3 changes: 3 additions & 0 deletions invokeai/frontend/web/src/common/util/openMediaInNewTab.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const openMediaInNewTab = (mediaUrl: string) => {
window.open(mediaUrl, '_blank', 'noopener,noreferrer');
};
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@ export const waitForMediaCookieSelfHeal = (): Promise<void> => {
});
};

export const openMediaInNewTab = (url: string) => {
const tab = window.open('about:blank', '_blank');
if (tab) {
tab.opener = null;
}
void waitForMediaCookieSelfHeal().then(() => {
tab?.location.replace(url);
});
};

export const abortAndWaitForPendingRefreshes = async (pending: Set<PendingRefresh>) => {
for (const refresh of pending) {
refresh.abort();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ describe('protected media consumers', () => {
expect(source).not.toContain(rawUsage);
});

it('waits for media-cookie self-heal before opening the video metadata link', () => {
it('opens the video metadata link through the shared direct opener', () => {
const source = readConsumer('../../gallery/components/ImageMetadataViewer/VideoMetadataViewer.tsx');

expect(source).toContain('openMediaInNewTab');
expect(source).toContain("from 'common/util/openMediaInNewTab'");
expect(source).not.toContain('href={video.video_url}');
expect(source).not.toContain('href={videoUrl}');
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IconMenuItem } from 'common/components/IconMenuItem';
import { openImageInNewTab } from 'common/util/openImageInNewTab';
import { openMediaInNewTab } from 'common/util/openMediaInNewTab';
import { useImageDTOContext } from 'features/gallery/contexts/ImageDTOContext';
import { memo, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
Expand All @@ -9,7 +9,7 @@ export const ContextMenuItemOpenInNewTab = memo(() => {
const { t } = useTranslation();
const imageDTO = useImageDTOContext();
const onClick = useCallback(() => {
openImageInNewTab(imageDTO.image_url);
openMediaInNewTab(imageDTO.image_url);
}, [imageDTO]);

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MenuItem } from '@invoke-ai/ui-library';
import { openMediaInNewTab } from 'features/auth/hooks/useMediaCookieRefresh';
import { openMediaInNewTab } from 'common/util/openMediaInNewTab';
import { useVideoDTOContext } from 'features/gallery/contexts/VideoDTOContext';
import { memo, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ExternalLink, Flex, Tab, TabList, TabPanel, TabPanels, Tabs, Text } from '@invoke-ai/ui-library';
import { IAINoContentFallback } from 'common/components/IAIImageFallback';
import { openMediaInNewTab } from 'features/auth/hooks/useMediaCookieRefresh';
import { openMediaInNewTab } from 'common/util/openMediaInNewTab';
import { memo } from 'react';
import { useTranslation } from 'react-i18next';
import { useGetVideoMetadataQuery, useGetVideoWorkflowQuery } from 'services/api/endpoints/videos';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { useStore } from '@nanostores/react';
import { useAppSelector, useAppStore } from 'app/store/storeHooks';
import { useClipboard } from 'common/hooks/useClipboard';
import { useDownloadItem } from 'common/hooks/useDownloadImage';
import { isMediaCookieSelfHealPending, openMediaInNewTab } from 'features/auth/hooks/useMediaCookieRefresh';
import { openMediaInNewTab } from 'common/util/openMediaInNewTab';
import { isMediaCookieSelfHealPending } from 'features/auth/hooks/useMediaCookieRefresh';
import { useMediaUrl } from 'features/auth/store/mediaCookieRefresh';
import { useDeleteVideoModalApi } from 'features/deleteVideoModal/store/state';
import { multipleVideoDndSource, singleVideoDndSource } from 'features/dnd/dnd';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,14 @@ describe('video review regressions', () => {
expect(locale).toContain('"problemDownloadingMedia": "Unable to Download Media"');
});

it('waits for cookie self-heal before opening protected video URLs', () => {
it('opens protected video URLs through the shared direct opener', () => {
const preview = readSource('./components/ImageViewer/CurrentVideoPreview.tsx');
const contextMenu = readSource('./components/ContextMenu/MenuItems/ContextMenuItemOpenInNewTabVideo.tsx');

expect(preview).toContain('openMediaInNewTab');
expect(contextMenu).toContain('openMediaInNewTab');
expect(preview).toContain("from 'common/util/openMediaInNewTab'");
expect(contextMenu).toContain("from 'common/util/openMediaInNewTab'");
expect(preview).not.toContain('window.open(videoDTO.video_url');
expect(contextMenu).not.toContain('window.open(videoDTO.video_url');
});
Expand Down
Loading