@oracle/oraclejet 18.1.0 → 18.1.2

package/dist/js/libs/oj/debug_esm/ojdatagrid.js

@@ -6171,18 +6171,22 @@ DvtDataGrid.prototype._setScrollerDimension = function (scroller, endRowPixel, e
   let totalHeight = 0;
   let totalWidth = 0;
 
-  if (!this._isCountUnknown('row') && !isHWS) {
-    totalHeight = rowCount * this.m_avgRowHeight; // Known row count & virtual scrolling
-  } else if (this._isCountUnknown('column') && !isHWS) {
-    totalHeight = maxRowKnownCount * this.m_avgRowHeight; // Unknown row count & virtual scrolling
+  if (!isHWS) {
+    if (this.getDataSource().getCount('row') < 0) {
+      totalHeight = maxRowKnownCount * this.m_avgRowHeight;
+    } else {
+      totalHeight = rowCount * this.m_avgRowHeight;
+    }
   } else {
     totalHeight = endRowPixel; // HWS
   }
 
-  if (!this._isCountUnknown('column') && !isHWS) {
-    totalWidth = colCount * this.m_avgColWidth; // Known column count & virtual scrolling
-  } else if (this._isCountUnknown('column') && !isHWS) {
-    totalWidth = maxColKnownCount * this.m_avgColWidth; // Unknown column count & virtual scrolling
+  if (!isHWS) {
+    if (this.getDataSource().getCount('column') < 0) {
+      totalWidth = maxColKnownCount * this.m_avgColWidth;
+    } else {
+      totalWidth = colCount * this.m_avgColWidth;
+    }
   } else {
     totalWidth = endColPixel; // HWS
   }
@@ -17288,7 +17292,8 @@ DvtDataGrid.prototype._handleInsertRangeEvent = function (eventDetail) {
       headerFragment: headerFragment,
       endHeaderFragment: endHeaderFragment,
       totalDimension: 0,
-      promiseResolve: promiseResolve
+      promiseResolve: promiseResolve,
+      update: false
     };
 
     this.fetchHeaders(axis, start, headerFragment, endHeaderFragment, count, {
@@ -17471,7 +17476,8 @@ DvtDataGrid.prototype._handleUpdateRangeEvent = function (eventDetail) {
       headerFragment,
       endHeaderFragment,
       totalDimension: 0,
-      promiseResolve: promiseResolve
+      promiseResolve: promiseResolve,
+      update: true
     };
 
     this.m_fetchingForUpdate = true;
@@ -17533,6 +17539,7 @@ DvtDataGrid.prototype._handleUpdateEditableHeader = function (props, cellSet, ce
   // handleInsertRangeCellFetchSuccess expects { offset, count } as commonProps.range
   delete commonProps.range;
   commonProps.range = { offset, count };
+  commonProps.update = true;
   // this ends the task
   this._handleInsertRangeCellFetchSuccess(commonProps, cellSet, cellRange, focusCallback);
 };
@@ -17554,11 +17561,16 @@ DvtDataGrid.prototype._handleInsertRangeHeaderFetchSuccess = function (
   const headerFragment = commonProps.headerFragment;
   const endHeaderFragment = commonProps.endHeaderFragment;
   const insertDimension = axis === 'row' ? 'top' : dir;
+  let isUpdate = commonProps.update || false;
   // freezeIndex rather than m_frozenIndex as during update post deletion m_frozenIndex would be deducted
   // while freezeIndex would retain intact.
-  let freezeIndex = this._hasFrozenRows() ? this.m_options._getFreezeIndex('row') : null;
-  if (axis === 'column') {
-    freezeIndex = this._hasFrozenColumns() ? this.m_options._getFreezeIndex('column') : null;
+  let rowFreezeIndex = null;
+  if (this._hasFrozenRows()) {
+    rowFreezeIndex = isUpdate ? this.m_options._getFreezeIndex('row') : this.m_frozenRowIndex;
+  }
+  let columnFreezeIndex = null;
+  if (this._hasFrozenColumns()) {
+    columnFreezeIndex = isUpdate ? this.m_options._getFreezeIndex('column') : this.m_frozenColIndex;
   }
 
   this.updateHiddenAxisForInsertion(start, count, axis);
@@ -17596,7 +17608,8 @@ DvtDataGrid.prototype._handleInsertRangeHeaderFetchSuccess = function (
       axis === 'column' &&
       this._hasFrozenColumns() &&
       !this.m_fetchingForUpdate &&
-      start === freezeIndex
+      start === columnFreezeIndex + 1 &&
+      isUpdate
     ) {
       if (this.m_colHeaderFrozen) {
         insertPixel = this.getElementWidth(this.m_colHeaderFrozen);
@@ -17607,7 +17620,8 @@ DvtDataGrid.prototype._handleInsertRangeHeaderFetchSuccess = function (
       axis === 'row' &&
       this._hasFrozenRows() &&
       !this.m_fetchingForUpdate &&
-      start === freezeIndex
+      start === rowFreezeIndex + 1 &&
+      isUpdate
     ) {
       if (this.m_rowHeaderFrozen) {
         insertPixel = this.getElementHeight(this.m_rowHeaderFrozen);
@@ -17630,8 +17644,8 @@ DvtDataGrid.prototype._handleInsertRangeHeaderFetchSuccess = function (
 
       index = start + c;
       if (
-        (axis === 'column' && this._hasFrozenColumns() && index <= freezeIndex) ||
-        (axis === 'row' && this._hasFrozenRows() && index <= freezeIndex)
+        (axis === 'column' && this._hasFrozenColumns() && index <= columnFreezeIndex) ||
+        (axis === 'row' && this._hasFrozenRows() && index <= rowFreezeIndex)
       ) {
         className = `${className} ${this.getMappedStyle('frozenHeader')}`;
       }
@@ -17734,16 +17748,24 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
   let frozenDatabody = this.m_databodyFrozenRow;
   let frozenHeaderRoot = this.m_rowHeaderFrozen;
   let frozenEndHeaderRoot = this.m_rowEndHeaderFrozen;
+  let isUpdate = commonProps.update || false;
   // freezeIndex rather than m_frozenIndex as during update post deletion m_frozenIndex would be deducted
   // while freezeIndex would retain intact.
-  let freezeIndex = this._hasFrozenRows() ? this.m_options._getFreezeIndex('row') : null;
+  let frozenRowIndex = null;
+  if (this._hasFrozenRows()) {
+    frozenRowIndex = isUpdate ? this.m_options._getFreezeIndex('row') : this.m_frozenRowIndex;
+  }
+  let frozenColIndex = null;
+  if (this._hasFrozenColumns()) {
+    frozenColIndex = isUpdate ? this.m_options._getFreezeIndex('column') : this.m_frozenColIndex;
+  }
+
   if (axis === 'column') {
     headerRoot = this.m_colHeader;
     endHeaderRoot = this.m_colEndHeader;
     frozenDatabody = this.m_databodyFrozenCol;
     frozenHeaderRoot = this.m_colHeaderFrozen;
     frozenEndHeaderRoot = this.m_colEndHeaderFrozen;
-    freezeIndex = this._hasFrozenColumns() ? this.m_options._getFreezeIndex('column') : null;
   }
 
   this._signalTaskEnd();
@@ -17766,10 +17788,15 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
     if (insertReference) {
       topPixel = axis === 'row' ? this.getElementDir(insertReference, 'top') : this.m_startRowPixel;
       leftPixel = axis === 'row' ? this.m_startColPixel : this.getElementDir(insertReference, dir);
-      if (axis === 'column' && this._hasFrozenColumns() && columnStart === freezeIndex) {
+      if (
+        axis === 'column' &&
+        this._hasFrozenColumns() &&
+        columnStart === frozenColIndex &&
+        isUpdate
+      ) {
         leftPixel = this.getElementWidth(this.m_databodyFrozenCol);
       }
-      if (axis === 'row' && this._hasFrozenRows() && rowStart === freezeIndex) {
+      if (axis === 'row' && this._hasFrozenRows() && rowStart === frozenRowIndex && isUpdate) {
         topPixel = this.getElementHeight(this.m_databodyFrozenRow);
       }
     } else {
@@ -17779,7 +17806,7 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
 
     if (axis === 'column') {
       // if insert is within frozen section.
-      if (this._hasFrozenColumns() && columnStart < freezeIndex + 1) {
+      if (this._hasFrozenColumns() && columnStart < frozenColIndex + 1) {
         if (this.m_databodyFrozenCorner) {
           this._addCellsToFragment(
             newFrozenCornerCellElements,
@@ -17788,11 +17815,11 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
             topPixel,
             columnStart,
             leftPixel,
-            freezeIndex + 1,
+            frozenRowIndex + 1,
             null
           );
-          rowStart = freezeIndex + 1;
-          rowCount -= freezeIndex + 1;
+          rowStart = frozenRowIndex + 1;
+          rowCount -= frozenRowIndex + 1;
         }
         const returnVal = this._addCellsToFragment(
           newFrozenColCellElements,
@@ -17815,11 +17842,11 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
             topPixel,
             columnStart,
             leftPixel,
-            freezeIndex + 1,
+            frozenRowIndex + 1,
             null
           );
-          rowStart = freezeIndex + 1;
-          rowCount -= freezeIndex + 1;
+          rowStart = frozenRowIndex + 1;
+          rowCount -= frozenRowIndex + 1;
         }
         const returnVal = this._addCellsToFragment(
           newCellElements,
@@ -17838,7 +17865,7 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
       }
     } else if (axis === 'row') {
       // if insert is within frozen section.
-      if (this._hasFrozenRows() && rowStart < freezeIndex + 1) {
+      if (this._hasFrozenRows() && rowStart < frozenRowIndex + 1) {
         if (this.m_databodyFrozenCorner) {
           this._addCellsToFragment(
             newFrozenCornerCellElements,
@@ -17848,10 +17875,10 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
             columnStart,
             leftPixel,
             null,
-            freezeIndex + 1
+            frozenColIndex + 1
           );
-          columnStart = freezeIndex + 1;
-          columnCount -= freezeIndex + 1;
+          columnStart = frozenColIndex + 1;
+          columnCount -= frozenColIndex + 1;
         }
         const returnVal = this._addCellsToFragment(
           newFrozenRowCellElements,
@@ -17875,10 +17902,10 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
             columnStart,
             leftPixel,
             null,
-            freezeIndex + 1
+            frozenColIndex + 1
           );
-          columnStart = freezeIndex + 1;
-          columnCount -= freezeIndex + 1;
+          columnStart = frozenColIndex + 1;
+          columnCount -= frozenColIndex + 1;
         }
         const returnVal = this._addCellsToFragment(
           newCellElements,
@@ -17925,8 +17952,8 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
   // are available and insert is done at the end of the frozen section.
   if (this._hasFrozenColumns() || this._hasFrozenRows()) {
     if (
-      (axis === 'column' && this._hasFrozenColumns() && offset < freezeIndex + 1) ||
-      (axis === 'row' && this._hasFrozenRows() && offset < freezeIndex + 1)
+      (axis === 'column' && this._hasFrozenColumns() && offset < frozenColIndex + 1) ||
+      (axis === 'row' && this._hasFrozenRows() && offset < frozenRowIndex + 1)
     ) {
       frozenDimensions = new Array(count).fill(totalDimension / count);
     } else {
@@ -17948,8 +17975,8 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
   for (let i = indexes.length - 1; i >= 0; i--) {
     let index = indexes[i];
     if (
-      (axis === 'column' && this._hasFrozenColumns() && index < freezeIndex + 1) ||
-      (axis === 'row' && this._hasFrozenRows() && index < freezeIndex + 1)
+      (axis === 'column' && this._hasFrozenColumns() && index < frozenColIndex + 1) ||
+      (axis === 'row' && this._hasFrozenRows() && index < frozenRowIndex + 1)
     ) {
       frozenIndexes.push(index);
       indexes.splice(i, 1);
@@ -18012,8 +18039,24 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
     }
     if (axis === 'column') {
       this.m_frozenColIndex += frozenIndexes.length;
+      let details = {
+        event: null,
+        ui: {
+          frozenCount: this.m_frozenColIndex + 1
+        }
+      };
+
+      this.fireEvent('columnFreeze', details);
     } else {
       this.m_frozenRowIndex += frozenIndexes.length;
+      let details = {
+        event: null,
+        ui: {
+          frozenCount: this.m_frozenRowIndex + 1
+        }
+      };
+
+      this.fireEvent('rowFreeze', details);
     }
   }
 
@@ -19401,8 +19444,26 @@ DvtDataGrid.prototype._handleDeleteRangeEvent = function (eventDetail, isFromUpd
     }
     if (axis === 'column') {
       this.m_frozenColIndex -= frozenIndexes.length;
+      if (!isFromUpdate) {
+        let details = {
+          event: null,
+          ui: {
+            frozenCount: this.m_frozenColIndex + 1
+          }
+        };
+        this.fireEvent('columnFreeze', details);
+      }
     } else {
       this.m_frozenRowIndex -= frozenIndexes.length;
+      if (!isFromUpdate) {
+        let details = {
+          event: null,
+          ui: {
+            frozenCount: this.m_frozenRowIndex + 1
+          }
+        };
+        this.fireEvent('rowFreeze', details);
+      }
     }
   }
 

package/dist/js/libs/oj/debug_esm/ojtable.js

@@ -5754,16 +5754,22 @@ Table.prototype._initFetch = function (options, isSortUpdate) {
     }
     return this._invokeDataFetchRows(updatedOptions);
   } else if (dataprovider == null) {
-    var promiseArray = [];
-    promiseArray.push(this._refreshTableHeader());
-    promiseArray.push(this._refreshTableBody());
-    promiseArray.push(this._refreshTableFooter());
-
-    return Promise.all(promiseArray);
+    return this._renderFallbackTable();
   }
   return Promise.resolve(undefined);
 };
 
+/**
+ * Renders each area of the Table without triggering a data fetch
+ */
+Table.prototype._renderFallbackTable = function () {
+  var promiseArray = [];
+  promiseArray.push(this._refreshTableHeader());
+  promiseArray.push(this._refreshTableBody());
+  promiseArray.push(this._refreshTableFooter());
+  return Promise.all(promiseArray);
+};
+
 /**
  * Initialize the template engine
  * @private
@@ -20625,7 +20631,10 @@ Table.prototype._getCurrentHorizontalScrollPosition = function (newScrollLeft) {
         break;
       }
     }
-    scrollPosition.columnKey = this._getColumnDefs()[index].id;
+    var columnDefs = this._getColumnDefs();
+    if (columnDefs.length > index) {
+      scrollPosition.columnKey = columnDefs[index].id;
+    }
     scrollPosition.columnIndex = index;
     scrollPosition.offsetX = scrollPosition.x - columnLocations[index];
   }
@@ -26518,14 +26527,25 @@ Table.prototype._SetupResources = function () {
   this._registerDataSourceEventListeners();
   // setup selection change listener to support browser selection.
   this._setupSelectionChangedListener();
+  // save dataprovider info before task is queued, otherwise it may reflect a pending 'refresh'
+  var dataprovider = this._getData();
   this._queueTask(
     function () {
       this._getLayoutManager().notifyTableUpdate(Table._UPDATE._REFRESH);
+      // only perform a real fetch if dataprovider was initialized already
+      if (dataprovider != null) {
+        if (this._isInitFetch) {
+          this._isInitFetch = false;
+          return this._initFetch();
+        }
+        return this._invokeDataFetchRows();
+      }
+      // fall back to basic rendering if no data was available at the time of resource setup
       if (this._isInitFetch) {
         this._isInitFetch = false;
-        return this._initFetch();
+        return this._renderFallbackTable();
       }
-      return this._invokeDataFetchRows();
+      return Promise.resolve(null);
     }.bind(this)
   );
 };

package/dist/js/libs/oj/debug_esm/ojtreeview.js

@@ -4734,7 +4734,7 @@ class TreeviewSelectionManager {
 
             var index = this._getInsertIndex(
               parentItem,
-              addEvent.indexes[i],
+              indexes == null ? null : indexes[i],
               metadata[i].key,
               finalKeys
             );

package/dist/js/libs/oj/main-template.js

@@ -15,9 +15,9 @@
   requirejs.config({
     // Path mappings for the logical module names
     paths: {
-      'ojs': 'libs/oj/18.1.0/min@insertESLevelPath@',
-      'ojL10n': 'libs/oj/18.1.0/ojL10n',
-      'ojtranslations': 'libs/oj/18.1.0/resources',
+      'ojs': 'libs/oj/18.1.2/min@insertESLevelPath@',
+      'ojL10n': 'libs/oj/18.1.2/ojL10n',
+      'ojtranslations': 'libs/oj/18.1.2/resources',
       
   'knockout': 'libs/knockout/knockout-3.5.1',
   'jquery': 'libs/jquery/jquery-3.7.1.min',

package/dist/js/libs/oj/min/ojcore-base.js

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(["ojs/ojlogger","ojs/ojwebdrivertest-proxy"],function(e,t){"use strict";let n={};"undefined"!=typeof window?n=window:"undefined"!=typeof self&&(n=self);var r=n.oj;const o={version:"18.1.0",revision:"2025-05-09_09-09-03",noConflict:function(){n.oj=r},_registerLegacyNamespaceProp:function(e,t){this[e]=t}};n.oj=o;const i={};o._registerLegacyNamespaceProp("StringUtils",i),i._TRIM_ALL_RE=/^\s*|\s*$/g,i.isEmpty=function(e){return null===e||0===i.trim(e).length},i.isEmptyOrUndefined=function(e){return!(void 0!==e&&!i.isEmpty(e))},i.isString=function(e){return null!==e&&("string"==typeof e||e instanceof String)},i.trim=function(e){return i.isString(e)?e.replace(i._TRIM_ALL_RE,""):e},i.hashCode=function(e){var t=0;if(0===e.length)return t;for(var n=0;n<e.length;n++){t=(t<<5)-t+e.charCodeAt(n),t&=t}return t};const s=function(){};o._registerLegacyNamespaceProp("AgentUtils",s),s.BROWSER={IE:"ie",FIREFOX:"firefox",SAFARI:"safari",CHROME:"chrome",EDGE:"edge",EDGE_CHROMIUM:"edge-chromium",UNKNOWN:"unknown"},s.ENGINE={TRIDENT:"trident",WEBKIT:"webkit",GECKO:"gecko",BLINK:"blink",EDGE_HTML:"edgehtml",UNKNOWN:"unknown"},s.OS={WINDOWS:"Windows",SOLARIS:"Solaris",MAC:"Mac",UNKNOWN:"Unknown",ANDROID:"Android",IOS:"IOS",WINDOWSPHONE:"WindowsPhone",LINUX:"Linux"},s.DEVICETYPE={PHONE:"phone",TABLET:"tablet",OTHERS:"others"},s.getAgentInfo=function(e){i.isEmptyOrUndefined(e)&&(e=navigator.userAgent),e=e.toLowerCase();var t=i.hashCode(e),n=s._currAgentInfo;if(n&&n.hashCode===t)return{os:n.os,browser:n.browser,browserVersion:n.browserVersion,deviceType:n.deviceType,engine:n.engine,engineVersion:n.engineVersion,hashCode:n.hashCode};var r=s.OS.UNKNOWN,o=s.BROWSER.UNKNOWN,a=0,c=s.DEVICETYPE.OTHERS,u=s.ENGINE.UNKNOWN,l=0;return e.indexOf("iphone")>-1||e.indexOf("ipad")>-1||e.indexOf("macintosh")>-1&&navigator.maxTouchPoints>0?r=s.OS.IOS:e.indexOf("macintosh")>-1?r=s.OS.MAC:e.indexOf("sunos")>-1?r=s.OS.SOLARIS:e.indexOf("android")>-1?r=s.OS.ANDROID:e.indexOf("linux")>-1?r=s.OS.LINUX:e.indexOf("windows phone")>-1?r=s.OS.WINDOWSPHONE:e.indexOf("windows")>-1&&(r=s.OS.WINDOWS),r===s.OS.ANDROID?c=e.indexOf("mobile")>-1?s.DEVICETYPE.PHONE:s.DEVICETYPE.TABLET:r===s.OS.IOS&&(c=e.indexOf("iphone")>-1?s.DEVICETYPE.PHONE:s.DEVICETYPE.TABLET),e.indexOf("msie")>-1?(o=s.BROWSER.IE,a=s._parseFloatVersion(e,/msie (\d+[.]\d+)/),e.indexOf("trident")&&(u=s.ENGINE.TRIDENT,l=s._parseFloatVersion(e,/trident\/(\d+[.]\d+)/))):e.indexOf("trident")>-1?(o=s.BROWSER.IE,a=s._parseFloatVersion(e,/rv:(\d+[.]\d+)/),e.indexOf("trident")&&(u=s.ENGINE.TRIDENT,l=s._parseFloatVersion(e,/trident\/(\d+[.]\d+)/))):e.indexOf("edge")>-1?(o=s.BROWSER.EDGE,a=l=s._parseFloatVersion(e,/edge\/(\d+[.]\d+)/),u=s.ENGINE.EDGE_HTML):e.indexOf("edg")>-1?(o=s.BROWSER.EDGE_CHROMIUM,a=s._parseFloatVersion(e,/edg\/(\d+[.]\d+)/),u=s.ENGINE.BLINK,l=a):e.indexOf("chrome")>-1?(o=s.BROWSER.CHROME,(a=s._parseFloatVersion(e,/chrome\/(\d+[.]\d+)/))>=28?(u=s.ENGINE.BLINK,l=a):(u=s.ENGINE.WEBKIT,l=s._parseFloatVersion(e,/applewebkit\/(\d+[.]\d+)/))):e.indexOf("safari")>-1?(o=s.BROWSER.SAFARI,a=s._parseFloatVersion(e,/version\/(\d+[.]\d+)/),u=s.ENGINE.WEBKIT,l=s._parseFloatVersion(e,/applewebkit\/(\d+[.]\d+)/)):e.indexOf("firefox")>-1&&(o=s.BROWSER.FIREFOX,a=s._parseFloatVersion(e,/rv:(\d+[.]\d+)/),u=s.ENGINE.GECKO,l=s._parseFloatVersion(e,/gecko\/(\d+)/)),s._currAgentInfo=n={hashCode:t,os:r,browser:o,browserVersion:a,deviceType:c,engine:u,engineVersion:l},{os:n.os,browser:n.browser,browserVersion:n.browserVersion,deviceType:n.deviceType,engine:n.engine,engineVersion:n.engineVersion,hashCode:n.hashCode}},s._parseFloatVersion=function(e,t){var n=e.match(t);if(n){var r=n[1];if(r)return parseFloat(r)}return 0};const a={};o._registerLegacyNamespaceProp("Assert",a);var c="DEBUG";const u="' doesn't match prototype ";a.forceDebug=function(){a[c]=!0},a.clearDebug=function(){a[c]=!1},a.isDebug=function(){return!0===a[c]},a.assert=function(e,t){if(a[c]&&!e){var n=t||"";if(arguments.length>2){n+="(";for(var r=2;r<arguments.length;r+=1)n+=arguments[r];n+=")"}a.assertionFailed(n,1)}},a.failedInAbstractFunction=function(){a[c]&&a.assertionFailed("Abstract function called",1)},a.assertPrototype=function(e,t,n){if(a[c]){var r=t.prototype;if(null!=e)a.assertType(t,"function",null,1,!1),Object.prototype.isPrototypeOf.call(r,e)||a.assertionFailed("object '"+e+u+r,1,n);else a.assertionFailed("null object doesn't match prototype "+r,1,n)}},a.assertPrototypeOrNull=function(e,t,n){if(a[c]&&null!=e){a.assertType(t,"function",null,1,!1);var r=t.prototype;Object.prototype.isPrototypeOf.call(r,e)||a.assertionFailed("object '"+e+u+r,1,n)}},a.assertPrototypes=function(e,t,n,r){if(a[c]){var o=t.prototype,i=n.prototype,s=Object.prototype.isPrototypeOf;s.call(o,e)||s.call(i,e)||a.assertionFailed("object '"+e+u+o+" or "+i,1,r)}},a.assertDomNodeOrNull=function(e,t){a[c]&&e&&void 0===e.nodeType&&a.assertionFailed(e+" is not a DOM Node",t+1)},a.assertDomNode=function(e,t){a[c]&&(e&&void 0!==e.nodeType||a.assertionFailed(e+" is not a DOM Node",t+1))},a.assertDomElement=function(e,t){a[c]&&(a.assertDomNode(e,1),1!==e.nodeType?a.assertionFailed(e+" is not a DOM Element",1):t&&e.nodeName!==t&&a.assertionFailed(e+" is not a "+t+" Element",1))},a.assertDomElementOrNull=function(e,t){a[c]&&null!=e&&(a.assertDomNode(e,1),1!==e.nodeType?a.assertionFailed(e+" is not a DOM Element",1):t&&e.nodeName!==t&&a.assertionFailed(e+" is not a "+t+" Element",1))},a.assertType=function(e,t,n,r,o){if(a[c]&&!(null==e&&o||typeof e===t)){var i=e+" is not of type "+t;n&&(i=n+i),r||(r=0),a.assertionFailed(i,r+1)}},a.assertObject=function(e,t){a[c]&&a.assertType(e,"object",t,1,!1)},a.assertObjectOrNull=function(e,t){a[c]&&a.assertType(e,"object",t,1,!0)},a.assertNonEmptyString=function(e,t){a[c]&&(a.assertType(e,"string",t,1,!1),a.assert(e.length>0,"empty string"))},a.assertString=function(e,t){a[c]&&a.assertType(e,"string",t,1,!1)},a.assertStringOrNull=function(e,t){a[c]&&a.assertType(e,"string",t,1,!0)},a.assertFunction=function(e,t){a[c]&&a.assertType(e,"function",t,1,!1)},a.assertFunctionOrNull=function(e,t){a[c]&&a.assertType(e,"function",t,1,!0)},a.assertBoolean=function(e,t){a[c]&&a.assertType(e,"boolean",t,1,!1)},a.assertNumber=function(e,t){a[c]&&a.assertType(e,"number",t,1,!1)},a.assertNumberOrNull=function(e,t){a[c]&&a.assertType(e,"number",t,1,!0)},a.assertArray=function(e,t){a[c]&&(Array.isArray(e)||(void 0===t&&(t=e+" is not an array"),a.assertionFailed(t,1)))},a.assertArrayOrNull=function(e,t){a[c]&&null!=e&&(Array.isArray(e)||(void 0===t&&(t=e+" is not an array"),a.assertionFailed(t,1)))},a.assertNonNumeric=function(e,t){a[c]&&(isNaN(e)||(void 0===t&&(t=e+" is convertible to a number"),a.assertionFailed(t,1)))},a.assertNumeric=function(e,t){a[c]&&isNaN(e)&&(void 0===t&&(t=e+" is not convertible to a number"),a.assertionFailed(t,1))},a.assertInSet=function(e,t,n){if(null==e||void 0===t[e.toString()]){if(void 0===n){for(var r=" is not in set: {",o=Object.keys(t),i=0;i<o.length;i++){r+=o[i],r+=","}n=e+(r+="}")}a.assertionFailed(n,1)}},a.assertionFailed=function(e,t,n){t||(t=0);var r="Assertion";throw n&&(r+=" ("+n+")"),r+=" failed: ",void 0!==e&&(r+=e),new Error(r)};var l=n.__oj_Assert_DEBUG;void 0!==l&&(a[c]=l),s.getAgentInfo().browser===s.BROWSER.IE&&e.error("Internet Explorer is not supported with this version of JET.");const d={};o._registerLegacyNamespaceProp("CollectionUtils",d),d.copyInto=function(e,t,n,r,o){return d._copyIntoImpl(e,t,n,r,o,0)},d.mergeDeep=function(e,...t){if(!t.length)return e;const n=d.isPlainObject,r=d.mergeDeep,o=t.shift();return n(e)&&n(o)&&Object.keys(o).forEach(t=>{n(o[t])?(e[t]||Object.assign(e,{[t]:{}}),r(e[t],o[t])):Object.assign(e,{[t]:o[t]})}),r(e,...t)},d.isPlainObject=function(e){if(null!==e&&"object"==typeof e)try{var t=Object.prototype.hasOwnProperty;if(e.constructor&&t.call(e.constructor.prototype,"isPrototypeOf"))return!0}catch(e){}return!1},d._copyIntoImpl=function(e,t,n,r,o,i){var s;if(null==o&&(o=Number.MAX_VALUE),e&&t&&e!==t)for(var a=Object.keys(t),c=0;c<a.length;c++){var u=a[c];s=n?n(u):u;var l=t[u],f=!1;if(r&&i<o){var p=e[s];d.isPlainObject(l)&&(null==p||d.isPlainObject(p))&&(f=!0,e[s]=p||{},d._copyIntoImpl(e[s],l,n,!0,o,i+1))}f||(e[s]=l)}return e},"undefined"!=typeof window&&window.Element&&!Element.prototype.closest&&(Element.prototype.closest=function(e){var t,n=(this.document||this.ownerDocument).querySelectorAll(e),r=this;do{for(t=n.length;--t>=0&&n.item(t)!==r;);}while(t<0&&(r=r.parentElement));return r}),function(){function e(e){return function(t,n,r){return e.call(this,t,n,function(e){return"boolean"==typeof e?e:!!e&&e.capture}(r))}}if("undefined"!=typeof window&&!function(){let e=!1;try{var t=Object.defineProperty({},"passive",{get:function(){return e=!0,e}});window.addEventListener("testPassive",null,t),window.removeEventListener("testPassive",null,t)}catch(e){}return e}()){let t;window.EventTarget?t=EventTarget.prototype:window.Node&&(t=Node.prototype),t&&(t.addEventListener=e(t.addEventListener),t.removeEventListener=e(t.removeEventListener))}}(),
+define(["ojs/ojlogger","ojs/ojwebdrivertest-proxy"],function(e,t){"use strict";let n={};"undefined"!=typeof window?n=window:"undefined"!=typeof self&&(n=self);var r=n.oj;const o={version:"18.1.2",revision:"2025-06-04_16-38-45",noConflict:function(){n.oj=r},_registerLegacyNamespaceProp:function(e,t){this[e]=t}};n.oj=o;const i={};o._registerLegacyNamespaceProp("StringUtils",i),i._TRIM_ALL_RE=/^\s*|\s*$/g,i.isEmpty=function(e){return null===e||0===i.trim(e).length},i.isEmptyOrUndefined=function(e){return!(void 0!==e&&!i.isEmpty(e))},i.isString=function(e){return null!==e&&("string"==typeof e||e instanceof String)},i.trim=function(e){return i.isString(e)?e.replace(i._TRIM_ALL_RE,""):e},i.hashCode=function(e){var t=0;if(0===e.length)return t;for(var n=0;n<e.length;n++){t=(t<<5)-t+e.charCodeAt(n),t&=t}return t};const s=function(){};o._registerLegacyNamespaceProp("AgentUtils",s),s.BROWSER={IE:"ie",FIREFOX:"firefox",SAFARI:"safari",CHROME:"chrome",EDGE:"edge",EDGE_CHROMIUM:"edge-chromium",UNKNOWN:"unknown"},s.ENGINE={TRIDENT:"trident",WEBKIT:"webkit",GECKO:"gecko",BLINK:"blink",EDGE_HTML:"edgehtml",UNKNOWN:"unknown"},s.OS={WINDOWS:"Windows",SOLARIS:"Solaris",MAC:"Mac",UNKNOWN:"Unknown",ANDROID:"Android",IOS:"IOS",WINDOWSPHONE:"WindowsPhone",LINUX:"Linux"},s.DEVICETYPE={PHONE:"phone",TABLET:"tablet",OTHERS:"others"},s.getAgentInfo=function(e){i.isEmptyOrUndefined(e)&&(e=navigator.userAgent),e=e.toLowerCase();var t=i.hashCode(e),n=s._currAgentInfo;if(n&&n.hashCode===t)return{os:n.os,browser:n.browser,browserVersion:n.browserVersion,deviceType:n.deviceType,engine:n.engine,engineVersion:n.engineVersion,hashCode:n.hashCode};var r=s.OS.UNKNOWN,o=s.BROWSER.UNKNOWN,a=0,c=s.DEVICETYPE.OTHERS,u=s.ENGINE.UNKNOWN,l=0;return e.indexOf("iphone")>-1||e.indexOf("ipad")>-1||e.indexOf("macintosh")>-1&&navigator.maxTouchPoints>0?r=s.OS.IOS:e.indexOf("macintosh")>-1?r=s.OS.MAC:e.indexOf("sunos")>-1?r=s.OS.SOLARIS:e.indexOf("android")>-1?r=s.OS.ANDROID:e.indexOf("linux")>-1?r=s.OS.LINUX:e.indexOf("windows phone")>-1?r=s.OS.WINDOWSPHONE:e.indexOf("windows")>-1&&(r=s.OS.WINDOWS),r===s.OS.ANDROID?c=e.indexOf("mobile")>-1?s.DEVICETYPE.PHONE:s.DEVICETYPE.TABLET:r===s.OS.IOS&&(c=e.indexOf("iphone")>-1?s.DEVICETYPE.PHONE:s.DEVICETYPE.TABLET),e.indexOf("msie")>-1?(o=s.BROWSER.IE,a=s._parseFloatVersion(e,/msie (\d+[.]\d+)/),e.indexOf("trident")&&(u=s.ENGINE.TRIDENT,l=s._parseFloatVersion(e,/trident\/(\d+[.]\d+)/))):e.indexOf("trident")>-1?(o=s.BROWSER.IE,a=s._parseFloatVersion(e,/rv:(\d+[.]\d+)/),e.indexOf("trident")&&(u=s.ENGINE.TRIDENT,l=s._parseFloatVersion(e,/trident\/(\d+[.]\d+)/))):e.indexOf("edge")>-1?(o=s.BROWSER.EDGE,a=l=s._parseFloatVersion(e,/edge\/(\d+[.]\d+)/),u=s.ENGINE.EDGE_HTML):e.indexOf("edg")>-1?(o=s.BROWSER.EDGE_CHROMIUM,a=s._parseFloatVersion(e,/edg\/(\d+[.]\d+)/),u=s.ENGINE.BLINK,l=a):e.indexOf("chrome")>-1?(o=s.BROWSER.CHROME,(a=s._parseFloatVersion(e,/chrome\/(\d+[.]\d+)/))>=28?(u=s.ENGINE.BLINK,l=a):(u=s.ENGINE.WEBKIT,l=s._parseFloatVersion(e,/applewebkit\/(\d+[.]\d+)/))):e.indexOf("safari")>-1?(o=s.BROWSER.SAFARI,a=s._parseFloatVersion(e,/version\/(\d+[.]\d+)/),u=s.ENGINE.WEBKIT,l=s._parseFloatVersion(e,/applewebkit\/(\d+[.]\d+)/)):e.indexOf("firefox")>-1&&(o=s.BROWSER.FIREFOX,a=s._parseFloatVersion(e,/rv:(\d+[.]\d+)/),u=s.ENGINE.GECKO,l=s._parseFloatVersion(e,/gecko\/(\d+)/)),s._currAgentInfo=n={hashCode:t,os:r,browser:o,browserVersion:a,deviceType:c,engine:u,engineVersion:l},{os:n.os,browser:n.browser,browserVersion:n.browserVersion,deviceType:n.deviceType,engine:n.engine,engineVersion:n.engineVersion,hashCode:n.hashCode}},s._parseFloatVersion=function(e,t){var n=e.match(t);if(n){var r=n[1];if(r)return parseFloat(r)}return 0};const a={};o._registerLegacyNamespaceProp("Assert",a);var c="DEBUG";const u="' doesn't match prototype ";a.forceDebug=function(){a[c]=!0},a.clearDebug=function(){a[c]=!1},a.isDebug=function(){return!0===a[c]},a.assert=function(e,t){if(a[c]&&!e){var n=t||"";if(arguments.length>2){n+="(";for(var r=2;r<arguments.length;r+=1)n+=arguments[r];n+=")"}a.assertionFailed(n,1)}},a.failedInAbstractFunction=function(){a[c]&&a.assertionFailed("Abstract function called",1)},a.assertPrototype=function(e,t,n){if(a[c]){var r=t.prototype;if(null!=e)a.assertType(t,"function",null,1,!1),Object.prototype.isPrototypeOf.call(r,e)||a.assertionFailed("object '"+e+u+r,1,n);else a.assertionFailed("null object doesn't match prototype "+r,1,n)}},a.assertPrototypeOrNull=function(e,t,n){if(a[c]&&null!=e){a.assertType(t,"function",null,1,!1);var r=t.prototype;Object.prototype.isPrototypeOf.call(r,e)||a.assertionFailed("object '"+e+u+r,1,n)}},a.assertPrototypes=function(e,t,n,r){if(a[c]){var o=t.prototype,i=n.prototype,s=Object.prototype.isPrototypeOf;s.call(o,e)||s.call(i,e)||a.assertionFailed("object '"+e+u+o+" or "+i,1,r)}},a.assertDomNodeOrNull=function(e,t){a[c]&&e&&void 0===e.nodeType&&a.assertionFailed(e+" is not a DOM Node",t+1)},a.assertDomNode=function(e,t){a[c]&&(e&&void 0!==e.nodeType||a.assertionFailed(e+" is not a DOM Node",t+1))},a.assertDomElement=function(e,t){a[c]&&(a.assertDomNode(e,1),1!==e.nodeType?a.assertionFailed(e+" is not a DOM Element",1):t&&e.nodeName!==t&&a.assertionFailed(e+" is not a "+t+" Element",1))},a.assertDomElementOrNull=function(e,t){a[c]&&null!=e&&(a.assertDomNode(e,1),1!==e.nodeType?a.assertionFailed(e+" is not a DOM Element",1):t&&e.nodeName!==t&&a.assertionFailed(e+" is not a "+t+" Element",1))},a.assertType=function(e,t,n,r,o){if(a[c]&&!(null==e&&o||typeof e===t)){var i=e+" is not of type "+t;n&&(i=n+i),r||(r=0),a.assertionFailed(i,r+1)}},a.assertObject=function(e,t){a[c]&&a.assertType(e,"object",t,1,!1)},a.assertObjectOrNull=function(e,t){a[c]&&a.assertType(e,"object",t,1,!0)},a.assertNonEmptyString=function(e,t){a[c]&&(a.assertType(e,"string",t,1,!1),a.assert(e.length>0,"empty string"))},a.assertString=function(e,t){a[c]&&a.assertType(e,"string",t,1,!1)},a.assertStringOrNull=function(e,t){a[c]&&a.assertType(e,"string",t,1,!0)},a.assertFunction=function(e,t){a[c]&&a.assertType(e,"function",t,1,!1)},a.assertFunctionOrNull=function(e,t){a[c]&&a.assertType(e,"function",t,1,!0)},a.assertBoolean=function(e,t){a[c]&&a.assertType(e,"boolean",t,1,!1)},a.assertNumber=function(e,t){a[c]&&a.assertType(e,"number",t,1,!1)},a.assertNumberOrNull=function(e,t){a[c]&&a.assertType(e,"number",t,1,!0)},a.assertArray=function(e,t){a[c]&&(Array.isArray(e)||(void 0===t&&(t=e+" is not an array"),a.assertionFailed(t,1)))},a.assertArrayOrNull=function(e,t){a[c]&&null!=e&&(Array.isArray(e)||(void 0===t&&(t=e+" is not an array"),a.assertionFailed(t,1)))},a.assertNonNumeric=function(e,t){a[c]&&(isNaN(e)||(void 0===t&&(t=e+" is convertible to a number"),a.assertionFailed(t,1)))},a.assertNumeric=function(e,t){a[c]&&isNaN(e)&&(void 0===t&&(t=e+" is not convertible to a number"),a.assertionFailed(t,1))},a.assertInSet=function(e,t,n){if(null==e||void 0===t[e.toString()]){if(void 0===n){for(var r=" is not in set: {",o=Object.keys(t),i=0;i<o.length;i++){r+=o[i],r+=","}n=e+(r+="}")}a.assertionFailed(n,1)}},a.assertionFailed=function(e,t,n){t||(t=0);var r="Assertion";throw n&&(r+=" ("+n+")"),r+=" failed: ",void 0!==e&&(r+=e),new Error(r)};var l=n.__oj_Assert_DEBUG;void 0!==l&&(a[c]=l),s.getAgentInfo().browser===s.BROWSER.IE&&e.error("Internet Explorer is not supported with this version of JET.");const d={};o._registerLegacyNamespaceProp("CollectionUtils",d),d.copyInto=function(e,t,n,r,o){return d._copyIntoImpl(e,t,n,r,o,0)},d.mergeDeep=function(e,...t){if(!t.length)return e;const n=d.isPlainObject,r=d.mergeDeep,o=t.shift();return n(e)&&n(o)&&Object.keys(o).forEach(t=>{n(o[t])?(e[t]||Object.assign(e,{[t]:{}}),r(e[t],o[t])):Object.assign(e,{[t]:o[t]})}),r(e,...t)},d.isPlainObject=function(e){if(null!==e&&"object"==typeof e)try{var t=Object.prototype.hasOwnProperty;if(e.constructor&&t.call(e.constructor.prototype,"isPrototypeOf"))return!0}catch(e){}return!1},d._copyIntoImpl=function(e,t,n,r,o,i){var s;if(null==o&&(o=Number.MAX_VALUE),e&&t&&e!==t)for(var a=Object.keys(t),c=0;c<a.length;c++){var u=a[c];s=n?n(u):u;var l=t[u],f=!1;if(r&&i<o){var p=e[s];d.isPlainObject(l)&&(null==p||d.isPlainObject(p))&&(f=!0,e[s]=p||{},d._copyIntoImpl(e[s],l,n,!0,o,i+1))}f||(e[s]=l)}return e},"undefined"!=typeof window&&window.Element&&!Element.prototype.closest&&(Element.prototype.closest=function(e){var t,n=(this.document||this.ownerDocument).querySelectorAll(e),r=this;do{for(t=n.length;--t>=0&&n.item(t)!==r;);}while(t<0&&(r=r.parentElement));return r}),function(){function e(e){return function(t,n,r){return e.call(this,t,n,function(e){return"boolean"==typeof e?e:!!e&&e.capture}(r))}}if("undefined"!=typeof window&&!function(){let e=!1;try{var t=Object.defineProperty({},"passive",{get:function(){return e=!0,e}});window.addEventListener("testPassive",null,t),window.removeEventListener("testPassive",null,t)}catch(e){}return e}()){let t;window.EventTarget?t=EventTarget.prototype:window.Node&&(t=Node.prototype),t&&(t.addEventListener=e(t.addEventListener),t.removeEventListener=e(t.removeEventListener))}}(),
 /**
      * @license
      * Code taken from