Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] flexChangesBundler: Merge existing with new flexibility-bundle.json #974

Merged
merged 4 commits into from
Jan 17, 2024

Conversation

alexeng06
Copy link
Member

  • merge existing level zero changes into the flexibility-bundle.json of UI5 adaptation projects

- merge existing level zero changes into the flexibility-bundle.json of UI5 adaptation projects
Copy link

cla-assistant bot commented Jan 15, 2024

CLA assistant check
All committers have signed the CLA.

@coveralls
Copy link

coveralls commented Jan 15, 2024

Coverage Status

coverage: 94.608% (+0.07%) from 94.541%
when pulling 143249c on alexeng06:merge-flex-bundle
into b84d3e9 on SAP:main.

@flovogt flovogt requested a review from matz3 January 15, 2024 15:39
@flovogt flovogt added the enhancement New feature or request label Jan 15, 2024
"variants": []
};

const dummyWorkspace = createDummyWorkspace(changeList, manifest, flexBundle);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe workspaceMock would be a good name

@matz3 matz3 changed the title [FEATURE] Merge exising and new flexibility-bundle.json [FEATURE] Merge existing and new flexibility-bundle.json Jan 15, 2024
@matz3 matz3 requested a review from RandomByte January 15, 2024 16:48
Copy link
Member

@matz3 matz3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just a few comments that should be clarified before merging this PR.

PS: Are there any other details to take into account with this change? Should the merge happen in all projects, or depending on a specific UI5 version or other project specific details?

- added description for parameter existingFlexBundle
@alexeng06
Copy link
Member Author

This change it mainly for the adaptation project to enable merging changes of the existing base app and the new changes from the adaptation project.
The change would be needed for the newer UI5 versions > 1.73.0.

@RandomByte
Copy link
Member

/AzurePipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Member

@RandomByte RandomByte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly suggestions, but the JSDoc should match the code

- adjust JSDoc for flexChangesBundler
- reduce number of needed JSON.stringify
@RandomByte
Copy link
Member

LGTM

/AzurePipelines run

RandomByte
RandomByte previously approved these changes Jan 17, 2024
matz3
matz3 previously requested changes Jan 17, 2024
- remove unnecessary parameter
- adjust JSDoc
@RandomByte
Copy link
Member

/AzurePipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Member

@matz3 matz3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@RandomByte RandomByte changed the title [FEATURE] Merge existing and new flexibility-bundle.json [FEATURE] flexChangesBundler: Merge existing with new flexibility-bundle.json Jan 17, 2024
@RandomByte RandomByte enabled auto-merge (rebase) January 17, 2024 19:11
@RandomByte RandomByte merged commit 67e0d24 into SAP:main Jan 17, 2024
15 checks passed
RandomByte pushed a commit that referenced this pull request Jan 18, 2024
…dle.json

Merge any existing level zero changes into the flexibility-bundle.json
of UI5 adaptation projects

#974
@flovogt
Copy link
Member

flovogt commented Jan 18, 2024

Thanks a lot for your contribution. This PR is available with @ui5/[email protected] and @ui5/[email protected]

matz3 pushed a commit that referenced this pull request Jan 18, 2024
…json

Merge any existing level zero changes into the flexibility-bundle.json
of UI5 adaptation projects

Cherry-pick of #974
matz3 pushed a commit that referenced this pull request Jan 18, 2024
…json

Merge any existing level zero changes into the flexibility-bundle.json
of UI5 adaptation projects

Cherry-pick of #974
matz3 pushed a commit that referenced this pull request Jan 18, 2024
…json

Merge any existing level zero changes into the flexibility-bundle.json
of UI5 adaptation projects

Cherry-pick of #974
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants