@oracle/oraclejet-webdriver 16.1.3 → 17.0.0

package/elements/OjWebElement.js

@@ -5,6 +5,7 @@ const selenium_webdriver_1 = require("selenium-webdriver");
 const __1 = require("../");
 const stale_element_1 = require("../lib/stale-element");
 const busy_context_utils_1 = require("../lib/busy-context-utils");
+const oj_module_proxy_1 = require("../lib/oj-module-proxy");
 /**
  * The base WebElement class from which all cusom WebElements should extend.
  * This class can also be used (instantiated) directly if no component-specific
@@ -340,32 +341,7 @@ class OjWebElement extends selenium_webdriver_1.WebElement {
      * @typeparam T The value type of the property
      */
     async _getProperty(propertyName) {
-        if (!OjWebElement._BROWSER_NAME) {
-            const caps = await this.getDriver().getCapabilities();
-            OjWebElement._BROWSER_NAME = caps.get(selenium_webdriver_1.Capability.BROWSER_NAME);
-        }
-        if (OjWebElement._BROWSER_NAME === selenium_webdriver_1.Browser.FIREFOX) {
-            return this._getPropertyFirefox(propertyName);
-        }
-        return this.getDriver().executeAsyncScript(`let el = arguments[0], prop = arguments[1], done = arguments[2];
-      require(['ojs/ojcustomelement-utils'], function(utils) {
-        done(utils.CustomElementUtils.getElementProperty(el, prop));
-      }, done);
-      `, this, propertyName);
-    }
-    /**
-     * Get a DOM property. This method is for Firefox to work around the Geckodriver
-     * issue identified by JET-42751.
-     * @param propertyName The property name
-     * @return The property value
-     */
-    async _getPropertyFirefox(propertyName) {
-        const driver = this.getDriver();
-        // Ensure ojs/ojcustomelement-utils module is loaded, then do a synchronous
-        // executeScript call to retrieve the property
-        await driver.executeAsyncScript(`require(['ojs/ojcustomelement-utils'], arguments[0])`);
-        return driver.executeScript(`let el = arguments[0], prop = arguments[1];
-      return require('ojs/ojcustomelement-utils').CustomElementUtils.getElementProperty(el, prop);`, this, propertyName);
+        return (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['CustomElementUtils'], [this, propertyName], '({ getElementProperty }, el, prop) => getElementProperty(el, prop)');
     }
     /**
      * Private mutator to set the component property value. This is trapStaleElement

package/elements/OjWebElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"OjWebElement.js","sourceRoot":"","sources":["../../elements/OjWebElement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OjWebElement.js","sourceRoot":"","sources":["../../elements/OjWebElement.ts"],"names":[],"mappings":"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"}

package/elements/OjWebElement.ts

@@ -1,7 +1,5 @@
 import {
-  Browser,
   By,
-  Capability,
   Condition,
   error,
   ILocation,
@@ -14,6 +12,7 @@ import {
 import { DriverLike, ScreenshotManager as sm } from '../';
 import { requeryElement } from '../lib/stale-element';
 import { whenBusyContextReady } from '../lib/busy-context-utils';
+import { executeWithModules } from '../lib/oj-module-proxy';
 
 /**
  * The base WebElement class from which all cusom WebElements should extend.
@@ -55,10 +54,6 @@ export class OjWebElement extends WebElement {
    * Used by whenReady to avoid whenBusyContextReady being repeatedly called
    */
   private _skipBusyContext = false;
