github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert(ui): images from board generator only works on boards

Browse Source
This commit is contained in:
psychedelicious
2025-02-27 08:59:02 +10:00
parent 525da3257c
commit aee847065c
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/ImageGeneratorImagesFromBoardSettings.tsx
View File

@@ -1,5 +1,6 @@
import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
import { Combobox, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
import { EMPTY_ARRAY } from 'app/store/constants';
import { NO_DRAG_CLASS, NO_WHEEL_CLASS } from 'features/nodes/types/constants';
import type { ImageGeneratorImagesFromBoard } from 'features/nodes/types/field';
import { memo, useCallback, useMemo } from 'react';
@@ -49,31 +50,21 @@ const BoardCombobox = ({
board_id,
onChange: _onChange,
}: {
board_id: string;
board_id: string | undefined;
onChange: (board_id: string) => void;
}) => {
const { t } = useTranslation();
const listAllBoardsQuery = useListAllBoardsQuery(listAllBoardsQueryArg);
const noneOption = useMemo<ComboboxOption>(() => {
return {
label: `${t('common.none')} (${t('boards.uncategorized')})`,
value: 'none',
};
}, [t]);
const options = useMemo<ComboboxOption[]>(() => {
const _options: ComboboxOption[] = [noneOption];
if (listAllBoardsQuery.data) {
for (const board of listAllBoardsQuery.data) {
_options.push({
label: board.board_name,
value: board.board_id,
});
}
if (!listAllBoardsQuery.data) {
return EMPTY_ARRAY;
}
return _options;
}, [listAllBoardsQuery.data, noneOption]);
return listAllBoardsQuery.data.map((board) => ({
label: board.board_name,
value: board.board_id,
}));
}, [listAllBoardsQuery.data]);
const onChange = useCallback<ComboboxOnChange>(
(v) => {
@@ -87,13 +78,7 @@ const BoardCombobox = ({
[_onChange]
);
const value = useMemo(() => {
if (board_id === 'none') {
return noneOption;
}
const boardOption = options.find((o) => o.value === board_id);
return boardOption ?? noneOption;
}, [board_id, options, noneOption]);
const value = useMemo(() => options.find((o) => o.value === board_id) ?? null, [board_id, options]);
const noOptionsMessage = useCallback(() => t('boards.noMatching'), [t]);

7
invokeai/frontend/web/src/features/nodes/types/field.ts
View File

@@ -1534,7 +1534,7 @@ export const getStringGeneratorDefaults = (type: StringGeneratorFieldValue['type
export const ImageGeneratorImagesFromBoardType = 'image_generator_images_from_board';
const zImageGeneratorImagesFromBoard = z.object({
type: z.literal(ImageGeneratorImagesFromBoardType).default(ImageGeneratorImagesFromBoardType),
board_id: z.string().trim().min(1).optional().default('none'),
board_id: z.string().trim().min(1).optional(),
category: z.union([z.literal('images'), z.literal('assets')]).default('images'),
});
export type ImageGeneratorImagesFromBoard = z.infer<typeof zImageGeneratorImagesFromBoard>;
@@ -1544,10 +1544,13 @@ const getImageGeneratorImagesFromBoardValues = async (
dispatch: AppDispatch
) => {
const { board_id, category } = generator;
if (!board_id) {
return EMPTY_ARRAY;
}
const req = dispatch(
boardsApi.endpoints.listAllImageNamesForBoard.initiate(
{
board_id: board_id ?? 'none',
board_id,
categories: category === 'images' ? IMAGE_CATEGORIES : ASSETS_CATEGORIES,
is_intermediate: false,
},