@sap-ux/preview-middleware 0.19.20 → 0.19.23

package/dist/client/adp/quick-actions/common/add-new-annotation-file.js

@@ -63,6 +63,7 @@ sap.ui.define([
                     const {annotationExistsInWS} = source.annotationDetails;
                     if (source.metadataReadErrorMsg) {
                         this.children.push({
+                            path: this.children.length.toString(),
                             enabled: false,
                             tooltip: source.metadataReadErrorMsg,
                             label: this.context.resourceBundle.getText('ADD_ANNOTATION_FILE', [key]),
@@ -70,6 +71,7 @@ sap.ui.define([
                         });
                     } else {
                         this.children.push({
+                            path: this.children.length.toString(),
                             enabled: true,
                             label: annotationExistsInWS ? this.context.resourceBundle.getText('SHOW_ANNOTATION_FILE', [key]) : this.context.resourceBundle.getText('ADD_ANNOTATION_FILE', [key]),
                             children: []

package/dist/client/adp/quick-actions/common/add-new-annotation-file.ts

@@ -1,9 +1,6 @@
 import FlexCommand from 'sap/ui/rta/command/FlexCommand';
 
-import {
-    QuickActionContext,
-    NestedQuickActionDefinition
-} from '../../../cpe/quick-actions/quick-action-definition';
+import { QuickActionContext, NestedQuickActionDefinition } from '../../../cpe/quick-actions/quick-action-definition';
 import type { AnnotationDataSourceResponse } from '../../api-handler';
 import { getDataSourceAnnotationFileMap } from '../../api-handler';
 import {
@@ -65,6 +62,7 @@ export class AddNewAnnotationFile
                 const { annotationExistsInWS } = source.annotationDetails;
                 if (source.metadataReadErrorMsg) {
                     this.children.push({
+                        path: this.children.length.toString(),
                         enabled: false,
                         tooltip: source.metadataReadErrorMsg,
                         label: this.context.resourceBundle.getText('ADD_ANNOTATION_FILE', [key]),
@@ -72,6 +70,7 @@ export class AddNewAnnotationFile
                     });
                 } else {
                     this.children.push({
+                        path: this.children.length.toString(),
                         enabled: true,
                         label: annotationExistsInWS
                             ? this.context.resourceBundle.getText('SHOW_ANNOTATION_FILE', [key])

package/dist/client/adp/quick-actions/fe-v4/change-table-columns.js

@@ -29,12 +29,14 @@ sap.ui.define(["sap/ui/dt/OverlayUtil", "sap/ui/fl/apply/api/FlexRuntimeInfoAPI"
         const actions = await this.context.actionService.get(smartTable.getId());
         const changeColumnAction = actions.find(action => action.id === ACTION_ID);
         if (changeColumnAction) {
+          const path = this.children.length.toString();
           this.children.push({
+            path,
             label: `'${smartTable.getHeader()}' table`,
             enabled: true,
             children: []
           });
-          this.tableMap[`${this.children.length - 1}`] = {
+          this.tableMap[path] = {
             table: smartTable,
             tableUpdateEventAttachedOnce: false
           };

package/dist/client/adp/quick-actions/fe-v4/change-table-columns.ts

@@ -39,12 +39,14 @@ export class ChangeTableColumnsQuickAction
             const actions = await this.context.actionService.get(smartTable.getId());
             const changeColumnAction = actions.find((action) => action.id === ACTION_ID);
             if (changeColumnAction) {
+                const path = this.children.length.toString();
                 this.children.push({
+                    path,
                     label: `'${(smartTable as Table).getHeader()}' table`,
                     enabled: true,
                     children: []
                 });
-                this.tableMap[`${this.children.length - 1}`] = {
+                this.tableMap[path] = {
                     table: smartTable,
                     tableUpdateEventAttachedOnce: false
                 };

package/dist/client/adp/quick-actions/fe-v4/lr-enable-table-filtering.js

@@ -32,13 +32,15 @@ sap.ui.define(["../table-quick-action-base", "../../../cpe/quick-actions/utils",
         const personalizationData = smartTable.getP13nMode();
         const value = this.context.changeService.getConfigurationPropertyValue(smartTable.getId(), 'personalization');
         const isFilterEnabled = value?.filter === undefined ? personalizationData.includes('Filter') : value.filter;
+        const path = this.children.length.toString();
         this.children.push({
+          path,
           label: `'${smartTable.getHeader()}' table`,
           enabled: !isFilterEnabled,
           tooltip: isFilterEnabled ? tooltipText : undefined,
           children: []
         });
-        this.tableMap[`${this.children.length - 1}`] = {
+        this.tableMap[path] = {
           table: smartTable,
           tableUpdateEventAttachedOnce: false
         };

package/dist/client/adp/quick-actions/fe-v4/lr-enable-table-filtering.ts

@@ -48,13 +48,15 @@ export class EnableTableFilteringQuickAction
                 'personalization'
             ) as Personalization;
             const isFilterEnabled = value?.filter === undefined ? personalizationData.includes('Filter') : value.filter;
+            const path = this.children.length.toString();
             this.children.push({
+                path,
                 label: `'${(smartTable as Table).getHeader()}' table`,
                 enabled: !isFilterEnabled,
                 tooltip: isFilterEnabled ? tooltipText : undefined,
                 children: []
             });
-            this.tableMap[`${this.children.length - 1}`] = {
+            this.tableMap[path] = {
                 table: smartTable,
                 tableUpdateEventAttachedOnce: false
             };

package/dist/client/adp/quick-actions/table-quick-action-base.js

@@ -99,9 +99,9 @@ sap.ui.define([
                     await this.collectChildrenInSection(section, table);
                 } else if (this.iconTabBar && tabKey) {
                     const label = `'${ iconTabBarfilterMap[tabKey] }' table`;
-                    const child = this.createChild(label, table);
+                    const tableMapKey = this.children.length.toString();
+                    const child = this.createChild(label, table, tableMapKey);
                     this.children.push(child);
-                    const tableMapKey = `${ this.children.length - 1 }`;
                     this.tableMap[tableMapKey] = {
                         table,
                         iconTabBarFilterKey: tabKey,
@@ -140,9 +140,9 @@ sap.ui.define([
                     return `'${ header }' table`;
                 }
             } else if (isA(M_TABLE_TYPE, table)) {
-                const tilte = table?.getHeaderToolbar()?.getTitleControl()?.getText();
-                if (tilte) {
-                    return `'${ tilte }' table`;
+                const title = table?.getHeaderToolbar()?.getTitleControl()?.getText();
+                if (title) {
+                    return `'${ title }' table`;
                 }
             }
             return 'Unnamed table';
@@ -178,17 +178,19 @@ sap.ui.define([
                     const existingChildIdx = this.children.findIndex(val => val.label === `'${ section.getTitle() }' section`);
                     let tableMapIndex;
                     const label = this.getTableLabel(table);
-                    const child = this.createChild(label, table);
                     if (existingChildIdx < 0) {
+                        tableMapIndex = `${ this.children.length }/0`;
+                        const child = this.createChild(label, table, tableMapIndex);
                         this.children.push({
+                            path: this.children.length.toString(),
                             label: `'${ section?.getTitle() }' section`,
                             enabled: true,
                             children: [child]
                         });
-                        tableMapIndex = `${ this.children.length - 1 }/0`;
                     } else {
+                        tableMapIndex = `${ existingChildIdx }/${ this.children[existingChildIdx].children.length }`;
+                        const child = this.createChild(label, table, tableMapIndex);
                         this.children[existingChildIdx].children.push(child);
-                        tableMapIndex = `${ existingChildIdx.toFixed(0) }/${ this.children[existingChildIdx].children.length - 1 }`;
                     }
                     this.tableMap[tableMapIndex] = {
                         table,
@@ -204,6 +206,7 @@ sap.ui.define([
             }
         }
         async processTable(table, sectionInfo) {
+            const tableMapKey = this.children.length.toString();
             if ([
                     SMART_TABLE_TYPE,
                     M_TABLE_TYPE,
@@ -213,10 +216,9 @@ sap.ui.define([
                     ANALYTICAL_TABLE_TYPE
                 ].some(type => isA(type, table))) {
                 const label = this.getTableLabel(table);
-                const child = this.createChild(label, table);
+                const child = this.createChild(label, table, tableMapKey);
                 this.children.push(child);
             }
-            const tableMapKey = `${ this.children.length - 1 }`;
             this.tableMap[tableMapKey] = {
                 table,
                 sectionInfo: sectionInfo,
@@ -240,8 +242,9 @@ sap.ui.define([
                 children: this.children
             };
         }
-        createChild(label, table) {
+        createChild(label, table, path) {
             const child = {
+                path,
                 label,
                 enabled: true,
                 children: []

package/dist/client/adp/quick-actions/table-quick-action-base.ts

@@ -148,9 +148,9 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
                 await this.collectChildrenInSection(section, table);
             } else if (this.iconTabBar && tabKey) {
                 const label = `'${iconTabBarfilterMap[tabKey]}' table`;
-                const child = this.createChild(label, table);
+                const tableMapKey = this.children.length.toString();
+                const child = this.createChild(label, table, tableMapKey);
                 this.children.push(child);
-                const tableMapKey = `${this.children.length - 1}`;
                 this.tableMap[tableMapKey] = {
                     table,
                     iconTabBarFilterKey: tabKey,
@@ -202,9 +202,9 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
                 return `'${header}' table`;
             }
         } else if (isA<Table>(M_TABLE_TYPE, table)) {
-            const tilte = table?.getHeaderToolbar()?.getTitleControl()?.getText();
-            if (tilte) {
-                return `'${tilte}' table`;
+            const title = table?.getHeaderToolbar()?.getTitleControl()?.getText();
+            if (title) {
+                return `'${title}' table`;
             }
         }
 
@@ -255,20 +255,19 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
                 );
                 let tableMapIndex;
                 const label = this.getTableLabel(table);
-                const child = this.createChild(label, table);
                 if (existingChildIdx < 0) {
+                    tableMapIndex = `${this.children.length}/0`;
+                    const child = this.createChild(label, table, tableMapIndex);
                     this.children.push({
+                        path: this.children.length.toString(),
                         label: `'${section?.getTitle()}' section`,
                         enabled: true,
                         children: [child]
                     });
-
-                    tableMapIndex = `${this.children.length - 1}/0`;
                 } else {
+                    tableMapIndex = `${existingChildIdx}/${this.children[existingChildIdx].children.length}`;
+                    const child = this.createChild(label, table, tableMapIndex);
                     this.children[existingChildIdx].children.push(child);
-                    tableMapIndex = `${existingChildIdx.toFixed(0)}/${
-                        this.children[existingChildIdx].children.length - 1
-                    }`;
                 }
 
                 this.tableMap[tableMapIndex] = {
@@ -290,6 +289,7 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
         table: UI5Element,
         sectionInfo?: { section: ObjectPageSection; subSection: ObjectPageSubSection; layout?: ObjectPageLayout }
     ): Promise<void> {
+        const tableMapKey = this.children.length.toString();
         if (
             [
                 SMART_TABLE_TYPE,
@@ -301,11 +301,10 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
             ].some((type) => isA(type, table))
         ) {
             const label = this.getTableLabel(table);
-            const child = this.createChild(label, table);
+            const child = this.createChild(label, table, tableMapKey);
             this.children.push(child);
         }
 
-        const tableMapKey = `${this.children.length - 1}`;
         this.tableMap[tableMapKey] = {
             table,
             sectionInfo: sectionInfo,
@@ -340,8 +339,9 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
         };
     }
 
-    createChild(label: string, table: UI5Element): NestedQuickActionChild {
+    createChild(label: string, table: UI5Element, path: string): NestedQuickActionChild {
         const child: NestedQuickActionChild = {
+            path,
             label,
             enabled: true,
             children: []

package/dist/client/cpe/context-menu-service.js

@@ -2,13 +2,19 @@
 sap.ui.define([
     'open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common',
     '../adp/dialog-factory',
-    '../i18n'
-], function (___sap_ux_private_control_property_editor_common, ___adp_dialog_factory, ___i18n) {
+    '../i18n',
+    'sap/base/Log',
+    '../utils/core',
+    '../utils/version'
+], function (___sap_ux_private_control_property_editor_common, ___adp_dialog_factory, ___i18n, Log, ___utils_core, ___utils_version) {
     'use strict';
     const executeContextMenuAction = ___sap_ux_private_control_property_editor_common['executeContextMenuAction'];
+    const reportTelemetry = ___sap_ux_private_control_property_editor_common['reportTelemetry'];
     const requestControlContextMenu = ___sap_ux_private_control_property_editor_common['requestControlContextMenu'];
     const DialogFactory = ___adp_dialog_factory['DialogFactory'];
     const getTextBundle = ___i18n['getTextBundle'];
+    const getControlById = ___utils_core['getControlById'];
+    const getUi5Version = ___utils_version['getUi5Version'];
     class ContextMenuService {
         sendAction = () => {
         };
@@ -23,6 +29,18 @@ sap.ui.define([
                 if (executeContextMenuAction.match(action)) {
                     const {actionName, controlId} = action.payload;
                     await this.actionService.execute(controlId, actionName);
+                    try {
+                        const controlName = getControlById(controlId)?.getMetadata().getName();
+                        const versionInfo = await getUi5Version();
+                        await reportTelemetry({
+                            category: 'OutlineContextMenu',
+                            actionName,
+                            controlName,
+                            ui5Version: `${ versionInfo.major }.${ versionInfo.minor }.${ versionInfo.patch }`
+                        });
+                    } catch (err) {
+                        Log.error('Error in reporting Telemetry:', err);
+                    }
                 }
                 if (requestControlContextMenu.pending.match(action)) {
                     const controlId = action.payload;

package/dist/client/cpe/context-menu-service.ts

@@ -1,6 +1,7 @@
 import {
     executeContextMenuAction,
     ExternalAction,
+    reportTelemetry,
     requestControlContextMenu
 } from '@sap-ux-private/control-property-editor-common';
 import { ActionSenderFunction, SubscribeFunction } from './types';
@@ -8,6 +9,9 @@ import RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
 import { ActionService } from 'sap/ui/rta/service/Action';
 import { DialogFactory } from '../adp/dialog-factory';
 import { getTextBundle } from '../i18n';
+import Log from 'sap/base/Log';
+import { getControlById } from '../utils/core';
+import { getUi5Version } from '../utils/version';
 
 /**
  * A Class of ContextMenuService
@@ -35,6 +39,18 @@ export class ContextMenuService {
             if (executeContextMenuAction.match(action)) {
                 const { actionName, controlId } = action.payload;
                 await this.actionService.execute(controlId, actionName);
+                try {
+                    const controlName = getControlById(controlId)?.getMetadata().getName();
+                    const versionInfo = await getUi5Version();
+                    await reportTelemetry({
+                        category: 'OutlineContextMenu',
+                        actionName,
+                        controlName,
+                        ui5Version: `${versionInfo.major}.${versionInfo.minor}.${versionInfo.patch}`
+                    });
+                } catch (err) {
+                    Log.error('Error in reporting Telemetry:', err);
+                }
             }
             if (requestControlContextMenu.pending.match(action)) {
                 const controlId = action.payload;

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "0.19.20",
+  "version": "0.19.23",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -25,13 +25,13 @@
     "ejs": "3.1.10",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "@sap-ux/adp-tooling": "0.13.28",
+    "@sap-ux/adp-tooling": "0.13.29",
     "@sap-ux/btp-utils": "1.0.3",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.6.2",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.6.3",
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.29.18",
-    "@sap-ux/system-access": "0.5.35"
+    "@sap-ux/system-access": "0.5.36"
   },
   "devDependencies": {
     "@sap-ux-private/playwright": "0.1.0",
@@ -49,8 +49,8 @@
     "nock": "13.4.0",
     "npm-run-all2": "6.2.0",
     "supertest": "6.3.3",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.13.15",
-    "@sap-ux/axios-extension": "1.19.3",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.13.17",
+    "@sap-ux/axios-extension": "1.20.0",
     "@sap-ux/i18n": "0.2.3",
     "@sap-ux/store": "1.0.0",
     "@sap-ux/ui5-info": "0.9.1"