@oracle/oraclejet-webdriver 13.0.5 → 13.1.0

package/elements/oj-file-picker/OjFilePickerBase.js

@@ -58,7 +58,7 @@ class OjFilePickerBase extends __1.OjWebElement {
      * Gets the value of <code>selectOn</code> property.
      * The type of event to select the files.
      * @return The value of <code>selectOn</code> property.
-     *
+     * @deprecated Since 13.1.0. Main use case was to turn off drag and drop for button filepicker.  The current recommendation for that use case is to use ojfilepickerutils with an oj-button.
      */
     getSelectOn() {
         return this.getProperty('selectOn');

package/elements/oj-file-picker/OjFilePickerBase.ts

@@ -61,7 +61,7 @@ export class OjFilePickerBase extends OjWebElement {
    * Gets the value of <code>selectOn</code> property.
    * The type of event to select the files.
    * @return The value of <code>selectOn</code> property.
-   *
+   * @deprecated Since 13.1.0. Main use case was to turn off drag and drop for button filepicker.  The current recommendation for that use case is to use ojfilepickerutils with an oj-button.
    */
   public getSelectOn(): Promise<string> {
     return this.getProperty<string>('selectOn');

package/elements/oj-table/OjTable.js

@@ -50,7 +50,7 @@ class OjTable extends OjTableBase_1.OjTableBase {
     /**
      * Retrieve a SlotProxy which represents a single cell.
      * Should be used only if cell contents are rendered using cell template/renderer/slot. Otherwise method will throw an exception.
-     * @param itemLocator The row and column indexes of the cell.
+     * @param itemLocator Either column index or key and row index or key of the cell.
      */
     async findCell(itemLocator) {
         // Call changeScrollPosition to scroll the row into view and ensure it's
@@ -60,22 +60,67 @@ class OjTable extends OjTableBase_1.OjTableBase {
             columnIndex: undefined,
             offsetX: undefined,
             offsetY: undefined,
-            rowKey: undefined,
+            rowKey: itemLocator.rowKey,
             columnKey: undefined,
             x: undefined,
             y: undefined
         });
-        const el = await this.getDriver().executeScript(`
+        const el = await this.getDriver().executeAsyncScript(`
       const element = arguments[0];
-      const columnData = element.columns[${itemLocator.columnIndex}];
+      const rowIndex = arguments[1];
+      let columnIndex = arguments[2];
+      const rowKey = arguments[3];
+      const columnKey = arguments[4];
+      const done = arguments[5];
+      const columns = element.columns;
+      if (columnIndex == null) {
+        for (let i = 0; i < columns.length; i++) {
+          if (columns[i].id === columnKey) {
+            columnIndex = i;
+            break;
+          }
+        }
+      }
+      if (columnIndex == null || columnIndex >= columns.length) {
+        done(null);
+      }
       const defaultCellTemplate = element.querySelectorAll('[slot="cellTemplate"]')[0];
-      if (columnData.template == null && columnData.renderer == null &&
+      if (columns[columnIndex].template == null && columns[columnIndex].renderer == null &&
           defaultCellTemplate == null) {
-        return null;
+            done(null);
       } else {
-        return element.getNodeBySubId({ subId: 'oj-table-cell', rowIndex: ${itemLocator.rowIndex}, columnIndex: ${itemLocator.columnIndex} });
+        if (rowIndex != null) {
+          done(element.getNodeBySubId({ subId: 'oj-table-cell', rowIndex: rowIndex, columnIndex: columnIndex }));
+        } else {
+          require(['ojs/ojcore'], function(oj) {
+            const rows = element.querySelectorAll('.oj-table-body-row');
+            let row;
+            for (let i = 0; i < rows.length; i++) {
+              if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+                row = rows[i];
+                break;
+              }
+            }
+            if (row == null) {
+              done(null);
+            }
+            const cells = row.querySelectorAll('.oj-table-data-cell');
+            if (cells.length === columns.length) {
+              done(cells[columnIndex]);
+            } else {
+              let index = 0;
+              for (let i = 0; i < cells.length; i++) {
+                let colSpan = cells[i].colSpan
+                if (columnIndex >= index && columnIndex < index + colSpan) {
+                  done(cells[i]);
+                }
+                index += colSpan;
+              }
+            }
+          });
+        }
       }
-    `, this);
+    `, this, itemLocator.rowIndex, itemLocator.columnIndex, itemLocator.rowKey, itemLocator.columnKey);
         if (el) {
             return (0, __1.slotProxy)(el, this);
         }
@@ -86,7 +131,7 @@ class OjTable extends OjTableBase_1.OjTableBase {
     /**
      * Retrieve a SlotProxy which represents a single row.
      * Should be used only if row is rendered using rowTemplate slot or renderer. Otherwise method will throw an exception.
-     * @param itemLocator The index of the row.
+     * @param itemLocator Either index or key of the row.
      */
     async findRow(itemLocator) {
         // Call changeScrollPosition to scroll the row into view and ensure it's
@@ -96,22 +141,38 @@ class OjTable extends OjTableBase_1.OjTableBase {
             columnIndex: undefined,
             offsetX: undefined,
             offsetY: undefined,
-            rowKey: undefined,
+            rowKey: itemLocator.rowKey,
             columnKey: undefined,
             x: undefined,
             y: undefined
         });
-        const el = await this.getDriver().executeScript(`
+        const el = await this.getDriver().executeAsyncScript(`
       const element = arguments[0];
+      const rowIndex = arguments[1];
+      const rowKey = arguments[2];
+      const done = arguments[3];
       const rowTemplate = element.querySelectorAll('[slot="rowTemplate"]')[0];
       const rowRenderer = element.rowRenderer;
       if (rowTemplate == null && rowRenderer == null) {
-        return null;
+        done(null);
       }
-      const rowIndex = arguments[1];
-      const rows = element.querySelectorAll('.oj-table-body-row');
-      return rows[rowIndex];
-    `, this, itemLocator.rowIndex);
+      require(['ojs/ojcore'], function(oj) {
+        const rows = element.querySelectorAll('.oj-table-body-row');
+        if (rowKey != null) {
+          for (let i = 0; i < rows.length; i++) {
+            if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+              done(rows[i]);
+            }
+          }
+          done(null);
+        } else {
+          if (rowIndex == null || rowIndex >= rows.length){
+            done(null);
+          }
+          done(rows[rowIndex]);
+        }
+      });
+    `, this, itemLocator.rowIndex, itemLocator.rowKey);
         if (el) {
             return (0, __1.slotProxy)(el, this);
         }
@@ -122,20 +183,33 @@ class OjTable extends OjTableBase_1.OjTableBase {
     /**
      * Retrieve a SlotProxy which represents the given header cell.
      * Should be used only if header is rendered using template/renderer/slot. Otherwise method will throw an exception.
-     * @param itemLocator The column index of the header cell.
+     * @param itemLocator Either index or key of the header cell.
      */
     async findHeader(itemLocator) {
         await this.whenReady();
         const el = await this.getDriver().executeScript(`
       const element = arguments[0];
-      const columnData = element.columns[${itemLocator.columnIndex}];
+      let columnIndex = arguments[1];
+      const columnKey = arguments[2];
+      const columns = element.columns;
+      if (columnIndex == null) {
+        for (let i = 0; i < columns.length; i++) {
+          if (columns[i].id === columnKey) {
+            columnIndex = i;
+            break;
+          }
+        }
+      }
+      if (columnIndex == null || columnIndex >= columns.length) {
+        return null;
+      }
       const defaultHeaderTemplate = element.querySelectorAll('[slot="headerTemplate"]')[0];
-      if (columnData.headerTemplate == null && 
-          columnData.headerRenderer == null && defaultHeaderTemplate == null) {
+      if (columns[columnIndex].headerTemplate == null &&
+        columns[columnIndex].headerRenderer == null && defaultHeaderTemplate == null) {
         return null;
       }
-      return element.getNodeBySubId({ subId: 'oj-table-header', index: ${itemLocator.columnIndex} })
-    `, this);
+      return element.getNodeBySubId({ subId: 'oj-table-header', index: columnIndex})
+    `, this, itemLocator.columnIndex, itemLocator.columnKey);
         if (el) {
             return (0, __1.slotProxy)(el, this);
         }
@@ -146,20 +220,33 @@ class OjTable extends OjTableBase_1.OjTableBase {
     /**
      * Retrieve a SlotProxy which represents the given footer cell.
      * Should be used only if footer is rendered using template/renderer/slot. Otherwise method will throw an exception.
-     * @param itemLocator The column index of the footer cell.
+     * @param itemLocator Either index or key of the footer cell.
      */
     async findFooter(itemLocator) {
         await this.whenReady();
         const el = await this.getDriver().executeScript(`
       const element = arguments[0];
-      const columnData = element.columns[${itemLocator.columnIndex}];
+      let columnIndex = arguments[1];
+      const columnKey = arguments[2];
+      const columns = element.columns;
+      if (columnIndex == null) {
+        for (let i = 0; i < columns.length; i++) {
+          if (columns[i].id === columnKey) {
+            columnIndex = i;
+            break;
+          }
+        }
+      }
+      if (columnIndex == null || columnIndex >= columns.length) {
+        return null;
+      }
       const defaultFooterTemplate = element.querySelectorAll('[slot="footerTemplate"]')[0];
-      if (columnData.footerTemplate == null &&
-          columnData.footerRenderer == null && defaultFooterTemplate == null) {
+      if (columns[columnIndex].footerTemplate == null &&
+        columns[columnIndex].footerRenderer == null && defaultFooterTemplate == null) {
         return null;
       }
-      return element.getNodeBySubId({ subId: 'oj-table-footer', index: ${itemLocator.columnIndex} })
-    `, this);
+      return element.getNodeBySubId({ subId: 'oj-table-footer', index: columnIndex })
+    `, this, itemLocator.columnIndex, itemLocator.columnKey);
         if (el) {
             return (0, __1.slotProxy)(el, this);
         }

package/elements/oj-table/OjTable.js.map

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

package/elements/oj-table/OjTable.ts

@@ -58,9 +58,15 @@ export class OjTable extends OjTableBase {
   /**
    * Retrieve a SlotProxy which represents a single cell.
    * Should be used only if cell contents are rendered using cell template/renderer/slot. Otherwise method will throw an exception.
-   * @param itemLocator The row and column indexes of the cell.
+   * @param itemLocator Either column index or key and row index or key of the cell.
    */
-  async findCell(itemLocator: { rowIndex: number; columnIndex: number }): Promise<SlotProxy> {
+  async findCell<K>(
+    itemLocator: (
+      | { columnIndex: number; columnKey?: never }
+      | { columnKey: string; columnIndex?: never }
+    ) &
+      ({ rowIndex: number; rowKey?: never } | { rowKey: K; rowIndex?: never })
+  ): Promise<SlotProxy> {
     // Call changeScrollPosition to scroll the row into view and ensure it's
     // rendered in DOM
     await this.changeScrollPosition({
@@ -68,24 +74,73 @@ export class OjTable extends OjTableBase {
       columnIndex: undefined,
       offsetX: undefined,
       offsetY: undefined,
-      rowKey: undefined,
+      rowKey: itemLocator.rowKey,
       columnKey: undefined,
       x: undefined,
       y: undefined
     });
-    const el = await this.getDriver().executeScript<WebElement>(
+    const el = await this.getDriver().executeAsyncScript<WebElement>(
       `
       const element = arguments[0];
-      const columnData = element.columns[${itemLocator.columnIndex}];
+      const rowIndex = arguments[1];
+      let columnIndex = arguments[2];
+      const rowKey = arguments[3];
+      const columnKey = arguments[4];
+      const done = arguments[5];
+      const columns = element.columns;
+      if (columnIndex == null) {
+        for (let i = 0; i < columns.length; i++) {
+          if (columns[i].id === columnKey) {
+            columnIndex = i;
+            break;
+          }
+        }
+      }
+      if (columnIndex == null || columnIndex >= columns.length) {
+        done(null);
+      }
       const defaultCellTemplate = element.querySelectorAll('[slot="cellTemplate"]')[0];
-      if (columnData.template == null && columnData.renderer == null &&
+      if (columns[columnIndex].template == null && columns[columnIndex].renderer == null &&
           defaultCellTemplate == null) {
-        return null;
+            done(null);
       } else {
-        return element.getNodeBySubId({ subId: 'oj-table-cell', rowIndex: ${itemLocator.rowIndex}, columnIndex: ${itemLocator.columnIndex} });
+        if (rowIndex != null) {
+          done(element.getNodeBySubId({ subId: 'oj-table-cell', rowIndex: rowIndex, columnIndex: columnIndex }));
+        } else {
+          require(['ojs/ojcore'], function(oj) {
+            const rows = element.querySelectorAll('.oj-table-body-row');
+            let row;
+            for (let i = 0; i < rows.length; i++) {
+              if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+                row = rows[i];
+                break;
+              }
+            }
+            if (row == null) {
+              done(null);
+            }
+            const cells = row.querySelectorAll('.oj-table-data-cell');
+            if (cells.length === columns.length) {
+              done(cells[columnIndex]);
+            } else {
+              let index = 0;
+              for (let i = 0; i < cells.length; i++) {
+                let colSpan = cells[i].colSpan
+                if (columnIndex >= index && columnIndex < index + colSpan) {
+                  done(cells[i]);
+                }
+                index += colSpan;
+              }
+            }
+          });
+        }
       }
     `,
-      this
+      this,
+      itemLocator.rowIndex,
+      itemLocator.columnIndex,
+      itemLocator.rowKey,
+      itemLocator.columnKey
     );
     if (el) {
       return slotProxy(el, this);
@@ -97,9 +152,11 @@ export class OjTable extends OjTableBase {
   /**
    * Retrieve a SlotProxy which represents a single row.
    * Should be used only if row is rendered using rowTemplate slot or renderer. Otherwise method will throw an exception.
-   * @param itemLocator The index of the row.
+   * @param itemLocator Either index or key of the row.
    */
-  async findRow(itemLocator: { rowIndex: number }): Promise<SlotProxy> {
+  async findRow<K>(
+    itemLocator: { rowIndex: number; rowKey?: never } | { rowKey: K; rowIndex?: never }
+  ): Promise<SlotProxy> {
     // Call changeScrollPosition to scroll the row into view and ensure it's
     // rendered in DOM
     await this.changeScrollPosition({
@@ -107,25 +164,42 @@ export class OjTable extends OjTableBase {
       columnIndex: undefined,
       offsetX: undefined,
       offsetY: undefined,
-      rowKey: undefined,
+      rowKey: itemLocator.rowKey,
       columnKey: undefined,
       x: undefined,
       y: undefined
     });
-    const el = await this.getDriver().executeScript<WebElement>(
+    const el = await this.getDriver().executeAsyncScript<WebElement>(
       `
       const element = arguments[0];
+      const rowIndex = arguments[1];
+      const rowKey = arguments[2];
+      const done = arguments[3];
       const rowTemplate = element.querySelectorAll('[slot="rowTemplate"]')[0];
       const rowRenderer = element.rowRenderer;
       if (rowTemplate == null && rowRenderer == null) {
-        return null;
+        done(null);
       }
-      const rowIndex = arguments[1];
-      const rows = element.querySelectorAll('.oj-table-body-row');
-      return rows[rowIndex];
+      require(['ojs/ojcore'], function(oj) {
+        const rows = element.querySelectorAll('.oj-table-body-row');
+        if (rowKey != null) {
+          for (let i = 0; i < rows.length; i++) {
+            if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+              done(rows[i]);
+            }
+          }
+          done(null);
+        } else {
+          if (rowIndex == null || rowIndex >= rows.length){
+            done(null);
+          }
+          done(rows[rowIndex]);
+        }
+      });
     `,
       this,
-      itemLocator.rowIndex
+      itemLocator.rowIndex,
+      itemLocator.rowKey
     );
     if (el) {
       return slotProxy(el, this);
@@ -137,22 +211,41 @@ export class OjTable extends OjTableBase {
   /**
    * Retrieve a SlotProxy which represents the given header cell.
    * Should be used only if header is rendered using template/renderer/slot. Otherwise method will throw an exception.
-   * @param itemLocator The column index of the header cell.
+   * @param itemLocator Either index or key of the header cell.
    */
-  async findHeader(itemLocator: { columnIndex: number }): Promise<SlotProxy> {
+  async findHeader(
+    itemLocator:
+      | { columnIndex: number; columnKey?: never }
+      | { columnKey: string; columnIndex?: never }
+  ): Promise<SlotProxy> {
     await this.whenReady();
     const el = await this.getDriver().executeScript<WebElement>(
       `
       const element = arguments[0];
-      const columnData = element.columns[${itemLocator.columnIndex}];
+      let columnIndex = arguments[1];
+      const columnKey = arguments[2];
+      const columns = element.columns;
+      if (columnIndex == null) {
+        for (let i = 0; i < columns.length; i++) {
+          if (columns[i].id === columnKey) {
+            columnIndex = i;
+            break;
+          }
+        }
+      }
+      if (columnIndex == null || columnIndex >= columns.length) {
+        return null;
+      }
       const defaultHeaderTemplate = element.querySelectorAll('[slot="headerTemplate"]')[0];
-      if (columnData.headerTemplate == null && 
-          columnData.headerRenderer == null && defaultHeaderTemplate == null) {
+      if (columns[columnIndex].headerTemplate == null &&
+        columns[columnIndex].headerRenderer == null && defaultHeaderTemplate == null) {
         return null;
       }
-      return element.getNodeBySubId({ subId: 'oj-table-header', index: ${itemLocator.columnIndex} })
+      return element.getNodeBySubId({ subId: 'oj-table-header', index: columnIndex})
     `,
-      this
+      this,
+      itemLocator.columnIndex,
+      itemLocator.columnKey
     );
     if (el) {
       return slotProxy(el, this);
@@ -164,22 +257,41 @@ export class OjTable extends OjTableBase {
   /**
    * Retrieve a SlotProxy which represents the given footer cell.
    * Should be used only if footer is rendered using template/renderer/slot. Otherwise method will throw an exception.
-   * @param itemLocator The column index of the footer cell.
+   * @param itemLocator Either index or key of the footer cell.
    */
-  async findFooter(itemLocator: { columnIndex: number }): Promise<SlotProxy> {
+  async findFooter(
+    itemLocator:
+      | { columnIndex: number; columnKey?: never }
+      | { columnKey: string; columnIndex?: never }
+  ): Promise<SlotProxy> {
     await this.whenReady();
     const el = await this.getDriver().executeScript<WebElement>(
       `
       const element = arguments[0];
-      const columnData = element.columns[${itemLocator.columnIndex}];
+      let columnIndex = arguments[1];
+      const columnKey = arguments[2];
+      const columns = element.columns;
+      if (columnIndex == null) {
+        for (let i = 0; i < columns.length; i++) {
+          if (columns[i].id === columnKey) {
+            columnIndex = i;
+            break;
+          }
+        }
+      }
+      if (columnIndex == null || columnIndex >= columns.length) {
+        return null;
+      }
       const defaultFooterTemplate = element.querySelectorAll('[slot="footerTemplate"]')[0];
-      if (columnData.footerTemplate == null &&
-          columnData.footerRenderer == null && defaultFooterTemplate == null) {
+      if (columns[columnIndex].footerTemplate == null &&
+        columns[columnIndex].footerRenderer == null && defaultFooterTemplate == null) {
         return null;
       }
-      return element.getNodeBySubId({ subId: 'oj-table-footer', index: ${itemLocator.columnIndex} })
+      return element.getNodeBySubId({ subId: 'oj-table-footer', index: columnIndex })
     `,
-      this
+      this,
+      itemLocator.columnIndex,
+      itemLocator.columnKey
     );
     if (el) {
       return slotProxy(el, this);

package/elements/oj-table/OjTableBase.js

@@ -153,6 +153,15 @@ class OjTableBase extends __1.OjWebElement {
     getLayout() {
         return this.getProperty('layout');
     }
+    /**
+     * Gets the value of <code>row</code> property.
+     * Customizes the functionality of each row in the table.
+     * @return The value of <code>row</code> property.
+     *
+     */
+    getRow() {
+        return this.getProperty('row');
+    }
     /**
      * Gets the value of <code>rowRenderer</code> property.
      * A function that returns row content. The function takes a context argument, provided by the table. See the Help documentation for more information.

package/elements/oj-table/OjTableBase.js.map

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

package/elements/oj-table/OjTableBase.ts

@@ -167,6 +167,16 @@ export class OjTableBase extends OjWebElement {
     return this.getProperty<string>('layout');
   }
 
+  /**
+   * Gets the value of <code>row</code> property.
+   * Customizes the functionality of each row in the table.
+   * @return The value of <code>row</code> property.
+   *
+   */
+  public getRow(): Promise<Row> {
+    return this.getProperty<Row>('row');
+  }
+
   /**
    * Gets the value of <code>rowRenderer</code> property.
    * A function that returns row content. The function takes a context argument, provided by the table. See the Help documentation for more information.
@@ -575,6 +585,20 @@ export interface FirstSelectedRow {
    */
   key: any;
 }
+export interface Row {
+  /**
+   * Specifies whether the row can be edited. See the Help documentation for more information.
+   */
+  editable: null | null;
+  /**
+   * Specifies whether the row can be selected. See the Help documentation for more information.
+   */
+  selectable: null | null;
+  /**
+   * Specifies whether the row is sticky. See the Help documentation for more information.
+   */
+  sticky: null | null;
+}
 export interface ScrollPolicyOptions {
   /**
    * The number of data rows to fetch in each block.
@@ -641,6 +665,10 @@ export interface ScrollPosition {
 }
 export interface Selected {}
 export interface Translations {
+  /**
+   * Provides properties to customize the accessible text for the 'add row' row.
+   */
+  accessibleAddRow: string;
   /**
    * Provides properties to customize the accessible context for the column index.
    */
@@ -653,6 +681,10 @@ export interface Translations {
    * Provides properties to customize the accessible context for the column header index.
    */
   accessibleColumnHeaderContext: string;
+  /**
+   * Provides properties to customize the accessible text when a cell spans multiple columns.
+   */
+  accessibleColumnsSpan: string;
   /**
    * Provides properties to customize the accessible text when a cell contains controls.
    */

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@oracle/oraclejet-webdriver",
-  "version": "13.0.5",
+  "version": "13.1.0",
   "description": "Oracle JET WebDriverJS WebElements",
   "config": {
-    "revision": "2022-10-04_18-09-44"
+    "revision": "2022-10-01_20-13-24"
   },
   "scripts": {
     "clean": "rimraf built dist test/built test_results",