@oracle/oraclejet 15.0.3 → 15.0.4

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

@@ -2103,6 +2103,10 @@ IteratingDataProviderContentHandler.prototype.renderInitialSkeletons = function
     this.m_root = this.m_superRoot;
     this.m_superRoot = null;
   }
+  if (this.m_engine && this.m_root.querySelector('.oj-listview-item-element') != null) {
+    // we need to clean the items before emptying them
+    this.cleanItems(this.m_engine);
+  }
   $(this.m_root).empty();
 
   // determines how many items needed to fill the viewport

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

@@ -2001,6 +2001,8 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
   _KEYBOARD_EDIT_OPTION_ENABLED: 'enabled',
   _KEYBOARD_EDIT_OPTION_DISABLED: 'disabled',
 
+  _INPUTDATE_CLEAR_ICON_LABEL_KEY: 'accessibleClearIconAltText',
+
   options: {
     /**
      * <p>
@@ -2914,7 +2916,7 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     this._triggerNode = null;
     this._inputContainer = null;
     this._redirectFocusToInputContainer = false;
-    this._isMobile = false;
+    this._hasTouch = false;
 
     // only case is when of showOn of focus and one hides the element [need to avoid showing]
     this._ignoreDatePickerShow = false;
@@ -2934,6 +2936,7 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     this._nativePickerConverter = null;
 
     this._labelValueWrapper = null;
+    this._isMobile = getDeviceRenderMode() === 'phone';
 
     var nodeName = this.element[0].nodeName.toLowerCase();
     this._isInLine = nodeName === 'div' || nodeName === 'span';
@@ -3251,6 +3254,9 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
         this._resolveDateConverterBusyState();
         delete this._resolveDateConverterBusyState;
       }
+      if (this.options.readOnly !== true) {
+        this._attachClearIcon();
+      }
     }.bind(this);
 
     if (this._dateConverterPromise) {
@@ -3393,6 +3399,31 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     return retVal;
   },
 
+  /**
+   * Performs post processing after _SetOption() calls _superApply(). Different options, when changed, perform
+   * different tasks.
+   *
+   * @param {string} option
+   * @param {Object=} flags
+   * @protected
+   * @memberof oj.ojInputDate
+   * @instance
+   */
+  _AfterSetOption: function (option, flags) {
+    this._super(option, flags);
+
+    switch (option) {
+      case 'disabled':
+      case 'readOnly':
+      case 'value':
+        this._attachClearIcon();
+        break;
+
+      default:
+        break;
+    }
+  },
+
   /**
    * @ignore
    */
@@ -3719,6 +3750,73 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     }
   },
 
