Merge branch '3849-http-request-node-bug' into 'develop'

Improve schema handling and add support for `anyOf` schema type

Closes baserow#3849

See merge request baserow/baserow!3780

Author: Tsering Paljor

backend/src/baserow/contrib/integrations/core/service_types.py

@@ -1446,6 +1446,10 @@ def process_webhook_request(
             method isn't allowed for this service.
         """
 
+        # When the service is published, the previous published service may
+        # be kept (e.g. see `AutomationWorkflowHandler::publish()`). Since the
+        # uid is the same between the two, a filter is necessary to fetch only
+        # the latest published service.
         service = (
             self.model_class.objects.filter(uid=webhook_uid, is_public=not simulate)
             .order_by("-id")

web-frontend/locales/en.json

@@ -22,7 +22,8 @@
     "thursday": "Thursday",
     "friday": "Friday",
     "saturday": "Saturday",
-    "sunday": "Sunday"
+    "sunday": "Sunday",
+    "value": "value"
   },
   "action": {
     "close": "Close",

web-frontend/modules/core/components/dataExplorer/DataExplorerNode.vue

@@ -28,8 +28,12 @@
           :depth="depth + 1"
           :open-nodes="openNodes"
           :node-selected="nodeSelected"
-          :path="`${path}.${subNode.identifier}`"
-          :search-path="`${searchPath}.${subNode.identifier}`"
+          :path="subNode.identifier ? `${path}.${subNode.identifier}` : path"
+          :search-path="
+            subNode.identifier
+              ? `${searchPath}.${subNode.identifier}`
+              : searchPath
+          "
           :search="search"
           @click="$emit('click', $event)"
           @toggle="$emit('toggle', $event)"

web-frontend/modules/core/dataProviderTypes.js

@@ -186,17 +186,45 @@ export class DataProviderType extends Registerable {
       }
     }
 
+    if (schema.anyOf) {
+      const schemaObject = schema.anyOf.find((s) => s.type === 'object')
+
+      return {
+        name,
+        identifier,
+        order,
+        type: 'union',
+        icon: this.getIconForNode({ type: 'union' }),
+        nodes: [
+          // Always allow direct access to the entire value
+          {
+            name: `${name} (${this.app.i18n.t('common.value')})`,
+            identifier: '',
+            order: 0,
+            type: 'unknown',
+            icon: this.getIconForNode({ type: 'union' }),
+          },
+
+          // If it is an object, show the individual properties
+          ...(schemaObject && schemaObject.properties
+            ? Object.entries(schemaObject.properties).map(([key, subSchema]) =>
+                this._toNode(applicationContext, [...pathParts, key], subSchema)
+              )
+            : []),
+        ],
+      }
+    }
+
     if (schema.type === 'array') {
       return {
         name,
         identifier,
         icon: this.getIconForNode(schema),
         type: 'array',
-        nodes: this._toNode(
-          applicationContext,
-          [...pathParts, null],
-          schema.items
-        ).nodes,
+        nodes: schema.items
+          ? this._toNode(applicationContext, [...pathParts, null], schema.items)
+              .nodes
+          : [],
       }
     }
 
@@ -206,14 +234,15 @@ export class DataProviderType extends Registerable {
         identifier,
         order,
         icon: this.getIconForNode(schema),
-        nodes: Object.entries(schema.properties).map(
-          ([identifier, subSchema]) =>
-            this._toNode(
-              applicationContext,
-              [...pathParts, identifier],
-              subSchema
+        nodes: schema.properties
+          ? Object.entries(schema.properties).map(([identifier, subSchema]) =>
+              this._toNode(
+                applicationContext,
+                [...pathParts, identifier],
+                subSchema
+              )
             )
-        ),
+          : [],
       }
     }
 

web-frontend/modules/core/enums.js

@@ -37,6 +37,7 @@ export const DATA_TYPE_TO_ICON_MAP = {
   datetime: 'iconoir-calendar',
   array: 'iconoir-list',
   file: 'iconoir-attachment',
+  union: 'iconoir-union-alt',
 }
 
 export const UNKNOWN_DATA_TYPE_ICON = 'iconoir-question-mark'