npm - @sap/ux-specification - Versions diffs - 1.71.121 → 1.71.123 - Mend

@sap/ux-specification 1.71.121 → 1.71.123

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (45) hide show

package/dist/specification/src/sync/v2/import/common/index.js CHANGED Viewed

@@ -11,7 +11,6 @@ exports.determineTableType = determineTableType;
 exports.addFragments = addFragments;
 exports.importHeaderActions = importHeaderActions;
 const ux_specification_types_1 = require("@sap/ux-specification-types");
-const table_1 = require("../controls/table");
 const common_1 = require("../../../common");
 const decorators_1 = require("../../../common/decoration/decorators");
 const manifest_1 = require("../../export/manifest");
@@ -20,6 +19,7 @@ const i18next_1 = __importDefault(require("i18next"));
 const xml_js_1 = require("xml-js");
 const controls_1 = require("../../export/controls");
 const types_1 = require("../../types");
+const table_1 = require("../controls/table");
 function convertActionKey(actionProperty) {
     return actionProperty.replace('/', '::');
 }
@@ -166,33 +166,6 @@ function addSmartChartFlex(config, changePropertyKey, change, jsonSchema) {
         }
     }
 }
-/**
- * Checks and adds further flex changes to in config file
- * @param {ListReportConfig | AnalyticalListPageConfig} config - the configuration to be filled
- * @param {ChangeDefinition} change - change definition
- * @param {object} jsonSchema - application specific schema
- */
-function addAdditionalFlexChanges(config, change, jsonSchema) {
-    const flexForTransfer = {
-        controlId: change.controlId,
-        propertyId: change.content.property,
-        newValue: change.content.newBinding ? change.content.newBinding : change.content.newValue,
-        controlType: change.controlType,
-        creation: change.creation
-    };
-    let constructorName;
-    if ((!config.table.type || config.table.type === ux_specification_types_1.v2.TableTypeV2.ResponsiveTable) &&
-        !flexForTransfer.controlId?.includes(ux_specification_types_1.PAGETYPE_VIEW_EXTENSION_TEMPLATE_MAP.get(ux_specification_types_1.PageTypeV2.AnalyticalListPage))) {
-        constructorName = 'ResponsiveTable';
-    }
-    else {
-        constructorName = config.table.constructor.name;
-    }
-    const schemaProperty = jsonSchema['definitions'][`${constructorName}<LineItems>`].properties[flexForTransfer.propertyId];
-    if (schemaProperty || flexForTransfer.controlType === ux_specification_types_1.ControlType.TableColumn) {
-        (0, table_1.addFlexForTable)(config.table, flexForTransfer, jsonSchema);
-    }
-}
 /**
  * Adds flex changes to config file
  * @param {ListReportConfig | AnalyticalListPageConfig} config - the configuration to be filled
@@ -231,7 +204,6 @@ function addFlex(config, changeString, appSchema, logger) {
                     break;
                 }
                 default: {
-                    addAdditionalFlexChanges(config, change, appSchema);
                     break;
                 }
             }
@@ -362,64 +334,70 @@ function analyzeFilteredFragments(filteredFragments, config, viewExtensionsOfPag
     }
 }
 /**
- * Imports view extesnions of a page
- * @param {object} viewExtensionsOfPage
- * @param {string} targetKeyEntitySet
- * @param {LROPConfigsType} config
- * @param {CommonImportParameters} importParameters
+ * Imports view extensions of a page
+ * @param {object} viewExtensionsOfPage - the view extensions of a page, as specified in manifest
+ * @param {string} targetKeyEntitySet - the entitySet, as part of the extension key
+ * @param {LROPConfigsType} config - the configuration to be filled
+ * @param {CommonImportParameters} importParameters  - object comprising all input data
+ * @param lineItemsId - ID of the line items
  */
