Skip to content

Commit 4b8ca93

Browse files
LonwyrRandomByte
Lonwyr
authored and
RandomByte
committed
error message
1 parent 869496b commit 4b8ca93

10 files changed

Lines changed: 146 additions & 50 deletions

File tree

‎lib/processors/bundlers/flexChangesBundler.js‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import {createResource} from "@ui5/fs/resourceFactory";
1818
* @param {@ui5/fs/Resource[]} parameters.resources List of resources to be processed
1919
* @param {object} parameters.options Options
2020
* @param {string} parameters.options.pathPrefix Prefix for bundle path
21-
* @param {string} parameters.options.hasFlexBundleVersion true if minUI5Version >= 1.73 than
22-
* create flexibility-bundle.json
21+
* @param {string} parameters.options.hasFlexBundleVersion true if minUI5Version >= 1.73
22+
* and create flexibility-bundle.json
2323
* @param {object} [parameters.existingFlexBundle={}] Object with existing flexibility-bundle.json
2424
* to merge with new changes
2525
* @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with flex changes bundle resources
@@ -45,6 +45,7 @@ export default function({resources, options: {pathPrefix, hasFlexBundleVersion},
4545
const variants = [];
4646
const variantChanges = [];
4747
const variantManagementChanges = [];
48+
const annotationChanges = [];
4849

4950
changesContent.forEach(function(content) {
5051
if (content.layer === "VENDOR") {
@@ -74,21 +75,31 @@ export default function({resources, options: {pathPrefix, hasFlexBundleVersion},
7475
case "ctrl_variant_management_change":
7576
variantManagementChanges.push(content);
7677
break;
78+
case "annotation_change":
79+
annotationChanges.push(content);
80+
break;
7781
}
7882
});
7983

80-
if (!hasFlexBundleVersion && (compVariants.length != 0 || variants.length != 0 || variantChanges.length != 0 ||
81-
variantDependentControlChanges.length != 0 || variantManagementChanges.length != 0)) {
84+
if (!hasFlexBundleVersion && (
85+
compVariants.length != 0 ||
86+
variants.length != 0 ||
87+
variantChanges.length != 0 ||
88+
variantDependentControlChanges.length != 0 ||
89+
variantManagementChanges.length != 0 ||
90+
annotationChanges.length != 0
91+
)) {
8292
throw new Error(
83-
"There are some control variant changes in the changes folder. This only works with a " +
84-
"minUI5Version 1.73.0. Please update the minUI5Version in the manifest.json to 1.73.0 or higher");
93+
"There are some files in the changes folder supported only with a UI5 version 1.73 and above. " +
94+
"Please update the minUI5Version in the manifest.json to 1.73 or higher");
8595
}
8696
// create changes-bundle.json
8797
if (!hasFlexBundleVersion) {
8898
return JSON.stringify(changes);
8999
} else {
90100
bundleName = "flexibility-bundle.json";
91101
let newChangeFormat = {
102+
annotationChanges,
92103
changes,
93104
compVariants,
94105
variants,

‎lib/tasks/bundlers/generateFlexChangesBundle.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ export default async function({workspace, taskUtil, options = {}}) {
9595

9696
log.verbose("Collecting flexibility changes");
9797
const allResources = await workspace.byGlob(
98-
`${pathPrefix}/changes/*.{change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change}`);
98+
pathPrefix + "/changes/*.{annotation_change,change,variant,ctrl_variant," +
99+
"ctrl_variant_change,ctrl_variant_management_change}"
100+
);
99101

100102
let bBundleCreated = false;
101103

‎test/expected/build/application.j/dest-resources-json/Component-preload.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/expected/build/application.j/dest-resources-json/changes/flexibility-bundle.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"changes":[{"fileName":"id_456_addField","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2023-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}},{"fileName":"id_123_addField","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"CUSTOMER","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"Max Mustermann"}}],"compVariants":[{"fileName":"id_111_compVariants","fileType":"variant","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"},"appDescriptorChange":false}],"variants":[{"fileName":"id_111_test","fileType":"ctrl_variant","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}],"variantChanges":[{"fileName":"id_111_test","fileType":"ctrl_variant_change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}],"variantDependentControlChanges":[{"fileName":"id_111_variantDependentControlChange","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"},"variantReference":"someting here"}],"variantManagementChanges":[{"fileName":"id_111_test","fileType":"ctrl_variant_management_change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}]}
1+
{"annotationChanges":[{"fileName":"id_111","fileType":"annotation_change","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"CUSTOMER","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"Max Mustermann"}}],"changes":[{"fileName":"id_456_addField","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2023-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}},{"fileName":"id_123_addField","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"CUSTOMER","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"Max Mustermann"}}],"compVariants":[{"fileName":"id_111_compVariants","fileType":"variant","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"},"appDescriptorChange":false}],"variants":[{"fileName":"id_111_test","fileType":"ctrl_variant","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}],"variantChanges":[{"fileName":"id_111_test","fileType":"ctrl_variant_change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}],"variantDependentControlChanges":[{"fileName":"id_111_variantDependentControlChange","fileType":"change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"},"variantReference":"someting here"}],"variantManagementChanges":[{"fileName":"id_111_test","fileType":"ctrl_variant_management_change","changeType":"hideControl","component":"application.j.Component","content":{},"selector":{"id":"control1"},"layer":"VENDOR","texts":{},"namespace":"apps/application.j.Component/changes","creation":"2025-10-30T13:52:40.4754350Z","originalLanguage":"","conditions":{},"support":{"generator":"did it","user":"SAP"}}]}

‎test/expected/build/application.j/dest-resources-json/resources.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{
1818
"name": "Component-preload.js",
1919
"module": "application/j/Component-preload.js",
20-
"size": 3676,
20+
"size": 4049,
2121
"merged": true,
2222
"required": [
2323
"sap/m/library.js",
@@ -75,7 +75,7 @@
7575
{
7676
"name": "changes/flexibility-bundle.json",
7777
"module": "application/j/changes/flexibility-bundle.json",
78-
"size": 2800
78+
"size": 3173
7979
},
8080
{
8181
"name": "changes/fragments/MyFragment.fragment.xml",

0 commit comments

Comments
 (0)