@sap/ux-specification 1.71.49 → 1.71.52

package/dist/src/sync/v2/import/pages/listReport.js

@@ -10,8 +10,6 @@ const extensionLogger_1 = require("../../../../extensionLogger");
 const i18next_1 = __importDefault(require("i18next"));
 const i18n_1 = require("../../../../i18n/i18n");
 const utils_1 = require("../../import/utils");
-const xml_js_1 = require("xml-js");
-const controls_1 = require("../../export/controls");
 const factory_1 = require("../../export/factory");
 const types_1 = require("../../types");
 /**
@@ -39,133 +37,25 @@ function addSettings(importParameters, listReportConfig, factory, pageKey) {
     index_1.transferSettingsOfObject(listReportConfig.table.toolBar, importParameters.manifest, importParameters.jsonSchema['definitions']['ToolBar'], pageKey, importParameters.logger);
     if (importParameters.jsonSchema['definitions']['Actions<LineItems>']) {
         for (const actionProperty in importParameters.jsonSchema['definitions']['Actions<LineItems>'].properties) {
-            const actionKey = actionProperty.replace('/', '::');
+            const actionKey = actionProperty;
             listReportConfig.table.toolBar.actions[actionKey] = factory.createInstance(common_1.PageType.ListReport, 'Action');
             index_1.transferSettingsOfObject(listReportConfig.table.toolBar.actions[actionKey], importParameters.manifest, importParameters.jsonSchema['definitions']['Action'], pageKey, importParameters.logger);
         }
     }
-    //Filterbar:
-    listReportConfig.filterBar = factory.createInstance(common_1.PageType.ListReport, 'FilterBar', listReportConfig.filterBar);
-    index_1.transferSettingsOfObject(listReportConfig.filterBar, importParameters.manifest, importParameters.jsonSchema['definitions']['FilterBar'], pageKey, importParameters.logger);
-}
-/**
- * Removes empty properties in the config.json of List Report V2
- * @param {ListReportConfig} config - the configuration to be checked
- */
-function removeEmptySettings(config) {
-    // Check ToolBar
-    if (config.table.toolBar) {
-        for (const actionKey in config.table.toolBar.actions) {
-            if (Object.keys(config.table.toolBar.actions[actionKey]).length === 0) {
-                delete config.table.toolBar.actions[actionKey];
-            }
-        }
-        if (Object.keys(config.table.toolBar.actions).length === 0) {
-            delete config.table.toolBar.actions;
-        }
-        if (Object.keys(config.table.toolBar).length === 0) {
-            delete config.table.toolBar;
-        }
-    }
-}
-function evaluateFragmentColumn(column, viewExtensionsOfPage, manifestKey, keyPart3, config, extensionType, cellsFragmentName) {
-    if (column['customData'] || column['table:customData']) {
-        const p13nData = column['customData']
-            ? column['customData']['core:CustomData']._attributes.value
-            : column['table:customData']['core:CustomData']._attributes.value;
-        const columnParts = JSON.parse(p13nData.substr(1, p13nData.length));
-        let columnText = column['Text'] && column['Text']._attributes && column['Text']._attributes['text'];
-        if (!columnText) {
-            columnText = column['Label'] && column['Label']._attributes && column['Label']._attributes['text'];
-        }
-        const customElement = {
-            id: column._attributes && column._attributes['id'],
-            text: columnText,
-            columnKey: columnParts['columnKey'],
-            columnIndex: columnParts['columnIndex'] !== undefined ? Number(columnParts['columnIndex']) : undefined,
-            leadingProperty: columnParts['leadingProperty'],
-            className: viewExtensionsOfPage[manifestKey].className,
-            fragmentName: viewExtensionsOfPage[manifestKey].fragmentName,
-            tabKey: keyPart3,
-            extensionType
-        };
-        if (cellsFragmentName) {
-            customElement.cellsFragmentName = cellsFragmentName;
-        }
-        if (!config.table['columns']['custom']) {
-            config.table['columns']['custom'] = [];
-        }
-        const customColumns = config.table['columns']['custom'];
-        customColumns.push(customElement);
-    }
-}
-function addFragments(config, manifest, v2Page, pageType, fragments, objectPageSectionData) {
-    if (!fragments) {
-        return;
-    }
-    const targetKeyEntitySet = '|' + (objectPageSectionData && objectPageSectionData.target ? objectPageSectionData.target : v2Page.entitySet);
-    if (manifest[common_1.ManifestSection.ui5] &&
-        manifest[common_1.ManifestSection.ui5]['extends'] &&
-        manifest[common_1.ManifestSection.ui5]['extends']['extensions'] &&
-        manifest[common_1.ManifestSection.ui5]['extends']['extensions']['sap.ui.viewExtensions']) {
-        const viewExtension = common_1.PAGETYPE_VIEW_EXTENSION_TEMPLATE_MAP.get(pageType);
-        const viewExtensionsOfPage = manifest[common_1.ManifestSection.ui5]['extends']['extensions']['sap.ui.viewExtensions'][viewExtension];
-        if (viewExtensionsOfPage) {
-            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 referenceId = manifestKeyParts[2];
-                const keyTab = objectPageSectionData && referenceId === objectPageSectionData.key ? undefined : referenceId;
-                const extensionType = common_2.ViewTemplateType[keyExtensionType];
-                if (extensionType && '|' + keyEntitySet === targetKeyEntitySet) {
-                    const fragmentType = viewExtensionsOfPage[manifestKey].type
-                        ? viewExtensionsOfPage[manifestKey].type.toLowerCase()
-                        : 'xml';
-                    let fragmentName = viewExtensionsOfPage[manifestKey].fragmentName;
-                    if (!fragmentName) {
-                        continue;
-                    }
-                    // Responsive Table ==> check cells' fragment name
-                    let cellsFragmentName;
-                    if (extensionType === common_2.ViewTemplateType.ResponsiveTableColumnsExtension) {
-                        for (const cellsKey of Object.keys(viewExtensionsOfPage)) {
-                            const [cellsKeyType, cellsKeyEntitySet, cellsKeyTab] = cellsKey.split('|');
-                            if (cellsKeyType === common_2.ViewTemplateType.ResponsiveTableCellsExtension &&
-                                cellsKeyEntitySet === keyEntitySet &&
-                                cellsKeyTab === referenceId) {
-                                cellsFragmentName = viewExtensionsOfPage[cellsKey].fragmentName;
-                            }
-                        }
-                    }
-                    // Retrieve information from fragment
-                    const fragmentParts = fragmentName.split('.');
-                    fragmentName = fragmentParts[fragmentParts.length - 1] + common_2.FRAGMENTNAMEPART + fragmentType;
-                    const filteredFragments = fragments.filter((fragment) => fragment['dataSourceUri'].endsWith(fragmentName));
-                    if (filteredFragments[0]) {
-                        const fragmentJson = JSON.parse(xml_js_1.xml2json(filteredFragments[0].fileContent, { compact: true }));
-                        const fragmentDefintion = fragmentJson[controls_1.FRAGMENT_DEFINITION];
-                        const columnDefinition = controls_1.getRootCustomColumnFromFragmentJSON(fragmentDefintion);
-                        if (columnDefinition) {
-                            if (!config.table['columns']) {
-                                config.table['columns'] = {};
-                            }
-                            if (Array.isArray(columnDefinition)) {
-                                for (let j = 0; j < columnDefinition.length; j++) {
-                                    evaluateFragmentColumn(columnDefinition[j], viewExtensionsOfPage, manifestKey, keyTab, config, extensionType, cellsFragmentName);
-                                }
-                            }
-                            else {
-                                evaluateFragmentColumn(columnDefinition, viewExtensionsOfPage, manifestKey, keyTab, config, extensionType, cellsFragmentName);
-                            }
-                        }
-                    }
-                }
-            }
+    //FilterBar:
+    listReportConfig.filterBar = factory.createInstance(common_1.PageType.ListReport, common_2.DefinitionName.ListReportFilterBar, listReportConfig.filterBar);
+    index_1.transferSettingsOfObject(listReportConfig.filterBar, importParameters.manifest, importParameters.jsonSchema['definitions'][common_2.DefinitionName.ListReportFilterBar], pageKey, importParameters.logger);
+    //Footer:
+    listReportConfig.footer = { actions: {} };
+    const footerAction = importParameters.jsonSchema['definitions']['FooterActions<LineItems>'];
+    if (footerAction) {
+        for (const actionProperty in footerAction.properties) {
+            const actionKey = actionProperty.replace('/', '::');
+            listReportConfig.footer.actions[actionKey] = factory.createInstance(common_1.PageType.ListReport, 'FooterAction');
+            index_1.transferSettingsOfObject(listReportConfig.footer.actions[actionKey], importParameters.manifest, importParameters.jsonSchema['definitions']['Action'], pageKey, importParameters.logger);
         }
     }
 }
-exports.addFragments = addFragments;
 /**
  * Creates the configuration file content for a list report V2
  * @param {ImportListReportV2Parameters} importParameters  - object comprising all input data
@@ -222,8 +112,8 @@ function createListReportConfig(importParameters) {
             index_1.addFlex(config, change, importParameters.jsonSchema, importParameters.logger);
         }
     });
-    addFragments(config, importParameters.manifest, v2Page, common_1.PageType.ListReport, importParameters.fragments);
-    removeEmptySettings(config);
+    index_1.addFragments(config, importParameters.manifest, v2Page, common_1.PageType.ListReport, importParameters.fragments);
+    utils_1.removeEmptySettings(config);
     return config;
 }
 exports.createListReportConfig = createListReportConfig;

package/dist/src/sync/v2/import/pages/listReport.js.map

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

package/dist/src/sync/v2/import/pages/objectPage.js

@@ -13,7 +13,6 @@ const sapUiPageV2_1 = require("../.../../../../../specification/v2/webapp/manife
 const i18next_1 = __importDefault(require("i18next"));
 const i18n_1 = require("../../../../i18n/i18n");
 const common_2 = require("../../../../specification/common");
-const listReport_1 = require("../pages/listReport");
 const factory_1 = require("../../export/factory");
 const types_1 = require("../../types");
 const common_3 = require("../common");
@@ -25,9 +24,12 @@ const common_3 = require("../common");
 function getSingleSelectorIdPart(selectorIdParts, facetID) {
     const lastIdParts = selectorIdParts[0].split('-');
     const id = lastIdParts[lastIdParts.length - 1];
-    if (selectorIdParts[0].indexOf("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) >= 0 && selectorIdParts[0].indexOf('action') >= 0) {
+    if (selectorIdParts[0].indexOf('::action::') >= 0 || selectorIdParts[0].startsWith('action::')) {
         // Object Page ToolBar Actions
-        facetID = lastIdParts[0].split(`${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}::`)[1].split('::')[0];
+        facetID =
+            lastIdParts[0].split('::action::')[0] ||
+                lastIdParts[0].split(`${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}::`)[1].split('::')[0];
+        facetID = `${common_1.ActionTitlePrefix}${facetID}`;
     }
     else if (selectorIdParts[0].indexOf("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) >= 0 ||
         selectorIdParts[0].indexOf('UI.LineItem') >= 0 ||
@@ -91,7 +93,7 @@ function prepareFlexChanges(changes, entitySet, logger) {
             const change = common_1.parseChangeString(changeString);
             if (change && ((_a = change.controlId) === null || _a === void 0 ? void 0 : _a.includes(sapUiPageV2_1.FE_TEMPLATE_V2_OBJECT_PAGE)) && ((_b = change.controlId) === null || _b === void 0 ? void 0 : _b.includes(entitySet))) {
                 let selectorId = change.controlId.split('--')[1].replace(/:3a:3a/g, '::');
-                const complexIdMatch = new RegExp('.+DataField.+:::sSmartTableId::.+');
+                const complexIdMatch = /.+DataField.+:::sSmartTableId::.+/;
                 if (complexIdMatch.exec(selectorId) !== null) {
                     selectorId = selectorId.split('template:::TableColumn:::')[1];
                 }
@@ -121,9 +123,11 @@ function prepareFlexChanges(changes, entitySet, logger) {
     });
     return result;
 }
-const addFlexToConfig = (config, propertyKey, flexChange) => {
-    config[propertyKey] = flexChange;
-};
+/**
+ * Returns the type of a given section
+ * @param schemaSection - current section
+ * @returns {SectionTypeV2} - type of section, differentiated by level (Sub/Section)
+ */
 const getSectionType = (schemaSection) => {
     var _a, _b, _c;
     let reference;
@@ -140,6 +144,149 @@ const getSectionType = (schemaSection) => {
         return types_1.SectionTypeV2.SubSection;
     }
 };
+/**
+ * Import of flex changes of a table to the config JSON of OP
+ * @param flexChanges - list of flex changes (pre-processed by prepareFlexChanges)
+ * @param propertyKey - key of the current property in the app schema
+ * @param configPart - part of the configuration to be filled
+ * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
+ * @param sectionTitle - title of the section (optional)
+ * @param sectionId - ID of the given section (optional)
+ */
+function importFlexChangesOfTable(flexChanges, propertyKey, configPart, importParameters, sectionTitle, sectionId) {
+    const unescapedId = sectionId === null || sectionId === void 0 ? void 0 : sectionId.replace(/::@com.sap.vocabularies/g, v2_1.VOCWITHSLASH);
+    for (const selector in flexChanges) {
+        const flexChange = flexChanges[selector];
+        const propertyIdMatch = flexChange.propertyId === propertyKey;
+        const isTableColumn = propertyKey === 'columns' && flexChange.controlType === common_1.ControlType.TableColumn;
+        let facetIds;
+        if (sectionTitle) {
+            facetIds = [sectionTitle];
+        }
+        else {
+            facetIds = [sectionId, unescapedId];
+        }
+        if ((propertyIdMatch || isTableColumn) && facetIds.indexOf(flexChange === null || flexChange === void 0 ? void 0 : flexChange.facetId) > -1) {
+            table_1.addFlexForTable(configPart, flexChanges[selector], importParameters.jsonSchema);
+        }
+    }
+}
+/**
+ * Import of (regular) flex changes to the config JSON of OP
+ * @param schemaDefinition - current section of the app specific schema
+ * @param configPart - part of the configuration to be filled
+ * @param flexChanges - list of flex changes (pre-processed by prepareFlexChanges)
+ * @param propertyKey - key of the current property in the app schema
+ * @param sectionTitle - title of the section (optional)
+ * @param controlId - ID of the given control, for e.g. GroupElement, Action (optional)
+ */
+function importFlexChanges(schemaDefinition, configPart, flexChanges, propertyKey, sectionTitle, controlId) {
+    var _a, _b;
+    // Comprises list of flexChanges that do not require a faacet id
+    const SupportedFlexChangesWithoutFacetId = [
+        common_1.ControlType.Avatar,
+        common_1.ControlType.ObjectPageLayout,
+        common_1.ControlType.DynamicPage
+    ];
+    for (const selector in flexChanges) {
+        const flexChange = flexChanges[selector];
+        const controlIdMatch = new RegExp(`.*${controlId}\\d?$`).test(selector);
+        const propertyIdMatch = flexChange.propertyId === propertyKey;
+        const schemaControlType = (_a = schemaDefinition['properties'][flexChange.propertyId]) === null || _a === void 0 ? void 0 : _a.controlType;
+        const controlTypeMatch = flexChange.controlType === schemaControlType;
+        const isFlexChangeSupproted = SupportedFlexChangesWithoutFacetId.includes(flexChange.controlType);
+        if (flexChange.controlType === common_1.ControlType.SmartGroup &&
+            propertyIdMatch &&
+            controlTypeMatch &&
+            controlIdMatch) {
+            configPart[propertyKey] = flexChange.newValue;
+        }
+        else if ((((_b = flexChange === null || flexChange === void 0 ? void 0 : flexChange.facetId) === null || _b === void 0 ? void 0 : _b.includes(common_1.ActionTitlePrefix)) &&
+            !sectionTitle &&
+            controlIdMatch &&
+            propertyIdMatch &&
+            controlTypeMatch) ||
+            ((selector.includes(sectionTitle) || selector.includes(schemaDefinition['title'])) &&
+                propertyIdMatch &&
+                controlTypeMatch)) {
+            configPart[propertyKey] = flexChange.newValue;
+        }
+        else if ((flexChange === null || flexChange === void 0 ? void 0 : flexChange.facetId) === undefined && propertyIdMatch && controlTypeMatch && isFlexChangeSupproted) {
+            configPart[propertyKey] = flexChange.newValue;
+        }
+    }
+}
+/**
+ * Checks for deprecated properties and writes them to the log
+ * @param manifestSection - given section in the manifest
+ * @param deprecatedProperties - list of deperecated properties
+ * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
+ * @param manifestPath - manifest path, as calcualted by the sync rule
+ */
+function checkDeprecatedProperties(manifestSection, deprecatedProperties, importParameters, manifestPath) {
+    if (manifestSection && deprecatedProperties) {
+        for (const key in manifestSection) {
+            const deprecated = deprecatedProperties[key];
+            if (deprecated) {
+                extensionLogger_1.log(importParameters.logger, {
+                    severity: "warning" /* Warning */,
+                    message: common_1.getTextForDeprecated(key, deprecated),
+                    location: {
+                        path: 'webapp/manifest.json/',
+                        range: manifestPath.split('/')
+                    }
+                });
+                delete deprecatedProperties[key];
+            }
+        }
+    }
+}
+/**
+ * Imports manifest settings to the object page config
+ * @param syncRule - sync rule for accessing the reflect-metadata
+ * @param pageKeys - list of page keys (comprises the one entry describing the given page)
+ * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
+ * @param configPart - part of the configuration to be filled
+ * @param propertyKey  - key of the current property of the schema definition
+ * @param deprecatedProperties - list od deperecated properties
+ * @param sectionId - ID of the given section (optional)
+ * @param sectionTitle - title of the section (optional)
+ */
+function importManifestSetting(syncRule, pageKeys, importParameters, configPart, propertyKey, deprecatedProperties, sectionId, sectionTitle) {
+    const sectionIdInManifest = sectionId ? sectionId.replace(/\/@/g, '::').replace(/@com.sap/g, 'com.sap') : undefined;
+    let manifestPath;
+    let manifestSection;
+    if (sectionTitle) {
+        manifestPath = syncRule.manifest.path(pageKeys, {}, sectionTitle);
+        if (Object.values(manifest_1.getManifestSectionByPathV2(importParameters.manifest, manifestPath)).length !== 0) {
+            manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, manifestPath);
+        }
+        else {
+            manifestPath = syncRule.manifest.path(pageKeys, {}, sectionIdInManifest);
+            manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, manifestPath);
+        }
+    }
+    else {
+        manifestPath = syncRule.manifest.path(pageKeys, {}, sectionIdInManifest);
+        manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, manifestPath);
+    }
+    const importHandler = syncRule.manifest.import;
+    if (importHandler && typeof importHandler === 'function') {
+        const value = importHandler(manifestSection, sectionId);
+        if (value !== undefined) {
+            configPart[propertyKey] = value;
+        }
+    }
+    else {
+        const manifestKey = syncRule.manifest.key || propertyKey;
+        if (manifestKey in manifestSection) {
+            configPart[propertyKey] = manifestSection[manifestKey];
+        }
+    }
+    // Check for deprecated properties.
+    checkDeprecatedProperties(manifestSection, deprecatedProperties, importParameters, manifestPath);
+    return manifestSection;
+}
 /**
  * Transfers settings from manifest and flexChanges to object page config
  * @param {ImportObjectPageV2Parameters} importParameters  - object comprising all input data
@@ -148,105 +295,57 @@ const getSectionType = (schemaSection) => {
  * @param pageKeys - list of page keys (comprises the one entry describing the given page)
  * @param flexChanges - list of flex changes (pre-processed by prepareFlexChanges)
  * @param sectionId - ID of the given section (optional)
+ * @param sectionTitle - Facet ID of the given section mentioned in annotations (optional)
  * @param actionId - ID of the given action (optional)
  */
 function transferSettingsAndFlexChanges(importParameters, configPart, schemaDefinition, pageKeys, flexChanges, sectionId, sectionTitle, actionId) {
-    var _a;
     if (!schemaDefinition) {
         return;
     }
-    let deprecatedProperties = [];
-    let manifestSection = {};
+    let deprecatedProperties = {};
     if (configPart === null || configPart === void 0 ? void 0 : configPart.getDeprecated) {
         deprecatedProperties = configPart.getDeprecated();
     }
-    const unescapedId = sectionId && sectionId.replace(/::@com.sap.vocabularies/g, v2_1.VOCWITHSLASH);
     for (const propertyKey in schemaDefinition['properties'] || schemaDefinition) {
         const syncRule = common_1.getReflectMetadata(configPart, propertyKey);
         if (syncRule || propertyKey === 'columns') {
-            if (propertyKey === 'columns' || (syncRule && syncRule.flex)) {
+            if (propertyKey === 'columns' || (syncRule === null || syncRule === void 0 ? void 0 : syncRule.flex)) {
                 if (sectionId) {
-                    for (const selector in flexChanges) {
-                        const flexChange = flexChanges[selector];
-                        const propertyIdMatch = flexChange.propertyId === propertyKey;
-                        const isTableColumn = propertyKey === 'columns' && flexChange.controlType === common_1.ControlType.TableColumn;
-                        const facetIds = [sectionId, unescapedId, sectionTitle];
-                        if ((propertyIdMatch || isTableColumn) && facetIds.indexOf(flexChange === null || flexChange === void 0 ? void 0 : flexChange.facetId) > -1) {
-                            table_1.addFlexForTable(configPart, flexChanges[selector], importParameters.jsonSchema);
-                        }
-                    }
+                    importFlexChangesOfTable(flexChanges, propertyKey, configPart, importParameters, sectionTitle, sectionId);
                 }
                 else {
-                    for (const selector in flexChanges) {
-                        const flexChange = flexChanges[selector];
-                        const actionIdMatch = !actionId || new RegExp(`.*${actionId}\\d?$`).test(selector);
-                        const propertyIdMatch = flexChange.propertyId === propertyKey;
-                        const schemaControlType = (_a = schemaDefinition['properties'][flexChange.propertyId]) === null || _a === void 0 ? void 0 : _a.controlType;
-                        const controlTypeMatch = flexChange.controlType === schemaControlType;
-                        if (
-                        // Actions
-                        (flexChange.facetId === 'action' && !sectionTitle && actionIdMatch && propertyIdMatch) ||
-                            (!sectionTitle && actionIdMatch && propertyIdMatch && controlTypeMatch) ||
-                            // Sections
-                            (selector.includes(sectionTitle) && actionIdMatch && propertyIdMatch && controlTypeMatch)) {
-                            addFlexToConfig(configPart, propertyKey, flexChange.newValue);
-                        }
-                    }
+                    importFlexChanges(schemaDefinition, configPart, flexChanges, propertyKey, sectionTitle, actionId);
                 }
             }
             else if (syncRule.manifest) {
-                const sectionIdInManifest = sectionId
-                    ? sectionId.replace(/\/@/g, '::').replace(/@com.sap/g, 'com.sap')
-                    : undefined;
-                let path;
-                if (sectionTitle) {
-                    path = syncRule.manifest.path(pageKeys, {}, sectionTitle);
-                    if (Object.values(manifest_1.getManifestSectionByPathV2(importParameters.manifest, path)).length !== 0) {
-                        manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, path);
-                    }
-                    else {
-                        path = syncRule.manifest.path(pageKeys, {}, sectionIdInManifest);
-                        manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, path);
-                    }
-                }
-                else {
-                    path = syncRule.manifest.path(pageKeys, {}, sectionIdInManifest);
-                    manifestSection = manifest_1.getManifestSectionByPathV2(importParameters.manifest, path);
-                }
-                const importHandler = syncRule.manifest.import;
-                if (importHandler && typeof importHandler === 'function') {
-                    const value = importHandler(manifestSection, sectionId);
-                    if (value !== undefined) {
-                        configPart[propertyKey] = value;
-                    }
-                }
-                else {
-                    const manifestKey = syncRule.manifest.key || propertyKey;
-                    if (manifestKey in manifestSection) {
-                        configPart[propertyKey] = manifestSection[manifestKey];
-                    }
-                }
-                // Check for deprecated properties.
-                if (manifestSection && deprecatedProperties) {
-                    for (const key in manifestSection) {
-                        const deprecated = deprecatedProperties[key];
-                        if (deprecated) {
-                            extensionLogger_1.log(importParameters.logger, {
-                                severity: "warning" /* Warning */,
-                                message: common_1.getTextForDeprecated(key, deprecated),
-                                location: {
-                                    path: 'webapp/manifest.json/',
-                                    range: path.split('/')
-                                }
-                            });
-                            delete deprecatedProperties[key];
-                        }
-                    }
-                }
+                importManifestSetting(syncRule, pageKeys, importParameters, configPart, propertyKey, deprecatedProperties, sectionId, sectionTitle);
             }
         }
     }
 }
