Merge branch 'main' into 3399/resolve-merge-conflicts

Author: longieirl

examples/ui-prompting-examples/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @sap-ux-private/ui-prompting-examples
 
+## 0.4.2
+
+### Patch Changes
+
+-   Updated dependencies [7f652f3]
+    -   @sap-ux/ui-components@1.26.11
+    -   @sap-ux/ui-prompting@0.5.1
+
 ## 0.4.1
 
 ### Patch Changes

examples/ui-prompting-examples/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sap-ux-private/ui-prompting-examples",
-    "version": "0.4.1",
+    "version": "0.4.2",
     "description": "This project contains UI storybook stories with exampleS with prompt ui and FPM based building blocks.",
     "license": "Apache-2.0",
     "private": true,

packages/abap-deploy-config-sub-generator/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sap-ux/abap-deploy-config-sub-generator
 
+## 0.1.71
+
+### Patch Changes
+
+-   30cf923: fix: "lrep" property is not added when the deploy config is created from within the ADP Generator
+
 ## 0.1.70
 
 ### Patch Changes

packages/abap-deploy-config-sub-generator/package.json

@@ -6,7 +6,7 @@
         "url": "https://github.com/SAP/open-ux-tools.git",
         "directory": "packages/abap-deploy-config-sub-generator"
     },
