From 6712f3d4d0db72ea105a4e71b78c65a21740b212 Mon Sep 17 00:00:00 2001 From: Bruno Vieira Date: Sun, 21 Jan 2024 14:32:00 -0300 Subject: [PATCH] read new setting and use default for packaging --- src/handler/SpecifyPackagingStep.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/handler/SpecifyPackagingStep.ts b/src/handler/SpecifyPackagingStep.ts index 59711a8..7283c24 100644 --- a/src/handler/SpecifyPackagingStep.ts +++ b/src/handler/SpecifyPackagingStep.ts @@ -4,7 +4,7 @@ import { workspace } from "vscode"; import { instrumentOperationStep } from "vscode-extension-telemetry-wrapper"; import { serviceManager } from "../model"; -import { MatadataType, Packaging } from "../model/Metadata"; +import { MetadataType, Packaging } from "../model/Metadata"; import { IPickMetadata, IProjectMetadata, IStep } from "./HandlerInterfaces"; import { SpecifyJavaVersionStep } from "./SpecifyJavaVersionStep"; import { createPickBox } from "./utils"; @@ -30,17 +30,27 @@ export class SpecifyPackagingStep implements IStep { private async specifyPackaging(projectMetadata: IProjectMetadata): Promise { const packaging: string = projectMetadata.defaults.packaging || workspace.getConfiguration("spring.initializr").get("defaultPackaging"); + if (packaging) { projectMetadata.packaging = packaging && packaging.toLowerCase(); return true; } + + const items = await serviceManager.getItems(projectMetadata.serviceUrl, MetadataType.PACKAGING); + + if (projectMetadata.enableSmartDefaults === true) { + projectMetadata.packaging = items.find(x => x.default === true)?.label?.toLowerCase(); + return true; + } + const pickMetaData: IPickMetadata = { metadata: projectMetadata, title: "Spring Initializr: Specify packaging type", pickStep: SpecifyPackagingStep.getInstance(), placeholder: "Specify packaging type.", - items: serviceManager.getItems(projectMetadata.serviceUrl, MatadataType.PACKAGING), + items: items }; + return await createPickBox(pickMetaData); } }