@microsoft/teamsfx-core 1.2.0-rc.1 → 1.2.2-alpha.7b2fe9ea.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/armInterface.d.ts +0 -20
- package/build/common/armInterface.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.d.ts +1 -0
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/depsManager.d.ts +2 -1
- package/build/common/deps-checker/depsManager.d.ts.map +1 -1
- package/build/common/deps-checker/depsManager.js +12 -7
- package/build/common/deps-checker/depsManager.js.map +1 -1
- package/build/common/deps-checker/index.d.ts +1 -0
- package/build/common/deps-checker/index.d.ts.map +1 -1
- package/build/common/deps-checker/index.js +1 -0
- package/build/common/deps-checker/index.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +2 -1
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +2 -1
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.d.ts +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.js +2 -4
- package/build/common/deps-checker/internal/ngrokChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts +1 -0
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +9 -1
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/util/extensionInstaller.d.ts +3 -0
- package/build/common/deps-checker/util/extensionInstaller.d.ts.map +1 -0
- package/build/common/deps-checker/util/extensionInstaller.js +47 -0
- package/build/common/deps-checker/util/extensionInstaller.js.map +1 -0
- package/build/common/deps-checker/util/index.d.ts +5 -0
- package/build/common/deps-checker/util/index.d.ts.map +1 -0
- package/build/common/deps-checker/util/index.js +10 -0
- package/build/common/deps-checker/util/index.js.map +1 -0
- package/build/common/index.d.ts +1 -3
- package/build/common/index.d.ts.map +1 -1
- package/build/common/index.js +1 -3
- package/build/common/index.js.map +1 -1
- package/build/common/local/constants.d.ts +5 -0
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +7 -1
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/index.d.ts +5 -0
- package/build/common/local/index.d.ts.map +1 -0
- package/build/common/local/index.js +10 -0
- package/build/common/local/index.js.map +1 -0
- package/build/{plugins/solution/fx-solution/debug/util/certificate.d.ts → common/local/localCertificateManager.d.ts} +4 -6
- package/build/common/local/localCertificateManager.d.ts.map +1 -0
- package/build/{plugins/solution/fx-solution/debug/util/certificate.js → common/local/localCertificateManager.js} +37 -47
- package/build/common/local/localCertificateManager.js.map +1 -0
- package/build/common/local/localEnvManager.d.ts +6 -2
- package/build/common/local/localEnvManager.d.ts.map +1 -1
- package/build/common/local/localEnvManager.js +41 -1
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/{plugins/solution/fx-solution/debug/util → common/local}/process.d.ts +0 -0
- package/build/common/local/process.d.ts.map +1 -0
- package/build/{plugins/solution/fx-solution/debug/util → common/local}/process.js +0 -0
- package/build/common/local/process.js.map +1 -0
- package/build/common/local/projectSettingsHelper.d.ts +5 -5
- package/build/common/local/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/local/projectSettingsHelper.js +28 -21
- package/build/common/local/projectSettingsHelper.js.map +1 -1
- package/build/common/local/taskDefinition.d.ts +1 -1
- package/build/common/local/taskDefinition.d.ts.map +1 -1
- package/build/common/local/taskDefinition.js +6 -4
- package/build/common/local/taskDefinition.js.map +1 -1
- package/build/common/localSettingsConstants.d.ts +1 -0
- package/build/common/localSettingsConstants.d.ts.map +1 -1
- package/build/common/localSettingsConstants.js +1 -0
- package/build/common/localSettingsConstants.js.map +1 -1
- package/build/common/localSettingsProvider.d.ts.map +1 -1
- package/build/common/localSettingsProvider.js +1 -0
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/common/permissionInterface.d.ts +2 -0
- package/build/common/permissionInterface.d.ts.map +1 -1
- package/build/common/permissionInterface.js +2 -0
- package/build/common/permissionInterface.js.map +1 -1
- package/build/common/samples-config.json +24 -12
- package/build/common/samples.d.ts +1 -0
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +1 -0
- package/build/common/samples.js.map +1 -1
- package/build/common/telemetry.d.ts +7 -2
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +10 -4
- package/build/common/telemetry.js.map +1 -1
- package/build/common/{templates.d.ts → template-utils/templates.d.ts} +0 -0
- package/build/common/template-utils/templates.d.ts.map +1 -0
- package/build/common/{templates.js → template-utils/templates.js} +1 -1
- package/build/common/template-utils/templates.js.map +1 -0
- package/build/common/{templatesActions.d.ts → template-utils/templatesActions.d.ts} +0 -0
- package/build/common/template-utils/templatesActions.d.ts.map +1 -0
- package/build/common/{templatesActions.js → template-utils/templatesActions.js} +3 -3
- package/build/common/template-utils/templatesActions.js.map +1 -0
- package/build/common/{templatesUtils.d.ts → template-utils/templatesUtils.d.ts} +0 -0
- package/build/common/template-utils/templatesUtils.d.ts.map +1 -0
- package/build/common/{templatesUtils.js → template-utils/templatesUtils.js} +1 -1
- package/build/common/template-utils/templatesUtils.js.map +1 -0
- package/build/common/tools.d.ts +1 -4
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +41 -12
- package/build/common/tools.js.map +1 -1
- package/build/core/index.d.ts +2 -2
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +14 -6
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/index.d.ts +0 -1
- package/build/core/middleware/index.d.ts.map +1 -1
- package/build/core/middleware/index.js +0 -1
- package/build/core/middleware/index.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +1 -11
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/permissionRequest.js +2 -2
- package/build/core/permissionRequest.js.map +1 -1
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +7 -4
- package/build/core/question.js.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.d.ts +2 -2
- package/build/plugins/resource/aad/aadAppClient.d.ts.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.js +3 -4
- package/build/plugins/resource/aad/aadAppClient.js.map +1 -1
- package/build/plugins/resource/aad/errors.d.ts.map +1 -1
- package/build/plugins/resource/aad/errors.js +1 -2
- package/build/plugins/resource/aad/errors.js.map +1 -1
- package/build/plugins/resource/aad/interfaces/IAADDefinition.d.ts +4 -0
- package/build/plugins/resource/aad/interfaces/IAADDefinition.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +33 -46
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/common.d.ts +2 -0
- package/build/plugins/resource/aad/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/common.js +14 -14
- package/build/plugins/resource/aad/utils/common.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts +1 -0
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +20 -38
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts +2 -2
- package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/v2/index.js +2 -1
- package/build/plugins/resource/aad/v2/index.js.map +1 -1
- package/build/plugins/resource/apim/error.d.ts.map +1 -1
- package/build/plugins/resource/apim/error.js +1 -4
- package/build/plugins/resource/apim/error.js.map +1 -1
- package/build/plugins/resource/apim/managers/apimManager.d.ts.map +1 -1
- package/build/plugins/resource/apim/managers/apimManager.js +23 -62
- package/build/plugins/resource/apim/managers/apimManager.js.map +1 -1
- package/build/plugins/resource/apim/managers/questionManager.d.ts.map +1 -1
- package/build/plugins/resource/apim/managers/questionManager.js +0 -7
- package/build/plugins/resource/apim/managers/questionManager.js.map +1 -1
- package/build/plugins/resource/apim/questions/vscodeQuestion.d.ts.map +1 -1
- package/build/plugins/resource/apim/questions/vscodeQuestion.js +6 -13
- package/build/plugins/resource/apim/questions/vscodeQuestion.js.map +1 -1
- package/build/plugins/resource/apim/v2/index.d.ts +2 -2
- package/build/plugins/resource/apim/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/apim/v2/index.js +2 -1
- package/build/plugins/resource/apim/v2/index.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +3 -2
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +12 -11
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts +2 -36
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +1 -31
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +16 -8
- package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +1 -0
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +14 -1
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.d.ts +2 -2
- package/build/plugins/resource/appstudio/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.js +2 -1
- package/build/plugins/resource/appstudio/v2/index.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts +1 -3
- package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +28 -16
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/bot/configs/provisionConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/provisionConfig.js +0 -10
- package/build/plugins/resource/bot/configs/provisionConfig.js.map +1 -1
- package/build/plugins/resource/bot/languageStrategy.d.ts +1 -1
- package/build/plugins/resource/bot/languageStrategy.d.ts.map +1 -1
- package/build/plugins/resource/bot/languageStrategy.js +1 -1
- package/build/plugins/resource/bot/languageStrategy.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +16 -135
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts +2 -2
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +2 -1
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/configs.d.ts +1 -1
- package/build/plugins/resource/frontend/configs.d.ts.map +1 -1
- package/build/plugins/resource/frontend/configs.js +3 -9
- package/build/plugins/resource/frontend/configs.js.map +1 -1
- package/build/plugins/resource/frontend/constants.d.ts +2 -8
- package/build/plugins/resource/frontend/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/constants.js +3 -11
- package/build/plugins/resource/frontend/constants.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/constants.d.ts +52 -0
- package/build/plugins/resource/frontend/dotnet/constants.d.ts.map +1 -0
- package/build/plugins/resource/frontend/dotnet/constants.js +69 -0
- package/build/plugins/resource/frontend/dotnet/constants.js.map +1 -0
- package/build/plugins/resource/frontend/{blazor → dotnet}/enum.d.ts +1 -1
- package/build/plugins/resource/frontend/{blazor → dotnet}/enum.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/enum.js +39 -0
- package/build/plugins/resource/frontend/{blazor → dotnet}/enum.js.map +1 -1
- package/build/plugins/resource/frontend/{blazor → dotnet}/error-factory.d.ts +0 -0
- package/build/plugins/resource/frontend/{blazor → dotnet}/error-factory.d.ts.map +1 -1
- package/build/plugins/resource/frontend/{blazor → dotnet}/error-factory.js +3 -3
- package/build/plugins/resource/frontend/{blazor → dotnet}/error-factory.js.map +1 -1
- package/build/plugins/resource/frontend/{blazor → dotnet}/ops/deploy.d.ts +0 -0
- package/build/plugins/resource/frontend/{blazor → dotnet}/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/frontend/{blazor → dotnet}/ops/deploy.js +3 -3
- package/build/plugins/resource/frontend/{blazor → dotnet}/ops/deploy.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts +34 -0
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts.map +1 -0
- package/build/plugins/resource/frontend/dotnet/plugin.js +124 -0
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -0
- package/build/plugins/resource/frontend/dotnet/resources/errors.d.ts +35 -0
- package/build/plugins/resource/frontend/dotnet/resources/errors.d.ts.map +1 -0
- package/build/plugins/resource/frontend/{blazor → dotnet}/resources/errors.js +10 -22
- package/build/plugins/resource/frontend/dotnet/resources/errors.js.map +1 -0
- package/build/plugins/resource/frontend/{blazor → dotnet}/resources/messages.d.ts +0 -4
- package/build/plugins/resource/frontend/dotnet/resources/messages.d.ts.map +1 -0
- package/build/plugins/resource/frontend/{blazor → dotnet}/resources/messages.js +0 -4
- package/build/plugins/resource/frontend/dotnet/resources/messages.js.map +1 -0
- package/build/plugins/resource/frontend/dotnet/utils/azure-client.d.ts +6 -0
- package/build/plugins/resource/frontend/dotnet/utils/azure-client.d.ts.map +1 -0
- package/build/plugins/resource/frontend/dotnet/utils/azure-client.js +11 -0
- package/build/plugins/resource/frontend/dotnet/utils/azure-client.js.map +1 -0
- package/build/plugins/resource/frontend/index.d.ts +6 -3
- package/build/plugins/resource/frontend/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/index.js +27 -45
- package/build/plugins/resource/frontend/index.js.map +1 -1
- package/build/plugins/resource/frontend/interface.d.ts +13 -0
- package/build/plugins/resource/frontend/interface.d.ts.map +1 -0
- package/build/plugins/resource/frontend/interface.js +3 -0
- package/build/plugins/resource/frontend/interface.js.map +1 -0
- package/build/plugins/resource/frontend/ops/deploy.d.ts +3 -0
- package/build/plugins/resource/frontend/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.js +43 -0
- package/build/plugins/resource/frontend/ops/deploy.js.map +1 -1
- package/build/plugins/resource/frontend/ops/scaffold.d.ts.map +1 -1
- package/build/plugins/resource/frontend/ops/scaffold.js +1 -1
- package/build/plugins/resource/frontend/ops/scaffold.js.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts +3 -3
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +14 -46
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.d.ts +23 -20
- package/build/plugins/resource/frontend/resources/errors.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.js +31 -67
- package/build/plugins/resource/frontend/resources/errors.js.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
- package/build/plugins/resource/frontend/utils/logger.d.ts +3 -1
- package/build/plugins/resource/frontend/utils/logger.d.ts.map +1 -1
- package/build/plugins/resource/frontend/utils/logger.js +9 -6
- package/build/plugins/resource/frontend/utils/logger.js.map +1 -1
- package/build/plugins/resource/frontend/utils/progress-helper.d.ts +0 -8
- package/build/plugins/resource/frontend/utils/progress-helper.d.ts.map +1 -1
- package/build/plugins/resource/frontend/utils/progress-helper.js +1 -19
- package/build/plugins/resource/frontend/utils/progress-helper.js.map +1 -1
- package/build/plugins/resource/frontend/v2/index.d.ts +3 -2
- package/build/plugins/resource/frontend/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v2/index.js +5 -1
- package/build/plugins/resource/frontend/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/v3/AzureStoragePlugin.d.ts +15 -0
- package/build/plugins/resource/frontend/v3/AzureStoragePlugin.d.ts.map +1 -0
- package/build/plugins/resource/frontend/v3/AzureStoragePlugin.js +149 -0
- package/build/plugins/resource/frontend/v3/AzureStoragePlugin.js.map +1 -0
- package/build/plugins/resource/frontend/v3/ReactTabScaffoldPlugin.d.ts +8 -0
- package/build/plugins/resource/frontend/v3/ReactTabScaffoldPlugin.d.ts.map +1 -0
- package/build/plugins/resource/frontend/v3/ReactTabScaffoldPlugin.js +95 -0
- package/build/plugins/resource/frontend/v3/ReactTabScaffoldPlugin.js.map +1 -0
- package/build/plugins/resource/frontend/v3/error.d.ts +23 -0
- package/build/plugins/resource/frontend/v3/error.d.ts.map +1 -0
- package/build/plugins/resource/frontend/v3/error.js +66 -0
- package/build/plugins/resource/frontend/v3/error.js.map +1 -0
- package/build/plugins/resource/frontend/v3/index.d.ts +3 -0
- package/build/plugins/resource/frontend/v3/index.d.ts.map +1 -0
- package/build/plugins/resource/frontend/v3/index.js +7 -0
- package/build/plugins/resource/frontend/v3/index.js.map +1 -0
- package/build/plugins/resource/function/index.d.ts +1 -1
- package/build/plugins/resource/function/index.d.ts.map +1 -1
- package/build/plugins/resource/function/index.js +8 -21
- package/build/plugins/resource/function/index.js.map +1 -1
- package/build/plugins/resource/function/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/function/ops/deploy.js +8 -9
- package/build/plugins/resource/function/ops/deploy.js.map +1 -1
- package/build/plugins/resource/function/ops/scaffold.js +1 -1
- package/build/plugins/resource/function/ops/scaffold.js.map +1 -1
- package/build/plugins/resource/function/plugin.d.ts.map +1 -1
- package/build/plugins/resource/function/plugin.js +35 -138
- package/build/plugins/resource/function/plugin.js.map +1 -1
- package/build/plugins/resource/function/resources/message.d.ts +0 -1
- package/build/plugins/resource/function/resources/message.d.ts.map +1 -1
- package/build/plugins/resource/function/resources/message.js +0 -1
- package/build/plugins/resource/function/resources/message.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/funcHelper.d.ts +11 -0
- package/build/plugins/resource/function/utils/depsChecker/funcHelper.d.ts.map +1 -0
- package/build/plugins/resource/function/utils/depsChecker/funcHelper.js +48 -0
- package/build/plugins/resource/function/utils/depsChecker/funcHelper.js.map +1 -0
- package/build/plugins/resource/function/utils/depsChecker/funcPluginLogger.d.ts +6 -4
- package/build/plugins/resource/function/utils/depsChecker/funcPluginLogger.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginLogger.js +15 -8
- package/build/plugins/resource/function/utils/depsChecker/funcPluginLogger.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginTelemetry.d.ts +4 -3
- package/build/plugins/resource/function/utils/depsChecker/funcPluginTelemetry.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginTelemetry.js +5 -4
- package/build/plugins/resource/function/utils/depsChecker/funcPluginTelemetry.js.map +1 -1
- package/build/plugins/resource/function/utils/telemetry-helper.d.ts +1 -1
- package/build/plugins/resource/function/utils/telemetry-helper.d.ts.map +1 -1
- package/build/plugins/resource/function/v2/index.d.ts +2 -2
- package/build/plugins/resource/function/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/function/v2/index.js +2 -1
- package/build/plugins/resource/function/v2/index.js.map +1 -1
- package/build/plugins/resource/identity/index.d.ts +0 -1
- package/build/plugins/resource/identity/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/index.js +3 -22
- package/build/plugins/resource/identity/index.js.map +1 -1
- package/build/plugins/resource/identity/v2/index.d.ts +2 -2
- package/build/plugins/resource/identity/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/v2/index.js +2 -1
- package/build/plugins/resource/identity/v2/index.js.map +1 -1
- package/build/plugins/resource/keyvault/plugin.d.ts.map +1 -1
- package/build/plugins/resource/keyvault/plugin.js +1 -2
- package/build/plugins/resource/keyvault/plugin.js.map +1 -1
- package/build/plugins/resource/keyvault/v2/index.d.ts +2 -2
- package/build/plugins/resource/keyvault/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/keyvault/v2/index.js +2 -1
- package/build/plugins/resource/keyvault/v2/index.js.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts +2 -2
- package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.js +2 -1
- package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/index.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/index.js +1 -6
- package/build/plugins/resource/simpleauth/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.js +2 -7
- package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
- package/build/plugins/resource/simpleauth/v2/index.d.ts +2 -2
- package/build/plugins/resource/simpleauth/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/v2/index.js +2 -1
- package/build/plugins/resource/simpleauth/v2/index.js.map +1 -1
- package/build/plugins/resource/spfx/plugin.d.ts.map +1 -1
- package/build/plugins/resource/spfx/plugin.js +14 -9
- package/build/plugins/resource/spfx/plugin.js.map +1 -1
- package/build/plugins/resource/spfx/utils/constants.d.ts +5 -4
- package/build/plugins/resource/spfx/utils/constants.d.ts.map +1 -1
- package/build/plugins/resource/spfx/utils/constants.js +5 -4
- package/build/plugins/resource/spfx/utils/constants.js.map +1 -1
- package/build/plugins/resource/spfx/utils/progress-helper.d.ts.map +1 -1
- package/build/plugins/resource/spfx/utils/progress-helper.js +1 -1
- package/build/plugins/resource/spfx/utils/progress-helper.js.map +1 -1
- package/build/plugins/resource/spfx/v2/index.d.ts +2 -2
- package/build/plugins/resource/spfx/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/spfx/v2/index.js +2 -1
- package/build/plugins/resource/spfx/v2/index.js.map +1 -1
- package/build/plugins/resource/sql/config.d.ts +1 -0
- package/build/plugins/resource/sql/config.d.ts.map +1 -1
- package/build/plugins/resource/sql/config.js +1 -0
- package/build/plugins/resource/sql/config.js.map +1 -1
- package/build/plugins/resource/sql/constants.d.ts +3 -0
- package/build/plugins/resource/sql/constants.d.ts.map +1 -1
- package/build/plugins/resource/sql/constants.js +3 -0
- package/build/plugins/resource/sql/constants.js.map +1 -1
- package/build/plugins/resource/sql/errors.d.ts +1 -1
- package/build/plugins/resource/sql/errors.d.ts.map +1 -1
- package/build/plugins/resource/sql/errors.js +1 -1
- package/build/plugins/resource/sql/errors.js.map +1 -1
- package/build/plugins/resource/sql/index.d.ts.map +1 -1
- package/build/plugins/resource/sql/index.js +10 -10
- package/build/plugins/resource/sql/index.js.map +1 -1
- package/build/plugins/resource/sql/plugin.d.ts +3 -0
- package/build/plugins/resource/sql/plugin.d.ts.map +1 -1
- package/build/plugins/resource/sql/plugin.js +76 -68
- package/build/plugins/resource/sql/plugin.js.map +1 -1
- package/build/plugins/resource/sql/sqlClient.d.ts +2 -2
- package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
- package/build/plugins/resource/sql/sqlClient.js +13 -12
- package/build/plugins/resource/sql/sqlClient.js.map +1 -1
- package/build/plugins/resource/sql/v2/index.d.ts +2 -2
- package/build/plugins/resource/sql/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/sql/v2/index.js +2 -1
- package/build/plugins/resource/sql/v2/index.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts +1 -1
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js +3 -3
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts +3 -3
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +3 -3
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts +9 -2
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +44 -13
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts +4 -3
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.js +11 -10
- package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +1 -0
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +1 -0
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/constants.d.ts +0 -5
- package/build/plugins/solution/fx-solution/debug/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/constants.js +1 -7
- package/build/plugins/solution/fx-solution/debug/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js +2 -2
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts +2 -2
- package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.js +5 -3
- package/build/plugins/solution/fx-solution/debug/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +2 -2
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +32 -22
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +15 -15
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.d.ts +31 -0
- package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.js +222 -0
- package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.js.map +1 -0
- package/build/plugins/solution/fx-solution/v2/adaptor.js +1 -1
- package/build/plugins/solution/fx-solution/v2/adaptor.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.js +1 -2
- package/build/plugins/solution/fx-solution/v2/checkPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.js +1 -3
- package/build/plugins/solution/fx-solution/v2/createEnv.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +196 -122
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js +9 -16
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +84 -99
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/grantPermission.js +1 -2
- package/build/plugins/solution/fx-solution/v2/grantPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js +6 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.js +7 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts +3 -3
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +7 -5
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addModule.d.ts +2 -4
- package/build/plugins/solution/fx-solution/v3/addModule.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addModule.js +29 -6
- package/build/plugins/solution/fx-solution/v3/addModule.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addResource.d.ts +6 -14
- package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addResource.js +23 -51
- package/build/plugins/solution/fx-solution/v3/addResource.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/constants.d.ts +2 -0
- package/build/plugins/solution/fx-solution/v3/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/constants.js +2 -0
- package/build/plugins/solution/fx-solution/v3/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/deploy.d.ts +1 -3
- package/build/plugins/solution/fx-solution/v3/deploy.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/init.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/init.js +9 -0
- package/build/plugins/solution/fx-solution/v3/init.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.d.ts +8 -1
- package/build/plugins/solution/fx-solution/v3/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.js +219 -16
- package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js +96 -1
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/scaffold.d.ts +8 -13
- package/build/plugins/solution/fx-solution/v3/scaffold.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v3/scaffold.js +30 -52
- package/build/plugins/solution/fx-solution/v3/scaffold.js.map +1 -1
- package/build/plugins/solution/spfx-solution/addModule.d.ts +2 -4
- package/build/plugins/solution/spfx-solution/addModule.d.ts.map +1 -1
- package/build/plugins/solution/spfx-solution/addModule.js +1 -1
- package/build/plugins/solution/spfx-solution/addModule.js.map +1 -1
- package/build/plugins/solution/spfx-solution/scaffold.d.ts +2 -10
- package/build/plugins/solution/spfx-solution/scaffold.d.ts.map +1 -1
- package/build/plugins/solution/spfx-solution/scaffold.js +3 -39
- package/build/plugins/solution/spfx-solution/scaffold.js.map +1 -1
- package/build/plugins/solution/spfx-solution/solution.d.ts +12 -17
- package/build/plugins/solution/spfx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/spfx-solution/solution.js +7 -7
- package/build/plugins/solution/spfx-solution/solution.js.map +1 -1
- package/package.json +6 -7
- package/resource/strings.json +23 -8
- package/templates/plugins/resource/apim/bicep/apimConfiguration.bicep +1 -0
- package/templates/plugins/resource/apim/bicep/apimProvision.bicep +7 -5
- package/templates/plugins/resource/apim/bicep/config.template.bicep +1 -0
- package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +12 -12
- package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +15 -11
- package/templates/plugins/resource/bot/bicep/config.template.bicep +2 -0
- package/templates/plugins/resource/bot/bot-msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot-msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/frontend/bicep/frontendHostingProvision.bicep +4 -2
- package/templates/plugins/resource/frontend/bicep/provision.template.bicep +1 -0
- package/templates/plugins/resource/frontend/tab.js.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.ts.default.zip +0 -0
- package/templates/plugins/resource/function/bicep/config.template.bicep +2 -0
- package/templates/plugins/resource/function/bicep/functionConfiguration.template.bicep +15 -15
- package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +17 -14
- package/templates/plugins/resource/function/function-base.js.default.zip +0 -0
- package/templates/plugins/resource/function/function-base.ts.default.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/plugins/resource/identity/bicep/identityProvision.template.bicep +2 -1
- package/templates/plugins/resource/keyvault/bicep/keyVaultProvision.template.bicep +9 -7
- package/templates/plugins/resource/simpleauth/bicep/config.template.bicep +2 -0
- package/templates/plugins/resource/simpleauth/bicep/simpleAuthConfiguration.template.bicep +7 -7
- package/templates/plugins/resource/simpleauth/bicep/simpleAuthProvision.template.bicep +9 -6
- package/templates/plugins/resource/sql/bicep/newDatabase.orchestration.template.bicep +5 -0
- package/templates/plugins/resource/sql/bicep/newDatabaseProvision.template.bicep +15 -0
- package/templates/plugins/resource/sql/bicep/sqlProvision.template.bicep +9 -5
- package/templates/plugins/resource/storage/bicep/azureStorageProvision.bicep +25 -0
- package/templates/plugins/resource/storage/bicep/provision.template.bicep +15 -0
- package/templates/plugins/resource/webapp/bicep/config.template.bicep +10 -0
- package/templates/plugins/resource/webapp/bicep/provision.template.bicep +16 -0
- package/templates/plugins/resource/webapp/bicep/webappConfiguration.template.bicep +74 -0
- package/templates/plugins/resource/webapp/bicep/webappProvision.template.bicep +48 -0
- package/build/common/templates.d.ts.map +0 -1
- package/build/common/templates.js.map +0 -1
- package/build/common/templatesActions.d.ts.map +0 -1
- package/build/common/templatesActions.js.map +0 -1
- package/build/common/templatesUtils.d.ts.map +0 -1
- package/build/common/templatesUtils.js.map +0 -1
- package/build/core/middleware/projectUpgrader.d.ts +0 -6
- package/build/core/middleware/projectUpgrader.d.ts.map +0 -1
- package/build/core/middleware/projectUpgrader.js +0 -224
- package/build/core/middleware/projectUpgrader.js.map +0 -1
- package/build/plugins/resource/frontend/blazor/constants.d.ts +0 -75
- package/build/plugins/resource/frontend/blazor/constants.d.ts.map +0 -1
- package/build/plugins/resource/frontend/blazor/constants.js +0 -98
- package/build/plugins/resource/frontend/blazor/constants.js.map +0 -1
- package/build/plugins/resource/frontend/blazor/enum.js +0 -39
- package/build/plugins/resource/frontend/blazor/ops/provision.d.ts +0 -8
- package/build/plugins/resource/frontend/blazor/ops/provision.d.ts.map +0 -1
- package/build/plugins/resource/frontend/blazor/ops/provision.js +0 -42
- package/build/plugins/resource/frontend/blazor/ops/provision.js.map +0 -1
- package/build/plugins/resource/frontend/blazor/plugin.d.ts +0 -35
- package/build/plugins/resource/frontend/blazor/plugin.d.ts.map +0 -1
- package/build/plugins/resource/frontend/blazor/plugin.js +0 -190
- package/build/plugins/resource/frontend/blazor/plugin.js.map +0 -1
- package/build/plugins/resource/frontend/blazor/resources/errors.d.ts +0 -41
- package/build/plugins/resource/frontend/blazor/resources/errors.d.ts.map +0 -1
- package/build/plugins/resource/frontend/blazor/resources/errors.js.map +0 -1
- package/build/plugins/resource/frontend/blazor/resources/messages.d.ts.map +0 -1
- package/build/plugins/resource/frontend/blazor/resources/messages.js.map +0 -1
- package/build/plugins/resource/frontend/blazor/utils/azure-client.d.ts +0 -21
- package/build/plugins/resource/frontend/blazor/utils/azure-client.d.ts.map +0 -1
- package/build/plugins/resource/frontend/blazor/utils/azure-client.js +0 -47
- package/build/plugins/resource/frontend/blazor/utils/azure-client.js.map +0 -1
- package/build/plugins/resource/frontend/utils/azure-client.d.ts +0 -12
- package/build/plugins/resource/frontend/utils/azure-client.d.ts.map +0 -1
- package/build/plugins/resource/frontend/utils/azure-client.js +0 -29
- package/build/plugins/resource/frontend/utils/azure-client.js.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/backendExtensionsInstall.d.ts +0 -9
- package/build/plugins/resource/function/utils/depsChecker/backendExtensionsInstall.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/backendExtensionsInstall.js +0 -55
- package/build/plugins/resource/function/utils/depsChecker/backendExtensionsInstall.js.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/checker.d.ts +0 -54
- package/build/plugins/resource/function/utils/depsChecker/checker.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/checker.js +0 -104
- package/build/plugins/resource/function/utils/depsChecker/checker.js.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/common.d.ts +0 -84
- package/build/plugins/resource/function/utils/depsChecker/common.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/common.js +0 -136
- package/build/plugins/resource/function/utils/depsChecker/common.js.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/cpUtils.d.ts +0 -22
- package/build/plugins/resource/function/utils/depsChecker/cpUtils.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/cpUtils.js +0 -105
- package/build/plugins/resource/function/utils/depsChecker/cpUtils.js.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.d.ts +0 -53
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.js +0 -387
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.js.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/errors.d.ts +0 -14
- package/build/plugins/resource/function/utils/depsChecker/errors.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/errors.js +0 -41
- package/build/plugins/resource/function/utils/depsChecker/errors.js.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.d.ts +0 -26
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.js +0 -111
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.js.map +0 -1
- package/build/plugins/solution/fx-solution/debug/util/certificate.d.ts.map +0 -1
- package/build/plugins/solution/fx-solution/debug/util/certificate.js.map +0 -1
- package/build/plugins/solution/fx-solution/debug/util/process.d.ts.map +0 -1
- package/build/plugins/solution/fx-solution/debug/util/process.js.map +0 -1
- package/resource/plugins/resource/function/dotnet-install.ps1 +0 -1095
- package/resource/plugins/resource/function/dotnet-install.sh +0 -1222
|
@@ -12,6 +12,8 @@ const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
|
|
|
12
12
|
const utils_1 = require("./utils");
|
|
13
13
|
const __1 = require("../../../..");
|
|
14
14
|
const constants_3 = require("./constants");
|
|
15
|
+
const constants_4 = require("../v3/constants");
|
|
16
|
+
const executeUserTask_1 = require("./executeUserTask");
|
|
15
17
|
async function getQuestionsForScaffolding(ctx, inputs) {
|
|
16
18
|
const node = new teamsfx_api_1.QTreeNode({
|
|
17
19
|
name: "azure-solution-group",
|
|
@@ -167,7 +169,7 @@ async function getQuestions(ctx, inputs, envInfo, tokenProvider) {
|
|
|
167
169
|
}
|
|
168
170
|
let plugins = [];
|
|
169
171
|
if (isDynamicQuestion) {
|
|
170
|
-
plugins = utils_1.getSelectedPlugins(
|
|
172
|
+
plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
171
173
|
}
|
|
172
174
|
else {
|
|
173
175
|
plugins = ResourcePluginContainer_1.getAllV2ResourcePlugins();
|
|
@@ -195,7 +197,7 @@ async function getQuestions(ctx, inputs, envInfo, tokenProvider) {
|
|
|
195
197
|
}
|
|
196
198
|
let plugins = [];
|
|
197
199
|
if (isDynamicQuestion) {
|
|
198
|
-
plugins = utils_1.getSelectedPlugins(
|
|
200
|
+
plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
199
201
|
}
|
|
200
202
|
else {
|
|
201
203
|
plugins = ResourcePluginContainer_1.getAllV2ResourcePlugins();
|
|
@@ -245,7 +247,7 @@ async function getQuestions(ctx, inputs, envInfo, tokenProvider) {
|
|
|
245
247
|
}
|
|
246
248
|
let plugins = [];
|
|
247
249
|
if (isDynamicQuestion) {
|
|
248
|
-
plugins = utils_1.getSelectedPlugins(
|
|
250
|
+
plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
249
251
|
}
|
|
250
252
|
else {
|
|
251
253
|
plugins = ResourcePluginContainer_1.getAllV2ResourcePlugins();
|
|
@@ -264,7 +266,10 @@ async function getQuestions(ctx, inputs, envInfo, tokenProvider) {
|
|
|
264
266
|
}
|
|
265
267
|
}
|
|
266
268
|
else if (stage === teamsfx_api_1.Stage.grantPermission) {
|
|
267
|
-
|
|
269
|
+
if (isDynamicQuestion) {
|
|
270
|
+
const jsonObject = await tokenProvider.appStudioToken.getJsonObject();
|
|
271
|
+
node.addChild(new teamsfx_api_1.QTreeNode(question_1.getUserEmailQuestion(jsonObject.upn)));
|
|
272
|
+
}
|
|
268
273
|
}
|
|
269
274
|
return teamsfx_api_1.ok(node);
|
|
270
275
|
}
|
|
@@ -292,116 +297,96 @@ exports.getQuestionsForUserTask = getQuestionsForUserTask;
|
|
|
292
297
|
async function getQuestionsForAddCapability(ctx, inputs) {
|
|
293
298
|
var _a;
|
|
294
299
|
const settings = ctx.projectSetting.solutionSettings;
|
|
300
|
+
const addCapQuestion = {
|
|
301
|
+
name: question_1.AzureSolutionQuestionNames.Capabilities,
|
|
302
|
+
title: "Choose capabilities",
|
|
303
|
+
type: "multiSelect",
|
|
304
|
+
staticOptions: [],
|
|
305
|
+
default: [],
|
|
306
|
+
};
|
|
295
307
|
const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(inputs.platform);
|
|
296
|
-
if (!
|
|
297
|
-
|
|
308
|
+
if (!isDynamicQuestion) {
|
|
309
|
+
// For CLI_HELP
|
|
310
|
+
addCapQuestion.staticOptions = [question_1.TabOptionItem, question_1.BotOptionItem, question_1.MessageExtensionItem];
|
|
311
|
+
return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(addCapQuestion));
|
|
298
312
|
}
|
|
299
|
-
const
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
if (alreadyHaveBotOrMe && alreadyHaveTab) {
|
|
303
|
-
const cannotAddCapWarnMsg = "Your App already has both Tab and Bot/Messaging extension, can not Add Capability.";
|
|
304
|
-
(_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.showMessage("error", cannotAddCapWarnMsg, false);
|
|
305
|
-
return teamsfx_api_1.ok(undefined);
|
|
313
|
+
const canProceed = executeUserTask_1.canAddCapability(settings, ctx.telemetryReporter);
|
|
314
|
+
if (canProceed.isErr()) {
|
|
315
|
+
return teamsfx_api_1.err(canProceed.error);
|
|
306
316
|
}
|
|
307
|
-
const
|
|
308
|
-
const
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
tabNode.condition = { contains: question_1.TabOptionItem.id };
|
|
317
|
-
addCapNode.addChild(tabNode);
|
|
318
|
-
}
|
|
317
|
+
const appStudioPlugin = typedi_1.default.get(constants_4.BuiltInResourcePluginNames.appStudio);
|
|
318
|
+
const tabExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "staticTab");
|
|
319
|
+
if (tabExceedRes.isErr()) {
|
|
320
|
+
return teamsfx_api_1.err(tabExceedRes.error);
|
|
321
|
+
}
|
|
322
|
+
const isTabAddable = !tabExceedRes.value;
|
|
323
|
+
const botExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "Bot");
|
|
324
|
+
if (botExceedRes.isErr()) {
|
|
325
|
+
return teamsfx_api_1.err(botExceedRes.error);
|
|
319
326
|
}
|
|
320
|
-
|
|
321
|
-
|
|
327
|
+
const isBotAddable = !botExceedRes.value;
|
|
328
|
+
const meExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "MessageExtension");
|
|
329
|
+
if (meExceedRes.isErr()) {
|
|
330
|
+
return teamsfx_api_1.err(meExceedRes.error);
|
|
331
|
+
}
|
|
332
|
+
const isMEAddable = !meExceedRes.value;
|
|
333
|
+
if (!(isTabAddable || isBotAddable || isMEAddable)) {
|
|
334
|
+
(_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.showMessage("error", tools_1.getStrings().solution.addCapability.ExceedMaxLimit, false);
|
|
335
|
+
return teamsfx_api_1.ok(undefined);
|
|
336
|
+
}
|
|
337
|
+
const options = [];
|
|
338
|
+
if (isTabAddable)
|
|
339
|
+
options.push(question_1.TabOptionItem);
|
|
340
|
+
if (isBotAddable)
|
|
341
|
+
options.push(question_1.BotOptionItem);
|
|
342
|
+
if (isMEAddable)
|
|
343
|
+
options.push(question_1.MessageExtensionItem);
|
|
344
|
+
addCapQuestion.staticOptions = options;
|
|
345
|
+
return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(addCapQuestion));
|
|
322
346
|
}
|
|
323
347
|
exports.getQuestionsForAddCapability = getQuestionsForAddCapability;
|
|
324
348
|
async function getQuestionsForAddResource(ctx, inputs, func, envInfo, tokenProvider) {
|
|
325
349
|
const settings = ctx.projectSetting.solutionSettings;
|
|
326
350
|
const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(inputs.platform);
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
settings.capabilities.includes(question_1.TabOptionItem.id))) {
|
|
331
|
-
return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.AddResourceNotSupport, "Add resource is only supported for Tab app hosted in Azure.", constants_2.SolutionSource));
|
|
351
|
+
let addQuestion;
|
|
352
|
+
if (!isDynamicQuestion) {
|
|
353
|
+
addQuestion = question_1.createAddAzureResourceQuestion(false, false, false, false);
|
|
332
354
|
}
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
355
|
+
else {
|
|
356
|
+
const alreadyHaveFunction = settings.azureResources.includes(question_1.AzureResourceFunction.id);
|
|
357
|
+
const alreadyHaveSQL = settings.azureResources.includes(question_1.AzureResourceSQL.id);
|
|
358
|
+
const alreadyHaveAPIM = settings.azureResources.includes(question_1.AzureResourceApim.id);
|
|
359
|
+
const alreadyHaveKeyVault = settings.azureResources.includes(question_1.AzureResourceKeyVault.id);
|
|
360
|
+
addQuestion = question_1.createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM, alreadyHaveKeyVault);
|
|
361
|
+
const canProceed = executeUserTask_1.canAddResource(ctx.projectSetting, ctx.telemetryReporter);
|
|
362
|
+
if (canProceed.isErr()) {
|
|
363
|
+
return teamsfx_api_1.err(canProceed.error);
|
|
364
|
+
}
|
|
336
365
|
}
|
|
337
|
-
const functionPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin);
|
|
338
|
-
const sqlPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin);
|
|
339
|
-
const apimPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin);
|
|
340
|
-
const keyVaultPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin);
|
|
341
|
-
const alreadyHaveFunction = selectedPlugins.includes(functionPlugin.name);
|
|
342
|
-
const alreadyHaveSQL = selectedPlugins.includes(sqlPlugin.name);
|
|
343
|
-
const alreadyHaveAPIM = selectedPlugins.includes(apimPlugin.name);
|
|
344
|
-
const alreadyHavekeyVault = selectedPlugins.includes(keyVaultPlugin.name);
|
|
345
|
-
const addQuestion = question_1.createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM, alreadyHavekeyVault);
|
|
346
366
|
const addAzureResourceNode = new teamsfx_api_1.QTreeNode(addQuestion);
|
|
347
|
-
//
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
367
|
+
//traverse plugins' getQuestionsForUserTask
|
|
368
|
+
const pluginsWithResources = [
|
|
369
|
+
[ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin, question_1.AzureResourceFunction.id],
|
|
370
|
+
[ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin, question_1.AzureResourceSQL.id],
|
|
371
|
+
[ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin, question_1.AzureResourceApim.id],
|
|
372
|
+
[ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin, question_1.AzureResourceKeyVault.id],
|
|
373
|
+
];
|
|
374
|
+
for (const pair of pluginsWithResources) {
|
|
375
|
+
const pluginName = pair[0];
|
|
376
|
+
const resourceName = pair[1];
|
|
377
|
+
const plugin = typedi_1.default.get(pluginName);
|
|
378
|
+
if (plugin.getQuestionsForUserTask) {
|
|
379
|
+
const res = await plugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
|
|
380
|
+
if (res.isErr())
|
|
381
|
+
return res;
|
|
382
|
+
if (res.value) {
|
|
383
|
+
const node = res.value;
|
|
384
|
+
node.condition = { contains: resourceName };
|
|
385
|
+
if (node.data)
|
|
386
|
+
addAzureResourceNode.addChild(node);
|
|
363
387
|
}
|
|
364
|
-
if (azure_function.data)
|
|
365
|
-
addAzureResourceNode.addChild(azure_function);
|
|
366
388
|
}
|
|
367
389
|
}
|
|
368
|
-
// //Azure SQL
|
|
369
|
-
// if (sqlPlugin.getQuestionsForUserTask && !alreadyHaveSQL) {
|
|
370
|
-
// const res = await sqlPlugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
|
|
371
|
-
// if (res.isErr()) return res;
|
|
372
|
-
// if (res.value) {
|
|
373
|
-
// const azure_sql = res.value as QTreeNode;
|
|
374
|
-
// azure_sql.condition = { contains: AzureResourceSQL.id };
|
|
375
|
-
// if (azure_sql.data) addAzureResourceNode.addChild(azure_sql);
|
|
376
|
-
// }
|
|
377
|
-
// }
|
|
378
|
-
// //APIM
|
|
379
|
-
// if (apimPlugin.getQuestionsForUserTask && (!alreadyHaveAPIM || !isDynamicQuestion)) {
|
|
380
|
-
// const res = await apimPlugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
|
|
381
|
-
// if (res.isErr()) return res;
|
|
382
|
-
// if (res.value) {
|
|
383
|
-
// const apim = res.value as QTreeNode;
|
|
384
|
-
// if (apim.data.type !== "group" || (apim.children && apim.children.length > 0)) {
|
|
385
|
-
// const groupNode = new QTreeNode({ type: "group" });
|
|
386
|
-
// groupNode.condition = { contains: AzureResourceApim.id };
|
|
387
|
-
// addAzureResourceNode.addChild(groupNode);
|
|
388
|
-
// const funcNode = new QTreeNode(AskSubscriptionQuestion);
|
|
389
|
-
// AskSubscriptionQuestion.func = async (
|
|
390
|
-
// inputs: Inputs
|
|
391
|
-
// ): Promise<Result<SubscriptionInfo, FxError>> => {
|
|
392
|
-
// const res = await checkSubscription(envInfo, tokenProvider.azureAccountProvider);
|
|
393
|
-
// if (res.isOk()) {
|
|
394
|
-
// const sub = res.value;
|
|
395
|
-
// inputs.subscriptionId = sub.subscriptionId;
|
|
396
|
-
// inputs.tenantId = sub.tenantId;
|
|
397
|
-
// }
|
|
398
|
-
// return res;
|
|
399
|
-
// };
|
|
400
|
-
// groupNode.addChild(funcNode);
|
|
401
|
-
// groupNode.addChild(apim);
|
|
402
|
-
// }
|
|
403
|
-
// }
|
|
404
|
-
// }
|
|
405
390
|
return teamsfx_api_1.ok(addAzureResourceNode);
|
|
406
391
|
}
|
|
407
392
|
exports.getQuestionsForAddResource = getQuestionsForAddResource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":";;;;AAAA,wDAmBgC;AAChC,4DAA+B;AAC/B,oDAAsD;AACtD,4DAAyD;AACzD,4CAA6D;AAC7D,0CAgBqB;AACrB,wEAIoC;AACpC,mCAA4F;AAC5F,mCAAmC;AACnC,2CAAqD;AACrD,+CAA6D;AAE7D,uDAAqE;AAE9D,KAAK,UAAU,0BAA0B,CAC9C,GAAe,EACf,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC;QACzB,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE;YACvB,MAAM,CAAC,qCAA0B,CAAC,QAAQ,CAAC,GAAG,kCAAsB,CAAC;QACvE,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,QAAI,EAAE,EAAE;QACX,IAAI,CAAC,SAAS,GAAG;YACf,WAAW,EAAE,CAAC,sBAAW,CAAC,EAAE,EAAE,wBAAa,CAAC,EAAE,EAAE,wBAAa,CAAC,EAAE,EAAE,+BAAoB,CAAC,EAAE,CAAC;SAC3F,CAAC;QACF,iBAAiB;QACjB,MAAM,UAAU,GAAsB,gBAAS,CAAC,GAAG,CACjD,2CAAiB,CAAC,UAAU,CAC7B,CAAC;QACF,IAAI,UAAU,CAAC,0BAA0B,EAAE;YACzC,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrE,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,GAAG,CAAC;YAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;gBACb,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAkB,CAAC;gBACxC,QAAQ,CAAC,SAAS,GAAG;oBACnB,SAAS,EAAE,CAAC,KAAU,EAAE,MAAe,EAAE,EAAE;wBACzC,IAAI,CAAC,MAAM,EAAE;4BACX,OAAO,gBAAgB,CAAC;yBACzB;wBACD,MAAM,GAAG,GAAG,MAAM,CAAC,qCAA0B,CAAC,YAAY,CAAa,CAAC;wBACxE,IAAI,GAAG,CAAC,QAAQ,CAAC,sBAAW,CAAC,EAAE,CAAC,EAAE;4BAChC,OAAO,SAAS,CAAC;yBAClB;wBACD,OAAO,sBAAsB,CAAC;oBAChC,CAAC;iBACF,CAAC;gBACF,IAAI,QAAQ,CAAC,IAAI;oBAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aAC5C;SACF;KACF;SAAM;QACL,IAAI,CAAC,SAAS,GAAG,EAAE,WAAW,EAAE,CAAC,wBAAa,CAAC,EAAE,EAAE,wBAAa,CAAC,EAAE,EAAE,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC;KACjG;IAED,kBAAkB;IAClB,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAC5C,GAAG,EACH,MAAM,EACN,0BAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,yDAAyD;KACjG,CAAC;IACF,IAAI,MAAM,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC;IAClC,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC;QAC7B,OAAO,CAAC,SAAS,GAAG;YAClB,SAAS,EAAE,CAAC,KAAU,EAAE,MAAe,EAAE,EAAE;gBACzC,IAAI,CAAC,MAAM,EAAE;oBACX,OAAO,gBAAgB,CAAC;iBACzB;gBACD,MAAM,GAAG,GAAG,MAAM,CAAC,qCAA0B,CAAC,YAAY,CAAa,CAAC;gBACxE,IAAI,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EAAE;oBAClC,OAAO,SAAS,CAAC;iBAClB;gBACD,OAAO,qBAAqB,CAAC;YAC/B,CAAC;SACF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;KACxB;IAED,UAAU;IACV,MAAM,SAAS,GAAsB,gBAAS,CAAC,GAAG,CAChD,2CAAiB,CAAC,SAAS,CAC5B,CAAC;IACF,IAAI,SAAS,CAAC,0BAA0B,EAAE;QACxC,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACpE,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,GAAG,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAkB,CAAC;YACxC,QAAQ,CAAC,SAAS,GAAG;gBACnB,SAAS,EAAE,CAAC,KAAU,EAAE,MAAe,EAAE,EAAE;oBACzC,IAAI,CAAC,MAAM,EAAE;wBACX,OAAO,gBAAgB,CAAC;qBACzB;oBACD,MAAM,GAAG,GAAG,MAAM,CAAC,qCAA0B,CAAC,YAAY,CAAa,CAAC;oBACxE,IAAI,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE;wBAC3E,OAAO,SAAS,CAAC;qBAClB;oBACD,OAAO,uCAAuC,CAAC;gBACjD,CAAC;aACF,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACzB;KACF;IAED,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AA9FD,gEA8FC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,GAAe,EACf,MAAc,EACd,gBAAyB;IAEzB,MAAM,OAAO,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAEjD,iBAAiB;IACjB,MAAM,YAAY,GAAsB,gBAAS,CAAC,GAAG,CACnD,2CAAiB,CAAC,cAAc,CACjC,CAAC;IACF,IAAI,YAAY,CAAC,0BAA0B,EAAE;QAC3C,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvE,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,GAAG,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,YAAY,GAAG,GAAG,CAAC,KAAkB,CAAC;YAC5C,IAAI,YAAY,CAAC,IAAI;gBAAE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SACvD;KACF;IAED,IAAI,gBAAgB,EAAE;QACpB,MAAM,iBAAiB,GAAG,IAAI,uBAAS,CAAC,iCAAsB,CAAC,CAAC;QAChE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACpC,MAAM,cAAc,GAAsB,gBAAS,CAAC,GAAG,CACrD,2CAAiB,CAAC,cAAc,CACjC,CAAC;QACF,gBAAgB;QAChB,IAAI,cAAc,CAAC,0BAA0B,EAAE;YAC7C,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACzE,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,GAAG,CAAC;YAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;gBACb,MAAM,cAAc,GAAG,GAAG,CAAC,KAAkB,CAAC;gBAC9C,cAAc,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;gBAC3C,IAAI,cAAc,CAAC,IAAI;oBAAE,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;aACrE;SACF;QACD,MAAM,SAAS,GAAsB,gBAAS,CAAC,GAAG,CAChD,2CAAiB,CAAC,SAAS,CAC5B,CAAC;QACF,WAAW;QACX,IAAI,SAAS,CAAC,0BAA0B,EAAE;YACxC,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACpE,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,GAAG,CAAC;YAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;gBACb,MAAM,SAAS,GAAG,GAAG,CAAC,KAAkB,CAAC;gBACzC,SAAS,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,2BAAgB,CAAC,EAAE,EAAE,CAAC;gBACxD,IAAI,SAAS,CAAC,IAAI;oBAAE,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;aAC3D;SACF;KACF;IACD,OAAO,gBAAE,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAnDD,8DAmDC;AAEM,KAAK,UAAU,YAAY,CAChC,GAAe,EACf,MAAc,EACd,OAAsC,EACtC,aAA4B;IAE5B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,iBAAG,CAAC,IAAI,+BAAiB,CAAC,0BAAc,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;KAChF;IACD,MAAM,iBAAiB,GAAG,8BAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;IACtF,IAAI,KAAK,IAAI,mBAAK,CAAC,SAAS,EAAE;QAC5B,MAAM,WAAW,GAAG,qCAA0B,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,uBAAS,CAAC,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;KACxB;SAAM,IAAI,KAAK,KAAK,mBAAK,CAAC,SAAS,EAAE;QACpC,IAAI,iBAAiB,EAAE;YACrB,MAAM,WAAW,GAAG,qCAA6B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,WAAW;gBAAE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACvC;QACD,IAAI,OAAO,GAAwB,EAAE,CAAC;QACtC,IAAI,iBAAiB,EAAE;YACrB,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SAClD;aAAM;YACL,OAAO,GAAG,iDAAuB,EAAE,CAAC;YACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,kCAAuB,CAAC,CAAC,CAAC;SACvD;QACD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,MAAM,CAAC,YAAY,EAAE;gBACvB,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;gBACtF,IAAI,cAAc,CAAC,KAAK,EAAE;oBAAE,OAAO,cAAc,CAAC;gBAClD,IAAI,cAAc,CAAC,KAAK,EAAE;oBACxB,MAAM,OAAO,GAAG,cAAc,CAAC,KAAkB,CAAC;oBAClD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;iBACxB;aACF;SACF;KACF;SAAM,IAAI,KAAK,KAAK,mBAAK,CAAC,MAAM,EAAE;QACjC,IAAI,iBAAiB,EAAE;YACrB,MAAM,OAAO,GAAG,sBAAc,CAAC,gBAAgB,CAAC,CAAC;YACjD,MAAM,WAAW,GAAG,qCAA6B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,OAAO,IAAI,CAAC,WAAW,EAAE;gBAC3B,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EAC9D,0BAAc,EACd,yBAAa,CAAC,2BAA2B,EACzC,qBAAS,CAAC,gBAAgB,CAC3B,CACF,CAAC;aACH;SACF;QACD,IAAI,OAAO,GAAwB,EAAE,CAAC;QACtC,IAAI,iBAAiB,EAAE;YACrB,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SAClD;aAAM;YACL,OAAO,GAAG,iDAAuB,EAAE,CAAC;SACrC;QACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,uBAAuB,CAAC,EAClC,0BAAc,EACd,yBAAa,CAAC,kBAAkB,CACjC,CACF,CAAC;SACH;QACD,MAAM,YAAY,GAAG,cAAc,CAAC;QACpC,MAAM,OAAO,GAAiB,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACnD,MAAM,IAAI,GAAe;gBACvB,EAAE,EAAE,MAAM,CAAC,IAAI;gBACf,KAAK,EAAE,MAAM,CAAC,WAAW;gBACzB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;aAC/C,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,qCAA0B,CAAC;QAClD,cAAc,CAAC,aAAa,GAAG,OAAO,CAAC;QACvC,cAAc,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,IAAI,uBAAS,CAAC,cAAc,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAE/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,MAAM,CAAC,YAAY,EAAE;gBACvB,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;gBACtF,IAAI,cAAc,CAAC,KAAK,EAAE;oBAAE,OAAO,cAAc,CAAC;gBAClD,IAAI,cAAc,CAAC,KAAK,EAAE;oBACxB,MAAM,OAAO,GAAG,cAAc,CAAC,KAAkB,CAAC;oBAClD,OAAO,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;oBAC9C,IAAI,OAAO,CAAC,IAAI;wBAAE,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;iBACrD;aACF;SACF;KACF;SAAM,IAAI,KAAK,KAAK,mBAAK,CAAC,OAAO,EAAE;QAClC,IAAI,iBAAiB,EAAE;YACrB,MAAM,OAAO,GAAG,sBAAc,CAAC,gBAAgB,CAAC,CAAC;YACjD,MAAM,WAAW,GAAG,qCAA6B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,CAAC,WAAW,EAAE;gBAChB,MAAM,QAAQ,GAAG,OAAO;oBACtB,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,8BAA8B;oBACtD,CAAC,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;gBACxD,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,QAAQ,CAAC,EACnB,0BAAc,EACd,yBAAa,CAAC,4BAA4B,EAC1C,qBAAS,CAAC,gBAAgB,CAC3B,CACF,CAAC;aACH;SACF;QACD,IAAI,OAAO,GAAwB,EAAE,CAAC;QACtC,IAAI,iBAAiB,EAAE;YACrB,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SAClD;aAAM;YACL,OAAO,GAAG,iDAAuB,EAAE,CAAC;SACrC;QACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAClE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,MAAM,CAAC,YAAY,EAAE;gBACvB,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;gBACtF,IAAI,cAAc,CAAC,KAAK,EAAE;oBAAE,OAAO,cAAc,CAAC;gBAClD,IAAI,cAAc,CAAC,KAAK,EAAE;oBACxB,MAAM,OAAO,GAAG,cAAc,CAAC,KAAkB,CAAC;oBAClD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;iBACxB;aACF;SACF;KACF;SAAM,IAAI,KAAK,KAAK,mBAAK,CAAC,eAAe,EAAE;QAC1C,IAAI,iBAAiB,EAAE;YACrB,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;YACtE,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,+BAAoB,CAAE,UAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAC7E;KACF;IACD,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AA3ID,oCA2IC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAc,EACd,IAAU,EACV,OAAsC,EACtC,aAA4B;IAE5B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACjC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,EAAE;QACnC,OAAO,MAAM,4BAA4B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACxD;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,aAAa,EAAE;QACjC,OAAO,MAAM,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;KACpF;IACD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACrB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,SAAS,GAAG,mDAAyB,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzC,IAAI,MAAM,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAC5C,OAAO,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;SACxF;KACF;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAxBD,0DAwBC;AAEM,KAAK,UAAU,4BAA4B,CAChD,GAAe,EACf,MAAc;;IAEd,MAAM,QAAQ,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;IAC9E,MAAM,cAAc,GAAwB;QAC1C,IAAI,EAAE,qCAA0B,CAAC,YAAY;QAC7C,KAAK,EAAE,qBAAqB;QAC5B,IAAI,EAAE,aAAa;QACnB,aAAa,EAAE,EAAE;QACjB,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,MAAM,iBAAiB,GAAG,8BAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrE,IAAI,CAAC,iBAAiB,EAAE;QACtB,eAAe;QACf,cAAc,CAAC,aAAa,GAAG,CAAC,wBAAa,EAAE,wBAAa,EAAE,+BAAoB,CAAC,CAAC;QACpF,OAAO,gBAAE,CAAC,IAAI,uBAAS,CAAC,cAAc,CAAC,CAAC,CAAC;KAC1C;IACD,MAAM,UAAU,GAAG,kCAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrE,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;QACtB,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KAC9B;IACD,MAAM,eAAe,GAAG,gBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,SAAS,CAAC,CAAC;IAC/F,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,qBAAqB,CAC9D,GAAG,EACH,MAAkC,EAClC,WAAW,CACZ,CAAC;IACF,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE;QACxB,OAAO,iBAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;KAChC;IACD,MAAM,YAAY,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;IACzC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,qBAAqB,CAC9D,GAAG,EACH,MAAkC,EAClC,KAAK,CACN,CAAC;IACF,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE;QACxB,OAAO,iBAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;KAChC;IACD,MAAM,YAAY,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;IACzC,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,qBAAqB,CAC7D,GAAG,EACH,MAAkC,EAClC,kBAAkB,CACnB,CAAC;IACF,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;QACvB,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;KAC/B;IACD,MAAM,WAAW,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC;IACvC,IAAI,CAAC,CAAC,YAAY,IAAI,YAAY,IAAI,WAAW,CAAC,EAAE;QAClD,MAAA,GAAG,CAAC,eAAe,0CAAE,WAAW,CAC9B,OAAO,EACP,kBAAU,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,cAAc,EAClD,KAAK,CACN,CAAC;QACF,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;KACtB;IACD,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,IAAI,YAAY;QAAE,OAAO,CAAC,IAAI,CAAC,wBAAa,CAAC,CAAC;IAC9C,IAAI,YAAY;QAAE,OAAO,CAAC,IAAI,CAAC,wBAAa,CAAC,CAAC;IAC9C,IAAI,WAAW;QAAE,OAAO,CAAC,IAAI,CAAC,+BAAoB,CAAC,CAAC;IACpD,cAAc,CAAC,aAAa,GAAG,OAAO,CAAC;IACvC,OAAO,gBAAE,CAAC,IAAI,uBAAS,CAAC,cAAc,CAAC,CAAC,CAAC;AAC3C,CAAC;AAhED,oEAgEC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,GAAe,EACf,MAAc,EACd,IAAU,EACV,OAAsC,EACtC,aAA4B;IAE5B,MAAM,QAAQ,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,8BAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrE,IAAI,WAAgC,CAAC;IACrC,IAAI,CAAC,iBAAiB,EAAE;QACtB,WAAW,GAAG,yCAA8B,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;KAC1E;SAAM;QACL,MAAM,mBAAmB,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;QACvF,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,2BAAgB,CAAC,EAAE,CAAC,CAAC;QAC7E,MAAM,eAAe,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,4BAAiB,CAAC,EAAE,CAAC,CAAC;QAC/E,MAAM,mBAAmB,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;QACvF,WAAW,GAAG,yCAA8B,CAC1C,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,mBAAmB,CACpB,CAAC;QACF,MAAM,UAAU,GAAG,gCAAc,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC7E,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC9B;KACF;IACD,MAAM,oBAAoB,GAAG,IAAI,uBAAS,CAAC,WAAW,CAAC,CAAC;IACxD,2CAA2C;IAC3C,MAAM,oBAAoB,GAAG;QAC3B,CAAC,2CAAiB,CAAC,cAAc,EAAE,gCAAqB,CAAC,EAAE,CAAC;QAC5D,CAAC,2CAAiB,CAAC,SAAS,EAAE,2BAAgB,CAAC,EAAE,CAAC;QAClD,CAAC,2CAAiB,CAAC,UAAU,EAAE,4BAAiB,CAAC,EAAE,CAAC;QACpD,CAAC,2CAAiB,CAAC,cAAc,EAAE,gCAAqB,CAAC,EAAE,CAAC;KAC7D,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAsB,gBAAS,CAAC,GAAG,CAAoB,UAAU,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAClC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;YAC5F,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,GAAG,CAAC;YAC5B,IAAI,GAAG,CAAC,KAAK,EAAE;gBACb,MAAM,IAAI,GAAG,GAAG,CAAC,KAAkB,CAAC;gBACpC,IAAI,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;gBAC5C,IAAI,IAAI,CAAC,IAAI;oBAAE,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aACpD;SACF;KACF;IACD,OAAO,gBAAE,CAAC,oBAAoB,CAAC,CAAC;AAClC,CAAC;AAnDD,gEAmDC"}
|
|
@@ -173,8 +173,7 @@ async function executeGrantPermissionsV1(ctx, userInfo) {
|
|
|
173
173
|
}
|
|
174
174
|
// Execute plugins' grantPermission() using v2 API
|
|
175
175
|
async function executeGrantPermissionsV2(ctx, inputs, envInfo, tokenProvider, userInfo) {
|
|
176
|
-
|
|
177
|
-
const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins((_a = ctx.projectSetting) === null || _a === void 0 ? void 0 : _a.solutionSettings);
|
|
176
|
+
const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(ctx.projectSetting);
|
|
178
177
|
const thunks = plugins
|
|
179
178
|
.filter((plugin) => !!plugin.grantPermission)
|
|
180
179
|
.map((plugin) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grantPermission.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/grantPermission.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"grantPermission.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/grantPermission.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listCollaborator.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAKP,MAAM,EAGN,eAAe,EACf,EAAE,EAEF,GAAG,EACH,aAAa,EAOd,MAAM,wBAAwB,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"listCollaborator.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAKP,MAAM,EAGN,eAAe,EACf,EAAE,EAEF,GAAG,EACH,aAAa,EAOd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAML,sBAAsB,EAEvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,uDAAuD,CAAC;AAelF,OAAO,EAAE,cAAc,EAAqB,MAAM,qBAAqB,CAAC;AAOxE,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CA6BxD;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,eAAe,EACpB,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CA+BxD;AA6LD,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC,CAgDlD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.listCollaborator = exports.executeListCollaboratorV1 = exports.executeListCollaboratorV2 = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
5
6
|
const common_1 = require("../../../../common");
|
|
6
7
|
const constants_1 = require("../constants");
|
|
@@ -13,6 +14,7 @@ const utils_1 = require("./utils");
|
|
|
13
14
|
const typedi_1 = require("typedi");
|
|
14
15
|
const utils4v2_1 = require("../../../resource/utils4v2");
|
|
15
16
|
const __1 = require("..");
|
|
17
|
+
const util = tslib_1.__importStar(require("util"));
|
|
16
18
|
async function executeListCollaboratorV2(ctx, inputs, envInfo, tokenProvider, userInfo) {
|
|
17
19
|
const plugins = [
|
|
18
20
|
typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin),
|
|
@@ -97,7 +99,7 @@ async function listCollaboratorImpl(param, envState, envName, telemetryReporter,
|
|
|
97
99
|
: await executeListCollaboratorV2(param.ctx, param.inputs, param.envInfo, param.tokenProvider, userInfo);
|
|
98
100
|
let errorMsg = "";
|
|
99
101
|
if (errors.length > 0) {
|
|
100
|
-
errorMsg +=
|
|
102
|
+
errorMsg += common_1.getStrings().solution.Collaboration.FailedToListCollaborators;
|
|
101
103
|
for (const fxError of errors) {
|
|
102
104
|
errorMsg += fxError.error.message + "\n";
|
|
103
105
|
}
|
|
@@ -155,6 +157,9 @@ async function listCollaboratorImpl(param, envState, envName, telemetryReporter,
|
|
|
155
157
|
ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, false);
|
|
156
158
|
}
|
|
157
159
|
else if (platform === teamsfx_api_1.Platform.VSCode) {
|
|
160
|
+
ui === null || ui === void 0 ? void 0 : ui.showMessage("info", util.format(common_1.getStrings().solution.Collaboration.ListCollaboratorsSuccess, collaborationUtil_1.CollaborationUtil.isSpfxProject(param.ctx)
|
|
161
|
+
? common_1.getStrings().solution.Collaboration.WithAadApp
|
|
162
|
+
: ""), false);
|
|
158
163
|
logProvider === null || logProvider === void 0 ? void 0 : logProvider.info(message);
|
|
159
164
|
}
|
|
160
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listCollaborator.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"listCollaborator.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,aAAa,EACb,IAAI,EACJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,aAAa,EACb,IAAI,EACJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAsChC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CA4O3D;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgDjG"}
|
|
@@ -70,7 +70,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
const solutionInputs = utils_1.extractSolutionInputs(newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"]);
|
|
73
|
-
const plugins = utils_1.getSelectedPlugins(
|
|
73
|
+
const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
74
74
|
const provisionThunks = plugins
|
|
75
75
|
.filter((plugin) => !lodash_1.isUndefined(plugin.provisionResource))
|
|
76
76
|
.map((plugin) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":";;;;AAAA,wDAYgC;AAChC,
|
|
1
|
+
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider)
|
|
|
37
37
|
if (m365TenantMatches.isErr()) {
|
|
38
38
|
return new teamsfx_api_1.v2.FxFailure(m365TenantMatches.error);
|
|
39
39
|
}
|
|
40
|
-
const plugins = utils_1.getSelectedPlugins(
|
|
40
|
+
const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
41
41
|
const provisionLocalResourceThunks = plugins
|
|
42
42
|
.filter((plugin) => !lodash_1.isUndefined(plugin.provisionLocalResource))
|
|
43
43
|
.map((plugin) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":";;;;AAAA,wDAOgC;AAChC,yCAAiD;AACjD,mCAOiB;AACjB,4CAA0E;AAC1E,mCAAqC;AACrC,4DAA+B;AAC/B,wEAA+D;AAC/D,8DAAkE;AAClE,0EAAmF;AACnF,sFAAsF;AACtF,4DAA4F;AAErF,KAAK,UAAU,sBAAsB,CAC1C,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,aAA4B;IAE5B,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,IAAI,gBAAE,CAAC,SAAS,CACrB,+BAAiB,CACf,IAAI,KAAK,CAAC,0BAA0B,CAAC,EACrC,UAAU,EACV,yBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,MAAM,qBAAqB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC5D,IAAI,sBAAc,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,GAAG,CAAC,yBAAyB,KAAK,SAAS,EAAE;YAC/C,GAAG,CAAC,yBAAyB,GAAG,IAAI,iDAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SACvF;QACD,MAAM,MAAM,GAAG,MAAM,+BAAuB,CAC1C,qBAAqB,EACrB,GAAG,CAAC,yBAAyB,CAC9B,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACvC;KACF;IAED,4EAA4E;IAC5E,sFAAsF;IACtF,4EAA4E;IAC5E,MAAM,aAAa,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAEpD,4DAA4D;IAC5D,MAAM,kBAAkB,GAAG,aAAa,CAAC,QAAQ,CAAC,kDAAyB,CAAC,QAAQ,CAAC,CAAC;IAEtF,MAAM,iBAAiB,GAAG,MAAM,+CAAuC,CACrE,kBAAkB,EAClB,aAAa,CAAC,cAAc,CAC7B,CAAC;IACF,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KAClD;IAED,MAAM,OAAO,GAAwB,0BAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
|
|
|
17
17
|
if (inAzureProject && !provisioned) {
|
|
18
18
|
return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, ctx.projectSetting.appName)), constants_2.SolutionSource, constants_2.SolutionError.CannotDeployBeforeProvision));
|
|
19
19
|
}
|
|
20
|
-
const plugins = utils_1.getSelectedPlugins(
|
|
20
|
+
const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
21
21
|
const thunks = plugins
|
|
22
22
|
.filter((plugin) => !lodash_1.isUndefined(plugin.publishApplication))
|
|
23
23
|
.map((plugin) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,mDAA6B;AAC7B,4DAAiE;AACjE,oDAAsD;AACtD,4CAKsB;AACtB,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAEzF,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CACP,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CACpF,EACD,0BAAc,EACd,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,mDAA6B;AAC7B,4DAAiE;AACjE,oDAAsD;AACtD,4CAKsB;AACtB,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAEzF,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CACP,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CACpF,EACD,0BAAc,EACd,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,kBAAkB,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAClF,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7F,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7CD,gDA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAIJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA8BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4EhC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAIJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA8BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4EhC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkChC;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmBf"}
|
|
@@ -26,7 +26,7 @@ async function scaffoldSourceCode(ctx, inputs) {
|
|
|
26
26
|
const fillinRes = utils_1.fillInSolutionSettings(solutionSettings, inputs);
|
|
27
27
|
if (fillinRes.isErr())
|
|
28
28
|
return teamsfx_api_1.err(fillinRes.error);
|
|
29
|
-
const plugins = utils_1.getSelectedPlugins(
|
|
29
|
+
const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
30
30
|
let thunks = plugins
|
|
31
31
|
.filter((plugin) => !!plugin.scaffoldSourceCode)
|
|
32
32
|
.map((plugin) => {
|
|
@@ -82,6 +82,10 @@ async function scaffoldSourceCode(ctx, inputs) {
|
|
|
82
82
|
}
|
|
83
83
|
exports.scaffoldSourceCode = scaffoldSourceCode;
|
|
84
84
|
async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
|
|
85
|
+
var _a, _b, _c;
|
|
86
|
+
if (plugins.length === 0)
|
|
87
|
+
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
88
|
+
(_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(`start scaffolding ${plugins.map((p) => p.name).join(",")}.....`);
|
|
85
89
|
const thunks = plugins
|
|
86
90
|
.filter((plugin) => !!plugin.scaffoldSourceCode)
|
|
87
91
|
.map((plugin) => {
|
|
@@ -100,9 +104,11 @@ async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
|
|
|
100
104
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
101
105
|
await scaffoldReadme(capabilities, azureResources, inputs.projectPath);
|
|
102
106
|
ctx.userInteraction.showMessage("info", `Success: ${tools_1.getStrings().solution.ScaffoldSuccessNotice}`, false);
|
|
107
|
+
(_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`finish scaffolding ${plugins.map((p) => p.name).join(",")}!`);
|
|
103
108
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
104
109
|
}
|
|
105
110
|
else {
|
|
111
|
+
(_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(`failed to scaffold ${plugins.map((p) => p.name).join(",")}!`);
|
|
106
112
|
return teamsfx_api_1.err(result.error);
|
|
107
113
|
}
|
|
108
114
|
}
|