-    "version": "0.1.70",
+    "version": "0.1.71",
     "license": "Apache-2.0",
     "main": "generators/app/index.js",
     "scripts": {

packages/abap-deploy-config-sub-generator/src/app/index.ts

@@ -289,7 +289,7 @@ export default class extends DeploymentGenerator {
         if (this.abort || this.answers.overwrite === false) {
             return;
         }
-        const namespace = await getVariantNamespace(this.destinationPath(), !!this.answers.isS4HC);
+        const namespace = await getVariantNamespace(this.destinationPath(), !!this.answers.isS4HC, this.fs);
         await generateAbapDeployConfig(
             this.destinationPath(),
             {

packages/abap-deploy-config-sub-generator/src/utils/project.ts

@@ -1,7 +1,6 @@
 import { FileName, getWebappPath } from '@sap-ux/project-access';
 import { join } from 'path';
 import type { Editor } from 'mem-fs-editor';
-import { existsSync, readFileSync } from 'fs';
 import { t } from './i18n';
 import { DeploymentGenerator } from '@sap-ux/deploy-config-generator-shared';
 
@@ -24,18 +23,19 @@ export async function indexHtmlExists(fs: Editor, path: string): Promise<boolean
  *
  * @param path - The path to the project.
  * @param isS4HC - Whether the project is Cloud.
+ * @param fs - The file system editor.
  * @returns The variant namespace.
  */
-export async function getVariantNamespace(path: string, isS4HC: boolean): Promise<string | undefined> {
+export async function getVariantNamespace(path: string, isS4HC: boolean, fs: Editor): Promise<string | undefined> {
     if (isS4HC) {
         return undefined;
     }
 
     try {
-        const webappPath = await getWebappPath(path);
-        const filePath = join(webappPath, FileName.ManifestAppDescrVar);
-        if (existsSync(filePath)) {
-            const descriptor = JSON.parse(readFileSync(filePath, 'utf-8'));
+        const filePath = join(await getWebappPath(path, fs), FileName.ManifestAppDescrVar);
+
+        if (fs.exists(filePath)) {
+            const descriptor = fs.readJSON(filePath) as unknown as { namespace: string };
             return descriptor.namespace;
         }
     } catch (e) {

packages/abap-deploy-config-sub-generator/test/unit/utils/project.test.ts

@@ -1,4 +1,5 @@
 import { join } from 'path';
+import type { Editor } from 'mem-fs-editor';
 import { existsSync, readFileSync } from 'fs';
 
 import { getWebappPath, FileName } from '@sap-ux/project-access';
@@ -36,64 +37,61 @@ describe('getVariantNamespace', () => {
     const mockWebappPath = '/test/project/webapp';
     const mockManifestPath = join(mockWebappPath, FileName.ManifestAppDescrVar);
 
+    let mockFs: Editor;
+    let mockFsExists: jest.Mock;
+    let mockFsReadJSON: jest.Mock;
+
     beforeAll(async () => {
         await initI18n();
     });
 
     beforeEach(() => {
         jest.clearAllMocks();
         mockGetWebappPath.mockResolvedValue(mockWebappPath);
+
+        mockFsExists = jest.fn();
+        mockFsReadJSON = jest.fn();
+
+        mockFs = {
+            exists: mockFsExists,
+            readJSON: mockFsReadJSON
+        } as unknown as Editor;
     });
 
     it('should return undefined for S4HC projects', async () => {
-        const result = await getVariantNamespace(mockPath, true);
-
+        const result = await getVariantNamespace(mockPath, true, mockFs);
         expect(result).toBeUndefined();
         expect(mockGetWebappPath).not.toHaveBeenCalled();
-        expect(mockExistsSync).not.toHaveBeenCalled();
     });
 
-    it('should return namespace from manifest.appdescr_variant file', async () => {
-        const mockManifest = {
-            namespace: 'apps/workcenter/appVariants/customer.app.variant'
-        };
+    it('should return namespace from memory', async () => {
+        const mockManifest = { namespace: 'apps/workcenter/appVariants/customer.app.variant' };
+        mockFsExists.mockReturnValue(true);
+        mockFsReadJSON.mockReturnValue(mockManifest);
 
-        mockExistsSync.mockReturnValue(true);
-        mockReadFileSync.mockReturnValue(JSON.stringify(mockManifest));
+        const result = await getVariantNamespace(mockPath, false, mockFs);
 
-        const result = await getVariantNamespace(mockPath, false);
-
-        expect(result).toBe('apps/workcenter/appVariants/customer.app.variant');
-        expect(mockGetWebappPath).toHaveBeenCalledWith(mockPath);
-        expect(mockExistsSync).toHaveBeenCalledWith(mockManifestPath);
-        expect(mockReadFileSync).toHaveBeenCalledWith(mockManifestPath, 'utf-8');
+        expect(result).toBe(mockManifest.namespace);
+        expect(mockGetWebappPath).toHaveBeenCalledWith(mockPath, mockFs);
+        expect(mockFsExists).toHaveBeenCalledWith(mockManifestPath);
     });
 
-    it('should return undefined when manifest file does not exist', async () => {
-        mockExistsSync.mockReturnValue(false);
-
-        const result = await getVariantNamespace(mockPath, false);
-
+    it('should return undefined when memory file does not exist', async () => {
+        mockFsExists.mockReturnValue(false);
+        const result = await getVariantNamespace(mockPath, false, mockFs);
         expect(result).toBeUndefined();
-        expect(mockGetWebappPath).toHaveBeenCalledWith(mockPath);
-        expect(mockExistsSync).toHaveBeenCalledWith(mockManifestPath);
-        expect(mockReadFileSync).not.toHaveBeenCalled();
     });
 
-    it('should handle JSON parsing errors gracefully', async () => {
-        mockExistsSync.mockReturnValue(true);
-        mockReadFileSync.mockReturnValue('invalid json content');
+    it('should handle errors gracefully', async () => {
+        mockFsExists.mockImplementation(() => {
+            throw new Error('Memory filesystem error');
+        });
 
-        const result = await getVariantNamespace(mockPath, false);
+        const result = await getVariantNamespace(mockPath, false, mockFs);
 
         expect(result).toBeUndefined();
-        expect(mockGetWebappPath).toHaveBeenCalledWith(mockPath);
-        expect(mockExistsSync).toHaveBeenCalledWith(mockManifestPath);
-        expect(mockReadFileSync).toHaveBeenCalledWith(mockManifestPath, 'utf-8');
         expect(DeploymentGenerator.logger.debug).toHaveBeenCalledWith(
-            t('debug.lrepNamespaceNotFound', {
-                error: 'Unexpected token \'i\', "invalid json content" is not valid JSON'
-            })
+            t('debug.lrepNamespaceNotFound', { error: 'Memory filesystem error' })
         );
     });
 });

packages/adp-flp-config-sub-generator/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sap-ux/adp-flp-config-sub-generator
 
+## 0.1.78
+
+### Patch Changes
+
+-   487296c: fix: Wrong navigation between steps in FLP Configuration generator for ADP
+
 ## 0.1.77
 
 ### Patch Changes

packages/adp-flp-config-sub-generator/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@sap-ux/adp-flp-config-sub-generator",
     "description": "Generator for adding FLP configuration to an Adaptation Project",
-    "version": "0.1.77",
+    "version": "0.1.78",
     "repository": {
         "type": "git",
         "url": "https://github.com/SAP/open-ux-tools.git",

packages/adp-flp-config-sub-generator/src/app/index.ts

@@ -127,7 +127,9 @@ export default class AdpFlpConfigGenerator extends Generator {
     }
 
     public async prompting(): Promise<void> {
-        if (this.authenticationRequired) {
+        // If authentication was already prompted it should not be skipped as this leads to issues with Yeoman UI navigation
+        const credentialsPrompted = getFromCache<boolean>(this.appWizard, 'credentialsPrompted', this.logger);
+        if (this.authenticationRequired || credentialsPrompted) {
             await this._promptAuthentication();
         }
         if (this.abort) {
@@ -197,7 +199,7 @@ export default class AdpFlpConfigGenerator extends Generator {
                 try {
                     this.provider = await getAbapServiceProvider(this.ui5Yaml, this.toolsLogger, this.credentials);
                     this.inbounds = await getBaseAppInbounds(this.appId, this.provider);
-                    addToCache(this.appWizard, { provider: this.provider }, this.logger);
+                    addToCache(this.appWizard, { provider: this.provider, credentialsPrompted: true }, this.logger);
                 } catch (error) {
                     if (!isAxiosError(error)) {
                         this.logger.error(`Base application inbounds fetching failed: ${error}`);