Merge remote-tracking branch 'origin/main' into feat(odata-service-in…

…quirer)/2373/adds_system_prompt_from_store
SAP · Oct 24, 2024 · 9299525 · 9299525
2 parents c51af26 + 9e62a6c
commit 9299525
Show file tree

Hide file tree

Showing 263 changed files with 4,066 additions and 984 deletions.
diff --git a/examples/fe-fpm-cli/CHANGELOG.md b/examples/fe-fpm-cli/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @sap-ux/fe-fpm-cli
 
+## 0.0.38
+
+### Patch Changes
+
+-   @sap-ux/fe-fpm-writer@0.31.11
+
+## 0.0.37
+
+### Patch Changes
+
+-   @sap-ux/fe-fpm-writer@0.31.10
+
+## 0.0.36
+
+### Patch Changes
+
+-   @sap-ux/fe-fpm-writer@0.31.9
+
+## 0.0.35
+
+### Patch Changes
+
+-   @sap-ux/fe-fpm-writer@0.31.8
+
 ## 0.0.34
 
 ### Patch Changes

diff --git a/examples/fe-fpm-cli/package.json b/examples/fe-fpm-cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/fe-fpm-cli",
-    "version": "0.0.34",
+    "version": "0.0.38",
     "description": "A simple CLI to prompt required information to create a building block using the fe-fpm-writer module's prompt and generate functions.",
     "license": "Apache-2.0",
     "private": true,

diff --git a/examples/odata-cli/CHANGELOG.md b/examples/odata-cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @sap-ux/odata-cli
 
+## 0.15.7
+
+### Patch Changes
+
+-   Updated dependencies [9bda640]
+    -   @sap-ux/axios-extension@1.16.7
+
 ## 0.15.6
 
 ### Patch Changes

diff --git a/examples/odata-cli/package.json b/examples/odata-cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/odata-cli",
-    "version": "0.15.6",
+    "version": "0.15.7",
     "description": "Simple example CLI uing the @sap-ux/axios-extension module to fetch metadata and annotations from an SAP system.",
     "license": "Apache-2.0",
     "private": true,

diff --git a/examples/simple-generator/CHANGELOG.md b/examples/simple-generator/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @sap-ux/generator-simple-fe
 
+## 1.0.63
+
+### Patch Changes
+
+-   Updated dependencies [f626d47]
+    -   @sap-ux/fiori-elements-writer@1.3.10
+    -   @sap-ux/fiori-freestyle-writer@1.2.7
+
+## 1.0.62
+
+### Patch Changes
+
+-   @sap-ux/fiori-elements-writer@1.3.9
+
+## 1.0.61
+
+### Patch Changes
+
+-   Updated dependencies [9bda640]
+    -   @sap-ux/axios-extension@1.16.7
+    -   @sap-ux/system-access@0.5.13
+
+## 1.0.60
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/system-access@0.5.12
+-   @sap-ux/fiori-elements-writer@1.3.8
+-   @sap-ux/fiori-freestyle-writer@1.2.6
+
+## 1.0.59
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/system-access@0.5.12
+-   @sap-ux/fiori-elements-writer@1.3.7
+-   @sap-ux/fiori-freestyle-writer@1.2.5
+
+## 1.0.58
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/system-access@0.5.12
+-   @sap-ux/fiori-elements-writer@1.3.6
+-   @sap-ux/fiori-freestyle-writer@1.2.4
+
 ## 1.0.57
 
 ### Patch Changes

diff --git a/examples/simple-generator/package.json b/examples/simple-generator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/generator-simple-fe",
-    "version": "1.0.57",
+    "version": "1.0.63",
     "description": "Simple example of a yeoman generator for Fiori elements.",
     "license": "Apache-2.0",
     "private": true,

diff --git a/examples/ui-prompting-examples/CHANGELOG.md b/examples/ui-prompting-examples/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @sap-ux-private/ui-prompting-examples
 
+## 0.2.10
+
+### Patch Changes
+
+-   Updated dependencies [ae2a993]
+    -   @sap-ux/ui-components@1.20.0
+    -   @sap-ux/ui-prompting@0.2.10
+
+## 0.2.9
+
+### Patch Changes
+
+-   Updated dependencies [ea18bcb]
+    -   @sap-ux/ui-components@1.19.0
+    -   @sap-ux/ui-prompting@0.2.9
+
+## 0.2.8
+
+### Patch Changes
+
+-   Updated dependencies [b403459]
+    -   @sap-ux/ui-components@1.18.11
+    -   @sap-ux/ui-prompting@0.2.8
+
+## 0.2.7
+
+### Patch Changes
+
+-   Updated dependencies [9e9daa4]
+    -   @sap-ux/ui-components@1.18.10
+    -   @sap-ux/ui-prompting@0.2.7
+
 ## 0.2.6
 
 ### Patch Changes

diff --git a/examples/ui-prompting-examples/package.json b/examples/ui-prompting-examples/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux-private/ui-prompting-examples",
-    "version": "0.2.6",
+    "version": "0.2.10",
     "description": "This project contains UI storybook stories with exampleS with prompt ui and FPM based building blocks.",
     "license": "Apache-2.0",
     "private": true,

diff --git a/packages/abap-deploy-config-inquirer/CHANGELOG.md b/packages/abap-deploy-config-inquirer/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @sap-ux/abap-deploy-config-inquirer
 
