@sap-ux/preview-middleware 0.11.35 → 0.12.0

package/dist/client/adp/init-dialogs.js

@@ -1,75 +1,76 @@
-"use strict";
-
-sap.ui.define(["sap/ui/core/mvc/XMLView", "./controllers/AddFragment.controller", "./controllers/ControllerExtension.controller", "./controllers/ExtensionPoint.controller"], function (XMLView, __AddFragment, __ControllerExtension, __ExtensionPoint) {
-  "use strict";
-
-  function _interopRequireDefault(obj) {
-    return obj && obj.__esModule && typeof obj.default !== "undefined" ? obj.default : obj;
-  }
-  const AddFragment = _interopRequireDefault(__AddFragment);
-  const ControllerExtension = _interopRequireDefault(__ControllerExtension);
-  const ExtensionPoint = _interopRequireDefault(__ExtensionPoint);
-  var DialogNames = /*#__PURE__*/function (DialogNames) {
-    DialogNames["ADD_FRAGMENT"] = "AddFragment";
-    DialogNames["CONTROLLER_EXTENSION"] = "ControllerExtension";
-    DialogNames["ADD_FRAGMENT_AT_EXTENSION_POINT"] = "ExtensionPoint";
-    return DialogNames;
-  }(DialogNames || {});
-  /**
-   * Adds a new item to the context menu
-   *
-   * @param rta Runtime Authoring
-   */
-  const initDialogs = rta => {
-    const contextMenu = rta.getDefaultPlugins().contextMenu;
-    contextMenu.addMenuItem({
-      id: 'ADD_FRAGMENT',
-      text: 'Add: Fragment',
-      handler: async overlays => await handler(overlays[0], rta, DialogNames.ADD_FRAGMENT),
-      icon: 'sap-icon://attachment-html'
-    });
-    contextMenu.addMenuItem({
-      id: 'EXTEND_CONTROLLER',
-      text: 'Extend With Controller',
-      handler: async overlays => await handler(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
-      icon: 'sap-icon://create-form'
-    });
-  };
-
-  /**
-   * Handler for new context menu entry
-   *
-   * @param overlays Control overlays
-   * @param rta Runtime Authoring
-   * @param dialogName Dialog name
-   * @param extensionPointData Control ID
-   */
-  async function handler(overlays, rta, dialogName, extensionPointData) {
-    let controller;
-    switch (dialogName) {
-      case DialogNames.ADD_FRAGMENT:
-        controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlays, rta);
-        break;
-      case DialogNames.CONTROLLER_EXTENSION:
-        controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlays, rta);
-        break;
-      case DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT:
-        controller = new ExtensionPoint(`open.ux.preview.client.adp.controllers.${dialogName}`, overlays, rta, extensionPointData);
-        break;
-    }
-    const id = dialogName === DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT ? `dialog--${dialogName}` : undefined;
-    await XMLView.create({
-      viewName: `open.ux.preview.client.adp.ui.${dialogName}`,
-      controller,
-      id
-    });
-  }
-  var __exports = {
-    __esModule: true
-  };
-  __exports.DialogNames = DialogNames;
-  __exports.initDialogs = initDialogs;
-  __exports.handler = handler;
-  return __exports;
+"use strict";
+
+sap.ui.define(["sap/ui/core/Fragment", "./controllers/AddFragment.controller", "./controllers/ControllerExtension.controller", "./controllers/ExtensionPoint.controller"], function (Fragment, __AddFragment, __ControllerExtension, __ExtensionPoint) {
+  "use strict";
+
+  function _interopRequireDefault(obj) {
+    return obj && obj.__esModule && typeof obj.default !== "undefined" ? obj.default : obj;
+  }
+  const AddFragment = _interopRequireDefault(__AddFragment);
+  const ControllerExtension = _interopRequireDefault(__ControllerExtension);
+  const ExtensionPoint = _interopRequireDefault(__ExtensionPoint);
+  var DialogNames = /*#__PURE__*/function (DialogNames) {
+    DialogNames["ADD_FRAGMENT"] = "AddFragment";
+    DialogNames["CONTROLLER_EXTENSION"] = "ControllerExtension";
+    DialogNames["ADD_FRAGMENT_AT_EXTENSION_POINT"] = "ExtensionPoint";
+    return DialogNames;
+  }(DialogNames || {});
+  /**
+   * Adds a new item to the context menu
+   *
+   * @param rta Runtime Authoring
+   */
+  const initDialogs = rta => {
+    const contextMenu = rta.getDefaultPlugins().contextMenu;
+    contextMenu.addMenuItem({
+      id: 'ADD_FRAGMENT',
+      text: 'Add: Fragment',
+      handler: async overlays => await handler(overlays[0], rta, DialogNames.ADD_FRAGMENT),
+      icon: 'sap-icon://attachment-html'
+    });
+    contextMenu.addMenuItem({
+      id: 'EXTEND_CONTROLLER',
+      text: 'Extend With Controller',
+      handler: async overlays => await handler(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
+      icon: 'sap-icon://create-form'
+    });
+  };
+
+  /**
+   * Handler for new context menu entry
+   *
+   * @param overlay Control overlays
+   * @param rta Runtime Authoring
+   * @param dialogName Dialog name
+   * @param extensionPointData Control ID
+   */
+  async function handler(overlay, rta, dialogName, extensionPointData) {
+    let controller;
+    switch (dialogName) {
+      case DialogNames.ADD_FRAGMENT:
+        controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta);
+        break;
+      case DialogNames.CONTROLLER_EXTENSION:
+        controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta);
+        break;
+      case DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT:
+        controller = new ExtensionPoint(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, extensionPointData);
+        break;
+    }
+    const id = dialogName === DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT ? `dialog--${dialogName}` : undefined;
+    const dialog = await Fragment.load({
+      name: `open.ux.preview.client.adp.ui.${dialogName}`,
+      controller,
+      id
+    });
+    await controller.setup(dialog);
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.DialogNames = DialogNames;
+  __exports.initDialogs = initDialogs;
+  __exports.handler = handler;
+  return __exports;
 });
 //# sourceMappingURL=init-dialogs.js.map

package/dist/client/adp/init-dialogs.ts

@@ -1,5 +1,8 @@
+/** sap.m */
+import type Dialog from 'sap/m/Dialog';
+
 /** sap.ui.core */
-import XMLView from 'sap/ui/core/mvc/XMLView';
+import Fragment from 'sap/ui/core/Fragment';
 import type UI5Element from 'sap/ui/core/Element';
 
 /** sap.ui.rta */
@@ -44,13 +47,13 @@ export const initDialogs = (rta: RuntimeAuthoring): void => {
 /**
  * Handler for new context menu entry
  *
- * @param overlays Control overlays
+ * @param overlay Control overlays
  * @param rta Runtime Authoring
  * @param dialogName Dialog name
  * @param extensionPointData Control ID
  */
 export async function handler(
-    overlays: UI5Element,
+    overlay: UI5Element,
     rta: RuntimeAuthoring,
     dialogName: DialogNames,
     extensionPointData?: ExtensionPointData
@@ -59,15 +62,15 @@ export async function handler(
 
     switch (dialogName) {
         case DialogNames.ADD_FRAGMENT:
-            controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlays, rta);
+            controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta);
             break;
         case DialogNames.CONTROLLER_EXTENSION:
-            controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlays, rta);
+            controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta);
             break;
         case DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT:
             controller = new ExtensionPoint(
                 `open.ux.preview.client.adp.controllers.${dialogName}`,
-                overlays,
+                overlay,
                 rta,
                 extensionPointData!
             );
@@ -76,9 +79,11 @@ export async function handler(
 
     const id = dialogName === DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT ? `dialog--${dialogName}` : undefined;
 
-    await XMLView.create({
-        viewName: `open.ux.preview.client.adp.ui.${dialogName}`,
+    const dialog = await Fragment.load({
+        name: `open.ux.preview.client.adp.ui.${dialogName}`,
         controller,
         id
     });
+
+    await controller.setup(dialog as Dialog);
 }

package/dist/client/adp/init.js

@@ -4,22 +4,35 @@ sap.ui.define([
     '../cpe/init',
     './init-dialogs',
     'open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common',
-    './extension-point',
     'sap/ui/VersionInfo',
     './ui5-version-utils'
-], function (log, __init, ___init_dialogs, ___sap_ux_private_control_property_editor_common, __ExtensionPointService, VersionInfo, ___ui5_version_utils) {
+], function (log, __init, ___init_dialogs, ___sap_ux_private_control_property_editor_common, VersionInfo, ___ui5_version_utils) {
     'use strict';
     function _interopRequireDefault(obj) {
         return obj && obj.__esModule && typeof obj.default !== 'undefined' ? obj.default : obj;
     }
+    function __ui5_require_async(path) {
+        return new Promise(function (resolve, reject) {
+            sap.ui.require([path], function (module) {
+                if (!(module && module.__esModule)) {
+                    module = module === null || !(typeof module === 'object' && path.endsWith('/library')) ? { default: module } : module;
+                    Object.defineProperty(module, '__esModule', { value: true });
+                }
+                resolve(module);
+            }, function (err) {
+                reject(err);
+            });
+        });
+    }
     const init = _interopRequireDefault(__init);
     const initDialogs = ___init_dialogs['initDialogs'];
     const showMessage = ___sap_ux_private_control_property_editor_common['showMessage'];
     const startPostMessageCommunication = ___sap_ux_private_control_property_editor_common['startPostMessageCommunication'];
-    const ExtensionPointService = _interopRequireDefault(__ExtensionPointService);
     const getUI5VersionValidationMessage = ___ui5_version_utils['getUI5VersionValidationMessage'];
     var __exports = async function (rta) {
-        const extPointService = new ExtensionPointService(rta);
+        const {version} = await VersionInfo.load();
+        const versionParts = version.split('.');
+        const minor = parseInt(versionParts[1], 10);
         const actionHandlers = [];
         function subscribe(handler) {
             actionHandlers.push(handler);
@@ -34,10 +47,13 @@ sap.ui.define([
             }
         });
         initDialogs(rta);
-        extPointService.init(subscribe);
+        if (minor > 77) {
+            const ExtensionPointService = (await __ui5_require_async('open/ux/preview/client/adp/extension-point')).default;
+            const extPointService = new ExtensionPointService(rta);
+            extPointService.init(subscribe);
+        }
         init(rta);
-        const ui5Version = await VersionInfo.load();
-        const ui5VersionValidationMsg = getUI5VersionValidationMessage(ui5Version.version);
+        const ui5VersionValidationMsg = getUI5VersionValidationMessage(version);
         if (ui5VersionValidationMsg) {
             sendAction(showMessage(ui5VersionValidationMsg));
         }

package/dist/client/adp/init.ts

@@ -8,13 +8,16 @@ import {
     showMessage,
     startPostMessageCommunication
 } from '@sap-ux-private/control-property-editor-common';
+
 import { ActionHandler } from '../cpe/types';
-import ExtensionPointService from './extension-point';
 import VersionInfo from 'sap/ui/VersionInfo';
 import { getUI5VersionValidationMessage } from './ui5-version-utils';
 
 export default async function (rta: RuntimeAuthoring) {
-    const extPointService = new ExtensionPointService(rta);
+    const { version } = (await VersionInfo.load()) as { version: string };
+    const versionParts = version.split('.');
+    const minor = parseInt(versionParts[1], 10);
+
     const actionHandlers: ActionHandler[] = [];
     /**
      *
@@ -26,7 +29,7 @@ export default async function (rta: RuntimeAuthoring) {
 
     const { sendAction } = startPostMessageCommunication<ExternalAction>(
         window.parent,
-        async function onAction(action) {
+        async function onAction(action: ExternalAction) {
             for (const handler of actionHandlers) {
                 try {
                     await handler(action);
@@ -39,13 +42,18 @@ export default async function (rta: RuntimeAuthoring) {
 
     // initialize fragment content menu entry
     initDialogs(rta);
+
     // initialize extension point service
-    extPointService.init(subscribe);
+    if (minor > 77) {
+        const ExtensionPointService = (await import('open/ux/preview/client/adp/extension-point')).default;
+        const extPointService = new ExtensionPointService(rta);
+        extPointService.init(subscribe);
+    }
+
     // also initialize the editor
     init(rta);
 
-    const ui5Version = (await VersionInfo.load()) as { version: string };
-    const ui5VersionValidationMsg = getUI5VersionValidationMessage(ui5Version.version);
+    const ui5VersionValidationMsg = getUI5VersionValidationMessage(version);
 
     if (ui5VersionValidationMsg) {
         sendAction(showMessage(ui5VersionValidationMsg));

package/dist/client/adp/ui/AddFragment.fragment.xml

@@ -0,0 +1,69 @@
+<Dialog id="addNewFragmentDialog"
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core"
+    xmlns:f="sap.ui.layout.form"  
+    title="Add XML Fragment" 
+    contentWidth="500px" 
+    class="sapUiRTABorder">
+    <content>
+        <f:SimpleForm id="addNewFragmentDialog_Form"
+            editable="true"
+            layout="ResponsiveGridLayout"
+            labelSpanS="4"
+            singleContainerFullSize="false">
+            <f:content>
+                <Label text="Control Type" />
+                <Text text="{/selectedControlName}" />
+                <Label text="Target Aggregation" />
+                <Select
+                    change="onAggregationChanged"
+                    selectedKey="{/selectedAggregation/key}"
+                    items="{
+                        path: '/targetAggregation',
+                        sorter: { path: 'text' }
+                    }">
+                    <core:Item key="{key}" text="{value}" />
+                </Select>
+                <Label text="Index" />
+                <HBox alignItems="Center">
+                    <Select
+                        enabled="{/indexHandlingFlag}"
+                        selectedKey='{/selectedIndex}'
+                        items="{
+                            path: '/index',
+                            sorter: { path: 'text' }
+                        }">
+                        <core:Item key="{key}" text="{value}" />
+                    </Select>
+                    <core:Icon
+                        useIconTooltip="false"
+                        visible="{/specialIndexHandlingIcon}" 
+                        src="sap-icon://message-information" 
+                        class= "sapUiTinyMarginBegin" 
+                        tooltip="{/iconTooltip}" />
+                </HBox>
+                <Label text="Fragment Name" />
+                <Input 
+                    description=".fragment.xml" 
+                    value="{/newFragmentName}" 
+                    liveChange="onFragmentNameInputChange">
+                </Input>
+            </f:content>
+        </f:SimpleForm>
+    </content>
+    <beginButton>
+        <Button 
+            id="createDialogBtn" 
+            text="Create"
+            press="onCreateBtnPress"
+            enabled="false"
+            type="Emphasized" />
+    </beginButton>
+    <endButton>
+        <Button 
+            id="closeDialogBtn" 
+            text="Cancel"
+            press="handleDialogClose"
+            type="Reject" />
+    </endButton>
+</Dialog>

package/dist/client/adp/ui/ControllerExtension.fragment.xml

@@ -0,0 +1,51 @@
+<Dialog id="controllerExtensionDialog"  
+    xmlns:mvc="sap.ui.core.mvc"
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core"
+    xmlns:f="sap.ui.layout.form" 
+    title="Extend With Controller" 
+    contentWidth="450px" 
+    class="sapUiRTABorder">
+    <content>
+        <f:SimpleForm
+            editable="true"
+            layout="ResponsiveGridLayout"
+            labelSpanS="4"
+            singleContainerFullSize="false">
+            <f:content>
+                <Label text="Controller Name" />
+                <Input 
+                    description=".js" 
+                    value="{/newControllerName}" 
+                    liveChange="onControllerNameInputChange">
+                </Input>
+            </f:content>
+        </f:SimpleForm>
+        <f:SimpleForm
+            editable="true"
+            layout="ResponsiveGridLayout"
+            labelSpanS="12"
+            visible="false"
+            singleContainerFullSize="false">
+            <f:content>
+                <Label text="An existing controller extension has been found. Please use the previously created extension controller" />
+                <Text text="{/controllerPathFromRoot}" />
+            </f:content>
+        </f:SimpleForm>
+    </content>
+    <beginButton>
+        <Button 
+            id="createDialogBtn" 
+            text="Create"
+            press="onCreateBtnPress"
+            enabled="false"
+            type="Emphasized" />
+    </beginButton>
+    <endButton>
+        <Button 
+            id="closeDialogBtn" 
+            text="Cancel"
+            press="handleDialogClose"
+            type="Reject" />
+    </endButton>
+</Dialog>

package/dist/client/adp/ui/ExtensionPoint.fragment.xml

@@ -0,0 +1,51 @@
+<Dialog id="addFragmentAtExtPointDialog"
+    xmlns:mvc="sap.ui.core.mvc"
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core"
+    xmlns:f="sap.ui.layout.form" 
+    title="Add XML Fragment at Extension Point" 
+    contentWidth="500px" 
+    class="sapUiRTABorder">
+    <content>
+        <f:SimpleForm id="addFragmentAtExtPointDialog_Form"
+            editable="true"
+            layout="ResponsiveGridLayout"
+            labelSpanS="4"
+            singleContainerFullSize="false">
+            <f:content>
+                <Label text="Extension Point" />
+                <Select
+                    enabled="{/extensionListEnabled}"
+                    change="onExtensionPointHandler"
+                    selectedKey='{/extensionPointKey}'
+                    items="{
+                        path: '/extensionPointList',
+                        sorter: { path: 'text' }
+                    }">
+                    <core:Item key="{key}" text="{value}" />
+                </Select>
+                <Label text="Fragment Name" />
+                <Input 
+                    description=".fragment.xml" 
+                    value="{/newFragmentName}" 
+                    liveChange="onFragmentNameInputChange">
+                </Input>
+            </f:content>
+        </f:SimpleForm>
+    </content>
+    <beginButton>
+        <Button 
+            id="createDialogBtn" 
+            text="Create"
+            press="onCreateBtnPress"
+            enabled="false"
+            type="Emphasized" />
+    </beginButton>
+    <endButton>
+        <Button 
+            id="closeDialogBtn" 
+            text="Cancel"
+            press="handleDialogClose"
+            type="Reject" />
+    </endButton>
+</Dialog>

package/dist/client/adp/ui5-version-utils.js

@@ -1,65 +1,65 @@
-"use strict";
-
-sap.ui.define([], function () {
-  "use strict";
-
-  /**
-   * Checks if the given version is lower than the required minimal version.
-   * @param version to check
-   * @param minVersion to check
-   *
-   * @returns boolean
-   */
-  function isLowerThanMinimalUi5Version(version, minVersion) {
-    if (version && minVersion) {
-      const minVersionParsed = parseUI5Version(minVersion);
-      const ui5VersionParsed = parseUI5Version(version);
-      if (!isNaN(ui5VersionParsed.major) && !isNaN(ui5VersionParsed.minor)) {
-        if (ui5VersionParsed.major < minVersionParsed.major) {
-          return true;
-        }
-        if (ui5VersionParsed.major === minVersionParsed.major && ui5VersionParsed.minor < minVersionParsed.minor) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Get UI5 version validation message based on conditions.
-   * @param ui5Version to validate
-   * @returns string with validation message or undefined if non condition is met.
-   */
-  function getUI5VersionValidationMessage(ui5Version) {
-    if (isLowerThanMinimalUi5Version(ui5Version, '1.71')) {
-      return `The current SAPUI5 version set for this Adaptation project is ${ui5Version}. The minimum version to use for SAPUI5 Adaptation Project and its SAPUI5 Visual Editor is 1.71`;
-    }
-    return undefined;
-  }
-
-  /**
-   * Parses the UI5 version
-   * Returns NaN for snapshot or snapshot-untested
-   * Returns x.xx for snapshot-x.xx
-   *
-   * @param version the UI5 version to parse
-   * @returns The major and the minor version, e.g. 1.86
-   */
-  function parseUI5Version(version) {
-    const versionParts = version.replace(/snapshot-untested|snapshot-|snapshot/, '').split('.');
-    const major = parseInt(versionParts[0], 10);
-    const minor = parseInt(versionParts[1], 10);
-    return {
-      major,
-      minor
-    };
-  }
-  var __exports = {
-    __esModule: true
-  };
-  __exports.isLowerThanMinimalUi5Version = isLowerThanMinimalUi5Version;
-  __exports.getUI5VersionValidationMessage = getUI5VersionValidationMessage;
-  return __exports;
+"use strict";
+
+sap.ui.define([], function () {
+  "use strict";
+
+  /**
+   * Checks if the given version is lower than the required minimal version.
+   * @param version to check
+   * @param minVersion to check
+   *
+   * @returns boolean
+   */
+  function isLowerThanMinimalUi5Version(version, minVersion) {
+    if (version && minVersion) {
+      const minVersionParsed = parseUI5Version(minVersion);
+      const ui5VersionParsed = parseUI5Version(version);
+      if (!isNaN(ui5VersionParsed.major) && !isNaN(ui5VersionParsed.minor)) {
+        if (ui5VersionParsed.major < minVersionParsed.major) {
+          return true;
+        }
+        if (ui5VersionParsed.major === minVersionParsed.major && ui5VersionParsed.minor < minVersionParsed.minor) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Get UI5 version validation message based on conditions.
+   * @param ui5Version to validate
+   * @returns string with validation message or undefined if non condition is met.
+   */
+  function getUI5VersionValidationMessage(ui5Version) {
+    if (isLowerThanMinimalUi5Version(ui5Version, '1.71')) {
+      return `The current SAPUI5 version set for this Adaptation project is ${ui5Version}. The minimum version to use for SAPUI5 Adaptation Project and its SAPUI5 Visual Editor is 1.71`;
+    }
+    return undefined;
+  }
+
+  /**
+   * Parses the UI5 version
+   * Returns NaN for snapshot or snapshot-untested
+   * Returns x.xx for snapshot-x.xx
+   *
+   * @param version the UI5 version to parse
+   * @returns The major and the minor version, e.g. 1.86
+   */
+  function parseUI5Version(version) {
+    const versionParts = version.replace(/snapshot-untested|snapshot-|snapshot/, '').split('.');
+    const major = parseInt(versionParts[0], 10);
+    const minor = parseInt(versionParts[1], 10);
+    return {
+      major,
+      minor
+    };
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.isLowerThanMinimalUi5Version = isLowerThanMinimalUi5Version;
+  __exports.getUI5VersionValidationMessage = getUI5VersionValidationMessage;
+  return __exports;
 });
 //# sourceMappingURL=ui5-version-utils.js.map