Merge branch 'main' into feat/buildingBlocksGenerateAbsolutePathsWith…

…OptionForRelative
SAP · Sep 12, 2024 · ba337e9 · ba337e9
2 parents 2ca95e9 + 0ecbd4a
commit ba337e9
Show file tree

Hide file tree

Showing 64 changed files with 415 additions and 55 deletions.
diff --git a/examples/fe-fpm-cli/CHANGELOG.md b/examples/fe-fpm-cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sap-ux/fe-fpm-cli
 
+## 0.0.23
+
+### Patch Changes
+
+-   @sap-ux/fe-fpm-writer@0.29.4
+
 ## 0.0.22
 
 ### 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.22",
+    "version": "0.0.23",
     "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/simple-generator/CHANGELOG.md b/examples/simple-generator/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @sap-ux/generator-simple-fe
 
+## 1.0.44
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/system-access@0.5.11
+-   @sap-ux/fiori-elements-writer@1.1.18
+-   @sap-ux/fiori-freestyle-writer@1.0.23
+
 ## 1.0.43
 
 ### 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.43",
+    "version": "1.0.44",
     "description": "Simple example of a yeoman generator for Fiori elements.",
     "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,19 @@
 # @sap-ux/abap-deploy-config-inquirer
 
+## 0.0.17
+
+### Patch Changes
+
+-   c538657: handle missing www-auth header
+
+## 0.0.16
+
+### Patch Changes
+
+-   @sap-ux/axios-extension@1.16.6
+-   @sap-ux/fiori-generator-shared@0.3.20
+-   @sap-ux/system-access@0.5.11
+
 ## 0.0.15
 
 ### 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.15",
+    "version": "0.0.17",
     "license": "Apache-2.0",
     "main": "dist/index.js",
     "scripts": {

diff --git a/packages/abap-deploy-config-inquirer/src/service-provider-utils/transport-config.ts b/packages/abap-deploy-config-inquirer/src/service-provider-utils/transport-config.ts
@@ -135,21 +135,19 @@ class DefaultTransportConfig implements TransportConfig {
             }
         } catch (err) {
             deleteCachedServiceProvider();
-
             if (err.response?.status === 401) {
-                const auth: string = err.response.headers['www-authenticate'];
-
-                if (auth?.toLowerCase()?.startsWith('basic')) {
-                    result.transportConfigNeedsCreds = true;
-                }
+                const auth: string = err.response.headers?.['www-authenticate'];
+                result.transportConfigNeedsCreds = !!auth?.toLowerCase()?.startsWith('basic');
+                LoggerHelper.logger.debug(
+                    t('errors.debugAbapTargetSystemAuthFound', { isFound: !!result.transportConfigNeedsCreds })
+                );
             } else {
                 // Everything from network errors to service being inactive is a warning.
                 // Will be logged and the user is allowed to move on
                 // Business errors will be returned by the ATO response above and these act as hard stops
                 result.warning = err.message;
                 result.transportConfigNeedsCreds = false;
             }
-
             LoggerHelper.logger.debug(t('errors.debugAbapTargetSystem', { method: 'init', error: err.message }));
         }
         const initSuccessful = !result.error && !result.transportConfigNeedsCreds;

diff --git a/packages/abap-deploy-config-inquirer/src/translations/abap-deploy-config-inquirer.i18n.json b/packages/abap-deploy-config-inquirer/src/translations/abap-deploy-config-inquirer.i18n.json
@@ -117,8 +117,9 @@
         "invalidUrl": "Invalid URL: [{{url}}]",
         "invalidClient": "[{{client}}] is invalid. Enter blank or a value between 000-999",
         "debugAbapTargetSystem": "Error while getting ABAP target system during {{method}}, error {{error}}",
+        "debugAbapTargetSystemAuthFound": "HTTP 401 returned, www-authentication method found {{isFound}}",
         "s4SystemNoExtensible": "S4 system not configured as Extensibility Development system. Cannot deploy to it.",
