Enable durable configuration path for python v2 (#4688)

Author: MicroFish91

src/commands/createFunction/FunctionListStep.ts

@@ -18,7 +18,7 @@ import { getWorkspaceSetting, updateWorkspaceSetting } from '../../vsCodeConfig/
 import { FunctionSubWizard } from './FunctionSubWizard';
 import { type IFunctionWizardContext } from './IFunctionWizardContext';
 import { JobsListStep } from './JobsListStep';
-import { DurableStorageTypePromptStep } from './durableSteps/DurableStorageTypePromptStep';
+import { DurableStorageTypeListStep } from './durableSteps/DurableStorageTypePromptStep';
 
 export class FunctionListStep extends AzureWizardPromptStep<IFunctionWizardContext> {
     public hideStepCount: boolean = true;
@@ -66,17 +66,20 @@ export class FunctionListStep extends AzureWizardPromptStep<IFunctionWizardConte
     }
 
     public async getSubWizard(context: IFunctionWizardContext): Promise<IWizardOptions<IFunctionWizardContext> | undefined> {
+        const requiresDurableStorageSetup: boolean = durableUtils.requiresDurableStorageSetup(context);
+
         if (context.functionTemplate?.templateSchemaVersion === TemplateSchemaVersion.v2) {
-            return { promptSteps: [new JobsListStep(this._isProjectWizard)] };
+            return requiresDurableStorageSetup ?
+                { promptSteps: [new DurableStorageTypeListStep(), new JobsListStep(this._isProjectWizard)] } :
+                { promptSteps: [new JobsListStep(this._isProjectWizard)] };
         }
 
-        const requiresDurableStorageSetup: boolean = durableUtils.requiresDurableStorageSetup(context);
+        const { promptSteps = [], executeSteps = [] } = await FunctionSubWizard.createSubWizard(context, this._functionSettings, this._isProjectWizard) ?? { promptSteps: [], executeSteps: [] };
         if (requiresDurableStorageSetup) {
-            return { promptSteps: [new DurableStorageTypePromptStep()] };
-        } else {
-            return await FunctionSubWizard.createSubWizard(context, this._functionSettings, this._isProjectWizard);
+            promptSteps.unshift(new DurableStorageTypeListStep());
         }
 
+        return { promptSteps, executeSteps };
     }
 
     public async prompt(context: IFunctionWizardContext): Promise<void> {

src/commands/createFunction/FunctionSubWizard.ts

@@ -19,7 +19,6 @@ import { BallerinaFunctionNameStep } from './ballerinaSteps/BallerinaFunctionNam
 import { DotnetFunctionCreateStep } from './dotnetSteps/DotnetFunctionCreateStep';
 import { DotnetFunctionNameStep } from './dotnetSteps/DotnetFunctionNameStep';
 import { DotnetNamespaceStep } from './dotnetSteps/DotnetNamespaceStep';
-import { DurableProjectConfigureStep } from './durableSteps/DurableProjectConfigureStep';
 import { JavaFunctionCreateStep } from './javaSteps/JavaFunctionCreateStep';
 import { JavaFunctionNameStep } from './javaSteps/JavaFunctionNameStep';
 import { OpenAPICreateStep } from './openAPISteps/OpenAPICreateStep';
@@ -98,10 +97,6 @@ export class FunctionSubWizard {
                 }
             }
 
-            if (context.newDurableStorageType) {
-                executeSteps.push(new DurableProjectConfigureStep());
-            }
-
             const title: string = localize('createFunction', 'Create new {0}', template.name);
             return { promptSteps, executeSteps, title };
         } else if (context.generateFromOpenAPI) {

src/commands/createFunction/durableSteps/DurableStorageTypePromptStep.ts

@@ -7,17 +7,10 @@ import { AzureWizardPromptStep, openUrl, type IAzureQuickPickItem, type IWizardO
 import { DurableBackend } from "../../../constants";
 import { defaultDescription, previewDescription } from "../../../constants-nls";
 import { localize } from "../../../localize";
-import { FunctionSubWizard } from "../FunctionSubWizard";
 import { type IFunctionWizardContext } from "../IFunctionWizardContext";
+import { DurableProjectConfigureStep } from "./DurableProjectConfigureStep";
 
-export class DurableStorageTypePromptStep<T extends IFunctionWizardContext> extends AzureWizardPromptStep<T> {
-    private readonly _functionSettings: { [key: string]: string | undefined };
-
-    public constructor(functionSettings?: { [key: string]: string | undefined }) {
-        super();
-        this._functionSettings = functionSettings || {};
-    }
-
+export class DurableStorageTypeListStep<T extends IFunctionWizardContext> extends AzureWizardPromptStep<T> {
     public async prompt(context: T): Promise<void> {
         const durableStorageInfo: string = localize('durableStorageInfo', '$(link-external)  Learn more about the tradeoffs between storage providers');
 
@@ -45,7 +38,7 @@ export class DurableStorageTypePromptStep<T extends IFunctionWizardContext> exte
         return !context.hasDurableStorage && !context.newDurableStorageType;
     }
 
-    public async getSubWizard(context: T): Promise<IWizardOptions<T> | undefined> {
-        return await FunctionSubWizard.createSubWizard(context, this._functionSettings);
+    public async getSubWizard(): Promise<IWizardOptions<T> | undefined> {
+        return { executeSteps: [new DurableProjectConfigureStep()] };
     }
 }