-  /**
-   * Cached browser name
-   */
-  private static _BROWSER_NAME: string;
 
   /**
    * Constructor.  Pass an instance of WebDriver's WebElement that
@@ -419,40 +414,11 @@ export class OjWebElement extends WebElement {
    * @typeparam T The value type of the property
    */
   private async _getProperty<T>(propertyName: string): Promise<T> {
-    if (!OjWebElement._BROWSER_NAME) {
-      const caps = await this.getDriver().getCapabilities();
-      OjWebElement._BROWSER_NAME = caps.get(Capability.BROWSER_NAME);
-    }
-    if (OjWebElement._BROWSER_NAME === Browser.FIREFOX) {
-      return this._getPropertyFirefox<T>(propertyName);
-    }
-    return this.getDriver().executeAsyncScript<T>(
-      `let el = arguments[0], prop = arguments[1], done = arguments[2];
-      require(['ojs/ojcustomelement-utils'], function(utils) {
-        done(utils.CustomElementUtils.getElementProperty(el, prop));
-      }, done);
-      `,
-      this,
-      propertyName
-    );
-  }
-
-  /**
-   * Get a DOM property. This method is for Firefox to work around the Geckodriver
-   * issue identified by JET-42751.
-   * @param propertyName The property name
-   * @return The property value
-   */
-  private async _getPropertyFirefox<T>(propertyName: string): Promise<T> {
-    const driver = this.getDriver();
-    // Ensure ojs/ojcustomelement-utils module is loaded, then do a synchronous
-    // executeScript call to retrieve the property
-    await driver.executeAsyncScript(`require(['ojs/ojcustomelement-utils'], arguments[0])`);
-    return driver.executeScript<T>(
-      `let el = arguments[0], prop = arguments[1];
-      return require('ojs/ojcustomelement-utils').CustomElementUtils.getElementProperty(el, prop);`,
-      this,
-      propertyName
+    return executeWithModules(
+      this.getDriver(),
+      ['CustomElementUtils'],
+      [this, propertyName],
+      '({ getElementProperty }, el, prop) => getElementProperty(el, prop)'
     );
   }
 

package/elements/oj-chart/OjChartBase.ts

@@ -1433,6 +1433,14 @@ export interface Translations {
    * Used to describe the isolated state for accessibility.
    */
   stateIsolated: string;
+  /**
+   * Used by the component when data is loaded.
+   */
+  stateLoaded: string;
+  /**
+   * Used by the component when waiting for data.
+   */
+  stateLoading: string;
   /**
    * Used to describe the maximized state for accessibility.
    */

package/elements/oj-checkboxset/OjCheckboxset.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OjCheckboxset = void 0;
 const OjCheckboxsetBase_1 = require("./OjCheckboxsetBase");
 const selenium_webdriver_1 = require("selenium-webdriver");
+const oj_module_proxy_1 = require("../../lib/oj-module-proxy");
 /**
  * The component WebElement for [oj-checkboxset](../../jsdocs/oj.ojCheckboxset.html).
  * Do not instantiate this class directly, instead, use
@@ -83,44 +84,42 @@ class OjCheckboxset extends OjCheckboxsetBase_1.OjCheckboxsetBase {
      * @returns The array of filtered selected checkboxes
      */
     async getCheckboxesToUnselect(excludeList = []) {
-        return await this.getDriver().executeScript(`
-      var element = arguments[0];
-      var excludeList = arguments[1].slice();
-      
-      var oj = require('ojs/ojcore-base');
+        return (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeyUtils'], [this, excludeList], `
+    (({ equals }, element, excludeList) => {
 
       // get the selected checkboxes
       var selected = element.querySelectorAll("input.oj-selected:enabled");
-
+  
       // If either selected checkboxes or exclude list is empty,
       // return the selected array
       if (selected.length === 0 || excludeList.length === 0) {
         return Array.from(selected);
       }
-
+  
       var filteredSelectedCheckboxes = [];
       // Filter the selected array using the excludeList
       selected.forEach(function (node) {
         var subId = element.getSubIdByNode(node);
         var shouldExclude = false;
-
+  
         // Check if current selected item is in the exclude list
         for (var i = 0; i < excludeList.length; i++) {
           // If a match is found, set the flag and break the loop
-          if (oj.Object.compareValues(subId.value, excludeList[i])) {
+          if (equals(subId.value, excludeList[i])) {
             shouldExclude = true;
             break;
           }
         }
-
+  
         if (!shouldExclude) {
           // If no match is found, push the item to the return array and continue
           filteredSelectedCheckboxes.push(node);
         }
       });
-
+  
       return filteredSelectedCheckboxes;
-    `, this, excludeList);
+    })
+    `);
     }
 }
 exports.OjCheckboxset = OjCheckboxset;

package/elements/oj-checkboxset/OjCheckboxset.js.map

@@ -1 +1 @@
-{"version":3,"file":"OjCheckboxset.js","sourceRoot":"","sources":["../../../elements/oj-checkboxset/OjCheckboxset.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,2DAA4D;AAE5D;;;;GAIG;AACH,MAAa,aAAc,SAAQ,qCAAiB;IAClD;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,KAAY;QAC5B,uCAAuC;QACvC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;YACnC,2DAA2D;YAC3D,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,0BAAK,CAAC,2BAA2B,CACnC,iFAAiF,CAClF,CACF,CAAC;QACJ,CAAC;QAED,+BAA+B;QAC/B,qBAAqB;QACrB,wEAAwE;QACxE,6EAA6E;QAC7E,4EAA4E;QAC5E,sEAAsE;QACtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAE3D,8EAA8E;QAC9E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YACpD,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YACjD,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,2EAA2E;gBAC3E,yBAAyB;gBACzB,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,0BAAK,CAAC,oBAAoB,CAAC,kBAAkB,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CACnF,CAAC;YACJ,CAAC;YAED,gDAAgD;YAChD,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,KAAK,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5C,OAAO,CAAC,CAAC,UAAU,IAAI,UAAU,CAAC,CAAC;IACrC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,WAAW,CAAC,KAAU;QAClC,MAAM,KAAK,GAAG,EAAE,KAAK,EAAE,yBAAyB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACjE,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CACzC;;;;;;;;;;;KAWD,EACC,IAAI,EACJ,KAAK,CACN,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,uBAAuB,CAAC,cAAqB,EAAE;QAC3D,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CACzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAqCD,EACC,IAAI,EACJ,WAAW,CACZ,CAAC;IACJ,CAAC;CACF;AAvID,sCAuIC"}
+{"version":3,"file":"OjCheckboxset.js","sourceRoot":"","sources":["../../../elements/oj-checkboxset/OjCheckboxset.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,2DAA4D;AAC5D,+DAA+D;AAE/D;;;;GAIG;AACH,MAAa,aAAc,SAAQ,qCAAiB;IAClD;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,KAAY;QAC5B,uCAAuC;QACvC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;YACnC,2DAA2D;YAC3D,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,0BAAK,CAAC,2BAA2B,CACnC,iFAAiF,CAClF,CACF,CAAC;QACJ,CAAC;QAED,+BAA+B;QAC/B,qBAAqB;QACrB,wEAAwE;QACxE,6EAA6E;QAC7E,4EAA4E;QAC5E,sEAAsE;QACtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAE3D,8EAA8E;QAC9E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YACpD,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YACjD,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,2EAA2E;gBAC3E,yBAAyB;gBACzB,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,0BAAK,CAAC,oBAAoB,CAAC,kBAAkB,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CACnF,CAAC;YACJ,CAAC;YAED,gDAAgD;YAChD,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,KAAK,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5C,OAAO,CAAC,CAAC,UAAU,IAAI,UAAU,CAAC,CAAC;IACrC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,WAAW,CAAC,KAAU;QAClC,MAAM,KAAK,GAAG,EAAE,KAAK,EAAE,yBAAyB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACjE,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CACzC;;;;;;;;;;;KAWD,EACC,IAAI,EACJ,KAAK,CACN,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,uBAAuB,CAAC,cAAqB,EAAE;QAC3D,OAAO,IAAA,oCAAkB,EACvB,IAAI,CAAC,SAAS,EAAE,EAChB,CAAC,UAAU,CAAC,EACZ,CAAC,IAAI,EAAE,WAAW,CAAC,EACnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAmCD,CACA,CAAC;IACJ,CAAC;CACF;AAtID,sCAsIC"}

package/elements/oj-checkboxset/OjCheckboxset.ts

@@ -1,5 +1,6 @@
 import { OjCheckboxsetBase } from './OjCheckboxsetBase';
 import { error, Key, WebElement } from 'selenium-webdriver';
+import { executeWithModules } from '../../lib/oj-module-proxy';
 
 /**
  * The component WebElement for [oj-checkboxset](../../jsdocs/oj.ojCheckboxset.html).
@@ -98,47 +99,46 @@ export class OjCheckboxset extends OjCheckboxsetBase {
    * @returns The array of filtered selected checkboxes
    */
   private async getCheckboxesToUnselect(excludeList: any[] = []): Promise<WebElement[]> {
-    return await this.getDriver().executeScript<WebElement[]>(
+    return executeWithModules(
+      this.getDriver(),
+      ['KeyUtils'],
+      [this, excludeList],
       `
-      var element = arguments[0];
-      var excludeList = arguments[1].slice();
-      
-      var oj = require('ojs/ojcore-base');
+    (({ equals }, element, excludeList) => {
 
       // get the selected checkboxes
       var selected = element.querySelectorAll("input.oj-selected:enabled");
-
+  
       // If either selected checkboxes or exclude list is empty,
       // return the selected array
       if (selected.length === 0 || excludeList.length === 0) {
         return Array.from(selected);
       }
-
+  
       var filteredSelectedCheckboxes = [];
       // Filter the selected array using the excludeList
       selected.forEach(function (node) {
         var subId = element.getSubIdByNode(node);
         var shouldExclude = false;
-
+  
         // Check if current selected item is in the exclude list
         for (var i = 0; i < excludeList.length; i++) {
           // If a match is found, set the flag and break the loop
-          if (oj.Object.compareValues(subId.value, excludeList[i])) {
+          if (equals(subId.value, excludeList[i])) {
             shouldExclude = true;
             break;
           }
         }
-
+  
         if (!shouldExclude) {
           // If no match is found, push the item to the return array and continue
           filteredSelectedCheckboxes.push(node);
         }
       });
-
+  
       return filteredSelectedCheckboxes;
-    `,
-      this,
-      excludeList
+    })
+    `
     );
   }
 }

package/elements/oj-combobox-many/OjComboboxMany.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OjComboboxMany = void 0;
 const OjComboboxManyBase_1 = require("./OjComboboxManyBase");
+const oj_module_proxy_1 = require("../../lib/oj-module-proxy");
 /**
  * The component WebElement for [oj-combobox-many](../../jsdocs/oj.ojComboboxMany.html).
  * Do not instantiate this class directly, instead, use
@@ -28,26 +29,16 @@ class OjComboboxMany extends OjComboboxManyBase_1.OjComboboxManyBase {
                 await this.whenBusyContextReady();
                 return;
             }
-            const isValueSet = await this.getDriver().executeAsyncScript(`
-          var element = arguments[0];
-          var value = arguments[1];
-
-          // Last argument will the done function
-          var doneFunc = arguments[arguments.length - 1];
-          
-          var onSuccess = doneFunc.bind(null, true);
-          var onFailure = doneFunc.bind(null, false);
-          var onError = doneFunc.bind(null, false);
-          
-          require(['ojs/ojcustomelement-utils'], function (utils) {
-            // Retrieve the widget instance from the element
-            var bridge = utils.CustomElementUtils.getElementBridge(element);
-            var widget = bridge._WIDGET_INSTANCE.combobox;
-            widget._selectItemByValue(value)
-              .then(onSuccess, onFailure)
-              .catch(onFailure);
-          });
-        `, this, value);
+            const isValueSet = await (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['CustomElementUtils'], [this, value], `
+        (({ getElementBridge }, element, value) => {
+          // Retrieve the widget instance from the element
+          var bridge = getElementBridge(element);
+          var widget = bridge._WIDGET_INSTANCE.combobox;
+          return widget._selectItemByValue(value)
+            .then(() => true)
+            .catch(() => false);
+        })
+        `);
             // If failed to set value, fallback to setProperty
             if (isValueSet === false) {
                 console.warn('Failed to update value by interaction. Falling back to setProperty.');

package/elements/oj-combobox-many/OjComboboxMany.js.map

@@ -1 +1 @@
-{"version":3,"file":"OjComboboxMany.js","sourceRoot":"","sources":["../../../elements/oj-combobox-many/OjComboboxMany.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D;;;;GAIG;AACH,MAAa,cAAe,SAAQ,uCAAkB;IACpD;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,KAAwB;QACxC,mCAAmC;QACnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAElC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,uEAAuE;gBACvE,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBACtC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAClC,OAAO;YACT,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAC1D;;;;;;;;;;;;;;;;;;;SAmBC,EACD,IAAI,EACJ,KAAK,CACN,CAAC;YAEF,kDAAkD;YAClD,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACK,oBAAoB,CAAC,KAAwB;QACnD,OAAO,IAAI,CAAC,WAAW,CAAoB,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;CACF;AAzED,wCAyEC"}
+{"version":3,"file":"OjComboboxMany.js","sourceRoot":"","sources":["../../../elements/oj-combobox-many/OjComboboxMany.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAC1D,+DAA+D;AAE/D;;;;GAIG;AACH,MAAa,cAAe,SAAQ,uCAAkB;IACpD;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,KAAwB;QACxC,mCAAmC;QACnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAElC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,uEAAuE;gBACvE,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBACtC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAClC,OAAO;YACT,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,IAAA,oCAAkB,EACzC,IAAI,CAAC,SAAS,EAAE,EAChB,CAAC,oBAAoB,CAAC,EACtB,CAAC,IAAI,EAAE,KAAK,CAAC,EACb;;;;;;;;;SASC,CACF,CAAC;YAEF,kDAAkD;YAClD,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACK,oBAAoB,CAAC,KAAwB;QACnD,OAAO,IAAI,CAAC,WAAW,CAAoB,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;CACF;AAhED,wCAgEC"}

package/elements/oj-combobox-many/OjComboboxMany.ts

@@ -1,4 +1,5 @@
 import { OjComboboxManyBase } from './OjComboboxManyBase';
+import { executeWithModules } from '../../lib/oj-module-proxy';
 
 /**
  * The component WebElement for [oj-combobox-many](../../jsdocs/oj.ojComboboxMany.html).
@@ -28,29 +29,20 @@ export class OjComboboxMany extends OjComboboxManyBase {
         return;
       }
 
-      const isValueSet = await this.getDriver().executeAsyncScript(
+      const isValueSet = await executeWithModules<boolean>(
+        this.getDriver(),
+        ['CustomElementUtils'],
+        [this, value],
+        `
+        (({ getElementBridge }, element, value) => {
+          // Retrieve the widget instance from the element
+          var bridge = getElementBridge(element);
+          var widget = bridge._WIDGET_INSTANCE.combobox;
+          return widget._selectItemByValue(value)
+            .then(() => true)
+            .catch(() => false);
+        })
         `
-          var element = arguments[0];
-          var value = arguments[1];
-
-          // Last argument will the done function
-          var doneFunc = arguments[arguments.length - 1];
-          
-          var onSuccess = doneFunc.bind(null, true);
-          var onFailure = doneFunc.bind(null, false);
-          var onError = doneFunc.bind(null, false);
-          
-          require(['ojs/ojcustomelement-utils'], function (utils) {
-            // Retrieve the widget instance from the element
-            var bridge = utils.CustomElementUtils.getElementBridge(element);
-            var widget = bridge._WIDGET_INSTANCE.combobox;
-            widget._selectItemByValue(value)
-              .then(onSuccess, onFailure)
-              .catch(onFailure);
-          });
-        `,
-        this,
-        value
       );
 
       // If failed to set value, fallback to setProperty

package/elements/oj-combobox-one/OjComboboxOne.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OjComboboxOne = void 0;
 const selenium_webdriver_1 = require("selenium-webdriver");
 const OjComboboxOneBase_1 = require("./OjComboboxOneBase");
+const oj_module_proxy_1 = require("../../lib/oj-module-proxy");
 /**
  * The component WebElement for [oj-combobox-one](../../jsdocs/oj.ojComboboxOne.html).
  * Do not instantiate this class directly, instead, use
@@ -23,26 +24,16 @@ class OjComboboxOne extends OjComboboxOneBase_1.OjComboboxOneBase {
         const disabled = await this.getDisabled();
         if (!(readonly || disabled)) {
             await this.whenBusyContextReady();
-            const isValueSet = await this.getDriver().executeAsyncScript(`
-        var element = arguments[0];
-        var value = arguments[1];
-
-        // Last argument will the done function
-        var doneFunc = arguments[arguments.length - 1];
-        
-        var onSuccess = doneFunc.bind(null, true);
-        var onFailure = doneFunc.bind(null, false);
-        var onError = doneFunc.bind(null, false);
-        
-        require(['ojs/ojcustomelement-utils'], function (utils) {
+            const isValueSet = await (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['CustomElementUtils'], [this, value], `
+        (({ getElementBridge }, element, value) => {
           // Retrieve the widget instance from the element
-          var bridge = utils.CustomElementUtils.getElementBridge(element);
+          var bridge = getElementBridge(element);
           var widget = bridge._WIDGET_INSTANCE.combobox;
-          widget._selectItemByValue(value)
-            .then(onSuccess, onFailure)
-            .catch(onFailure);
-        });
-      `, this, value);
+          return widget._selectItemByValue(value)
+            .then(() => true)
+            .catch(() => false);
+        })
+        `);
             // If failed to set value, fallback to setProperty
             if (isValueSet === false) {
                 console.warn('Failed to update value by interaction. Falling back to setProperty.');

package/elements/oj-combobox-one/OjComboboxOne.js.map

@@ -1 +1 @@
-{"version":3,"file":"OjComboboxOne.js","sourceRoot":"","sources":["../../../elements/oj-combobox-one/OjComboboxOne.ts"],"names":[],"mappings":";;;AAAA,2DAA6C;AAC7C,2DAAwD;AAExD;;;;GAIG;AACH,MAAa,aAAc,SAAQ,qCAAiB;IAClD;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,KAAU;QAC1B,mCAAmC;QACnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAC1D;;;;;;;;;;;;;;;;;;;OAmBD,EACC,IAAI,EACJ,KAAK,CACN,CAAC;YAEF,kDAAkD;YAClD,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACnE,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED;;;;;OAKG;IACK,oBAAoB,CAAC,KAAU;QACrC,OAAO,IAAI,CAAC,WAAW,CAAM,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF;AAnED,sCAmEC"}
+{"version":3,"file":"OjComboboxOne.js","sourceRoot":"","sources":["../../../elements/oj-combobox-one/OjComboboxOne.ts"],"names":[],"mappings":";;;AAAA,2DAA6C;AAC7C,2DAAwD;AACxD,+DAA+D;AAE/D;;;;GAIG;AACH,MAAa,aAAc,SAAQ,qCAAiB;IAClD;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,KAAU;QAC1B,mCAAmC;QACnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,MAAM,IAAA,oCAAkB,EACzC,IAAI,CAAC,SAAS,EAAE,EAChB,CAAC,oBAAoB,CAAC,EACtB,CAAC,IAAI,EAAE,KAAK,CAAC,EACb;;;;;;;;;SASC,CACF,CAAC;YAEF,kDAAkD;YAClD,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACnE,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED;;;;;OAKG;IACK,oBAAoB,CAAC,KAAU;QACrC,OAAO,IAAI,CAAC,WAAW,CAAM,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF;AA1DD,sCA0DC"}

package/elements/oj-combobox-one/OjComboboxOne.ts

@@ -1,5 +1,6 @@
 import { By, Key } from 'selenium-webdriver';
 import { OjComboboxOneBase } from './OjComboboxOneBase';
+import { executeWithModules } from '../../lib/oj-module-proxy';
 
 /**
  * The component WebElement for [oj-combobox-one](../../jsdocs/oj.ojComboboxOne.html).
@@ -21,29 +22,20 @@ export class OjComboboxOne extends OjComboboxOneBase {
     const disabled = await this.getDisabled();
     if (!(readonly || disabled)) {
       await this.whenBusyContextReady();
-      const isValueSet = await this.getDriver().executeAsyncScript(
+      const isValueSet = await executeWithModules<boolean>(
+        this.getDriver(),
+        ['CustomElementUtils'],
+        [this, value],
         `
-        var element = arguments[0];
-        var value = arguments[1];
-
-        // Last argument will the done function
-        var doneFunc = arguments[arguments.length - 1];
-        
-        var onSuccess = doneFunc.bind(null, true);
-        var onFailure = doneFunc.bind(null, false);
-        var onError = doneFunc.bind(null, false);
-        
-        require(['ojs/ojcustomelement-utils'], function (utils) {
+        (({ getElementBridge }, element, value) => {
           // Retrieve the widget instance from the element
-          var bridge = utils.CustomElementUtils.getElementBridge(element);
+          var bridge = getElementBridge(element);
           var widget = bridge._WIDGET_INSTANCE.combobox;
-          widget._selectItemByValue(value)
-            .then(onSuccess, onFailure)
-            .catch(onFailure);
-        });
-      `,
-        this,
-        value
+          return widget._selectItemByValue(value)
+            .then(() => true)
+            .catch(() => false);
+        })
+        `
       );
 
       // If failed to set value, fallback to setProperty

package/elements/oj-data-grid/OjDataGridBase.ts

@@ -296,6 +296,10 @@ export interface Cell {
    * Specifies CSS class names to apply to cells. See the Help documentation for more information.
    */
   className: null | string | null;
+  /**
+   * Specifies if cells are editable. See the Help documentation for more information.
+   */
+  editable: null | string;
   /**
    * A function that returns cell content. The function takes a context argument, provided by the datagrid. See the Help documentation for more information.
    */
@@ -574,6 +578,10 @@ export interface HeaderColumnLabel {
    * A function that returns column header label content. The function takes a context argument, provided by the datagrid. See the Help documentation for more information.
    */
   renderer: null | null;
+  /**
+   * Specifies whether sorting is enabled on the column header labels. See the Help documentation for more information.
+   */
+  sortable: null | string;
   /**
    * Specifies inline style to apply to column header labels. See the Help documentation for more information.
    */
@@ -648,6 +656,10 @@ export interface HeaderColumnEndLabel {
    * A function that returns column end header label content. The function takes a context argument, provided by the datagrid. See the Help documentation for more information.
    */
   renderer: null | null;
+  /**
+   * Specifies whether sorting is enabled on the columnEnd header labels. See the Help documentation for more information.
+   */
+  sortable: null | string;
   /**
    * Specifies inline style to apply to column end header labels. See the Help documentation for more information.
    */
@@ -734,6 +746,10 @@ export interface HeaderRowLabel {
    * A function that returns row header label content. The function takes a context argument, provided by the datagrid. See the Help documentation for more information.
    */
   renderer: null | null;
+  /**
+   * Specifies whether sorting is enabled on the row header labels. See the Help documentation for more information.
+   */
+  sortable: null | string;
   /**
    * Specifies inline style to apply to row header labels. See the Help documentation for more information.
    */
@@ -808,6 +824,10 @@ export interface HeaderRowEndLabel {
    * A function that returns row end header label content. The function takes a context argument, provided by the datagrid. See the Help documentation for more information.
    */
   renderer: null | null;
+  /**
+   * Specifies whether sorting is enabled on the rowEnd header labels. See the Help documentation for more information.
+   */
+  sortable: null | string;
   /**
    * Specifies inline style to apply to row end header labels. See the Help documentation for more information.
    */
@@ -1241,6 +1261,10 @@ export interface Translations {
    * Provides properties to customize the empty data grid text.
    */
   msgNoData: string;
+  /**
+   * Provides properties to customize the read-only data grid cell popup text.
+   */
+  msgReadOnly: string;
   /**
    * Title of the dialog to set and apply column width.
    */