-        "incorrectAtoSettings": "Incorrect ATO settings. Package or prefix settings mising.",
+        "incorrectAtoSettings": "Incorrect ATO settings. Package or prefix settings missing.",
         "incorrectCredentials": "Incorrect credentials. Try again",
         "atoUnauthorisedSystem": "Authentication required to access the ATO Service",
         "createTransportReqFailed": "Create new Transport Request failed. Please enter Transport Request manually.",

diff --git a/packages/abap-deploy-config-inquirer/test/service-provider-utils/transport-config.test.ts b/packages/abap-deploy-config-inquirer/test/service-provider-utils/transport-config.test.ts
@@ -128,7 +128,7 @@ describe('getTransportConfigInstance', () => {
     });
 
     it('should handle errors and return transport config', async () => {
-        // 401
+        // 401 with headers
         const mockGetAdtService401 = {
             getAtoInfo: jest.fn().mockRejectedValueOnce({
                 message: 'Failed to get ATO info',
@@ -148,6 +148,26 @@ describe('getTransportConfigInstance', () => {
         });
         expect(transportConfigResult.transportConfigNeedsCreds).toBe(true);
 
+        // 401 without headers
+        const mockGetAdtService401WithoutHeaders = {
+            getAtoInfo: jest.fn().mockRejectedValueOnce({
+                message: 'Failed to get ATO info',
+                response: { status: 401 }
+            })
+        };
+
+        mockGetOrCreateServiceProvider.mockResolvedValueOnce({
+            getAdtService: jest.fn().mockResolvedValueOnce(mockGetAdtService401WithoutHeaders)
+        });
+
+        const transportConfigResultWithoutHeaders = await getTransportConfigInstance({
+            backendTarget: undefined,
+            scp: false,
+            credentials: {},
+            systemConfig: {}
+        });
+        expect(transportConfigResultWithoutHeaders.transportConfigNeedsCreds).toBe(false);
+
         // 500 error
         const mockGetAdtService500 = {
             getAtoInfo: jest.fn().mockRejectedValueOnce({

diff --git a/packages/abap-deploy-config-writer/CHANGELOG.md b/packages/abap-deploy-config-writer/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sap-ux/abap-deploy-config-writer
 
+## 0.0.42
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/system-access@0.5.11
+
 ## 0.0.41
 
 ### Patch Changes

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

diff --git a/packages/adp-tooling/CHANGELOG.md b/packages/adp-tooling/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @sap-ux/adp-tooling
 
+## 0.12.47
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/axios-extension@1.16.6
+    -   @sap-ux/system-access@0.5.11
+
 ## 0.12.46
 
 ### Patch Changes

diff --git a/packages/adp-tooling/package.json b/packages/adp-tooling/package.json
@@ -9,7 +9,7 @@
     "bugs": {
         "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
     },
-    "version": "0.12.46",
+    "version": "0.12.47",
     "license": "Apache-2.0",
     "author": "@SAP/ux-tools-team",
     "main": "dist/index.js",

diff --git a/packages/annotation-generator/CHANGELOG.md b/packages/annotation-generator/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sap-ux/annotation-generator
 
+## 0.2.2
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/fiori-annotation-api@0.2.2
+
 ## 0.2.1
 
 ### Patch Changes

diff --git a/packages/annotation-generator/package.json b/packages/annotation-generator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/annotation-generator",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "Library that provides API for generation of annotations by SAP Fiori App Generator",
     "publisher": "SAPSE",
     "author": "SAP SE",

diff --git a/packages/app-config-writer/CHANGELOG.md b/packages/app-config-writer/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sap-ux/app-config-writer
 
+## 0.4.33
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/axios-extension@1.16.6
+
 ## 0.4.32
 
 ### Patch Changes

diff --git a/packages/app-config-writer/package.json b/packages/app-config-writer/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/app-config-writer",
     "description": "Add or update configuration for SAP Fiori tools application",
-    "version": "0.4.32",
+    "version": "0.4.33",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",

diff --git a/packages/cap-config-writer/CHANGELOG.md b/packages/cap-config-writer/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @sap-ux/cap-config-writer
 
+## 0.7.39
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/fiori-generator-shared@0.3.20
+    -   @sap-ux/odata-service-inquirer@0.5.39
+
 ## 0.7.38
 
 ### Patch Changes

diff --git a/packages/cap-config-writer/package.json b/packages/cap-config-writer/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/cap-config-writer",
     "description": "Add or update configuration for SAP CAP projects",
-    "version": "0.7.38",
+    "version": "0.7.39",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",

diff --git a/packages/cards-editor-middleware/CHANGELOG.md b/packages/cards-editor-middleware/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @sap-ux/cards-editor-middleware
 
+## 0.4.23
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+
 ## 0.4.22
 
 ### Patch Changes

diff --git a/packages/cards-editor-middleware/package.json b/packages/cards-editor-middleware/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/cards-editor-middleware",
-    "version": "0.4.22",
+    "version": "0.4.23",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",

diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @sap-ux/create
 
+## 0.8.13
+
+### Patch Changes
+
+-   Updated dependencies [c538657]
+    -   @sap-ux/abap-deploy-config-inquirer@0.0.17
+
+## 0.8.12
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/abap-deploy-config-writer@0.0.42
+    -   @sap-ux/adp-tooling@0.12.47
+    -   @sap-ux/app-config-writer@0.4.33
+    -   @sap-ux/cap-config-writer@0.7.39
+    -   @sap-ux/cards-editor-config-writer@0.4.4
+    -   @sap-ux/mockserver-config-writer@0.6.4
+    -   @sap-ux/preview-middleware@0.16.63
+    -   @sap-ux/system-access@0.5.11
+    -   @sap-ux/abap-deploy-config-inquirer@0.0.16
+
 ## 0.8.11
 
 ### Patch Changes

diff --git a/packages/create/package.json b/packages/create/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/create",
     "description": "SAP Fiori tools module to add or remove features",
-    "version": "0.8.11",
+    "version": "0.8.13",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",

diff --git a/packages/environment-check/CHANGELOG.md b/packages/environment-check/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sap-ux/environment-check
 
+## 0.17.36
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/axios-extension@1.16.6
+
 ## 0.17.35
 
 ### Patch Changes

diff --git a/packages/environment-check/package.json b/packages/environment-check/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/environment-check",
-    "version": "0.17.35",
+    "version": "0.17.36",
     "description": "SAP Fiori environment check",
     "license": "Apache-2.0",
     "bin": {

diff --git a/packages/fe-fpm-writer/CHANGELOG.md b/packages/fe-fpm-writer/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sap-ux/fe-fpm-writer
 
+## 0.29.4
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/fiori-annotation-api@0.2.2
+
 ## 0.29.3
 
 ### Patch Changes

diff --git a/packages/fe-fpm-writer/package.json b/packages/fe-fpm-writer/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/fe-fpm-writer",
     "description": "SAP Fiori elements flexible programming model writer",
-    "version": "0.29.3",
+    "version": "0.29.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",

diff --git a/packages/fiori-annotation-api/CHANGELOG.md b/packages/fiori-annotation-api/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sap-ux/fiori-annotation-api
 
+## 0.2.2
+
+### Patch Changes
+
+-   Updated dependencies [09522df]
+    -   @sap-ux/project-access@1.27.2
+    -   @sap-ux/cds-odata-annotation-converter@0.3.6
+
 ## 0.2.1
 
 ### Patch Changes

diff --git a/packages/fiori-annotation-api/package.json b/packages/fiori-annotation-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux/fiori-annotation-api",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "Library that provides API for reading and writing annotations in SAP Fiori elements projects.",
     "publisher": "SAPSE",
     "author": "SAP SE",