@oracle/oraclejet 15.0.4 → 15.0.6

package/dist/css/stable/oj-stable.css

@@ -333,7 +333,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v15.0.4"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v15.0.6"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;

package/dist/icu-l10n/package.json

@@ -5,9 +5,8 @@
   "main": "l10nBundleBuilder.js",
   "scripts": {
     "clean": "rimraf test/built test_results",
-    "build:types": "tsc --declaration --emitDeclarationOnly --allowJs --skipLibCheck Bundler.js",
-    "test": "jest -c test/jest.config.js",
-    "test:debug": "yarn run --inspect jest -i"
+    "build-types": "tsc --declaration --emitDeclarationOnly --allowJs --skipLibCheck Bundler.js",
+    "test": "jest -c test/jest.config.js"
   },
   "author": "",
   "license": "ISC",

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

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '15.0.4',
+    version: '15.0.6',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-09-08_06-09-49',
+    revision: '2023-10-11_09-50-25',
 
     // This function is only meant to be used outside the library, so quoting the name
     // to avoid renaming is appropriate

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

@@ -16528,7 +16528,7 @@ var __oj_data_grid_metadata =
       }
       if (hasHeaders) {
         this.m_endRowHeader += count;
-        if (offset > this.m_frozenRowIndex + 1) {
+        if (!this._hasFrozenRows() || (this._hasFrozenRows() && offset > this.m_frozenRowIndex + 1)) {
           this.m_endRowHeaderPixel += totalDimension;
         }
         this.m_stopRowHeaderFetch = false;
@@ -16559,7 +16559,10 @@ var __oj_data_grid_metadata =
       }
       if (hasHeaders) {
         this.m_endColHeader += count;
-        if (offset > this.m_frozenColIndex + 1) {
+        if (
+          !this._hasFrozenColumns() ||
+          (this._hasFrozenColumns() && offset > this.m_frozenColIndex + 1)
+        ) {
           this.m_endColHeaderPixel += totalDimension;
         }
         this.m_stopColumnHeaderFetch = false;

package/dist/js/libs/oj/debug/ojdrawerpopup.js

@@ -62,22 +62,6 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
                     }
                 }
             };
-            this.handleOnBlur = (event) => {
-                if (this.props.modality === 'modal') {
-                    const zorderLayer = this.rootRef.current.parentNode;
-                    const isTargetWithin = this.isTargetDescendantOfOwnZorderLayerOrItsNextSiblings(zorderLayer, event.relatedTarget);
-                    if (!isTargetWithin && this.props.opened) {
-                        const focusables = ojdrawerutils.DrawerUtils.getFocusables(this.rootRef.current);
-                        event.preventDefault();
-                        if (focusables.length) {
-                            focusables[0].focus();
-                        }
-                        else {
-                            this.rootRef.current.focus();
-                        }
-                    }
-                }
-            };
             this.autoDismissHandler = (event) => {
                 const focusables = ojdrawerutils.DrawerUtils.getFocusables(this.rootRef.current);
                 const zorderLayer = this.rootRef.current.parentNode;
@@ -175,7 +159,7 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
         }
         render(props) {
             if (this.isDrawerOpened() || this.wasDrawerOpenedInPrevState()) {
-                return (jsxRuntime.jsx(ojvcomponent.Root, { ref: this.rootRef, class: this.getPopupStyleClasses(this.props.edge), tabIndex: -1, role: this.props.role || 'dialog', onKeyDown: this.handleKeyDown, onBlur: this.handleOnBlur, children: jsxRuntime.jsx("div", { class: "oj-drawer-full-height", children: props.children }) }));
+                return (jsxRuntime.jsx(ojvcomponent.Root, { ref: this.rootRef, class: this.getPopupStyleClasses(this.props.edge), tabIndex: -1, role: this.props.role || 'dialog', onKeyDown: this.handleKeyDown, children: jsxRuntime.jsx("div", { class: "oj-drawer-full-height", children: props.children }) }));
             }
             return jsxRuntime.jsx(ojvcomponent.Root, {});
         }

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

@@ -7918,14 +7918,9 @@ var __oj_table_metadata =
           this._applyForcedColumnWidth(bufferCell, bufferCellWidth);
         }
 
