@oracle/oraclejet 12.0.4 → 12.1.2

package/dist/js/libs/oj/debug/ojthematicmap-toolkit.js

@@ -4131,7 +4131,9 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas'], function (ex
      */
     _isSupportedGeometry: (geom) => {
       var type = geom['type'];
-      if (type === 'Polygon' || type === 'MultiPolygon')
+      if (type === 'Polygon' 
+          || type === 'MultiPolygon'
+          || type === 'GeometryCollection')
         return true;
       return false;
     },
@@ -4146,7 +4148,7 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas'], function (ex
     _geomToPath: (geom) => {
       var path = '';
       var type = geom['type'];
-      var coords = geom['coordinates'];
+      var coords = geom['coordinates'] || geom.geometries;
       if (type === 'Polygon') {
         path = DvtMapProviderUtils._polygonToPath(coords);
       }
@@ -4156,6 +4158,13 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas'], function (ex
           path += DvtMapProviderUtils._polygonToPath(coords[i]);
         }
       }
+      else if (type === 'GeometryCollection') {
+        // The GeometryCollection is an array of geometry objects. Each geometry object has coordinates of Polygon or MultiPolygon
+        for (var gIdx = 0; gIdx < coords.length; gIdx++) {
+          // each geometry has a type and coordinate
+          path += DvtMapProviderUtils._geomToPath(coords[gIdx]);
+        }
+      }
       return path;
     },
 

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

@@ -812,11 +812,12 @@ var __oj_thematic_map_marker_metadata =
    * <p>
    *   Thematic map supports rendering of GeoJSON formatted geographic data. An application can specify the GeoJSON along with keys
    *   used for determining area IDs and labels by setting the the [mapProvider]{@link oj.ojThematicMap#mapProvider} attribute.
-   *   Currently only GeoJSON objects of "type" Feature or FeatureCollection are supported. Each Feature object contains
+   *   Currently GeoJSON objects of "type" Feature, FeatureCollection and GeometryCollection are supported. Each Feature object contains
    *   the information to render a map area including the area id, coordinates, and optional short and long labels. Only Feature
-   *   "geometry" objects of "type" Polygon and MutliPolgyon will be used for defining area boundaries.  All other "type" values
+   *   "geometry" objects of "type" Polygon and MutliPolygon will be used for defining area boundaries.  All other "type" values
    *   will be skipped.  The Feature "properties" object is where the thematic map will look up area info like id, short
    *   label, and long label using the key mappings provided in the [propertiesKeys]{@link oj.ojThematicMap#mapProvider.propertiesKeys} property.
+   *   GeometryCollection is an array of geometry objects. Each geometry object has a type and coordinate of which only "types" Polygon and MultiPolygon are supported.
    *   See the thematic map Map Provider Demo for an example.
    * </p>
    * <p>

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

@@ -27,6 +27,7 @@ define(['exports', 'ojs/ojcustomelement-utils'], function (exports, ojcustomelem
 
     /**
      * Allow user to set an opentelemetry-compatible TracerProvider object
+     * Please see the {@link https://opentelemetry.io opentelemetry documentation}
      *
      * @ojexports
      * @memberof ojtracer
@@ -37,7 +38,7 @@ define(['exports', 'ojs/ojcustomelement-utils'], function (exports, ojcustomelem
 
     /**
      * Return the user-set opentelemetry-compatible TracerProvider object, or an internal no-op version if nothing has been set
-     *
+     * Please see the {@link https://opentelemetry.io opentelemetry documentation}
      * @ojexports
      * @memberof ojtracer
      * @returns {unknown} opentelemetry-compatible TracerProvider
@@ -80,7 +81,20 @@ define(['exports', 'ojs/ojcustomelement-utils'], function (exports, ojcustomelem
         startSpan(name, options, context) {
             return new NoOpSpan();
         }
-        startActiveSpan(name, fn) {
+        startActiveSpan(name, optOrFunc, contextOrFunc, func) {
+            let fn;
+            if (arguments.length < 2) {
+                return;
+            }
+            else if (arguments.length === 2) {
+                fn = optOrFunc;
+            }
+            else if (arguments.length === 3) {
+                fn = contextOrFunc;
+            }
+            else {
+                fn = func;
+            }
             return fn(new NoOpSpan());
         }
     }

package/dist/js/libs/oj/debug_esm/ojchart-toolkit.js

@@ -7192,7 +7192,7 @@ class DvtAxisEventManager extends EventManager {
         var group = axisInfo.getGroup(index);
 
         // Associate with logical object to support automation and tooltips
-        var params = DvtAxisEventManager.getUIParams('tickLabel', label.getTextString(), index);
+        var params = DvtAxisEventManager.getUIParams('tickLabel', label.getTextString(), index, null);
         axis.getEventManager().associate(label, new DvtAxisObjPeer(axis, label, group, drillable, tooltip, datatip, params));
 
         label.setTranslateX(availSpace.x + availSpace.w / 2);
@@ -8727,7 +8727,7 @@ DvtAxisInfo.registerConstructor('group', DvtGroupAxisInfo);
       if (logicalObj.getParams().type === 'title') // return chart axis title subId
         return 'title';
       else if (this._options.groups) { // return group axis label subId
-        var level = logicalObj.getParams().level;
+        var level = logicalObj.getParams().level || 0;
         var labelIndex = this._axisInfo.getStartIdx(logicalObj.getParams().index, level);
         var indexList = '';
         // Loop from outermost level to desired level
@@ -23330,7 +23330,7 @@ const DvtChartRefObjRenderer = {
     // If value is number, treat is as the group index for group axis
     if (!isNaN(value))
       return axis.getUnboundedCoordAt(value);
-
+    
     return null;
   }
 };
@@ -29486,11 +29486,18 @@ const DvtChartDataObjectUtils = {
       var refObjs = DvtChartDataUtils.getRefObjs(chart);
       for (var i = 0; i < refObjs.length; i++) {
         var items = refObjs[i]['items'];
-        if (!items)
+        if (!items) {
+          if (refObjs[i]['value'] && refObjs[i]['value'] != null) {
+            refObjs[i]['value'] = DvtChartDataObjectUtils._sanitizeDateTime(context, refObjs[i]['value']);
+          }
           continue;
+        }
+
         for (var j = 0; j < items.length; j++) {
           if (items[j] && items[j]['x'] != null)
             items[j]['x'] = DvtChartDataObjectUtils._sanitizeDateTime(context, items[j]['x']);
+          if (items[j] && items[j]['value'] != null)
+            items[j]['value'] = DvtChartDataObjectUtils._sanitizeDateTime(context, items[j]['value']);
         }
       }
     }