+## 1.0.7
+
+### Patch Changes
+
+-   Updated dependencies [02e4f29]
+    -   @sap-ux/inquirer-common@0.4.8
+
+## 1.0.6
+
+### Patch Changes
+
+-   Updated dependencies [d29b1a3]
+    -   @sap-ux/inquirer-common@0.4.7
+
+## 1.0.5
+
+### Patch Changes
+
+-   Updated dependencies [9bda640]
+    -   @sap-ux/axios-extension@1.16.7
+    -   @sap-ux/system-access@0.5.13
+
+## 1.0.4
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/fiori-generator-shared@0.6.4
+-   @sap-ux/system-access@0.5.12
+
+## 1.0.3
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/fiori-generator-shared@0.6.3
+-   @sap-ux/system-access@0.5.12
+
+## 1.0.2
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/fiori-generator-shared@0.6.2
+-   @sap-ux/system-access@0.5.12
+
+## 1.0.1
+
+### Patch Changes
+
+-   43988ca: bug fix
+
+## 1.0.0
+
+### Major Changes
+
+-   b3b1082: update prompt options for abap deploy config inquirer
+
 ## 0.0.25
 
 ### Patch Changes

diff --git a/packages/abap-deploy-config-inquirer/package.json b/packages/abap-deploy-config-inquirer/package.json
@@ -6,7 +6,7 @@
         "url": "https://github.com/SAP/open-ux-tools.git",
         "directory": "packages/abap-deploy-config-inquirer"
     },
-    "version": "0.0.25",
+    "version": "1.0.7",
     "license": "Apache-2.0",
     "main": "dist/index.js",
     "scripts": {

diff --git a/packages/abap-deploy-config-inquirer/src/prompts/conditions.ts b/packages/abap-deploy-config-inquirer/src/prompts/conditions.ts
@@ -151,13 +151,9 @@ export function showPasswordQuestion(): boolean {
 /**
  * Determines if the UI5 app deploy config question should be shown (UI5 Abap Repo name & Description).
  *
- * @param hideUi5AbapRepoPrompt - option to hide the prompt if using a btp system
  * @returns boolean
  */
-export function showUi5AppDeployConfigQuestion(hideUi5AbapRepoPrompt?: boolean): boolean {
-    if (hideUi5AbapRepoPrompt) {
-        return false;
-    }
+export function showUi5AppDeployConfigQuestion(): boolean {
     return !PromptState.transportAnswers.transportConfigNeedsCreds;
 }
 
@@ -309,18 +305,6 @@ export function defaultOrShowManualTransportQuestion(transportInputChoice?: stri
  * @returns boolean
  */
 export function showIndexQuestion(options: AbapDeployConfigPromptOptions): boolean {
-    const condition = Boolean(options.indexGenerationAllowed && !PromptState.abapDeployConfig.index);
+    const condition = Boolean(options.index?.indexGenerationAllowed && !PromptState.abapDeployConfig.index);
     return condition && !PromptState.transportAnswers.transportConfigError && options.backendTarget?.type !== 'library';
 }
-
-/**
- * Determines if the overwrite prompt should be shown.
- *
- * @param options - abap deploy config prompt options
- * @returns boolean
- */
-export function showOverwriteQuestion(options: AbapDeployConfigPromptOptions): boolean {
-    return Boolean(
-        options.showOverwriteQuestion && !!options.existingDeployTaskConfig && !PromptState.abapDeployConfig.overwrite
-    );
-}
diff --git a/packages/abap-deploy-config-inquirer/src/prompts/helpers.ts b/packages/abap-deploy-config-inquirer/src/prompts/helpers.ts
@@ -93,8 +93,10 @@ async function getBackendTargetChoices(
     const systemChoices: AbapSystemChoice[] = Object.values(backendSystems)
         .sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true, caseFirst: 'lower' }))
         .map((system) => {
-            if (!targetExists) {
-                targetExists = system.url === target?.url && (system.client ?? '') === (target?.client ?? '');
+            if (!targetExists && target?.url) {
+                targetExists =
+                    system.url.replace(/\/$/, '') === target.url.replace(/\/$/, '') &&
+                    (system.client ?? '') === (target?.client ?? '');
             }
             return {
                 name: targetExists

diff --git a/packages/abap-deploy-config-inquirer/src/prompts/index.ts b/packages/abap-deploy-config-inquirer/src/prompts/index.ts
@@ -21,19 +21,17 @@ export async function getAbapDeployConfigQuestions(
 
     const targetPrompts = await getAbapTargetPrompts(options);
     const authPrompts = getAuthPrompts(options);
-    const appConfigPrompts = getAppConfigPrompts(options);
+    const questions = [...targetPrompts, ...authPrompts];
+
+    if (options.ui5AbapRepo?.hide !== true) {
+        questions.push(...getAppConfigPrompts(options));
+    }
+
     const packagePrompts = getPackagePrompts(options);
     const transportRequestPrompts = getTransportRequestPrompts(options);
     const confirmPrompts = getConfirmPrompts(options);
 
-    const questions = [
-        ...targetPrompts,
-        ...authPrompts,
-        ...appConfigPrompts,
-        ...packagePrompts,
-        ...transportRequestPrompts,
-        ...confirmPrompts
-    ];
+    questions.push(...packagePrompts, ...transportRequestPrompts, ...confirmPrompts);
 
     return questions as AbapDeployConfigQuestion[];
 }