-        // if first row is in edit mode then fetching cell style from second row
-        if (this._table._editableRowIdx === 0 && tableBodyRows.length > 1) {
-          tableBodyCell = this._table._getTableBodyCell(1, i, null);
-        } else {
-          tableBodyCell = this._table._getTableBodyCell(0, i, null);
-        }
-        if (tableBodyCell != null) {
-          if (!this._table._hasRowOrCellRendererOrTemplate(i)) {
+        if (!this._table._hasRowOrCellRendererOrTemplate(i)) {
+          tableBodyCell = this._table._getTableBodyCell(0, i);
+          if (tableBodyCell != null) {
             columnCellCompStyle = window.getComputedStyle(tableBodyCell);
             forcedColumnCellWidth = this._getForcedColumnWidth(
               tableBodyCell,
@@ -7933,20 +7928,20 @@ var __oj_table_metadata =
               columnWidth
             );
           }
-          for (var j = 0; j < tableBodyRows.length; j++) {
-            tableBodyCell = this._table._getTableBodyCell(j, i, null);
-            if (tableBodyCell != null) {
-              if (columnCellCompStyle == null) {
-                var cellCompStyle = window.getComputedStyle(tableBodyCell);
-                var forcedCellWidth = this._getForcedColumnWidth(
-                  tableBodyCell,
-                  cellCompStyle,
-                  columnWidth
-                );
-                this._applyForcedColumnWidth(tableBodyCell, forcedCellWidth);
-              } else {
-                this._applyForcedColumnWidth(tableBodyCell, forcedColumnCellWidth);
-              }
+        }
+        for (var j = 0; j < tableBodyRows.length; j++) {
+          tableBodyCell = this._table._getTableBodyLogicalCells(j)[i];
+          if (tableBodyCell != null) {
+            if (columnCellCompStyle == null) {
+              var cellCompStyle = window.getComputedStyle(tableBodyCell);
+              var forcedCellWidth = this._getForcedColumnWidth(
+                tableBodyCell,
+                cellCompStyle,
+                columnWidth
+              );
+              this._applyForcedColumnWidth(tableBodyCell, forcedCellWidth);
+            } else {
+              this._applyForcedColumnWidth(tableBodyCell, forcedColumnCellWidth);
             }
           }
         }
@@ -8013,12 +8008,7 @@ var __oj_table_metadata =
       : this._getPixelStyleEquivalent(columns[columnIndex].maxWidth);
     if (colTestWidth != null) {
       headerCell = this._table._getTableHeaderColumn(columnIndex);
-      // if first row is in edit mode then fetching cell style from second row
-      if (this._table._editableRowIdx === 0 && rowsCount > 1) {
-        tableBodyCell = this._table._getTableBodyCell(1, columnIndex, null);
-      } else if (rowsCount > 0) {
-        tableBodyCell = this._table._getTableBodyCell(0, columnIndex, null);
-      }
+      tableBodyCell = this._table._getTableBodyLogicalCells(0)[columnIndex];
       footerCell = this._table._getTableFooterCell(columnIndex);
 
       if (headerCell != null) {
@@ -8054,30 +8044,27 @@ var __oj_table_metadata =
           this._applyForcedColumnWidth(bufferCell, bufferCellWidth);
         }
 
-        // update column table body cell widths
-        if (tableBodyCell != null) {
-          if (!this._table._hasRowOrCellRendererOrTemplate(columnIndex)) {
-            columnCellCompStyle = window.getComputedStyle(tableBodyCell);
-            forcedColumnCellWidth = this._getForcedColumnWidth(
-              tableBodyCell,
-              columnCellCompStyle,
-              colTestWidth
-            );
-          }
-          for (var i = 0; i < rowsCount; i++) {
-            tableBodyCell = this._table._getTableBodyCell(i, columnIndex, null);
-            if (tableBodyCell != null) {
-              if (columnCellCompStyle == null) {
-                var cellCompStyle = window.getComputedStyle(tableBodyCell);
-                var forcedCellWidth = this._getForcedColumnWidth(
-                  tableBodyCell,
-                  cellCompStyle,
-                  colTestWidth
-                );
-                this._applyForcedColumnWidth(tableBodyCell, forcedCellWidth);
-              } else {
-                this._applyForcedColumnWidth(tableBodyCell, forcedColumnCellWidth);
-              }
+        if (!this._table._hasRowOrCellRendererOrTemplate(columnIndex) && tableBodyCell != null) {
+          columnCellCompStyle = window.getComputedStyle(tableBodyCell);
+          forcedColumnCellWidth = this._getForcedColumnWidth(
+            tableBodyCell,
+            columnCellCompStyle,
+            colTestWidth
+          );
+        }
+        for (var i = 0; i < rowsCount; i++) {
+          tableBodyCell = this._table._getTableBodyLogicalCells(i)[columnIndex];
+          if (tableBodyCell != null) {
+            if (columnCellCompStyle == null) {
+              var cellCompStyle = window.getComputedStyle(tableBodyCell);
+              var forcedCellWidth = this._getForcedColumnWidth(
+                tableBodyCell,
+                cellCompStyle,
+                colTestWidth
+              );
+              this._applyForcedColumnWidth(tableBodyCell, forcedCellWidth);
+            } else {
+              this._applyForcedColumnWidth(tableBodyCell, forcedColumnCellWidth);
             }
           }
         }

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '15.0.4',
+  version: '15.0.6',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-09-08_06-09-49',
+  revision: '2023-10-11_09-50-25',
 
   // This function is only meant to be used outside the library, so quoting the name
   // to avoid renaming is appropriate

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

@@ -16544,7 +16544,7 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
     }
     if (hasHeaders) {
       this.m_endRowHeader += count;
-      if (offset > this.m_frozenRowIndex + 1) {
+      if (!this._hasFrozenRows() || (this._hasFrozenRows() && offset > this.m_frozenRowIndex + 1)) {
         this.m_endRowHeaderPixel += totalDimension;
       }
       this.m_stopRowHeaderFetch = false;
@@ -16575,7 +16575,10 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
     }
     if (hasHeaders) {
       this.m_endColHeader += count;
-      if (offset > this.m_frozenColIndex + 1) {
+      if (
+        !this._hasFrozenColumns() ||
+        (this._hasFrozenColumns() && offset > this.m_frozenColIndex + 1)
+      ) {
         this.m_endColHeaderPixel += totalDimension;
       }
       this.m_stopColumnHeaderFetch = false;

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

@@ -67,22 +67,6 @@ let DrawerPopup = DrawerPopup_1 = class DrawerPopup extends Component {
                 }
             }
         };
-        this.handleOnBlur = (event) => {
-            if (this.props.modality === 'modal') {
-                const zorderLayer = this.rootRef.current.parentNode;
-                const isTargetWithin = this.isTargetDescendantOfOwnZorderLayerOrItsNextSiblings(zorderLayer, event.relatedTarget);
-                if (!isTargetWithin && this.props.opened) {
-                    const focusables = DrawerUtils.getFocusables(this.rootRef.current);
-                    event.preventDefault();
-                    if (focusables.length) {
-                        focusables[0].focus();
-                    }
-                    else {
-                        this.rootRef.current.focus();
-                    }
-                }
-            }
-        };
         this.autoDismissHandler = (event) => {
             const focusables = DrawerUtils.getFocusables(this.rootRef.current);
             const zorderLayer = this.rootRef.current.parentNode;
@@ -180,7 +164,7 @@ let DrawerPopup = DrawerPopup_1 = class DrawerPopup extends Component {
     }
     render(props) {
         if (this.isDrawerOpened() || this.wasDrawerOpenedInPrevState()) {
-            return (jsx(Root, { ref: this.rootRef, class: this.getPopupStyleClasses(this.props.edge), tabIndex: -1, role: this.props.role || 'dialog', onKeyDown: this.handleKeyDown, onBlur: this.handleOnBlur, children: jsx("div", { class: "oj-drawer-full-height", children: props.children }) }));
+            return (jsx(Root, { ref: this.rootRef, class: this.getPopupStyleClasses(this.props.edge), tabIndex: -1, role: this.props.role || 'dialog', onKeyDown: this.handleKeyDown, children: jsx("div", { class: "oj-drawer-full-height", children: props.children }) }));
         }
         return jsx(Root, {});
     }

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

@@ -7939,14 +7939,9 @@ TableLayoutManager.prototype._setForcedColumnWidths = function () {
         this._applyForcedColumnWidth(bufferCell, bufferCellWidth);
       }
 
-      // if first row is in edit mode then fetching cell style from second row
-      if (this._table._editableRowIdx === 0 && tableBodyRows.length > 1) {
-        tableBodyCell = this._table._getTableBodyCell(1, i, null);
-      } else {
-        tableBodyCell = this._table._getTableBodyCell(0, i, null);
-      }
-      if (tableBodyCell != null) {
-        if (!this._table._hasRowOrCellRendererOrTemplate(i)) {
+      if (!this._table._hasRowOrCellRendererOrTemplate(i)) {
+        tableBodyCell = this._table._getTableBodyCell(0, i);
+        if (tableBodyCell != null) {
           columnCellCompStyle = window.getComputedStyle(tableBodyCell);
           forcedColumnCellWidth = this._getForcedColumnWidth(
             tableBodyCell,
@@ -7954,20 +7949,20 @@ TableLayoutManager.prototype._setForcedColumnWidths = function () {
             columnWidth
           );
         }
-        for (var j = 0; j < tableBodyRows.length; j++) {
-          tableBodyCell = this._table._getTableBodyCell(j, i, null);
-          if (tableBodyCell != null) {
-            if (columnCellCompStyle == null) {
-              var cellCompStyle = window.getComputedStyle(tableBodyCell);
-              var forcedCellWidth = this._getForcedColumnWidth(
-                tableBodyCell,
-                cellCompStyle,
-                columnWidth
-              );
-              this._applyForcedColumnWidth(tableBodyCell, forcedCellWidth);
-            } else {
-              this._applyForcedColumnWidth(tableBodyCell, forcedColumnCellWidth);
-            }
+      }
+      for (var j = 0; j < tableBodyRows.length; j++) {
+        tableBodyCell = this._table._getTableBodyLogicalCells(j)[i];
+        if (tableBodyCell != null) {
+          if (columnCellCompStyle == null) {
+            var cellCompStyle = window.getComputedStyle(tableBodyCell);
+            var forcedCellWidth = this._getForcedColumnWidth(
+              tableBodyCell,
+              cellCompStyle,
+              columnWidth
+            );
+            this._applyForcedColumnWidth(tableBodyCell, forcedCellWidth);
+          } else {
+            this._applyForcedColumnWidth(tableBodyCell, forcedColumnCellWidth);
           }
         }
       }
@@ -8034,12 +8029,7 @@ TableLayoutManager.prototype._applyColMinMax = function (columns, columnIndex, r
     : this._getPixelStyleEquivalent(columns[columnIndex].maxWidth);
   if (colTestWidth != null) {
     headerCell = this._table._getTableHeaderColumn(columnIndex);
-    // if first row is in edit mode then fetching cell style from second row
-    if (this._table._editableRowIdx === 0 && rowsCount > 1) {
-      tableBodyCell = this._table._getTableBodyCell(1, columnIndex, null);
-    } else if (rowsCount > 0) {
-      tableBodyCell = this._table._getTableBodyCell(0, columnIndex, null);
-    }
+    tableBodyCell = this._table._getTableBodyLogicalCells(0)[columnIndex];
     footerCell = this._table._getTableFooterCell(columnIndex);
 
     if (headerCell != null) {
@@ -8075,30 +8065,27 @@ TableLayoutManager.prototype._applyColMinMax = function (columns, columnIndex, r
         this._applyForcedColumnWidth(bufferCell, bufferCellWidth);
       }
 
-      // update column table body cell widths
-      if (tableBodyCell != null) {
-        if (!this._table._hasRowOrCellRendererOrTemplate(columnIndex)) {
-          columnCellCompStyle = window.getComputedStyle(tableBodyCell);
-          forcedColumnCellWidth = this._getForcedColumnWidth(
-            tableBodyCell,
-            columnCellCompStyle,
-            colTestWidth
-          );
-        }
-        for (var i = 0; i < rowsCount; i++) {
-          tableBodyCell = this._table._getTableBodyCell(i, columnIndex, null);
-          if (tableBodyCell != null) {
-            if (columnCellCompStyle == null) {
-              var cellCompStyle = window.getComputedStyle(tableBodyCell);
-              var forcedCellWidth = this._getForcedColumnWidth(
-                tableBodyCell,
-                cellCompStyle,
-                colTestWidth
-              );
-              this._applyForcedColumnWidth(tableBodyCell, forcedCellWidth);
-            } else {
-              this._applyForcedColumnWidth(tableBodyCell, forcedColumnCellWidth);
-            }
+      if (!this._table._hasRowOrCellRendererOrTemplate(columnIndex) && tableBodyCell != null) {
+        columnCellCompStyle = window.getComputedStyle(tableBodyCell);
+        forcedColumnCellWidth = this._getForcedColumnWidth(
+          tableBodyCell,
+          columnCellCompStyle,
+          colTestWidth
+        );
+      }
+      for (var i = 0; i < rowsCount; i++) {
+        tableBodyCell = this._table._getTableBodyLogicalCells(i)[columnIndex];
+        if (tableBodyCell != null) {
+          if (columnCellCompStyle == null) {
+            var cellCompStyle = window.getComputedStyle(tableBodyCell);
+            var forcedCellWidth = this._getForcedColumnWidth(
+              tableBodyCell,
+              cellCompStyle,
+              colTestWidth
+            );
+            this._applyForcedColumnWidth(tableBodyCell, forcedCellWidth);
+          } else {
+            this._applyForcedColumnWidth(tableBodyCell, forcedColumnCellWidth);
           }
         }
       }

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/15.0.4/min@insertESLevelPath@',
-      'ojL10n': 'libs/oj/15.0.4/ojL10n',
-      'ojtranslations': 'libs/oj/15.0.4/resources',
+      'ojs': 'libs/oj/15.0.6/min@insertESLevelPath@',
+      'ojL10n': 'libs/oj/15.0.6/ojL10n',
+      'ojtranslations': 'libs/oj/15.0.6/resources',
       
   'knockout': 'libs/knockout/knockout-3.5.1',
   'jquery': 'libs/jquery/jquery-3.6.4.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"],function(e){"use strict";let t={};"undefined"!=typeof window?t=window:"undefined"!=typeof self&&(t=self);var n=t.oj;const r={version:"15.0.4",revision:"2023-09-08_06-09-49",noConflict:function(){t.oj=n},_registerLegacyNamespaceProp:function(e,t){this[e]=t}};t.oj=r;const o={};r._registerLegacyNamespaceProp("StringUtils",o),o._TRIM_ALL_RE=/^\s*|\s*$/g,o.isEmpty=function(e){return null===e||0===o.trim(e).length},o.isEmptyOrUndefined=function(e){return!(void 0!==e&&!o.isEmpty(e))},o.isString=function(e){return null!==e&&("string"==typeof e||e instanceof String)},o.trim=function(e){return o.isString(e)?e.replace(o._TRIM_ALL_RE,""):e},o.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 i=function(){};r._registerLegacyNamespaceProp("AgentUtils",i),i.BROWSER={IE:"ie",FIREFOX:"firefox",SAFARI:"safari",CHROME:"chrome",EDGE:"edge",EDGE_CHROMIUM:"edge-chromium",UNKNOWN:"unknown"},i.ENGINE={TRIDENT:"trident",WEBKIT:"webkit",GECKO:"gecko",BLINK:"blink",EDGE_HTML:"edgehtml",UNKNOWN:"unknown"},i.OS={WINDOWS:"Windows",SOLARIS:"Solaris",MAC:"Mac",UNKNOWN:"Unknown",ANDROID:"Android",IOS:"IOS",WINDOWSPHONE:"WindowsPhone",LINUX:"Linux"},i.DEVICETYPE={PHONE:"phone",TABLET:"tablet",OTHERS:"others"},i.getAgentInfo=function(e){o.isEmptyOrUndefined(e)&&(e=navigator.userAgent),e=e.toLowerCase();var t=o.hashCode(e),n=i._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=i.OS.UNKNOWN,s=i.BROWSER.UNKNOWN,a=0,c=i.DEVICETYPE.OTHERS,u=i.ENGINE.UNKNOWN,l=0;return e.indexOf("iphone")>-1||e.indexOf("ipad")>-1||"MacIntel"===navigator.platform&&void 0!==navigator.standalone?r=i.OS.IOS:e.indexOf("mac")>-1?r=i.OS.MAC:e.indexOf("sunos")>-1?r=i.OS.SOLARIS:e.indexOf("android")>-1?r=i.OS.ANDROID:e.indexOf("linux")>-1?r=i.OS.LINUX:e.indexOf("windows phone")>-1?r=i.OS.WINDOWSPHONE:e.indexOf("win")>-1&&(r=i.OS.WINDOWS),r===i.OS.ANDROID?c=e.indexOf("mobile")>-1?i.DEVICETYPE.PHONE:i.DEVICETYPE.TABLET:r===i.OS.IOS&&(c=e.indexOf("iphone")>-1?i.DEVICETYPE.PHONE:i.DEVICETYPE.TABLET),e.indexOf("msie")>-1?(s=i.BROWSER.IE,a=i._parseFloatVersion(e,/msie (\d+[.]\d+)/),e.indexOf("trident")&&(u=i.ENGINE.TRIDENT,l=i._parseFloatVersion(e,/trident\/(\d+[.]\d+)/))):e.indexOf("trident")>-1?(s=i.BROWSER.IE,a=i._parseFloatVersion(e,/rv:(\d+[.]\d+)/),e.indexOf("trident")&&(u=i.ENGINE.TRIDENT,l=i._parseFloatVersion(e,/trident\/(\d+[.]\d+)/))):e.indexOf("edge")>-1?(s=i.BROWSER.EDGE,a=l=i._parseFloatVersion(e,/edge\/(\d+[.]\d+)/),u=i.ENGINE.EDGE_HTML):e.indexOf("edg")>-1?(s=i.BROWSER.EDGE_CHROMIUM,a=i._parseFloatVersion(e,/edg\/(\d+[.]\d+)/),u=i.ENGINE.BLINK,l=a):e.indexOf("chrome")>-1?(s=i.BROWSER.CHROME,(a=i._parseFloatVersion(e,/chrome\/(\d+[.]\d+)/))>=28?(u=i.ENGINE.BLINK,l=a):(u=i.ENGINE.WEBKIT,l=i._parseFloatVersion(e,/applewebkit\/(\d+[.]\d+)/))):e.indexOf("safari")>-1?(s=i.BROWSER.SAFARI,a=i._parseFloatVersion(e,/version\/(\d+[.]\d+)/),u=i.ENGINE.WEBKIT,l=i._parseFloatVersion(e,/applewebkit\/(\d+[.]\d+)/)):e.indexOf("firefox")>-1&&(s=i.BROWSER.FIREFOX,a=i._parseFloatVersion(e,/rv:(\d+[.]\d+)/),u=i.ENGINE.GECKO,l=i._parseFloatVersion(e,/gecko\/(\d+)/)),i._currAgentInfo=n={hashCode:t,os:r,browser:s,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}},i._parseFloatVersion=function(e,t){var n=e.match(t);if(n){var r=n[1];if(r)return parseFloat(r)}return 0};const s={};r._registerLegacyNamespaceProp("Assert",s);var a="DEBUG";const c="' doesn't match prototype ";s.forceDebug=function(){s[a]=!0},s.clearDebug=function(){s[a]=!1},s.isDebug=function(){return!0===s[a]},s.assert=function(e,t){if(s[a]&&!e){var n=t||"";if(arguments.length>2){n+="(";for(var r=2;r<arguments.length;r+=1)n+=arguments[r];n+=")"}s.assertionFailed(n,1)}},s.failedInAbstractFunction=function(){s[a]&&s.assertionFailed("Abstract function called",1)},s.assertPrototype=function(e,t,n){if(s[a]){var r=t.prototype;if(null!=e)s.assertType(t,"function",null,1,!1),Object.prototype.isPrototypeOf.call(r,e)||s.assertionFailed("object '"+e+c+r,1,n);else s.assertionFailed("null object doesn't match prototype "+r,1,n)}},s.assertPrototypeOrNull=function(e,t,n){if(s[a]&&null!=e){s.assertType(t,"function",null,1,!1);var r=t.prototype;Object.prototype.isPrototypeOf.call(r,e)||s.assertionFailed("object '"+e+c+r,1,n)}},s.assertPrototypes=function(e,t,n,r){if(s[a]){var o=t.prototype,i=n.prototype,u=Object.prototype.isPrototypeOf;u.call(o,e)||u.call(i,e)||s.assertionFailed("object '"+e+c+o+" or "+i,1,r)}},s.assertDomNodeOrNull=function(e,t){s[a]&&e&&void 0===e.nodeType&&s.assertionFailed(e+" is not a DOM Node",t+1)},s.assertDomNode=function(e,t){s[a]&&(e&&void 0!==e.nodeType||s.assertionFailed(e+" is not a DOM Node",t+1))},s.assertDomElement=function(e,t){s[a]&&(s.assertDomNode(e,1),1!==e.nodeType?s.assertionFailed(e+" is not a DOM Element",1):t&&e.nodeName!==t&&s.assertionFailed(e+" is not a "+t+" Element",1))},s.assertDomElementOrNull=function(e,t){s[a]&&null!=e&&(s.assertDomNode(e,1),1!==e.nodeType?s.assertionFailed(e+" is not a DOM Element",1):t&&e.nodeName!==t&&s.assertionFailed(e+" is not a "+t+" Element",1))},s.assertType=function(e,t,n,r,o){if(s[a]&&!(null==e&&o||typeof e===t)){var i=e+" is not of type "+t;n&&(i=n+i),r||(r=0),s.assertionFailed(i,r+1)}},s.assertObject=function(e,t){s[a]&&s.assertType(e,"object",t,1,!1)},s.assertObjectOrNull=function(e,t){s[a]&&s.assertType(e,"object",t,1,!0)},s.assertNonEmptyString=function(e,t){s[a]&&(s.assertType(e,"string",t,1,!1),s.assert(e.length>0,"empty string"))},s.assertString=function(e,t){s[a]&&s.assertType(e,"string",t,1,!1)},s.assertStringOrNull=function(e,t){s[a]&&s.assertType(e,"string",t,1,!0)},s.assertFunction=function(e,t){s[a]&&s.assertType(e,"function",t,1,!1)},s.assertFunctionOrNull=function(e,t){s[a]&&s.assertType(e,"function",t,1,!0)},s.assertBoolean=function(e,t){s[a]&&s.assertType(e,"boolean",t,1,!1)},s.assertNumber=function(e,t){s[a]&&s.assertType(e,"number",t,1,!1)},s.assertNumberOrNull=function(e,t){s[a]&&s.assertType(e,"number",t,1,!0)},s.assertArray=function(e,t){s[a]&&(Array.isArray(e)||(void 0===t&&(t=e+" is not an array"),s.assertionFailed(t,1)))},s.assertArrayOrNull=function(e,t){s[a]&&null!=e&&(Array.isArray(e)||(void 0===t&&(t=e+" is not an array"),s.assertionFailed(t,1)))},s.assertNonNumeric=function(e,t){s[a]&&(isNaN(e)||(void 0===t&&(t=e+" is convertible to a number"),s.assertionFailed(t,1)))},s.assertNumeric=function(e,t){s[a]&&isNaN(e)&&(void 0===t&&(t=e+" is not convertible to a number"),s.assertionFailed(t,1))},s.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+="}")}s.assertionFailed(n,1)}},s.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 u=t.__oj_Assert_DEBUG;void 0!==u&&(s[a]=u),i.getAgentInfo().browser===i.BROWSER.IE&&e.error("Internet Explorer is not supported with this version of JET.");const l={};r._registerLegacyNamespaceProp("CollectionUtils",l),l.copyInto=function(e,t,n,r,o){return l._copyIntoImpl(e,t,n,r,o,0)},l.mergeDeep=function(e,...t){if(!t.length)return e;const n=l.isPlainObject,r=l.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)},l.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},l._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 d=t[u],f=!1;if(r&&i<o){var p=e[s];l.isPlainObject(d)&&(null==p||l.isPlainObject(p))&&(f=!0,e[s]=p||{},l._copyIntoImpl(e[s],d,n,!0,o,i+1))}f||(e[s]=d)}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"],function(e){"use strict";let t={};"undefined"!=typeof window?t=window:"undefined"!=typeof self&&(t=self);var n=t.oj;const r={version:"15.0.6",revision:"2023-10-11_09-50-25",noConflict:function(){t.oj=n},_registerLegacyNamespaceProp:function(e,t){this[e]=t}};t.oj=r;const o={};r._registerLegacyNamespaceProp("StringUtils",o),o._TRIM_ALL_RE=/^\s*|\s*$/g,o.isEmpty=function(e){return null===e||0===o.trim(e).length},o.isEmptyOrUndefined=function(e){return!(void 0!==e&&!o.isEmpty(e))},o.isString=function(e){return null!==e&&("string"==typeof e||e instanceof String)},o.trim=function(e){return o.isString(e)?e.replace(o._TRIM_ALL_RE,""):e},o.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 i=function(){};r._registerLegacyNamespaceProp("AgentUtils",i),i.BROWSER={IE:"ie",FIREFOX:"firefox",SAFARI:"safari",CHROME:"chrome",EDGE:"edge",EDGE_CHROMIUM:"edge-chromium",UNKNOWN:"unknown"},i.ENGINE={TRIDENT:"trident",WEBKIT:"webkit",GECKO:"gecko",BLINK:"blink",EDGE_HTML:"edgehtml",UNKNOWN:"unknown"},i.OS={WINDOWS:"Windows",SOLARIS:"Solaris",MAC:"Mac",UNKNOWN:"Unknown",ANDROID:"Android",IOS:"IOS",WINDOWSPHONE:"WindowsPhone",LINUX:"Linux"},i.DEVICETYPE={PHONE:"phone",TABLET:"tablet",OTHERS:"others"},i.getAgentInfo=function(e){o.isEmptyOrUndefined(e)&&(e=navigator.userAgent),e=e.toLowerCase();var t=o.hashCode(e),n=i._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=i.OS.UNKNOWN,s=i.BROWSER.UNKNOWN,a=0,c=i.DEVICETYPE.OTHERS,u=i.ENGINE.UNKNOWN,l=0;return e.indexOf("iphone")>-1||e.indexOf("ipad")>-1||"MacIntel"===navigator.platform&&void 0!==navigator.standalone?r=i.OS.IOS:e.indexOf("mac")>-1?r=i.OS.MAC:e.indexOf("sunos")>-1?r=i.OS.SOLARIS:e.indexOf("android")>-1?r=i.OS.ANDROID:e.indexOf("linux")>-1?r=i.OS.LINUX:e.indexOf("windows phone")>-1?r=i.OS.WINDOWSPHONE:e.indexOf("win")>-1&&(r=i.OS.WINDOWS),r===i.OS.ANDROID?c=e.indexOf("mobile")>-1?i.DEVICETYPE.PHONE:i.DEVICETYPE.TABLET:r===i.OS.IOS&&(c=e.indexOf("iphone")>-1?i.DEVICETYPE.PHONE:i.DEVICETYPE.TABLET),e.indexOf("msie")>-1?(s=i.BROWSER.IE,a=i._parseFloatVersion(e,/msie (\d+[.]\d+)/),e.indexOf("trident")&&(u=i.ENGINE.TRIDENT,l=i._parseFloatVersion(e,/trident\/(\d+[.]\d+)/))):e.indexOf("trident")>-1?(s=i.BROWSER.IE,a=i._parseFloatVersion(e,/rv:(\d+[.]\d+)/),e.indexOf("trident")&&(u=i.ENGINE.TRIDENT,l=i._parseFloatVersion(e,/trident\/(\d+[.]\d+)/))):e.indexOf("edge")>-1?(s=i.BROWSER.EDGE,a=l=i._parseFloatVersion(e,/edge\/(\d+[.]\d+)/),u=i.ENGINE.EDGE_HTML):e.indexOf("edg")>-1?(s=i.BROWSER.EDGE_CHROMIUM,a=i._parseFloatVersion(e,/edg\/(\d+[.]\d+)/),u=i.ENGINE.BLINK,l=a):e.indexOf("chrome")>-1?(s=i.BROWSER.CHROME,(a=i._parseFloatVersion(e,/chrome\/(\d+[.]\d+)/))>=28?(u=i.ENGINE.BLINK,l=a):(u=i.ENGINE.WEBKIT,l=i._parseFloatVersion(e,/applewebkit\/(\d+[.]\d+)/))):e.indexOf("safari")>-1?(s=i.BROWSER.SAFARI,a=i._parseFloatVersion(e,/version\/(\d+[.]\d+)/),u=i.ENGINE.WEBKIT,l=i._parseFloatVersion(e,/applewebkit\/(\d+[.]\d+)/)):e.indexOf("firefox")>-1&&(s=i.BROWSER.FIREFOX,a=i._parseFloatVersion(e,/rv:(\d+[.]\d+)/),u=i.ENGINE.GECKO,l=i._parseFloatVersion(e,/gecko\/(\d+)/)),i._currAgentInfo=n={hashCode:t,os:r,browser:s,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}},i._parseFloatVersion=function(e,t){var n=e.match(t);if(n){var r=n[1];if(r)return parseFloat(r)}return 0};const s={};r._registerLegacyNamespaceProp("Assert",s);var a="DEBUG";const c="' doesn't match prototype ";s.forceDebug=function(){s[a]=!0},s.clearDebug=function(){s[a]=!1},s.isDebug=function(){return!0===s[a]},s.assert=function(e,t){if(s[a]&&!e){var n=t||"";if(arguments.length>2){n+="(";for(var r=2;r<arguments.length;r+=1)n+=arguments[r];n+=")"}s.assertionFailed(n,1)}},s.failedInAbstractFunction=function(){s[a]&&s.assertionFailed("Abstract function called",1)},s.assertPrototype=function(e,t,n){if(s[a]){var r=t.prototype;if(null!=e)s.assertType(t,"function",null,1,!1),Object.prototype.isPrototypeOf.call(r,e)||s.assertionFailed("object '"+e+c+r,1,n);else s.assertionFailed("null object doesn't match prototype "+r,1,n)}},s.assertPrototypeOrNull=function(e,t,n){if(s[a]&&null!=e){s.assertType(t,"function",null,1,!1);var r=t.prototype;Object.prototype.isPrototypeOf.call(r,e)||s.assertionFailed("object '"+e+c+r,1,n)}},s.assertPrototypes=function(e,t,n,r){if(s[a]){var o=t.prototype,i=n.prototype,u=Object.prototype.isPrototypeOf;u.call(o,e)||u.call(i,e)||s.assertionFailed("object '"+e+c+o+" or "+i,1,r)}},s.assertDomNodeOrNull=function(e,t){s[a]&&e&&void 0===e.nodeType&&s.assertionFailed(e+" is not a DOM Node",t+1)},s.assertDomNode=function(e,t){s[a]&&(e&&void 0!==e.nodeType||s.assertionFailed(e+" is not a DOM Node",t+1))},s.assertDomElement=function(e,t){s[a]&&(s.assertDomNode(e,1),1!==e.nodeType?s.assertionFailed(e+" is not a DOM Element",1):t&&e.nodeName!==t&&s.assertionFailed(e+" is not a "+t+" Element",1))},s.assertDomElementOrNull=function(e,t){s[a]&&null!=e&&(s.assertDomNode(e,1),1!==e.nodeType?s.assertionFailed(e+" is not a DOM Element",1):t&&e.nodeName!==t&&s.assertionFailed(e+" is not a "+t+" Element",1))},s.assertType=function(e,t,n,r,o){if(s[a]&&!(null==e&&o||typeof e===t)){var i=e+" is not of type "+t;n&&(i=n+i),r||(r=0),s.assertionFailed(i,r+1)}},s.assertObject=function(e,t){s[a]&&s.assertType(e,"object",t,1,!1)},s.assertObjectOrNull=function(e,t){s[a]&&s.assertType(e,"object",t,1,!0)},s.assertNonEmptyString=function(e,t){s[a]&&(s.assertType(e,"string",t,1,!1),s.assert(e.length>0,"empty string"))},s.assertString=function(e,t){s[a]&&s.assertType(e,"string",t,1,!1)},s.assertStringOrNull=function(e,t){s[a]&&s.assertType(e,"string",t,1,!0)},s.assertFunction=function(e,t){s[a]&&s.assertType(e,"function",t,1,!1)},s.assertFunctionOrNull=function(e,t){s[a]&&s.assertType(e,"function",t,1,!0)},s.assertBoolean=function(e,t){s[a]&&s.assertType(e,"boolean",t,1,!1)},s.assertNumber=function(e,t){s[a]&&s.assertType(e,"number",t,1,!1)},s.assertNumberOrNull=function(e,t){s[a]&&s.assertType(e,"number",t,1,!0)},s.assertArray=function(e,t){s[a]&&(Array.isArray(e)||(void 0===t&&(t=e+" is not an array"),s.assertionFailed(t,1)))},s.assertArrayOrNull=function(e,t){s[a]&&null!=e&&(Array.isArray(e)||(void 0===t&&(t=e+" is not an array"),s.assertionFailed(t,1)))},s.assertNonNumeric=function(e,t){s[a]&&(isNaN(e)||(void 0===t&&(t=e+" is convertible to a number"),s.assertionFailed(t,1)))},s.assertNumeric=function(e,t){s[a]&&isNaN(e)&&(void 0===t&&(t=e+" is not convertible to a number"),s.assertionFailed(t,1))},s.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+="}")}s.assertionFailed(n,1)}},s.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 u=t.__oj_Assert_DEBUG;void 0!==u&&(s[a]=u),i.getAgentInfo().browser===i.BROWSER.IE&&e.error("Internet Explorer is not supported with this version of JET.");const l={};r._registerLegacyNamespaceProp("CollectionUtils",l),l.copyInto=function(e,t,n,r,o){return l._copyIntoImpl(e,t,n,r,o,0)},l.mergeDeep=function(e,...t){if(!t.length)return e;const n=l.isPlainObject,r=l.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)},l.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},l._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 d=t[u],f=!1;if(r&&i<o){var p=e[s];l.isPlainObject(d)&&(null==p||l.isPlainObject(p))&&(f=!0,e[s]=p||{},l._copyIntoImpl(e[s],d,n,!0,o,i+1))}f||(e[s]=d)}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