@oracle/oraclejet 14.1.5 → 14.1.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":"v14.1.5"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v14.1.6"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;

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: '14.1.5',
+    version: '14.1.6',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-07-24_12-14-49',
+    revision: '2023-08-03_12-24-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/ojtreeview.js

@@ -1387,7 +1387,7 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
 
         this._refreshId = 0;
         this._uiExpanded = new ojkeyset.KeySetImpl();
-        this.m_fetching = new Set();
+        this.m_fetching = new Map();
 
         this._expandedChildrenMap = new Map();
         this._syncSelectionState();
@@ -1633,7 +1633,7 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
             Logger.error(self.constants.ERROR_FETCHING_DATA + reason);
             dataProviderPromiseBusyResolve();
             self._expandedChildrenMap = new Map();
-            self.m_fetching = new Set();
+            self.m_fetching = new Map();
           }
         );
       },
@@ -2180,9 +2180,6 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
        * @private
        */
       _decorateItem: function (item) {
-        var self = this;
-        var i;
-
         item.classList.add(this.constants.OJ_TREEVIEW_ITEM);
         item.setAttribute('role', 'treeitem');
         var itemKey = this._getKey(item);
@@ -2259,13 +2256,13 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
           var treeViewItems = itemContent.querySelectorAll(
             this.constants.PERIOD + this.constants.OJ_TREEVIEW_ITEM_ICON
           );
-          for (i = 0; i < treeViewItems.length; i++) {
+          for (let i = 0; i < treeViewItems.length; i++) {
             treeViewItems[i].classList.add(this.constants.OJ_TREEVIEW_ICON);
             treeViewItems[i].classList.add(this.constants.OJ_COMPONENT_ICON);
           }
         }
         // Initial selection
-        self._select(item);
+        this._select(item);
 
         // DnD
         itemContent.setAttribute('draggable', this._isDnD() ? 'true' : 'false');
@@ -2296,15 +2293,13 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
           itemContent.classList.add(this.constants.OJ_DRAGGABLE);
         }
 
-        if (self._isLeaf(item)) {
+        if (this._isLeaf(item)) {
           this._addTreeviewLeafClass(item);
+        } else if (this._isInitExpanded(itemKey)) {
+          this._expand(item, false);
+          this._addDisclosureClasses(disclosureIcon);
         } else {
-          // Expanded option
-          if (self._isInitExpanded(itemKey)) {
-            self._expand(item, false);
-          } else {
-            self._collapse(item, false);
-          }
+          this._collapse(item, false);
           this._addDisclosureClasses(disclosureIcon);
         }
       },
@@ -3312,11 +3307,19 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
         var busyContextPromise = busyContext.addBusyState({
           description: "The component identified by '" + id + "', " + description
         });
-        this.m_fetching.add(key);
+        if (this.m_fetching.has(key)) {
+          this.m_fetching.set(key, this.m_fetching.get(key) + 1);
+        } else {
+          this.m_fetching.set(key, 1);
+        }
         this._changeStatusMessage(key, false);
         return function () {
+          if (this.m_fetching.get(key) === 1) {
+            this.m_fetching.delete(key);
+          } else {
+            this.m_fetching.set(key, this.m_fetching.get(key) - 1);
+          }
           this._changeStatusMessage(key, true);
-          this.m_fetching.delete(key);
           busyContextPromise();
           Promise.resolve(this._processEventQueue());
         }.bind(this);
@@ -4207,7 +4210,7 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
         delete this.m_dataSource;
 
         this._expandedChildrenMap = new Map();
-        this.m_fetching = new Set();
+        this.m_fetching = new Map();
 
         this._render();
       },