+/**
+ *
+ * @param actionType - type of action
+ * @param configActionId - id of action in config
+ * @param {ActionTypeV2|string} importTypeId - type of action that was be initiated
+ * @returns {string} actionId - to be used for import of flex changes
+ */
+function getActionId(actionType, configActionId, importTypeId, facetId) {
+    if (actionType === types_1.ActionTypeV2.Form) {
+        return `${configActionId}::${facetId}::${importTypeId}`;
+    }
+    else if (actionType === types_1.ActionTypeV2.OPFooter) {
+        return `${configActionId}::Determining`;
+    }
+    else if (actionType === types_1.ActionTypeV2.OPToolBar) {
+        return configActionId.includes('sAction::')
+            ? configActionId.split('sAction::')[1]
+            : configActionId.replace(':2f', '::');
+    }
+    else {
+        return configActionId;
+    }
+}
 /**
  *  Fills the action of the configuration
  * @param {ImportObjectPageV2Parameters} importParameters - object comprising all input data
@@ -255,25 +354,17 @@ function transferSettingsAndFlexChanges(importParameters, configPart, schemaDefi
  * @param {ObjectPageV2ConfigParameters} configParameters - container for factory, pageKeys, flexChanges, v2Page, ObjectPageConfig
  * @param {ActionTypeV2|string} importTypeId - type of action that should be initiated
  */
