fix: static webapp path #2931

heimwege · 2025-02-17T16:20:22Z

changeset-bot · 2025-02-17T16:20:27Z

🦋 Changeset detected

Latest commit: 73c579d

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 41 packages

Name	Type
@sap-ux/adp-flp-config-sub-generator	Patch
@sap-ux/mockserver-config-writer	Patch
@sap-ux/odata-service-writer	Patch
@sap-ux/adp-tooling	Patch
@sap-ux/telemetry	Patch
@sap-ux/create	Patch
@sap-ux/i18n	Patch
@sap-ux/fiori-elements-writer	Patch
@sap-ux/fiori-freestyle-writer	Patch
@sap-ux/odata-service-inquirer	Patch
@sap-ux/generator-simple-fe	Patch
@sap-ux/flp-config-inquirer	Patch
@sap-ux/preview-middleware	Patch
@sap-ux/abap-deploy-config-sub-generator	Patch
@sap-ux/fiori-generator-shared	Patch
@sap-ux/inquirer-common	Patch
@sap-ux/ui5-library-reference-sub-generator	Patch
@sap-ux/cf-deploy-config-sub-generator	Patch
@sap-ux/fe-fpm-writer	Patch
@sap-ux/flp-config-sub-generator	Patch
@sap-ux/project-access	Patch
@sap-ux/app-config-writer	Patch
@sap-ux/abap-deploy-config-inquirer	Patch
@sap-ux/cap-config-writer	Patch
@sap-ux/deploy-config-generator-shared	Patch
@sap-ux/ui5-library-sub-generator	Patch
@sap-ux/cf-deploy-config-inquirer	Patch
@sap-ux/ui5-application-inquirer	Patch
@sap-ux/ui5-library-inquirer	Patch
@sap-ux/ui5-library-reference-inquirer	Patch
@sap-ux/abap-deploy-config-writer	Patch
@sap-ux/annotation-generator	Patch
@sap-ux/cards-editor-middleware	Patch
@sap-ux/cf-deploy-config-writer	Patch
@sap-ux/environment-check	Patch
@sap-ux/fiori-annotation-api	Patch
@sap-ux/launch-config	Patch
@sap-ux/project-integrity	Patch
@sap-ux/ui5-library-reference-writer	Patch
@sap-ux/ui5-library-writer	Patch
@sap-ux/fe-fpm-cli	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

broksy

Changes for @sap-ux/mockserver-config-writer and @sap-ux/odata-service-writer looks good from my side.
Changeset corresponds to the changes. Approved.

devinea

Code changes are clear.
assumed covered by tests
changeset ✅

johannes-kolbe

Focus on create, reusing refactored method lg
test snapshots show improved webapp path
changeset provided
Did not test manually

Klaus-Keller

Thanks @heimwege, update to use getWebappPath() looks good. I commented some cosmetic proposals.

packages/adp-tooling/src/base/helper.ts

packages/adp-tooling/src/prompts/add-annotations-to-odata/index.ts

packages/odata-service-writer/src/data/annotations.ts

heimwege · 2025-02-19T09:51:22Z

@mmilko01 While I was implementing the changes suggested by @Klaus-Keller I also refactored how the ui5 yaml config is being read in adp-tooling. project-access has a method for that as well (readUi5Yaml).

open-ux-tools/packages/adp-tooling/src/base/helper.ts

Lines 63 to 80 in defc2ba

    
           export async function getAdpConfig(basePath: string, yamlPath: string): Promise<AdpPreviewConfig> { 
        
               const ui5ConfigPath = isAbsolute(yamlPath) ? yamlPath : join(basePath, yamlPath); 
        
               let ui5Conf: UI5Config; 
        
               let adp: AdpPreviewConfig | undefined; 
        
               try { 
        
                   ui5Conf = await readUi5Yaml(dirname(ui5ConfigPath), basename(ui5ConfigPath)); 
        
                   const customMiddleware = 
        
                       ui5Conf.findCustomMiddleware<{ adp: AdpPreviewConfig }>('fiori-tools-preview') ?? 
        
                       ui5Conf.findCustomMiddleware<{ adp: AdpPreviewConfig }>('preview-middleware'); 
        
                   adp = customMiddleware?.configuration?.adp; 
        
               } catch (error) { 
        
                   // do nothing here 
        
               } 
        
               if (!adp) { 
        
                   throw new Error(`No system configuration found in ${basename(ui5ConfigPath)}`); 
        
               } 
        
               return adp; 
        
           }

At least the tests are still green 🤞🏻

…tic-webapp-path # Conflicts: # packages/odata-service-writer/src/data/annotations.ts

packages/odata-service-writer/src/delete.ts

mmilko01 · 2025-02-19T14:01:28Z

@mmilko01 While I was implementing the changes suggested by @Klaus-Keller I also refactored how the ui5 yaml config is being read in adp-tooling. project-access has a method for that as well (readUi5Yaml).

open-ux-tools/packages/adp-tooling/src/base/helper.ts

Lines 63 to 80 in defc2ba