@@ -4498,18 +4501,23 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
         keys.forEach(function (key) {
           let savedParentKey;
           const addEvent = event.detail.add;
-          if (!addEvent || (addEvent && !addEvent.keys.has(key))) {
-            const itemParentKey = self._getKey(self._getParentItem(self._getItemByKey(key)));
-            if (addEvent && addEvent.parentKeys) {
-              const foundParentKey = addEvent.parentKeys.find((parentKey) =>
-                oj.KeyUtils.equals(parentKey, itemParentKey)
-              );
-              if (foundParentKey) {
-                savedParentKey = foundParentKey;
-              }
+
+          const itemParentKey = self._getKey(self._getParentItem(self._getItemByKey(key)));
+          if (addEvent && addEvent.parentKeys) {
+            const foundParentKey = addEvent.parentKeys.find((parentKey) =>
+              oj.KeyUtils.equals(parentKey, itemParentKey)
+            );
+            if (foundParentKey) {
+              savedParentKey = foundParentKey;
             }
-            removedKeys = removedKeys.concat(self._removeAllChildrenOfParentKey(key, savedParentKey));
           }
+          removedKeys = removedKeys.concat(
+            self._removeAllChildrenOfParentKey(
+              key,
+              savedParentKey,
+              addEvent && addEvent.keys.has(key)
+            )
+          );
         });
 
         if (removedKeys.length === 0) {
@@ -4637,7 +4645,7 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
       _getItemDisclosureIcon: function (item) {
         return item.getElementsByTagName('ins')[0];
       },
-      _removeAllChildrenOfParentKey: function (key, savedParentKey) {
+      _removeAllChildrenOfParentKey: function (key, savedParentKey, reorder) {
         /* savedParentKey means remove all children but leave parent called when we have a smart refresh event from the dp*/
         var self = this;
         var removedKeys = [];
@@ -4645,16 +4653,18 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
         if (elem) {
           this._getChildItems(elem).forEach(function (child) {
             var childkey = self._getKey(child);
-            var childKeys = self._removeAllChildrenOfParentKey(childkey, savedParentKey);
+            var childKeys = self._removeAllChildrenOfParentKey(childkey, savedParentKey, reorder);
             removedKeys = removedKeys.concat(childKeys);
           });
           var subtree = elem.parentNode;
           if (!oj.KeyUtils.equals(key, savedParentKey)) {
             subtree.removeChild(elem);
             this._keyList.delete(key);
-            removedKeys.push(key);
+            if (!reorder) {
+              removedKeys.push(key);
+            }
           }
-          if (subtree.getElementsByTagName('li').length === 0 && !savedParentKey) {
+          if (subtree.getElementsByTagName('li').length === 0 && !savedParentKey && !reorder) {
             this._changeNodeToLeaf(subtree.parentNode, subtree);
           }
         }
@@ -4689,7 +4699,6 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
         var i = 0;
         var self = this;
         var addKeys = event.detail.add.keys;
-        const keys = [];
         const addEventBusyResolve = this._addBusyState(
           'validating mutation data for add event',
           null
@@ -4702,34 +4711,6 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
           this._truncateIfOverMaxCount(validatededEventData);
           const data = validatededEventData.data;
           const metadata = validatededEventData.metadata;
-          addKeys.forEach((key) => {
-            if (
-              !event.detail.remove ||
-              (event.detail.remove && !event.options.detail.remove.keys.has(key))
-            ) {
-              keys.push(key);
-            } else if (
-              addEvent.addBeforeKeys &&
-              addEvent.addBeforeKeys[i] &&
-              addEvent.addBeforeKeys.length !== 0
-            ) {
-              this.handleModelReorder(key, addEvent.addBeforeKeys[i], false);
-            } else {
-              var locationKey;
-              if (addEvent.parentKeys && addEvent.parentKeys[i] && addEvent.parentKeys.length !== 0) {
-                var parent = this._getItemByKey(addEvent.parentKeys[i]);
-                var parentItemList = this._getChildItems(parent);
-                locationKey = this.getLastItemKey(parentItemList);
-              } else {
-                var rootList = this._getItems();
-                locationKey = this.getLastItemKey(rootList);
-              }
-              if (locationKey) {
-                this.handleModelReorder(key, locationKey, true);
-              }
-            }
-            i += 1;
-          });
           parentKeys.forEach(function (key) {
             var parentItem = self._getItemByKey(key);
             if (parentItem && self._isLeafIcon(parentItem)) {
@@ -4740,9 +4721,9 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
           const finalKeys = DataCollectionUtils.getAddEventKeysResult(initialKeys, addEvent, true);
           if (
             data &&
-            keys.length > 0 &&
+            addKeys.size > 0 &&
             data.length > 0 &&
-            keys.length === data.length &&
+            addKeys.size === data.length &&
             (indexes == null || indexes.length === data.length)
           ) {
             for (i = 0; i < data.length; i++) {
@@ -4757,14 +4738,11 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
               var subtree;
               if (parentKey == null) {
                 subtree = this._getRoot();
-                if (subtree) {
-                  this._renderItem(subtree, { data: [data[i]], metadata: [metadata[i]] }, 0, index);
-                }
               } else if (parentItem) {
                 subtree = this._getSubtree(parentItem);
-                if (subtree) {
-                  this._renderItem(subtree, { data: [data[i]], metadata: [metadata[i]] }, 0, index);
-                }
+              }
+              if (subtree) {
+                this._renderItem(subtree, { data: [data[i]], metadata: [metadata[i]] }, 0, index);
               }
             }
             this._refreshTopAndBottomSelectionClasses();

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '14.1.5',
+  version: '14.1.6',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-07-24_12-14-49',
+  revision: '2023-08-03_12-24-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/ojtreeview.js

@@ -1378,7 +1378,7 @@ class TreeviewSelectionManager {
 
       this._refreshId = 0;
       this._uiExpanded = new KeySetImpl();
-      this.m_fetching = new Set();
+      this.m_fetching = new Map();
 
       this._expandedChildrenMap = new Map();
       this._syncSelectionState();
@@ -1624,7 +1624,7 @@ class TreeviewSelectionManager {
           error(self.constants.ERROR_FETCHING_DATA + reason);
           dataProviderPromiseBusyResolve();
           self._expandedChildrenMap = new Map();
-          self.m_fetching = new Set();
+          self.m_fetching = new Map();
         }
       );
     },
@@ -2171,9 +2171,6 @@ class TreeviewSelectionManager {
      * @private
      */
     _decorateItem: function (item) {
-      var self = this;
-      var i;
-
       item.classList.add(this.constants.OJ_TREEVIEW_ITEM);
       item.setAttribute('role', 'treeitem');
       var itemKey = this._getKey(item);
@@ -2250,13 +2247,13 @@ class TreeviewSelectionManager {
         var treeViewItems = itemContent.querySelectorAll(
           this.constants.PERIOD + this.constants.OJ_TREEVIEW_ITEM_ICON
         );
-        for (i = 0; i < treeViewItems.length; i++) {
+        for (let i = 0; i < treeViewItems.length; i++) {
           treeViewItems[i].classList.add(this.constants.OJ_TREEVIEW_ICON);
           treeViewItems[i].classList.add(this.constants.OJ_COMPONENT_ICON);
         }
       }
       // Initial selection
-      self._select(item);
+      this._select(item);
 
       // DnD
       itemContent.setAttribute('draggable', this._isDnD() ? 'true' : 'false');
@@ -2287,15 +2284,13 @@ class TreeviewSelectionManager {
         itemContent.classList.add(this.constants.OJ_DRAGGABLE);
       }
 
-      if (self._isLeaf(item)) {
+      if (this._isLeaf(item)) {
         this._addTreeviewLeafClass(item);
+      } else if (this._isInitExpanded(itemKey)) {
+        this._expand(item, false);
+        this._addDisclosureClasses(disclosureIcon);
       } else {
-        // Expanded option
-        if (self._isInitExpanded(itemKey)) {
-          self._expand(item, false);
-        } else {
-          self._collapse(item, false);
-        }
+        this._collapse(item, false);
         this._addDisclosureClasses(disclosureIcon);
       }
     },
@@ -3303,11 +3298,19 @@ class TreeviewSelectionManager {
       var busyContextPromise = busyContext.addBusyState({
         description: "The component identified by '" + id + "', " + description
       });
-      this.m_fetching.add(key);
+      if (this.m_fetching.has(key)) {
+        this.m_fetching.set(key, this.m_fetching.get(key) + 1);
+      } else {
+        this.m_fetching.set(key, 1);
+      }
       this._changeStatusMessage(key, false);
       return function () {
+        if (this.m_fetching.get(key) === 1) {
+          this.m_fetching.delete(key);
+        } else {
+          this.m_fetching.set(key, this.m_fetching.get(key) - 1);
+        }
         this._changeStatusMessage(key, true);
-        this.m_fetching.delete(key);
         busyContextPromise();
         Promise.resolve(this._processEventQueue());
       }.bind(this);
@@ -4198,7 +4201,7 @@ class TreeviewSelectionManager {
       delete this.m_dataSource;
 
       this._expandedChildrenMap = new Map();
-      this.m_fetching = new Set();
+      this.m_fetching = new Map();
 
       this._render();
     },
@@ -4489,18 +4492,23 @@ class TreeviewSelectionManager {
       keys.forEach(function (key) {
         let savedParentKey;
         const addEvent = event.detail.add;
-        if (!addEvent || (addEvent && !addEvent.keys.has(key))) {
-          const itemParentKey = self._getKey(self._getParentItem(self._getItemByKey(key)));
-          if (addEvent && addEvent.parentKeys) {
-            const foundParentKey = addEvent.parentKeys.find((parentKey) =>
-              oj.KeyUtils.equals(parentKey, itemParentKey)
-            );
-            if (foundParentKey) {
-              savedParentKey = foundParentKey;
-            }
+
+        const itemParentKey = self._getKey(self._getParentItem(self._getItemByKey(key)));
+        if (addEvent && addEvent.parentKeys) {
+          const foundParentKey = addEvent.parentKeys.find((parentKey) =>
+            oj.KeyUtils.equals(parentKey, itemParentKey)
+          );
+          if (foundParentKey) {
+            savedParentKey = foundParentKey;
           }
-          removedKeys = removedKeys.concat(self._removeAllChildrenOfParentKey(key, savedParentKey));
         }
+        removedKeys = removedKeys.concat(
+          self._removeAllChildrenOfParentKey(
+            key,
+            savedParentKey,
+            addEvent && addEvent.keys.has(key)
+          )
+        );
       });
 
       if (removedKeys.length === 0) {
@@ -4628,7 +4636,7 @@ class TreeviewSelectionManager {
     _getItemDisclosureIcon: function (item) {
       return item.getElementsByTagName('ins')[0];
     },
-    _removeAllChildrenOfParentKey: function (key, savedParentKey) {
+    _removeAllChildrenOfParentKey: function (key, savedParentKey, reorder) {
       /* savedParentKey means remove all children but leave parent called when we have a smart refresh event from the dp*/
       var self = this;
       var removedKeys = [];
@@ -4636,16 +4644,18 @@ class TreeviewSelectionManager {
       if (elem) {
         this._getChildItems(elem).forEach(function (child) {
           var childkey = self._getKey(child);
-          var childKeys = self._removeAllChildrenOfParentKey(childkey, savedParentKey);
+          var childKeys = self._removeAllChildrenOfParentKey(childkey, savedParentKey, reorder);
           removedKeys = removedKeys.concat(childKeys);
         });
         var subtree = elem.parentNode;
         if (!oj.KeyUtils.equals(key, savedParentKey)) {
           subtree.removeChild(elem);
           this._keyList.delete(key);
-          removedKeys.push(key);
+          if (!reorder) {
+            removedKeys.push(key);
+          }
         }
-        if (subtree.getElementsByTagName('li').length === 0 && !savedParentKey) {
+        if (subtree.getElementsByTagName('li').length === 0 && !savedParentKey && !reorder) {
           this._changeNodeToLeaf(subtree.parentNode, subtree);
         }
       }
@@ -4680,7 +4690,6 @@ class TreeviewSelectionManager {
       var i = 0;
       var self = this;
       var addKeys = event.detail.add.keys;
-      const keys = [];
       const addEventBusyResolve = this._addBusyState(
         'validating mutation data for add event',
         null
@@ -4693,34 +4702,6 @@ class TreeviewSelectionManager {
         this._truncateIfOverMaxCount(validatededEventData);
         const data = validatededEventData.data;
         const metadata = validatededEventData.metadata;
-        addKeys.forEach((key) => {
-          if (
-            !event.detail.remove ||
-            (event.detail.remove && !event.options.detail.remove.keys.has(key))
-          ) {
-            keys.push(key);
-          } else if (
-            addEvent.addBeforeKeys &&
-            addEvent.addBeforeKeys[i] &&
-            addEvent.addBeforeKeys.length !== 0
-          ) {
-            this.handleModelReorder(key, addEvent.addBeforeKeys[i], false);
-          } else {
-            var locationKey;
-            if (addEvent.parentKeys && addEvent.parentKeys[i] && addEvent.parentKeys.length !== 0) {
-              var parent = this._getItemByKey(addEvent.parentKeys[i]);
-              var parentItemList = this._getChildItems(parent);
-              locationKey = this.getLastItemKey(parentItemList);
-            } else {
-              var rootList = this._getItems();
-              locationKey = this.getLastItemKey(rootList);
-            }
-            if (locationKey) {
-              this.handleModelReorder(key, locationKey, true);
-            }
-          }
-          i += 1;
-        });
         parentKeys.forEach(function (key) {
           var parentItem = self._getItemByKey(key);
           if (parentItem && self._isLeafIcon(parentItem)) {
@@ -4731,9 +4712,9 @@ class TreeviewSelectionManager {
         const finalKeys = getAddEventKeysResult(initialKeys, addEvent, true);
         if (
           data &&
-          keys.length > 0 &&
+          addKeys.size > 0 &&
           data.length > 0 &&
-          keys.length === data.length &&
+          addKeys.size === data.length &&
           (indexes == null || indexes.length === data.length)
         ) {
           for (i = 0; i < data.length; i++) {
@@ -4748,14 +4729,11 @@ class TreeviewSelectionManager {
             var subtree;
             if (parentKey == null) {
               subtree = this._getRoot();
-              if (subtree) {
-                this._renderItem(subtree, { data: [data[i]], metadata: [metadata[i]] }, 0, index);
-              }
             } else if (parentItem) {
               subtree = this._getSubtree(parentItem);
-              if (subtree) {
-                this._renderItem(subtree, { data: [data[i]], metadata: [metadata[i]] }, 0, index);
-              }
+            }
+            if (subtree) {
+              this._renderItem(subtree, { data: [data[i]], metadata: [metadata[i]] }, 0, index);
             }
           }
           this._refreshTopAndBottomSelectionClasses();

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/14.1.5/min@insertESLevelPath@',
-      'ojL10n': 'libs/oj/14.1.5/ojL10n',
-      'ojtranslations': 'libs/oj/14.1.5/resources',
+      'ojs': 'libs/oj/14.1.6/min@insertESLevelPath@',
+      'ojL10n': 'libs/oj/14.1.6/ojL10n',
+      'ojtranslations': 'libs/oj/14.1.6/resources',
       
   'knockout': 'libs/knockout/knockout-3.5.1',
   'jquery': 'libs/jquery/jquery-3.6.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"],function(e){"use strict";let t={};"undefined"!=typeof window?t=window:"undefined"!=typeof self&&(t=self);var n=t.oj;const r={version:"14.1.5",revision:"2023-07-24_12-14-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:"14.1.6",revision:"2023-08-03_12-24-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