+  /**
+   * Render or remove the clear icon
+   * We don't render the clear icon for non-mobile or required fields.
+   * @ignore
+   * @private
+   * @memberof oj.ojInputDate
+   * @instance
+   */
+  _attachClearIcon: function () {
+    if (this._isMobile && !this.options.required) {
+      var contentWrapper = this._GetContentWrapper();
+      // content wrapper is undefined when the component is inline or is not a
+      // custom element, so we don't need a clear icon in that case.
+      if (contentWrapper) {
+        var wrapperElem = contentWrapper.parentElement;
+        var clearIconBtn = wrapperElem.querySelector('a.oj-inputdatetime-clear-icon-btn');
+
+        if (this.options.disabled || this.options.readOnly) {
+          // remove the icon if it is there
+          if (clearIconBtn) {
+            wrapperElem.removeChild(clearIconBtn);
+          }
+
+          // if the clearIcon is not rendered, we shouldn't have this class
+          wrapperElem.classList.remove('oj-inputdatetime-clearicon-mobile');
+        } else {
+          // Only add the clear icon for mobile
+          if (clearIconBtn === null) {
+            var clearIcon;
+            clearIconBtn = document.createElement('a');
+            clearIconBtn.className =
+              'oj-inputdatetime-clear-icon-btn oj-component-icon oj-clickable-icon-nocontext';
+            clearIconBtn.setAttribute('tabindex', '-1');
+            clearIconBtn.setAttribute(
+              'aria-label',
+              this.getTranslatedString(this._INPUTDATE_CLEAR_ICON_LABEL_KEY)
+            );
+
+            clearIconBtn.setAttribute('target', '_blank');
+            clearIcon = document.createElement('span');
+            clearIcon.className = 'oj-inputdatetime-clear-icon';
+
+            clearIconBtn.appendChild(clearIcon);
+            wrapperElem.insertBefore(clearIconBtn, this._labelValueWrapper.nextElementSibling); // @HTMLUpdateOK
+
+            clearIconBtn.addEventListener(
+              this._CLICK_HANDLER_KEY,
+              this._onClearIconClickHandler.bind(this)
+            );
+          }
+
+          // clear icon is only rendered for mobile at this time.
+          // For mobile, we render oj-form-control-empty-clearicon if the input doesn't
+          // have a value, as we always want the clear icon hidden for this case.
+          wrapperElem.classList.add('oj-inputdatetime-clearicon-mobile');
+
+          var val = this._GetDisplayValue();
+
+          if (val && val !== '') {
+            wrapperElem.classList.remove('oj-form-control-empty-clearicon');
+          } else {
+            wrapperElem.classList.add('oj-form-control-empty-clearicon');
+          }
+        }
+      }
+    }
+  },
   /**
    * This function will create the necessary calendar trigger container [i.e. image to launch the calendar]
    * and perform any attachment to events
@@ -3748,7 +3846,7 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     var self = this;
 
     this._datepickerWrapperTouchStartListener = function () {
-      self._isMobile = true;
+      self._hasTouch = true;
     };
     this._wrapper[0].addEventListener('touchstart', this._datepickerWrapperTouchStartListener, {
       passive: true
@@ -4453,6 +4551,15 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     }
 
     this._setDisplayAndValue(value, {});
+    // remove this class, since we have a value now.
+    // Only do this for oj-input-date, since oj-input-date-time doesn't
+    // update its value until done is pressed.
+    if (this.OuterWrapper.tagName === 'OJ-INPUT-DATE') {
+      let contentWrapper = this._GetContentWrapper();
+      if (contentWrapper) {
+        contentWrapper.parentElement.classList.remove('oj-form-control-empty-clearicon');
+      }
+    }
 
     if (this._isDateTimeSwitcher()) {
       this._placeFocusOnCalendar();
@@ -5948,6 +6055,50 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     }
   },
 
+  /**
+   * Invoked when the input event happens
+   *
+   * @ignore
+   * @protected
+   * @memberof! oj.ojInputDate
+   * @param {Event} event
+   */
+  _onInputHandler: function (event) {
+    this._super(event);
+    var inputNode = event.target;
+    let contentWrapper = this._GetContentWrapper();
+
+    if (contentWrapper && this._isMobile) {
+      if (inputNode.value !== '') {
+        contentWrapper.parentElement.classList.remove('oj-form-control-empty-clearicon');
+      } else {
+        contentWrapper.parentElement.classList.add('oj-form-control-empty-clearicon');
+      }
+    }
+  },
+
+  /**
+   * The handler clears the value of the input element and sets the focus on the input container
+   * since this is only used for mobile.
+   *
+   * @ignore
+   * @private
+   * @memberof! oj.ojInputDate
+   * @param {Event} event
+   */
+  _onClearIconClickHandler: function (event) {
+    var elem = this.element[0];
+
+    elem.value = '';
+    // we need to update the raw value to keep it in sync
+    this._SetRawValue('', event);
+    elem.focus();
+    let contentWrapper = this._GetContentWrapper();
+    if (contentWrapper) {
+      contentWrapper.parentElement.classList.add('oj-form-control-empty-clearicon');
+    }
+  },
+
   /**
    * This handler will set the value from the input text element.
    *
@@ -6399,7 +6550,7 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     this._closeInProgress = true;
     try {
       const showOnIsFocusOrUserFocus = this._showOnIsFocusOrUserFocus();
-      if (this._isMobile && showOnIsFocusOrUserFocus) {
+      if (this._hasTouch && showOnIsFocusOrUserFocus) {
         this._inputContainer.focus();
       } else {
         if (showOnIsFocusOrUserFocus) {
@@ -8951,6 +9102,8 @@ oj.__registerWidget('oj.ojInputTime', $.oj.inputBase, {
   _KEYBOARD_EDIT_OPTION_ENABLED: 'enabled',
   _KEYBOARD_EDIT_OPTION_DISABLED: 'disabled',
 
+  _INPUTTIME_CLEAR_ICON_LABEL_KEY: 'accessibleClearIconAltText',
+
   options: {
     /**
      * A datetime converter instance or a Promise to a datetime converter instance
@@ -9690,6 +9843,7 @@ oj.__registerWidget('oj.ojInputTime', $.oj.inputBase, {
       if (this.options.readOnly !== true) {
         if (this._isIndependentInput()) {
           this._attachTrigger();
+          this._attachClearIcon();
         }
       }
 
@@ -9862,6 +10016,31 @@ oj.__registerWidget('oj.ojInputTime', $.oj.inputBase, {
     return retVal;
   },
 
+  /**
+   * Performs post processing after _SetOption() calls _superApply(). Different options, when changed, perform
+   * different tasks.
+   *
+   * @param {string} option
+   * @param {Object=} flags
+   * @protected
+   * @memberof oj.ojInputTime
+   * @instance
+   */
+  _AfterSetOption: function (option, flags) {
+    this._super(option, flags);
+
+    switch (option) {
+      case 'disabled':
+      case 'readOnly':
+      case 'value':
+        this._attachClearIcon();
+        break;
+
+      default:
+        break;
+    }
+  },
+
   /**
    * @ignore
    * @protected
@@ -10192,6 +10371,76 @@ oj.__registerWidget('oj.ojInputTime', $.oj.inputBase, {
     }
   },
 
+  /**
+   * Render or remove the clear icon
+   * @ignore
+   * @private
+   * @memberof oj.ojInputTime
+   * @instance
+   */
+  _attachClearIcon: function () {
+    var labelValueWrapper = this.element[0].parentNode;
+    let wrapperElem = labelValueWrapper.parentNode;
+    var clearIconBtn = wrapperElem.querySelector('a.oj-inputdatetime-clear-icon-btn');
+
+    let isMobile = getDeviceRenderMode() === 'phone';
+
+    if (!isMobile || this.options.disabled || this.options.readOnly || this.options.required) {
+      // remove the icon if it is there
+      if (clearIconBtn) {
+        wrapperElem.removeChild(clearIconBtn);
+      }
+
+      // if the clearIcon is not rendered, we shouldn't have this class
+      wrapperElem.classList.remove('oj-inputdatetime-clearicon-mobile');
+    } else {
+      // Only add the clear icon for mobile
+      if (clearIconBtn === null) {
+        var clearIcon;
+        clearIconBtn = document.createElement('a');
+        clearIconBtn.className =
+          'oj-inputdatetime-clear-icon-btn oj-component-icon oj-clickable-icon-nocontext';
+        clearIconBtn.setAttribute('tabindex', '-1');
+        clearIconBtn.setAttribute(
+          'aria-label',
+          this.getTranslatedString(this._INPUTTIME_CLEAR_ICON_LABEL_KEY)
+        );
+
+        clearIconBtn.setAttribute('target', '_blank');
+        clearIcon = document.createElement('span');
+        clearIcon.className = 'oj-inputdatetime-clear-icon';
+
+        clearIconBtn.appendChild(clearIcon);
+        wrapperElem.insertBefore(clearIconBtn, labelValueWrapper.nextElementSibling); // @HTMLUpdateOK
+
+        clearIconBtn.addEventListener(
+          this._CLICK_HANDLER_KEY,
+          this._onClearIconClickHandler.bind(this)
+        );
+      }
+
+      // clear icon is only rendered for mobile at this time.
+      // For mobile, we render oj-form-control-empty-clearicon if the input doesn't
+      // have a value, as we always want the clear icon hidden for this case.
+      wrapperElem.classList.add('oj-inputdatetime-clearicon-mobile');
+
+      var val;
+
+      // if the component is not fully rendered, then we need to use the value option's value
+      // instead of the input element's value
+      if (wrapperElem.classList.contains('oj-complete')) {
+        val = this.element[0].value;
+      } else {
+        val = this.options.value;
+      }
+
+      if (val && val !== '') {
+        wrapperElem.classList.remove('oj-form-control-empty-clearicon');
+      } else {
+        wrapperElem.classList.add('oj-form-control-empty-clearicon');
+      }
+    }
+  },
   /**
    * This function will create the necessary time trigger container [i.e. image to launch the time drop down]
    * and perform any attachment to events
@@ -10282,6 +10531,50 @@ oj.__registerWidget('oj.ojInputTime', $.oj.inputBase, {
       : this.options.value;
   },
 
+  /**
+   * Invoked when the input event happens
+   *
+   * @ignore
+   * @protected
+   * @memberof! oj.ojInputTime
+   * @param {Event} event
+   */
+  _onInputHandler: function (event) {
+    this._super(event);
+    var inputNode = event.target;
+    let contentWrapper = this._GetContentWrapper();
+
+    if (contentWrapper && this._isMobile) {
+      if (inputNode.value !== '') {
+        contentWrapper.parentElement.classList.remove('oj-form-control-empty-clearicon');
+      } else {
+        contentWrapper.parentElement.classList.add('oj-form-control-empty-clearicon');
+      }
+    }
+  },
+
+  /**
+   * The handler clears the value of the input element and sets the focus on the input container
+   * since this is only used for mobile.
+   *
+   * @ignore
+   * @private
+   * @memberof! oj.ojInputTime
+   * @param {Event} event
+   */
+  _onClearIconClickHandler: function (event) {
+    var elem = this.element[0];
+
+    elem.value = '';
+    // we need to update the raw value to keep it in sync
+    this._SetRawValue('', event);
+    elem.focus();
+    let contentWrapper = this._GetContentWrapper();
+    if (contentWrapper) {
+      contentWrapper.parentElement.classList.add('oj-form-control-empty-clearicon');
+    }
+  },
+
   /**
    * Invoked when blur is triggered of the this.element
    *
@@ -10514,12 +10807,20 @@ oj.__registerWidget('oj.ojInputTime', $.oj.inputBase, {
    * @instance
    * @memberof! oj.ojInputTime
    */
