Skip to content

refactor(assets): collapse useMediaAssets factory wrapper (FE-727) #12283

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

Merged
dante01yoon merged 5 commits into from
May 19, 2026
Merged

refactor(assets): collapse useMediaAssets factory wrapper (FE-727) #12283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed3e2bf
refactor(assets): remove dead useInternalFilesApi wrapper
dante01yoon May 15, 2026
e0ef2fa
[automated] Apply ESLint and Oxfmt fixes
actions-user May 15, 2026
f318756
refactor(assets): inline useAssetsApi callers, drop useMediaAssets
dante01yoon May 15, 2026
a1b9b65
Merge branch 'main' into jaewon/refactor-remove-useinternalfilesapi-w…
dante01yoon May 18, 2026
0505b31
Merge branch 'main' into jaewon/refactor-remove-useinternalfilesapi-w…
DrJKL May 18, 2026
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
6 changes: 3 additions & 3 deletions src/components/sidebar/tabs/AssetsSidebarTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ import Button from '@/components/ui/button/Button.vue'
import MediaAssetContextMenu from '@/platform/assets/components/MediaAssetContextMenu.vue'
import MediaAssetFilterBar from '@/platform/assets/components/MediaAssetFilterBar.vue'
import { getAssetType } from '@/platform/assets/composables/media/assetMappers'
import { useMediaAssets } from '@/platform/assets/composables/media/useMediaAssets'
import { useAssetsApi } from '@/platform/assets/composables/media/useAssetsApi'
import { useAssetSelection } from '@/platform/assets/composables/useAssetSelection'
import { useMediaAssetActions } from '@/platform/assets/composables/useMediaAssetActions'
import { useMediaAssetFiltering } from '@/platform/assets/composables/useMediaAssetFiltering'
Expand Down Expand Up @@ -309,8 +309,8 @@ const formattedExecutionTime = computed(() => {

const toast = useToast()

const inputAssets = useMediaAssets('input')
const outputAssets = useMediaAssets('output')
const inputAssets = useAssetsApi('input')
const outputAssets = useAssetsApi('output')

// Asset selection
const {
Expand Down
63 changes: 0 additions & 63 deletions src/platform/assets/composables/media/useInternalFilesApi.ts
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/platform/assets/composables/media/useMediaAssets.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/renderer/extensions/linearMode/useOutputHistory.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const selectAsLatestFn = vi.fn()
const resolveIfReadyFn = vi.fn()
const resolvedOutputsCacheRef = new Map<string, ResultItemImpl[]>()

vi.mock('@/platform/assets/composables/media/useMediaAssets', () => ({
useMediaAssets: () => ({
vi.mock('@/platform/assets/composables/media/useAssetsApi', () => ({
useAssetsApi: () => ({
media: mediaRef,
loading: ref(false),
error: ref(null),
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/extensions/linearMode/useOutputHistory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { ComputedRef } from 'vue'
import { computed, ref, watchEffect } from 'vue'

import type { IAssetsProvider } from '@/platform/assets/composables/media/IAssetsProvider'
import { useMediaAssets } from '@/platform/assets/composables/media/useMediaAssets'
import { useAssetsApi } from '@/platform/assets/composables/media/useAssetsApi'
import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
Expand All @@ -25,7 +25,7 @@ export function useOutputHistory(): {
isWorkflowActive: ComputedRef<boolean>
cancelActiveWorkflowJobs: () => Promise<void>
} {
const backingOutputs = useMediaAssets('output')
const backingOutputs = useAssetsApi('output')
void backingOutputs.fetchMediaList()
const linearStore = useLinearOutputStore()
const workflowStore = useWorkflowStore()
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ const { mockMediaAssets } = vi.hoisted(() => {
}
})

vi.mock('@/platform/assets/composables/media/useMediaAssets', () => ({
useMediaAssets: () => mockMediaAssets
vi.mock('@/platform/assets/composables/media/useAssetsApi', () => ({
useAssetsApi: () => mockMediaAssets
}))

vi.mock('@/platform/assets/utils/outputAssetUtil', () => ({
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n'

import { useTransformCompatOverlayProps } from '@/composables/useTransformCompatOverlayProps'
import { SUPPORTED_EXTENSIONS_ACCEPT } from '@/extensions/core/load3d/constants'
import { useMediaAssets } from '@/platform/assets/composables/media/useMediaAssets'
import { useAssetsApi } from '@/platform/assets/composables/media/useAssetsApi'
import FormDropdown from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.vue'
import { AssetKindKey } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types'
import type { LayoutMode } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types'
Expand Down Expand Up @@ -47,7 +47,7 @@ const modelValue = defineModel<string | undefined>({

const { t } = useI18n()

const outputMediaAssets = useMediaAssets('output')
const outputMediaAssets = useAssetsApi('output')

const transformCompatProps = useTransformCompatOverlayProps()

Expand Down
4 changes: 2 additions & 2 deletions src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ function createMockMediaAssets() {

let mockMediaAssets = createMockMediaAssets()

vi.mock('@/platform/assets/composables/media/useMediaAssets', () => ({
useMediaAssets: () => mockMediaAssets
vi.mock('@/platform/assets/composables/media/useAssetsApi', () => ({
useAssetsApi: () => mockMediaAssets
}))

vi.mock('@/platform/assets/composables/useAssetFilterOptions', () => ({
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import type { useAssetWidgetData } from '@/renderer/extensions/vueNodes/widgets/
import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
import { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil'
import type { useMediaAssets } from '@/platform/assets/composables/media/useMediaAssets'
import type { IAssetsProvider } from '@/platform/assets/composables/media/IAssetsProvider'
import type { AssetKind } from '@/types/widgetTypes'
import { getMediaTypeFromFilename } from '@/utils/formatUtil'

Expand Down Expand Up @@ -65,7 +65,7 @@ interface UseWidgetSelectItemsOptions {
>
modelValue: Ref<string | undefined>
assetKind: MaybeRefOrGetter<AssetKind | undefined>
outputMediaAssets: ReturnType<typeof useMediaAssets>
outputMediaAssets: IAssetsProvider
assetData: ReturnType<typeof useAssetWidgetData> | null
isAssetMode: MaybeRefOrGetter<boolean | undefined>
}
Expand Down
Loading