-function processViewExtensions(viewExtensionsOfPage, targetKeyEntitySet, config, importParameters) {
-    for (const manifestKey of Object.keys(viewExtensionsOfPage)) {
-        const manifestKeyParts = manifestKey.split('|');
-        const [keyExtensionType, keyEntitySet] = manifestKeyParts;
-        // If Object Page section have key, then Ignore it as it is not from QuickVariantSelectionX
-        const keyTab = manifestKeyParts[2];
-        const extensionType = ux_specification_types_1.ViewTemplateType[keyExtensionType];
-        if (extensionType && '|' + keyEntitySet === targetKeyEntitySet) {
-            const fragmentType = viewExtensionsOfPage[manifestKey].type
-                ? viewExtensionsOfPage[manifestKey].type.toLowerCase()
+function processViewExtensions(viewExtensionsOfPage, targetKeyEntitySet, config, importParameters, lineItemsId) {
+    for (const extensionId of Object.keys(viewExtensionsOfPage)) {
+        const extensionIdParts = extensionId.split('|');
+        const [extensionType, entitySet] = extensionIdParts;
+        const keyTab = extensionIdParts[2];
+        // If Object Page sections have a tab key, then ignore it as it is not from QuickVariantSelectionX
+        if (extensionType && entitySet === targetKeyEntitySet) {
+            const fragmentType = viewExtensionsOfPage[extensionId].type
+                ? viewExtensionsOfPage[extensionId].type.toLowerCase()
                 : 'xml';
-            let fragmentName = viewExtensionsOfPage[manifestKey].fragmentName;
+            let fragmentName = viewExtensionsOfPage[extensionId].fragmentName;
             if (!fragmentName) {
                 continue;
             }
             // Responsive Table ==> check cells' fragment name
-            const cellsFragmentName = determineCellsFragmentName(extensionType, viewExtensionsOfPage, keyEntitySet, keyTab);
+            const cellsFragmentName = determineCellsFragmentName(extensionType, viewExtensionsOfPage, entitySet, keyTab);
             // Retrieve information from fragment
             const fragmentParts = fragmentName.split('.');
             fragmentName = fragmentParts[fragmentParts.length - 1] + ux_specification_types_1.FRAGMENTNAMEPART + fragmentType;
             const filteredFragments = importParameters.fragments.filter((fragment) => fragment['dataSourceUri'].endsWith(fragmentName));
             try {
-                analyzeFilteredFragments(filteredFragments, config, viewExtensionsOfPage, manifestKey, keyTab, extensionType, cellsFragmentName);
+                analyzeFilteredFragments(filteredFragments, config, viewExtensionsOfPage, extensionId, keyTab, extensionType, cellsFragmentName);
             }
             catch (error) {
+                //invalid fragment?!
                 importParameters.logger.error(error.message);
             }
+            if (config['table']['columns']?.custom) {
+                //custom array exists, it comprises the custom columns
+                config['table']['columns'].custom.forEach((customColumn) => {
+                    (0, table_1.importFlexChangesOfColumn)(importParameters, config, customColumn.id, customColumn, lineItemsId);
+                });
+            }
         }
     }
 }
 /**
  * Adds custom column information from manifest and fragments to the configuration
- * @param config - configuration, to be enhanced
+ * @param {LROPConfigsType} config - current configuration, to be enhanced
  * @param {CommonImportParameters} importParameters  - object comprising all input data
- * @param manifest - actual manifest.json
- * @param v2Page - actual page in the manifest
- * @param pageType - type of the page
- * @param fragments - list of all fragments
+ * @param {v2.SapUiAppPageV2} v2Page - actual page in the manifest
+ * @param {PageTypeV2} pageType - type of the page
  * @param objectPageSectionData - optional information, for object page
+ * @param lineItemsId - ID of the line items
  */
-function addFragments(config, importParameters, v2Page, pageType, objectPageSectionData) {
+function addFragments(config, importParameters, v2Page, pageType, objectPageSectionData, lineItemsId = 'LineItems') {
     if (!importParameters.fragments) {
         return;
     }
-    const targetKeyEntitySet = '|' + (objectPageSectionData && objectPageSectionData.target ? objectPageSectionData.target : v2Page.entitySet);
     if (importParameters.manifest[ux_specification_types_1.ManifestSection.ui5]?.extends?.extensions?.['sap.ui.viewExtensions']) {
         const viewExtension = ux_specification_types_1.PAGETYPE_VIEW_EXTENSION_TEMPLATE_MAP.get(pageType);
         const viewExtensionsOfPage = importParameters.manifest[ux_specification_types_1.ManifestSection.ui5].extends.extensions['sap.ui.viewExtensions'][viewExtension];
         if (!viewExtensionsOfPage) {
             return;
         }
-        processViewExtensions(viewExtensionsOfPage, targetKeyEntitySet, config, importParameters);
+        const targetKeyEntitySet = objectPageSectionData && objectPageSectionData.target ? objectPageSectionData.target : v2Page.entitySet;
+        processViewExtensions(viewExtensionsOfPage, targetKeyEntitySet, config, importParameters, lineItemsId);
     }
 }
 /**

package/dist/specification/src/sync/v2/import/common/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/common/index.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/common/index.ts"],"names":[],"mappings":"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"}

package/dist/specification/src/sync/v2/import/controls/table.d.ts CHANGED Viewed

@@ -1,5 +1,9 @@
-import type { v2 } from '@sap/ux-specification-types';
+import type { CommonImportParameters } from '@sap/ux-specification-types';
+import { v2 } from '@sap/ux-specification-types';
 import type { Definition } from 'typescript-json-schema';
+/**
+ * Flex change structure for the transfer to the flexiblity utils
+ */
 export type FlexForTransfer = {
     controlId: string;
     controlType: string;
@@ -12,5 +16,27 @@ export interface FlexChangesForTransfer {
     [controlId: string]: FlexForTransfer;
 }
 export type ConfigTableType = v2.ResponsiveTable | v2.TreeTable | v2.AnalyticalTable | v2.GridTable | v2.TableALP;
-export declare function addFlexForTable(config: ConfigTableType, change: FlexForTransfer, jsonSchema: Definition): void;
+/**
+ * Checks whether a given flex change applies to a given table column. If this is the case the change is filled into the config.
+ * @param {ConfigTableType} config - the table configuration
+ * @param {FlexForTransfer} change - the flex change
+ * @param {string} columnKey - the column key. If the column key is not equal to the column id of the change, the change will not be added to the column.
+ * @param {object} customColumn - the custom column. If set, the property of the change will be added to the given column.
+ */
+export declare function addFlexChangeToConfigTableColumn(config: ConfigTableType, change: FlexForTransfer, columnKey: string, customColumn?: object): void;
+/**
+ * Fills a table column flex change into the config, if it is relevant for the table
+ * @param {ConfigTableType} config - the table configuration
+ * @param {FlexForTransfer} change - the flex change
+ */
+export declare function addFlexChangeToConfigTable(config: ConfigTableType, change: FlexForTransfer, lineItemsDefinition: Definition): void;
+/**
+ * Imports the flex changes for a table column
+ * @param {CommonImportParameters} importParameters - common import parameters
+ * @param {v2.ListReportConfigV} listReportConfig - the list report configuration
+ * @param {string} columnKey - the column key
+ * @param {object} customColumn - optional: the custom column
+ * @param {string} lineItemsId - the line items id
+ */
+export declare function importFlexChangesOfColumn(importParameters: CommonImportParameters, listReportConfig: v2.ListReportConfigV2, columnKey: string, customColumn?: object, lineItemsId?: string): void;
 //# sourceMappingURL=table.d.ts.map

package/dist/specification/src/sync/v2/import/controls/table.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/controls/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,~~EAAE~~,EAAE,EAAE,MAAM,6BAA6B,CAAC;~~AAEtD~~,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;~~AAEzD~~,MAAM,MAAM,eAAe,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACnC,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,CAAC;CACxC;AAED,MAAM,MAAM,eAAe,GAAG,EAAE,CAAC,eAAe,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,eAAe,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,QAAQ,CAAC;AAElH,wBAAgB,eAAe,~~CAAC~~,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,~~UAAU~~,EAAE,UAAU,~~GAAG~~,IAAI,~~CA2B9G~~"}
1	+ {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/controls/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EACH,EAAE,EAML,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACnC,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,CAAC;CACxC;AAED,MAAM,MAAM,eAAe,GAAG,EAAE,CAAC,eAAe,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,eAAe,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,QAAQ,CAAC;AAElH;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,EACvB,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,GACtB,IAAI,CAwCN;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,EACvB,mBAAmB,EAAE,UAAU,GAChC,IAAI,CAON;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACrC,gBAAgB,EAAE,sBAAsB,EACxC,gBAAgB,EAAE,EAAE,CAAC,kBAAkB,EACvC,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,SAAc,QAuC5B"}

package/dist/specification/src/sync/v2/import/controls/table.js CHANGED Viewed

@@ -1,32 +1,108 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addFlexForTable = addFlexForTable;
+exports.addFlexChangeToConfigTableColumn = addFlexChangeToConfigTableColumn;
+exports.addFlexChangeToConfigTable = addFlexChangeToConfigTable;
+exports.importFlexChangesOfColumn = importFlexChangesOfColumn;
 const ux_specification_types_1 = require("@sap/ux-specification-types");
-function addFlexForTable(config, change, jsonSchema) {
-    if (change.controlType.endsWith(ux_specification_types_1.DefinitionName.Table)) {
-        config[change.propertyId] = change.newValue;
-    }
-    else if (change.controlType === ux_specification_types_1.ControlType.TableColumn) {
-        const schemaProperty = (jsonSchema?.definitions[ux_specification_types_1.DefinitionName.TableColumn]).properties[change.propertyId];
-        if (!schemaProperty) {
-            return;
-        }
+const common_1 = require("../../../common");
+/**
+ * Checks whether a given flex change applies to a given table column. If this is the case the change is filled into the config.
+ * @param {ConfigTableType} config - the table configuration
+ * @param {FlexForTransfer} change - the flex change
+ * @param {string} columnKey - the column key. If the column key is not equal to the column id of the change, the change will not be added to the column.
+ * @param {object} customColumn - the custom column. If set, the property of the change will be added to the given column.
+ */
+function addFlexChangeToConfigTableColumn(config, change, columnKey, customColumn) {
+    if (change.controlType === ux_specification_types_1.ControlType.TableColumn || change.controlType === ux_specification_types_1.ControlType.Button) {
         const idParts = change.controlId.split('-');
         const lastIdPart = idParts[idParts.length - 1];
         // As the last stable Id part is still too long in some cases, strip off the fixed parts.
         // It must the be added again by the export!
-        const annotationPart = lastIdPart.split('template:::TableColumn:::');
-        const colId = annotationPart[annotationPart.length - 1]
-            .replace(/sSmartTableId.+?:::/, '')
-            .replace('::com.sap.vocabularies', ux_specification_types_1.VOCWITHCOLONS)
-            .replace('/', ':2f');
-        if (!config.columns) {
-            config.columns = {};
-        }
-        if (!config.columns[colId]) {
-            config.columns[colId] = {};
-        }
-        config.columns[colId][change.propertyId] = change.newValue;
+        const annotationPart = change.controlType === ux_specification_types_1.ControlType.TableColumn
+            ? lastIdPart.split('template:::TableColumn:::')
+            : [lastIdPart];
+        const colId = customColumn
+            ? annotationPart[annotationPart.length - 1]
+            : annotationPart[annotationPart.length - 1]
+                .replace(/sSmartTableId.+?:::/, '')
+                .replace('::com.sap.vocabularies', ux_specification_types_1.VOCWITHCOLONS);
+        let columnKeyEncoded = columnKey?.replace(/@/g, ':40').replace(/#/g, ':23');
+        if (columnKeyEncoded?.startsWith('DataField')) {
+            //Regular encoding of stable ID's
+            columnKeyEncoded = columnKeyEncoded?.replace('/', ':2f');
+        }
+        else {
+            //legacy encoding, for smart table columns only
+            columnKeyEncoded = columnKeyEncoded?.replace('/', '_');
+        }
+        //Compare column part of the selectorId with the given columnKey
+        if (columnKeyEncoded !== colId && columnKey !== colId) {
+            return;
+        }
+        //Add property of flex change to the column in config
+        if (customColumn) {
+            customColumn[change.propertyId] = change.newValue;
+        }
+        else {
+            if (!config.columns) {
+                config.columns = {};
+            }
+            if (!config.columns[columnKey]) {
+                config.columns[columnKey] = {};
+            }
+            config.columns[columnKey][change.propertyId] = change.newValue;
+        }
+    }
+}
+/**
+ * Fills a table column flex change into the config, if it is relevant for the table
+ * @param {ConfigTableType} config - the table configuration
+ * @param {FlexForTransfer} change - the flex change
+ */
+function addFlexChangeToConfigTable(config, change, lineItemsDefinition) {
+    if (change.controlType?.endsWith(ux_specification_types_1.DefinitionName.Table) &&
+        Object.keys(lineItemsDefinition.properties).indexOf(change.propertyId) > -1) {
+        config[change.propertyId] = change.newValue;
     }
 }
+/**
+ * Imports the flex changes for a table column
+ * @param {CommonImportParameters} importParameters - common import parameters
+ * @param {v2.ListReportConfigV} listReportConfig - the list report configuration
+ * @param {string} columnKey - the column key
+ * @param {object} customColumn - optional: the custom column
+ * @param {string} lineItemsId - the line items id
+ */
+function importFlexChangesOfColumn(importParameters, listReportConfig, columnKey, customColumn, lineItemsId = 'LineItems') {
+    //Check all flex changes against the given column key
+    importParameters.flex.forEach((changeString) => {
+        const change = (0, common_1.parseChangeString)(changeString);
+        const flexForTransfer = {
+            controlId: change.controlId,
+            propertyId: change.content?.property,
+            newValue: change.content?.newBinding ? change.content.newBinding : change.content?.newValue,
+            controlType: change.controlType,
+            creation: change.creation
+        };
+        let schemaProperty;
+        //The relevant schema property can either reside on column or table level
+        if (change.controlType === ux_specification_types_1.ControlType.TableColumn) {
+            schemaProperty =
+                importParameters.jsonSchema['definitions'][`TableColumn`].properties[flexForTransfer.propertyId];
+        }
+        else {
+            //Determine the right table type ID for the schema entry
+            const tableTypeId = (!listReportConfig.table.type || listReportConfig.table.type === ux_specification_types_1.v2.TableTypeV2.ResponsiveTable) &&
+                !flexForTransfer.controlId?.includes(ux_specification_types_1.PAGETYPE_VIEW_EXTENSION_TEMPLATE_MAP.get(ux_specification_types_1.PageTypeV2.AnalyticalListPage))
+                ? 'ResponsiveTableWithMultiSelect'
+                : listReportConfig.table.constructor.name;
+            schemaProperty =
+                importParameters.jsonSchema['definitions'][`${tableTypeId}<${lineItemsId}>`]?.properties[flexForTransfer.propertyId];
+        }
+        if (schemaProperty) {
+            //Add the flex change to the config
+            addFlexChangeToConfigTableColumn(listReportConfig.table, flexForTransfer, columnKey, customColumn);
+        }
+    });
+}
 //# sourceMappingURL=table.js.map

package/dist/specification/src/sync/v2/import/controls/table.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"table.js","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/controls/table.ts"],"names":[],"mappings":";;~~AAmBA~~,~~0CA2BC~~;~~AA7CD~~,~~wEAAyF~~;~~AAkBzF~~,SAAgB,~~eAAe~~,~~CAAC~~,MAAuB,~~EAAE~~,MAAuB,~~EAAE~~,~~UAAsB~~;~~IACpG~~,IAAI,MAAM,CAAC,WAAW,~~CAAC~~,~~QAAQ~~,CAAC,~~uCAAc~~,CAAC,KAAK,CAAC,EAAE,CAAC;~~QACpD~~,MAAM,~~CAAC~~,MAAM,CAAC,~~UAAU~~,CAAC,GAAG,MAAM,CAAC,~~QAAQ~~,CAAC~~;IAChD~~,CAAC;~~SAAM~~,~~IAAI~~,MAAM,CAAC,WAAW,KAAK,oCAAW,CAAC,WAAW,~~EAAE~~,CAAC;~~QACxD~~,MAAM,cAAc,GAAG,CAAC,~~UAAU~~,EAAE,~~WAAW~~,CAAC,~~uCAAc~~,CAAC,~~WAAW~~,~~CAAgB~~,~~CAAA~~,CAAC,~~UAAU~~,~~CACjG~~,~~MAAM~~,CAAC,~~UAAU~~,~~CACpB~~,CAAC;~~QACF~~,IAAI,CAAC,~~cAAc~~,EAAE,CAAC;~~YAClB~~,OAAO;~~QACX~~,CAAC;~~QACD~~,~~MAAM~~,OAAO,GAAG,~~MAAM~~,CAAC,~~SAAS~~,CAAC,KAAK,CAAC,~~GAAG~~,CAAC,CAAC;~~QAC5C~~,MAAM,UAAU,GAAG,~~OAAO~~,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;~~QAC/C~~,~~yFAAyF~~;~~QACzF~~,~~4CAA4C~~;~~QAC5C~~,MAAM,~~cAAc~~,~~GAAG~~,UAAU,CAAC,~~KAAK~~,CAAC,~~2BAA2B~~,CAAC,CAAC;~~QACrE~~,MAAM,KAAK,GAAG,~~cAAc~~,CAAC,~~cAAc~~,CAAC,MAAM,GAAG,CAAC,CAAC;~~aAClD~~,OAAO,CAAC,~~qBAAqB~~,EAAE,EAAE,CAAC;~~aAClC~~,~~OAAO~~,~~CAAC~~,~~wBAAwB~~,EAAE,~~sCAAa~~,CAAC;~~aAChD~~,OAAO,CAAC,~~GAAG~~,EAAE,~~KAAK~~,CAAC,CAAC~~;QACzB~~,~~IAAI~~,CAAC,MAAM,CAAC,OAAO,EAAE,~~CAAC~~;~~YAClB~~,MAAM,CAAC,~~OAAO~~,~~GAAG~~,EAAE,CAAC;~~QACxB~~,CAAC;~~QACD~~,IAAI,CAAC,MAAM,CAAC,~~OAAO~~,~~CAAC,~~KAAK,CAAC,EAAE,CAAC;~~YACzB~~,MAAM,CAAC,~~OAAO~~,CAAC,KAAK,CAAC,~~GAAG~~,EAAE,CAAC;~~QAC/B~~,CAAC;~~QACD~~,~~MAAM~~,CAAC,~~OAAO~~,CAAC,KAAK,CAAC,CAAC,~~MAAM~~,CAAC,UAAU,CAAC,GAAG,~~MAAM~~,CAAC,~~QAAQ~~,CAAC;~~IAC/D~~,CAAC;~~AACL~~,CAAC"}
1	+ {"version":3,"file":"table.js","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/controls/table.ts"],"names":[],"mappings":"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"}

package/dist/specification/src/sync/v2/import/pages/analyticalListPage.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"analyticalListPage.d.ts","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/pages/analyticalListPage.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;~~AAoJ7E~~;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC1C,gBAAgB,EAAE,qBAAqB,GACxC,EAAE,CAAC,0BAA0B,GAAG,SAAS,~~CAgC3C~~"}
1	+ {"version":3,"file":"analyticalListPage.d.ts","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/pages/analyticalListPage.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAyJ7E;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC1C,gBAAgB,EAAE,qBAAqB,GACxC,EAAE,CAAC,0BAA0B,GAAG,SAAS,CAqC3C"}

package/dist/specification/src/sync/v2/import/pages/analyticalListPage.js CHANGED Viewed

@@ -7,6 +7,7 @@ const i18n_1 = require("../../../../i18n/i18n");
 const common_1 = require("../../../common");
 const utils_1 = require("../../import/utils");
 const factory_1 = require("../../export/factory");
+const listReport_1 = require("./listReport");
 /**
  * Adds manifest settings to the config.json
  * @param {AnalyticalListPageConfig} analyticalListPageConfig - the configuration to be filled
@@ -22,7 +23,11 @@ function addSettings(importParameters, analyticalListPageConfig, factory, pageKe
     // Import standard header actions:
     (0, index_1.importHeaderActions)(analyticalListPageConfig, factory, schemaDefinitions);
     analyticalListPageConfig.table = factory.createInstance(ux_specification_types_1.PageTypeV2.AnalyticalListPage, `ALP${tableType}`, analyticalListPageConfig.table);
-    (0, index_1.transferSettingsOfObject)(analyticalListPageConfig.table, importParameters.manifest, schemaDefinitions[`ALP${tableType}<LineItems>`], pageKey, importParameters.logger);
+    // Import table settings
+    const lineItemsDefinition = schemaDefinitions[`ALP${tableType}<LineItems>`];
+    (0, index_1.transferSettingsOfObject)(analyticalListPageConfig.table, importParameters.manifest, lineItemsDefinition, pageKey, importParameters.logger);
+    // Import flex changes for columns
+    (0, listReport_1.importFlexChangesOfTableAndColumns)(importParameters, lineItemsDefinition, analyticalListPageConfig);
     // ToolBar:
     analyticalListPageConfig.table.toolBar = factory.createInstance(ux_specification_types_1.PageTypeV2.AnalyticalListPage, ux_specification_types_1.DefinitionName.ToolBar, {
         actions: {}
@@ -85,13 +90,17 @@ function createAnalyticalListPageConfig(importParameters) {
     if (!v2Page) {
         return;
     }
+    //Add the manifest settings to the config (and dependent flex changes)
     addSettings(importParameters, config, factory, pageKeys[0]);
+    //Add the settings from other flex changes to the config
     importParameters.flex.forEach((change) => {
         if ((0, common_1.parseChangeString)(change)) {
-            (0, index_1.addFlex)(config, change, importParameters.jsonSchema);
+            (0, index_1.addFlex)(config, change, importParameters.jsonSchema, importParameters.logger);
         }
     });
+    //Add the settings from fragments to the config
     (0, index_1.addFragments)(config, importParameters, v2Page, ux_specification_types_1.PageTypeV2.AnalyticalListPage);
+    //Remove empty properties from the config if they are not required
     (0, utils_1.removeEmptySettings)(config);
     return config;
 }

package/dist/specification/src/sync/v2/import/pages/analyticalListPage.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"analyticalListPage.js","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/pages/analyticalListPage.ts"],"names":[],"mappings":";;~~AAkKA~~,~~wEAkCC~~;~~AApMD~~,2CAOyB;AAEzB,wEAA0F;AAC1F,gDAAiD;AACjD,4CAAoD;AACpD,8CAA0G;AAC1G,kDAA4E;~~AAI5E~~;;;;;;;;GAQG;AACH,SAAS,WAAW,CAChB,gBAAuC,EACvC,wBAAuD,EACvD,OAAkC,EAClC,OAAe;IAEf,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAI,gBAAgB,CAAC,UAAyB,CAAC,WAAyB,CAAC;IAEhG,kCAAkC;IAClC,IAAA,2BAAmB,EAAC,wBAAwB,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAE1E,wBAAwB,CAAC,KAAK,GAAG,OAAO,CAAC,cAAc,CACnD,mCAAU,CAAC,kBAAkB,EAC7B,MAAM,SAAS,EAAE,EACjB,wBAAwB,CAAC,KAAK,CACjC,CAAC;IACF,IAAA,gCAAwB,EACpB,wBAAwB,CAAC,KAAK,EAC9B,gBAAgB,CAAC,QAAQ,EACzB,~~iBAAiB~~,CAAC,MAAM,~~SAAS~~,~~aAAa,~~CAAC,~~EAC/C~~,~~OAAO~~,~~EACP~~,gBAAgB,~~CAAC~~,~~MAAM~~,~~CAC1B~~,CAAC;~~IACF~~,WAAW;IACX,wBAAwB,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,cAAc,CAC3D,mCAAU,CAAC,kBAAkB,EAC7B,uCAAc,CAAC,OAAO,EACtB;QACI,OAAO,EAAE,EAAE;KACd,CACJ,CAAC;IACF,IAAA,gCAAwB,EACpB,wBAAwB,CAAC,KAAK,CAAC,OAAO,EACtC,gBAAgB,CAAC,QAAQ,EACzB,iBAAiB,CAAC,uCAAc,CAAC,OAAO,CAAC,EACzC,OAAO,EACP,gBAAgB,CAAC,MAAM,CAC1B,CAAC;IACF,IAAI,iBAAiB,CAAC,uCAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9C,KAAK,MAAM,cAAc,IAAI,iBAAiB,CAAC,uCAAc,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,CAAC;YAClF,MAAM,SAAS,GAAG,IAAA,wBAAgB,EAAC,cAAc,CAAC,CAAC;YACnD,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,cAAc,CAC9E,mCAAU,CAAC,kBAAkB,EAC7B,uCAAc,CAAC,MAAM,CACxB,CAAC;YACF,IAAA,gCAAwB,EACpB,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EACzD,gBAAgB,CAAC,QAAQ,EACzB,iBAAiB,CAAC,uCAAc,CAAC,MAAM,CAAC,EACxC,OAAO,EACP,gBAAgB,CAAC,MAAM,CAC1B,CAAC;QACN,CAAC;IACL,CAAC;IACD,YAAY;IACZ,wBAAwB,CAAC,SAAS,GAAG,OAAO,CAAC,cAAc,CACvD,mCAAU,CAAC,kBAAkB,EAC7B,uCAAc,CAAC,2BAA2B,EAC1C,wBAAwB,CAAC,SAAS,CACrC,CAAC;IACF,IAAA,gCAAwB,EACpB,wBAAwB,CAAC,SAAS,EAClC,gBAAgB,CAAC,QAAQ,EACzB,iBAAiB,CAAC,uCAAc,CAAC,2BAA2B,CAAC,EAC7D,OAAO,EACP,gBAAgB,CAAC,MAAM,CAC1B,CAAC;~~IAEF~~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~~IAED~~,WAAW,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;~~IAC5D~~,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACrC,IAAI,IAAA,0BAAiB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,IAAA,eAAO,EAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;~~QACzD~~,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAA,oBAAY,EAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,mCAAU,CAAC,kBAAkB,CAAC,CAAC;~~IAC9E~~,IAAA,2BAAmB,EAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,MAAM,CAAC;AAClB,CAAC"}
1	+ {"version":3,"file":"analyticalListPage.js","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/pages/analyticalListPage.ts"],"names":[],"mappings":"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"}

package/dist/specification/src/sync/v2/import/pages/listReport.d.ts CHANGED Viewed

@@ -1,4 +1,12 @@
-import type { v2, ImportListReportV2Parameters } from '@sap/ux-specification-types';
+import type { ImportListReportV2Parameters, CommonImportParameters, v2 } from '@sap/ux-specification-types';
+import type { Definition } from 'typescript-json-schema';
+/**
+ * Imports flex changes for columns and table
+ * @param {ImportListReportV2Parameters} importParameters  - object comprising all input data
+ * @param {Definition} lineItemsDefinition - the relevant line items' definition in the schema
+ * @param {ListReportConfig} listReportConfig - LR config, to be filled
+ */
+export declare function importFlexChangesOfTableAndColumns(importParameters: CommonImportParameters, lineItemsDefinition: Definition, listReportConfig: v2.ListReportConfigV2): void;
 /**
  * Creates the configuration file content for a list report V2
  * @param {ImportListReportV2Parameters} importParameters  - object comprising all input data

package/dist/specification/src/sync/v2/import/pages/listReport.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"listReport.d.ts","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/pages/listReport.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,~~EAAE~~,EAAE,EAAE,~~4BAA4B~~,EAAE,MAAM,~~6BAA6B~~,CAAC;~~AAgKpF~~;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAClC,gBAAgB,EAAE,4BAA4B,GAC/C,EAAE,CAAC,kBAAkB,GAAG,SAAS,CAkCnC"}
1	+ {"version":3,"file":"listReport.d.ts","sourceRoot":"","sources":["../../../../../../../src/sync/v2/import/pages/listReport.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACR,4BAA4B,EAE5B,sBAAsB,EACtB,EAAE,EACL,MAAM,6BAA6B,CAAC;AAUrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAiCzD;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAC9C,gBAAgB,EAAE,sBAAsB,EACxC,mBAAmB,EAAE,UAAU,EAC/B,gBAAgB,EAAE,EAAE,CAAC,kBAAkB,QAkC1C;AA2HD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAClC,gBAAgB,EAAE,4BAA4B,GAC/C,EAAE,CAAC,kBAAkB,GAAG,SAAS,CAkCnC"}

package/dist/specification/src/sync/v2/import/pages/listReport.js CHANGED Viewed

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.importFlexChangesOfTableAndColumns = importFlexChangesOfTableAndColumns;
 exports.createListReportConfig = createListReportConfig;
 const index_1 = require("../common/index");
 const ux_specification_types_1 = require("@sap/ux-specification-types");
@@ -13,6 +14,7 @@ const i18n_1 = require("../../../../i18n/i18n");
 const utils_1 = require("../../import/utils");
 const factory_1 = require("../../export/factory");
 const types_1 = require("../../types");
+const table_1 = require("../controls/table");
 /**
  * Imports filterbar information into the LR config
  * @param {ListReportConfig} listReportConfig - LR config, to be filled
@@ -25,6 +27,42 @@ function importFilterBar(listReportConfig, factory, importParameters, schemaDefi
     listReportConfig.filterBar = factory.createInstance(ux_specification_types_1.PageTypeV2.ListReport, ux_specification_types_1.DefinitionName.ListReportFilterBar, listReportConfig.filterBar);
     (0, index_1.transferSettingsOfObject)(listReportConfig.filterBar, importParameters.manifest, schemaDefinitions[ux_specification_types_1.DefinitionName.ListReportFilterBar], pageKey, importParameters.logger);
 }
+/**
+ * Imports flex changes for columns and table
+ * @param {ImportListReportV2Parameters} importParameters  - object comprising all input data
+ * @param {Definition} lineItemsDefinition - the relevant line items' definition in the schema
+ * @param {ListReportConfig} listReportConfig - LR config, to be filled
+ */
+function importFlexChangesOfTableAndColumns(importParameters, lineItemsDefinition, listReportConfig) {
+    if (!importParameters.flex) {
+        return;
+    }
+    //Flex changes for table
+    importParameters.flex.forEach((changeString) => {
+        const change = (0, common_1.parseChangeString)(changeString);
+        //Prepare the flex change for transfer to the flexibility utility function
+        const flexForTransfer = {
+            controlId: change.controlId,
+            propertyId: change.content?.property,
+            newValue: change.content?.newBinding ? change.content.newBinding : change.content?.newValue,
+            controlType: change.controlType,
+            creation: change.creation
+        };
+        //Import the currently processed flex change if it applies to a property of the SmartTable or its inner table
+        (0, table_1.addFlexChangeToConfigTable)(listReportConfig.table, flexForTransfer, lineItemsDefinition);
+    });
+    //Flex changes for columns
+    const columnsDefinition = lineItemsDefinition.properties.columns.$ref.split('/').pop();
+    const columns = importParameters.jsonSchema.definitions[columnsDefinition]?.properties || {};
+    for (const column in columns) {
+        //custom is just a placeholder for the custom columns, we do not need to consider flex changes for it
+        if (column === 'custom') {
+            continue;
+        }
+        //Import the flex changes for the given column
+        (0, table_1.importFlexChangesOfColumn)(importParameters, listReportConfig, column);
+    }
+}
 /**
  * Imports table information into the LR config
  * @param {TableTypeV2} tableType - table type
@@ -34,14 +72,16 @@ function importFilterBar(listReportConfig, factory, importParameters, schemaDefi
  * @param {string} pageKey - key of the page in manifest
  */
 function importTable(tableType, schemaDefinitions, listReportConfig, importParameters, pageKey) {
-    let localJsonSchema;
+    let lineItemsDefinition;
     if (tableType) {
-        localJsonSchema = importParameters.jsonSchema['definitions'][tableType + '<LineItems>'];
+        lineItemsDefinition = importParameters.jsonSchema['definitions'][tableType + '<LineItems>'];
     }
     else {
-        localJsonSchema = importParameters.jsonSchema['definitions'][types_1.RESPONSIVETABLE];
+        lineItemsDefinition = importParameters.jsonSchema['definitions'][types_1.RESPONSIVETABLE];
     }
-    (0, index_1.transferSettingsOfObject)(listReportConfig.table, importParameters.manifest, localJsonSchema, pageKey, importParameters.logger);
+    (0, index_1.transferSettingsOfObject)(listReportConfig.table, importParameters.manifest, lineItemsDefinition, pageKey, importParameters.logger);
+    // Import flex changes for columns
+    importFlexChangesOfTableAndColumns(importParameters, lineItemsDefinition, listReportConfig);
     if ((!schemaDefinitions['LineItems']?.properties ||
         Object.keys(schemaDefinitions['LineItems'].properties).filter((item) => item !== 'custom').length < 1) &&
         !listReportConfig.table.quickVariantSelection &&