-  // eslint-disable-next-line no-unused-vars
   _SetDisplayValue: function (displayValue) {
     // When not part of datePickerComp or of inline should update input element
     if (this._isIndependentInput()) {
       this._superApply(arguments);
     }
+    // remove this class, since we have a value now.
+    let elem = this.element[0];
+    if (elem) {
+      if (displayValue) {
+        elem.parentElement.parentElement.classList.remove('oj-form-control-empty-clearicon');
+      } else {
+        elem.parentElement.parentElement.classList.add('oj-form-control-empty-clearicon');
+      }
+    }
 
     // so this is a change in behavior from original design. Previously it was decided that app developer
     // would have to invoke refresh to render the calendar after setting the new value programatically; however now it is
@@ -12589,6 +12890,11 @@ oj.__registerWidget('oj.ojInputDateTime', $.oj.ojInputDate, {
             self._switcherPrevYear = null;
             self._switcherPrevValue = null;
             self._hide(self._ON_CLOSE_REASON_SELECTION);
+            // remove this class, since we have a value now.
+            let contentWrapper = self._GetContentWrapper();
+            if (contentWrapper) {
+              contentWrapper.parentElement.classList.remove('oj-form-control-empty-clearicon');
+            }
             return false;
           }
           return undefined;

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

@@ -312,7 +312,9 @@ let DrawerPopup = DrawerPopup_1 = class DrawerPopup extends Component {
             popupServiceInstance.open(popupServiceOptions);
         }
         else if (!this.wasDrawerOpenedInPrevState()) {
-            this.forceUpdate();
+            window.queueMicrotask(() => {
+                this.forceUpdate();
+            });
         }
     }
     getDrawerSurrogateLayerSelectors() {

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

@@ -6258,10 +6258,17 @@ HorizontalNavListHandler.prototype.IsOptionUpdateAllowed = function (key, value,
  * @ignore
  * @private
  */
-var _HorizontalNavListOverflowHandler = function (items, overflow, truncation, navlistHandler) {
+var _HorizontalNavListOverflowHandler = function (
+  items,
+  overflow,
+  truncation,
+  display,
+  navlistHandler
+) {
   this._overflow = overflow;
   this._truncation = truncation;
   this._items = items;
+  this._display = display;
   this._navlistHandler = navlistHandler;
 };
 
@@ -6279,6 +6286,8 @@ HorizontalNavListHandler.prototype._handleOverflow = function (overflow, truncat
     return;
   }
 
+  var display = this.m_widget.GetOption('display');
+
   if (!overflow) {
     // eslint-disable-next-line no-param-reassign
     overflow = this.m_widget.GetOption('overflow');
@@ -6288,7 +6297,13 @@ HorizontalNavListHandler.prototype._handleOverflow = function (overflow, truncat
     truncation = this.m_widget.GetOption('truncation');
   }
 
-  var overflowHandler = new _HorizontalNavListOverflowHandler(items, overflow, truncation, this);
+  var overflowHandler = new _HorizontalNavListOverflowHandler(
+    items,
+    overflow,
+    truncation,
+    display,
+    this
+  );
 
   // Return if there is no truncation or overflow handling needed
   if (!overflowHandler.shouldHandleOverflow()) {
@@ -6723,7 +6738,7 @@ _HorizontalNavListOverflowHandler.prototype.applyTruncation = function () {
 _HorizontalNavListOverflowHandler.prototype.getOverflowThreshold = function () {
   var threshold = -1;
   if (this._overflow === 'popup') {
-    threshold = this._calculateThreshold(this._overflowData) - 1;
+    threshold = this._calculateThreshold(this._overflowData);
   }
   return threshold;
 };
@@ -6731,7 +6746,8 @@ _HorizontalNavListOverflowHandler.prototype.getOverflowThreshold = function () {
 _HorizontalNavListOverflowHandler.prototype._collectOverflowData = function () {
   var itemNonTextWidth;
   var overflowItemWidth;
-  var edge = getReadingDirection() === 'ltr' ? 'right' : 'left';
+  var readingDirection = getReadingDirection();
+  var edge = readingDirection === 'ltr' ? 'right' : 'left';
   var container = this._getWidget().ojContext.element;
 
   var item = this._items.last();
@@ -6746,14 +6762,23 @@ _HorizontalNavListOverflowHandler.prototype._collectOverflowData = function () {
   if (this._overflow === 'popup') {
     var overFlowMenuButton = this._getOverflowMenuButton()[0];
     var rect = overFlowMenuButton.getBoundingClientRect();
+    const overFlowMenuButtonComputedStyle = window.getComputedStyle(overFlowMenuButton);
     let margin = 0;
-    if (getReadingDirection() === 'ltr') {
-      margin = window.getComputedStyle(overFlowMenuButton).marginRight;
-    } else {
-      margin = window.getComputedStyle(overFlowMenuButton).marginLeft;
+    // NavigationList overflow icon has a left margin in ltr and right margin in rtl
+    // NavigationList overflow "more" item has no margin in any case so this calculated margin= 0px.
+    if (!this._navlistHandler._isTabBar() && this._display === 'icons') {
+      margin =
+        readingDirection === 'ltr'
+          ? overFlowMenuButtonComputedStyle.marginLeft
+          : overFlowMenuButtonComputedStyle.marginRight;
+    }
+    // TabBar overflow menu cases (icon and "more" item) has a right margin only in rtl
+    if (this._navlistHandler._isTabBar() && readingDirection === 'rtl') {
+      margin = overFlowMenuButtonComputedStyle.marginRight;
     }
     overflowItemWidth = rect.width + parseInt(margin, 10);
   }
+  // Since this is last item it does not have a margin added to item edge
   var itemEdge = item[0].getBoundingClientRect()[edge];
 
   return {
@@ -6817,7 +6842,8 @@ _HorizontalNavListOverflowHandler.prototype._isOverflowed = function (
 
 _HorizontalNavListOverflowHandler.prototype._calculateThreshold = function (overflowData) {
   var items = this._items;
-  var edge = getReadingDirection() === 'ltr' ? 'right' : 'left';
+  var readingDirection = getReadingDirection();
+  var edge = readingDirection === 'ltr' ? 'right' : 'left';
   var index = items.length - 1;
   var itemEdge = items[index].getBoundingClientRect()[edge];
 
@@ -6827,7 +6853,22 @@ _HorizontalNavListOverflowHandler.prototype._calculateThreshold = function (over
     index > 0
   ) {
     index -= 1;
-    itemEdge = items[index].getBoundingClientRect()[edge];
+    // NavigationList item icons have a left margin hence for icon-only cases item edge is sufficient
+    if (!this._navlistHandler._isTabBar() && this._display === 'icons') {
+      itemEdge = items[index].getBoundingClientRect()[edge];
+    } else {
+      // Non icon-only case items have a right margin except for the last one.
+      const itemComputedStyle = window.getComputedStyle(items[index]);
+      let itemMargin = 0;
+      // TabBar has right margin for all items in ltr and rtl mode.
+      if (this._navlistHandler._isTabBar() || readingDirection === 'ltr') {
+        itemMargin = itemComputedStyle.marginRight;
+      } else {
+        // Navigationlist non icon-only case items have a right margin (covered by if above) in ltr and left margin in rtl
+        itemMargin = itemComputedStyle.marginLeft;
+      }
+      itemEdge = items[index].getBoundingClientRect()[edge] + parseInt(itemMargin, 10);
+    }
   }
 
   return index + 1;

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.3/min@insertESLevelPath@',
-      'ojL10n': 'libs/oj/15.0.3/ojL10n',
-      'ojtranslations': 'libs/oj/15.0.3/resources',
+      'ojs': 'libs/oj/15.0.4/min@insertESLevelPath@',
+      'ojL10n': 'libs/oj/15.0.4/ojL10n',
+      'ojtranslations': 'libs/oj/15.0.4/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.3",revision:"2023-08-22_09-07-29",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.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))}}(),
 /**
      * @license
      * Code taken from