From 642db657c2b52d51eefb6918a1034625d6f059e9 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue, 27 Jun 2023 20:29:41 +1000
Subject: [PATCH] feat(ui): use max prompts for combinatorial, iterations for
 non-combinatorial

---
 .../components/ParamDynamicPromptsCollapse.tsx            | 2 +-
 .../components/ParamDynamicPromptsMaxPrompts.tsx          | 8 +++++---
 .../nodes/util/graphBuilders/addDynamicPromptsToGraph.ts  | 2 +-
 .../components/Parameters/Core/ParamIterations.tsx        | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCollapse.tsx b/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCollapse.tsx
index eeaf1b81ec..1aefecf3e6 100644
--- a/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCollapse.tsx
+++ b/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCollapse.tsx
@@ -35,8 +35,8 @@ const ParamDynamicPromptsCollapse = () => {
       withSwitch
     >
       <Flex sx={{ gap: 2, flexDir: 'column' }}>
-        <ParamDynamicPromptsMaxPrompts />
         <ParamDynamicPromptsCombinatorial />
+        <ParamDynamicPromptsMaxPrompts />
       </Flex>
     </IAICollapse>
   );
diff --git a/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsMaxPrompts.tsx b/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsMaxPrompts.tsx
index ab56abaa35..19f02ae3e5 100644
--- a/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsMaxPrompts.tsx
+++ b/invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsMaxPrompts.tsx
@@ -9,17 +9,18 @@ import { stateSelector } from 'app/store/store';
 const selector = createSelector(
   stateSelector,
   (state) => {
-    const { maxPrompts } = state.dynamicPrompts;
+    const { maxPrompts, combinatorial } = state.dynamicPrompts;
     const { min, sliderMax, inputMax } =
       state.config.sd.dynamicPrompts.maxPrompts;
 
-    return { maxPrompts, min, sliderMax, inputMax };
+    return { maxPrompts, min, sliderMax, inputMax, combinatorial };
   },
   defaultSelectorOptions
 );
 
 const ParamDynamicPromptsMaxPrompts = () => {
-  const { maxPrompts, min, sliderMax, inputMax } = useAppSelector(selector);
+  const { maxPrompts, min, sliderMax, inputMax, combinatorial } =
+    useAppSelector(selector);
   const dispatch = useAppDispatch();
 
   const handleChange = useCallback(
@@ -36,6 +37,7 @@ const ParamDynamicPromptsMaxPrompts = () => {
   return (
     <IAISlider
       label="Max Prompts"
+      isDisabled={!combinatorial}
       min={min}
       max={sliderMax}
       value={maxPrompts}
diff --git a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addDynamicPromptsToGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addDynamicPromptsToGraph.ts
index 23abb815a9..264dac2e14 100644
--- a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addDynamicPromptsToGraph.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/addDynamicPromptsToGraph.ts
@@ -37,7 +37,7 @@ export const addDynamicPromptsToGraph = (
     const dynamicPromptNode: DynamicPromptInvocation = {
       id: DYNAMIC_PROMPT,
       type: 'dynamic_prompt',
-      max_prompts: maxPrompts,
+      max_prompts: combinatorial ? maxPrompts : iterations,
       combinatorial,
       prompt: positivePrompt,
     };
diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamIterations.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamIterations.tsx
index 8dce097d82..a8cdabc8c9 100644
--- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamIterations.tsx
+++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamIterations.tsx
@@ -16,7 +16,8 @@ const selector = createSelector([stateSelector], (state) => {
     state.config.sd.iterations;
   const { iterations } = state.generation;
   const { shouldUseSliders } = state.ui;
-  const isDisabled = state.dynamicPrompts.isEnabled;
+  const isDisabled =
+    state.dynamicPrompts.isEnabled && state.dynamicPrompts.combinatorial;
 
   const step = state.hotkeys.shift ? fineStep : coarseStep;