-function fillActions(importParameters, actionProperties, configPart, configParameters, importTypeId) {
-    let actionId, configActionId;
+function fillActions(importParameters, actionProperties, configPart, configParameters, importTypeId, facetId) {
     configPart['actions'] = {};
-    importTypeId = importTypeId.replace(/@/g, '::');
     const actionType = importTypeId.split('::').pop();
     if (configParameters.flexChanges.constructor === Object && Object.keys(configParameters.flexChanges).length !== 0) {
         for (const actionProperty in actionProperties) {
-            configActionId = actionProperty.replace(/@/g, '::');
-            if (actionType === types_1.ActionTypeV2.Form) {
-                actionId = `${configActionId}${importTypeId}`;
-            }
-            else if (actionType === types_1.ActionTypeV2.Footer) {
-                actionId = `${configActionId}::Determining`;
-            }
-            else {
-                actionId = configActionId;
-            }
+            const configActionId = actionProperty.replace(/@/g, '::');
+            const actionId = getActionId(actionType, configActionId, importTypeId, facetId);
             configPart['actions'][configActionId] = configParameters.factory.createInstance(common_2.PageType.ObjectPage, actionType);
-            transferSettingsAndFlexChanges(importParameters, configPart['actions'][configActionId], importParameters.jsonSchema['definitions'][actionType], configParameters.pageKeys, configParameters.flexChanges, undefined, undefined, actionId);
+            if (actionId) {
+                transferSettingsAndFlexChanges(importParameters, configPart['actions'][configActionId], importParameters.jsonSchema['definitions'][actionType], configParameters.pageKeys, configParameters.flexChanges, undefined, undefined, actionId);
+            }
             if (Object.keys(configPart['actions'][configActionId]).length === 0) {
                 delete configPart['actions'][configActionId];
             }
@@ -344,7 +435,7 @@ function fillTableInConfig(importParameters, sectionPart, manifestSettings, conf
         transferSettingsAndFlexChanges(importParameters, configPart[sectionPart.id]['table'], localJsonSchema, configParameters.pageKeys, configParameters.flexChanges, sectionPart.id, sectionTitle);
         const toolBarActions = JSON.parse(JSON.stringify(schemaDefinitions))[`Actions<${sectionPart.id}>`];
         if (toolBarActions === null || toolBarActions === void 0 ? void 0 : toolBarActions['properties']) {
-            fillActions(importParameters, toolBarActions.properties, configPart[sectionPart.id]['table']['toolBar'], configParameters, types_1.ActionTypeV2.ToolBar);
+            fillActions(importParameters, toolBarActions.properties, configPart[sectionPart.id]['table']['toolBar'], configParameters, types_1.ActionTypeV2.OPToolBar);
         }
         if (Object.keys(configPart[sectionPart.id]['table']['toolBar']).length === 0) {
             delete configPart[sectionPart.id]['table']['toolBar'];
@@ -359,17 +450,17 @@ function fillTableInConfig(importParameters, sectionPart, manifestSettings, conf
  * @param {object} configPart - the given part of the object page config
  * @param {SapUiAppPageV2} v2Page - v2 page from manifest.
  */
-function fillCustomColumnsInConfig(importParameters, escapedSectionId, sectionTitle, configPart, v2Page) {
+function fillCustomColumnsInConfig(importParameters, escapedSectionId, configPart, v2Page) {
     const customColumnSchemaProp = importParameters.jsonSchema['definitions'][escapedSectionId].properties.custom;
     const customColumnTarget = customColumnSchemaProp
-        ? utils_1.getTargetFromCustomColumnRef(customColumnSchemaProp.$ref)
+        ? common_1.getTargetFromCustomColumnRef(customColumnSchemaProp.$ref)
         : undefined;
     if (customColumnTarget) {
         const objectPageSectionData = {
-            key: sectionTitle || escapedSectionId.replace('@', ''),
+            key: escapedSectionId.replace('@', ''),
             target: customColumnTarget
         };
-        listReport_1.addFragments(configPart[escapedSectionId], importParameters.manifest, v2Page, common_2.PageType.ObjectPage, importParameters.fragments, objectPageSectionData);
+        common_3.addFragments(configPart[escapedSectionId], importParameters.manifest, v2Page, common_2.PageType.ObjectPage, importParameters.fragments, objectPageSectionData);
     }
 }
 /**
@@ -410,8 +501,9 @@ function fillFormSection(importParameters, sectionPart, configPart, configParame
         transferSettingsAndFlexChanges(importParameters, configPart[sectionPart.id], sectionPart.schema, configParameters.pageKeys, configParameters.flexChanges, undefined, sectionTitle);
     }
     const formActions = importParameters.jsonSchema['definitions'][`SectionActions${formId}`];
+    const formFacetId = sectionTitle || sectionPart.id.replace(/@/g, '::').replace(/::com/g, 'com');
     if (formActions && formActions['properties']) {
-        fillActions(importParameters, formActions.properties, configPart[sectionPart.id]['form'], configParameters, `${sectionPart.id}::${types_1.ActionTypeV2.Form}`);
+        fillActions(importParameters, formActions.properties, configPart[sectionPart.id]['form'], configParameters, types_1.ActionTypeV2.Form, formFacetId);
     }
     const formFields = importParameters.jsonSchema['definitions'][`SectionFields${formId}`];
     if (formFields['properties']) {
@@ -460,8 +552,9 @@ function fillSubSection(importParameters, sectionPart, manifestSettings, configP
  */
 function fillSectionsInConfig(importParameters, sectionProperties, manifestSettings, configPart, configParameters) {
     for (const sectionId in sectionProperties) {
+        const escapedSectionId = sectionId.replace(/\/@/g, '::');
         const sectionPart = {
-            id: sectionId.replace(/\/@/g, '::'),
+            id: escapedSectionId,
             type: getSectionType(sectionProperties[sectionId]),
             schema: sectionProperties[sectionId]
         };
@@ -473,7 +566,7 @@ function fillSectionsInConfig(importParameters, sectionProperties, manifestSetti
                         importParameters.jsonSchema['definitions'][`${sectionPart.type}<${sectionId}>`];
                     fillTableInConfig(importParameters, sectionPart, manifestSettings, configPart, configParameters);
                     // Custom column ref
-                    fillCustomColumnsInConfig(importParameters, sectionPart.id, undefined, configPart, configParameters.v2Page);
+                    fillCustomColumnsInConfig(importParameters, escapedSectionId, configPart, configParameters.v2Page);
                     break;
                 }
                 case types_1.SectionTypeV2.SectionChart:
@@ -533,7 +626,7 @@ function fillConfig(importParameters, configParameters) {
     objectPageConfig.footer = {};
     const footerAction = importParameters.jsonSchema['definitions']['FooterActions'];
     if (footerAction) {
-        fillActions(importParameters, footerAction.properties, objectPageConfig.footer, configParameters, types_1.ActionTypeV2.Footer);
+        fillActions(importParameters, footerAction.properties, objectPageConfig.footer, configParameters, types_1.ActionTypeV2.OPFooter);
     }
     // Transfer Layout information
     objectPageConfig.layout = configParameters.factory.createInstance(common_2.PageType.ObjectPage, 'ObjectPageLayout');