export async function getAdpConfig(basePath: string, yamlPath: string): Promise<AdpPreviewConfig> {

const ui5ConfigPath = isAbsolute(yamlPath) ? yamlPath : join(basePath, yamlPath);

let ui5Conf: UI5Config;

let adp: AdpPreviewConfig | undefined;

try {

ui5Conf = await readUi5Yaml(dirname(ui5ConfigPath), basename(ui5ConfigPath));

const customMiddleware =

ui5Conf.findCustomMiddleware<{ adp: AdpPreviewConfig }>('fiori-tools-preview') ??

ui5Conf.findCustomMiddleware<{ adp: AdpPreviewConfig }>('preview-middleware');

adp = customMiddleware?.configuration?.adp;

} catch (error) {

// do nothing here

}

if (!adp) {

throw new Error(`No system configuration found in ${basename(ui5ConfigPath)}`);

}

return adp;

}

At least the tests are still green 🤞🏻

@heimwege thanks for the heads-up. This refactoring looks good.

johannes-kolbe

Reapproving. Nice cleanup, thanks @heimwege

sonarqubecloud · 2025-02-20T09:05:45Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
92.5% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

devinea

re-approving

Klaus-Keller

Thanks @heimwege!

all my comments have been addressed
changeset exists
code coverage is great
did a visual review, no manual test which I strongly suggest should be done for adaptation editor

Approved from my side.

get rid of static webapp path

437dfcd

heimwege added odata-service-writer @sap-ux/odata-servier-writer mockserver-config-writer @sap-ux/mockserver-config-writer adp-tooling telemetry @sap-ux/telemetry labels Feb 17, 2025

heimwege and others added 13 commits February 17, 2025 17:30

get rid of static webapp path (2)

fbac962

fix readme

b0ae942

fixes

142db20

fixes

8371fe4

refactoring

17d81a5

fix unit test

2258600

fix unit test

d6cd911

adjust snapshots

66ae4cc

adjust snapshots

25845d5

adjust snapshots

01ba2f6

backward compatibility

c5b65ab

force posix path

5ac81c0

adjust snapshots

9513c76

heimwege marked this pull request as ready for review February 18, 2025 07:04

heimwege requested review from a team as code owners February 18, 2025 07:04

heimwege requested a review from broksy February 18, 2025 07:09

heimwege added the create @sap-ux/create label Feb 18, 2025

broksy previously approved these changes Feb 18, 2025

View reviewed changes

devinea previously approved these changes Feb 18, 2025

View reviewed changes

johannes-kolbe previously approved these changes Feb 18, 2025

View reviewed changes

Klaus-Keller reviewed Feb 18, 2025

View reviewed changes

review comments + refactoring

defc2ba

heimwege dismissed stale reviews from johannes-kolbe, devinea, and broksy via defc2ba February 19, 2025 09:45

heimwege requested a review from Klaus-Keller February 19, 2025 09:56

Merge branch 'main' of github.com:SAP/open-ux-tools into fix/2589/sta…

8200424

…tic-webapp-path # Conflicts: # packages/odata-service-writer/src/data/annotations.ts

heimwege requested review from devinea, broksy and johannes-kolbe February 19, 2025 10:07

johannes-kolbe reviewed Feb 19, 2025

View reviewed changes

packages/odata-service-writer/src/delete.ts Show resolved Hide resolved

johannes-kolbe approved these changes Feb 20, 2025

View reviewed changes

Merge branch 'main' into fix/2589/static-webapp-path

73c579d

broksy approved these changes Feb 20, 2025

View reviewed changes

devinea approved these changes Feb 20, 2025

View reviewed changes

Klaus-Keller approved these changes Feb 20, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: static webapp path #2931

fix: static webapp path #2931

heimwege commented Feb 17, 2025

changeset-bot bot commented Feb 17, 2025 •

edited

Loading

broksy left a comment

devinea left a comment

johannes-kolbe left a comment

Klaus-Keller left a comment

heimwege commented Feb 19, 2025

mmilko01 commented Feb 19, 2025

johannes-kolbe left a comment

sonarqubecloud bot commented Feb 20, 2025

devinea left a comment

Klaus-Keller left a comment

fix: static webapp path #2931

Are you sure you want to change the base?

fix: static webapp path #2931

Conversation

heimwege commented Feb 17, 2025

changeset-bot bot commented Feb 17, 2025 • edited Loading

🦋 Changeset detected

broksy left a comment

Choose a reason for hiding this comment

devinea left a comment

Choose a reason for hiding this comment

johannes-kolbe left a comment

Choose a reason for hiding this comment

Klaus-Keller left a comment

Choose a reason for hiding this comment

heimwege commented Feb 19, 2025

mmilko01 commented Feb 19, 2025

johannes-kolbe left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Feb 20, 2025

Quality Gate passed

devinea left a comment

Choose a reason for hiding this comment

Klaus-Keller left a comment

Choose a reason for hiding this comment

changeset-bot bot commented Feb 17, 2025 •

edited

Loading