Fix order in node explorer (baserow#4221)

Author: jrmi

premium/backend/tests/baserow_premium_tests/fields/test_ai_field_type.py

@@ -1215,7 +1215,6 @@ def test_ai_field_type_check_can_filter_by(premium_data_fixture):
 
 @pytest.mark.django_db
 @pytest.mark.field_ai
-@pytest.mark.skip
 def test_create_ai_field_with_references(premium_data_fixture):
     """
     Test if AI field type handler creates appropriate FieldDependency entries.

web-frontend/modules/automation/dataProviderTypes.js

@@ -29,12 +29,16 @@ export class PreviousNodeDataProviderType extends DataProviderType {
 
     const previousNodeSchema = _.chain(previousNodes)
       // Retrieve the associated schema for each node
-      .map((previousNode) => [
+      .map((previousNode, index) => [
         previousNode,
         this.getNodeSchema({ automation, node: previousNode }),
       ])
       // Remove nodes without schema
       .filter(([_, schema]) => schema)
+      .map(([previousNode, schema], index) => [
+        previousNode,
+        { ...schema, order: index },
+      ])
       // Add an index number to the schema title for each node of the same
       // schema title. For example if we have two "Create a row in Customers"
       // nodes, then the schema titles will be:
@@ -46,7 +50,6 @@ export class PreviousNodeDataProviderType extends DataProviderType {
           {
             ...schema,
             title: `${schema.title}${index ? ` ${index + 1}` : ''}`,
-            order: index,
           },
         ])
       )

web-frontend/modules/core/utils/dataProviders.js

@@ -1,3 +1,18 @@
+const transformNode = (node) => ({
+  name: node.name,
+  type: node.type === 'array' ? 'array' : 'data',
+  identifier: node.identifier || node.name,
+  description: node.description || null,
+  icon: node.icon || 'iconoir-database',
+  highlightingColor: null,
+  example: null,
+  order: node.order || null,
+  signature: null,
+  nodes: node.nodes
+    ? node.nodes.map(transformNode).sort((a, b) => a.order - b.order)
+    : [],
+})
+
 /**
  * Processes a list of data providers to extract and transform their nodes
  * into a structure compatible with the FormulaInputField component. It also
@@ -20,22 +35,11 @@ export const getDataNodesFromDataProvider = (
       const providerNodes = dataProvider.getNodes(applicationContext)
 
       // Recursively transform provider nodes to match FormulaInputField's expected structure
-      const transformNode = (node) => ({
-        name: node.name,
-        type: node.type === 'array' ? 'array' : 'data',
-        identifier: node.identifier || node.name,
-        description: node.description || null,
-        icon: node.icon || 'iconoir-database',
-        highlightingColor: null,
-        example: null,
-        order: node.order || null,
-        signature: null,
-        nodes: node.nodes ? node.nodes.map(transformNode) : [],
-      })
-
       // Ensure providerNodes is an array before processing
       if (Array.isArray(providerNodes)) {
-        return providerNodes.map(transformNode)
+        return providerNodes
+          .map(transformNode)
+          .sort((a, b) => a.order - b.order)
       } else {
         // If it's a single object, transform and add it
         return transformNode(providerNodes)

web-frontend/modules/integrations/core/serviceTypes.js

@@ -32,7 +32,11 @@ export class CoreHTTPRequestServiceType extends WorkflowActionServiceTypeMixin(
   getErrorMessage({ service }) {
     // We check undefined because the url is not returned in public mode the
     // property is just ignored
-    if (service !== undefined && service.url !== undefined && !service.url) {
+    if (
+      service !== undefined &&
+      service.url !== undefined &&
+      !service.url.formula
+    ) {
       return this.app.i18n.t('serviceType.errorUrlMissing')
     }
 
@@ -75,15 +79,15 @@ export class CoreSMTPEmailServiceType extends WorkflowActionServiceTypeMixin(
     if (
       service !== undefined &&
       service.from_email !== undefined &&
-      !service.from_email
+      !service.from_email.formula
     ) {
       return this.app.i18n.t('serviceType.errorFromEmailMissing')
     }
 
     if (
       service !== undefined &&
       service.to_emails !== undefined &&
-      !service.to_emails
+      !service.to_emails.formula
     ) {
       return this.app.i18n.t('serviceType.errorToEmailsMissing')
     }