Skip to content

clearing intermediates bug fix #4859

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
merged 9 commits into from
Oct 15, 2023
Merged

clearing intermediates bug fix #4859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cad30cc
fixed bug #4857
martazavro Oct 12, 2023
1a3a8a9
fixed problems
martazavro Oct 12, 2023
61754c9
Merge branch 'main' into clear_intermediates
martazavro Oct 12, 2023
bd1bafc
Merge branch 'main' into clear_intermediates
psychedelicious Oct 12, 2023
11239ed
Merge branch 'main' into clear_intermediates
martazavro Oct 12, 2023
d8b170c
chore(ui): lint
psychedelicious Oct 15, 2023
aa5a22d
feat(ui): disable clear intermediates button when queue has items
psychedelicious Oct 15, 2023
a117752
Merge branch 'main' into clear_intermediates
psychedelicious Oct 15, 2023
8fd364a
feat(ui): add tooltip to clear intermediates button when disabled
psychedelicious Oct 15, 2023
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 invokeai/frontend/web/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,7 @@
"showProgressInViewer": "Show Progress Images in Viewer",
"ui": "User Interface",
"useSlidersForAll": "Use Sliders For All Options",
"clearIntermediatesDisabled": "Queue must be empty to clear intermediates",
"clearIntermediatesDesc1": "Clearing intermediates will reset your Canvas and ControlNet state.",
"clearIntermediatesDesc2": "Intermediate images are byproducts of generation, different from the result images in the gallery. Clearing intermediates will free disk space.",
"clearIntermediatesDesc3": "Your gallery images will not be deleted.",
Expand Down
17 changes: 15 additions & 2 deletions .../frontend/web/src/features/system/components/SettingsModal/SettingsClearIntermediates.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useAppDispatch } from 'app/store/storeHooks';
import { controlAdaptersReset } from 'features/controlAdapters/store/controlAdaptersSlice';
import { useCallback, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { useGetQueueStatusQuery } from 'services/api/endpoints/queue';
import IAIButton from '../../../../common/components/IAIButton';
import {
useClearIntermediatesMutation,
Expand All @@ -22,7 +23,16 @@ export default function SettingsClearIntermediates() {
const [clearIntermediates, { isLoading: isLoadingClearIntermediates }] =
useClearIntermediatesMutation();

const { data: queueStatus } = useGetQueueStatusQuery();
const hasPendingItems =
queueStatus &&
(queueStatus.queue.in_progress > 0 || queueStatus.queue.pending > 0);

const handleClickClearIntermediates = useCallback(() => {
if (hasPendingItems) {
return;
}

clearIntermediates()
.unwrap()
.then((clearedCount) => {
Expand All @@ -43,7 +53,7 @@ export default function SettingsClearIntermediates() {
})
);
});
}, [t, clearIntermediates, dispatch]);
}, [t, clearIntermediates, dispatch, hasPendingItems]);

useEffect(() => {
// update the count on mount
Expand All @@ -54,10 +64,13 @@ export default function SettingsClearIntermediates() {
<StyledFlex>
<Heading size="sm">{t('settings.clearIntermediates')}</Heading>
<IAIButton
tooltip={
hasPendingItems ? t('settings.clearIntermediatesDisabled') : undefined
}
colorScheme="warning"
onClick={handleClickClearIntermediates}
isLoading={isLoadingClearIntermediates}
isDisabled={!intermediatesCount}
isDisabled={!intermediatesCount || hasPendingItems}
>
{t('settings.clearIntermediatesWithCount', {
count: intermediatesCount ?? 0,
Expand Down