@oracle/oraclejet 12.0.2 → 12.1.1

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

@@ -10,10 +10,11 @@ import oj$1 from 'ojs/ojcore';
 import BindingProviderImpl from 'ojs/ojkoshared';
 import { getTemplateContent } from 'ojs/ojhtmlutils';
 import { info } from 'ojs/ojlogger';
-import { CACHED_BINDING_PROVIDER, AttributeUtils } from 'ojs/ojcustomelement-utils';
+import { CACHED_BINDING_PROVIDER, CustomElementUtils, transformPreactValue, AttributeUtils } from 'ojs/ojcustomelement-utils';
 import { render } from 'preact';
 import oj from 'ojs/ojcore-base';
 import Context from 'ojs/ojcontext';
+import { getPropertyMetadata } from 'ojs/ojmetadatautils';
 
 const ROW = Symbol('row');
 class PreactTemplate {
@@ -121,17 +122,18 @@ class PreactTemplate {
         };
     }
     static resolveVDomTemplateProps(template, renderer, elementTagName, propertySet, data, defaultValues, propertyValidator) {
+        const metadata = CustomElementUtils.getPropertiesForElementTag(elementTagName);
         const [cache, deleteEntry] = PreactTemplate._extendTemplate(template, PreactTemplate._COMPUTED_PROPS_CACHE_FACTORY, (recalc) => {
             for (const observable of cache) {
                 observable.recalculateValue(recalc);
             }
         });
-        const calcValue = (render) => PreactTemplate._computeProps(render, elementTagName, propertySet, data, propertyValidator);
+        const calcValue = (render) => PreactTemplate._computeProps(render, elementTagName, metadata, propertySet, data, propertyValidator);
         const item = new ObservableProperty(calcValue, renderer, defaultValues, deleteEntry);
         cache.add(item);
         return item;
     }
-    static _computeProps(renderer, elementTagName, propertySet, data, propertyValidator) {
+    static _computeProps(renderer, elementTagName, metadata, propertySet, data, propertyValidator) {
         const result = renderer(data);
         const vnodes = Array.isArray(result) ? result : [result];
         const targetNode = vnodes.find((n) => n.type === elementTagName);
@@ -142,7 +144,7 @@ class PreactTemplate {
         const vprops = targetNode.props;
         Object.keys(vprops).forEach((prop) => {
             if (propertySet.has(prop)) {
-                props[prop] = targetNode.props[prop];
+                props[prop] = transformPreactValue(null, getPropertyMetadata(prop, metadata), targetNode.props[prop]);
             }
         });
         return props;

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

@@ -4133,7 +4133,9 @@ const DvtMapProviderUtils = {
    */
   _isSupportedGeometry: (geom) => {
     var type = geom['type'];
-    if (type === 'Polygon' || type === 'MultiPolygon')
+    if (type === 'Polygon' 
+        || type === 'MultiPolygon'
+        || type === 'GeometryCollection')
       return true;
     return false;
   },
@@ -4148,7 +4150,7 @@ const DvtMapProviderUtils = {
   _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);
     }
@@ -4158,6 +4160,13 @@ const DvtMapProviderUtils = {
         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_esm/ojthematicmap.js

@@ -795,11 +795,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_esm/ojtracer.js

@@ -27,6 +27,7 @@ import { CustomElementUtils } from 'ojs/ojcustomelement-utils';
 
 /**
  * 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 @@ import { CustomElementUtils } from 'ojs/ojcustomelement-utils';
 
 /**
  * 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 @@ class NoOpTracer {
     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/main-template.js

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