From a9d4cf4108829cf412988233849f310657ea7e6d Mon Sep 17 00:00:00 2001
From: Peter Evans <peter@baserow.io>
Date: Fri, 12 Dec 2025 14:29:17 +0000
Subject: [PATCH] Improving the Local Baserow integration support for our
 one-way and two-data synced tables. (#4417)

---
 .../api/local_baserow/serializers.py          |   6 +-
 .../local_baserow/test_integration_types.py   |   1 +
 ...way_data_sync_support_in_local_basero.json |   9 ++
 .../workflow/sidePanels/NodeSidePanel.vue     |   1 +
 .../components/dataSource/DataSourceForm.vue  |   1 +
 .../WorkflowActionWithService.vue             |   1 +
 .../LocalBaserowAggregateRowsForm.vue         |   1 +
 .../services/LocalBaserowGetRowForm.vue       |   1 +
 .../services/LocalBaserowListRowsForm.vue     |   1 +
 .../services/LocalBaserowServiceForm.vue      |  17 +--
 .../LocalBaserowSignalTriggerServiceForm.vue  |   5 +
 .../services/LocalBaserowTableSelector.vue    |  40 +++---
 .../LocalBaserowUpsertRowServiceForm.vue      |  20 ++-
 .../mixins/localBaserowService.js             |   5 +
 .../integrations/localBaserow/serviceTypes.js |  35 ++++++
 .../modules/integrations/locales/en.json      |   3 +-
 .../localBaserow/serviceTypes.spec.js         | 119 ++++++++++++++++++
 17 files changed, 224 insertions(+), 42 deletions(-)
 create mode 100644 changelog/entries/unreleased/refactor/improved_oneway_and_twoway_data_sync_support_in_local_basero.json

diff --git a/backend/src/baserow/contrib/integrations/api/local_baserow/serializers.py b/backend/src/baserow/contrib/integrations/api/local_baserow/serializers.py
index 711162a98c..ed68850063 100644
--- a/backend/src/baserow/contrib/integrations/api/local_baserow/serializers.py
+++ b/backend/src/baserow/contrib/integrations/api/local_baserow/serializers.py
@@ -16,10 +16,14 @@ class LocalBaserowTableSerializer(serializers.ModelSerializer):
         source="is_data_synced_table",
         help_text="Whether this table is a data synced table or not.",
     )
+    is_two_way_data_sync = serializers.BooleanField(
+        source="is_two_way_data_synced_table",
+        help_text="Whether this table is a two-way data synced table or not.",
+    )
 
     class Meta:
         model = Table
-        fields = ("id", "database_id", "name", "is_data_sync")
+        fields = ("id", "database_id", "name", "is_data_sync", "is_two_way_data_sync")
 
 
 class LocalBaserowDatabaseSerializer(ApplicationSerializer):
diff --git a/backend/tests/baserow/contrib/integrations/local_baserow/test_integration_types.py b/backend/tests/baserow/contrib/integrations/local_baserow/test_integration_types.py
index ebe39ffc38..217074970d 100644
--- a/backend/tests/baserow/contrib/integrations/local_baserow/test_integration_types.py
+++ b/backend/tests/baserow/contrib/integrations/local_baserow/test_integration_types.py
@@ -215,6 +215,7 @@ def test_get_integrations_serializer(
                         "name": table.name,
                         "database_id": table.database_id,
                         "is_data_sync": table.is_data_synced_table,
+                        "is_two_way_data_sync": table.is_two_way_data_synced_table,
                     }
                 ],
                 "views": [
diff --git a/changelog/entries/unreleased/refactor/improved_oneway_and_twoway_data_sync_support_in_local_basero.json b/changelog/entries/unreleased/refactor/improved_oneway_and_twoway_data_sync_support_in_local_basero.json
new file mode 100644
index 0000000000..10291944d4
--- /dev/null
+++ b/changelog/entries/unreleased/refactor/improved_oneway_and_twoway_data_sync_support_in_local_basero.json
@@ -0,0 +1,9 @@
+{
+    "type": "refactor",
+    "message": "Improved one-way and two-way data sync support in Local Baserow actions.",
+    "issue_origin": "github",
+    "issue_number": null,
+    "domain": "integration",
+    "bullet_points": [],
+    "created_at": "2025-12-09"
+}
\ No newline at end of file
diff --git a/web-frontend/modules/automation/components/workflow/sidePanels/NodeSidePanel.vue b/web-frontend/modules/automation/components/workflow/sidePanels/NodeSidePanel.vue
index 54d0fe08cc..f671c4d6b7 100644
--- a/web-frontend/modules/automation/components/workflow/sidePanels/NodeSidePanel.vue
+++ b/web-frontend/modules/automation/components/workflow/sidePanels/NodeSidePanel.vue
@@ -27,6 +27,7 @@
       small
       :loading="nodeLoading"
       :service="node.service"
+      :service-type="nodeType.serviceType"
       :application="automation"
       enable-integration-picker
       :default-values="node.service"
diff --git a/web-frontend/modules/builder/components/dataSource/DataSourceForm.vue b/web-frontend/modules/builder/components/dataSource/DataSourceForm.vue
index 58a61a6eb9..dc546616d5 100644
--- a/web-frontend/modules/builder/components/dataSource/DataSourceForm.vue
+++ b/web-frontend/modules/builder/components/dataSource/DataSourceForm.vue
@@ -64,6 +64,7 @@
         ref="subForm"
         :application="builder"
         :service="dataSource"
+        :service-type="serviceType"
         :default-values="defaultValues"
         :context-data="integration.context_data"
         @values-changed="emitChange($event)"
diff --git a/web-frontend/modules/builder/components/workflowAction/WorkflowActionWithService.vue b/web-frontend/modules/builder/components/workflowAction/WorkflowActionWithService.vue
index 24a58ec0b5..042c73c7b7 100644
--- a/web-frontend/modules/builder/components/workflowAction/WorkflowActionWithService.vue
+++ b/web-frontend/modules/builder/components/workflowAction/WorkflowActionWithService.vue
@@ -3,6 +3,7 @@
     :is="serviceType.formComponent"
     :application="builder"
     :service="defaultValues.service"
+    :service-type="serviceType"
     :loading="workflowActionLoading"
     :default-values="defaultValues.service"
     @values-changed="values.service = { ...workflowAction.service, ...$event }"
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowAggregateRowsForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowAggregateRowsForm.vue
index f5feefc12f..7e36a3f850 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowAggregateRowsForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowAggregateRowsForm.vue
@@ -4,6 +4,7 @@
       <div class="col col-12">
         <LocalBaserowServiceForm
           :application="application"
+          :service-type="serviceType"
           :default-values="defaultValues"
           :enable-integration-picker="enableIntegrationPicker"
           @values-changed="values = { ...values, ...$event }"
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowGetRowForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowGetRowForm.vue
index 7e41cefc30..c784021e9f 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowGetRowForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowGetRowForm.vue
@@ -5,6 +5,7 @@
         <div class="col col-12">
           <LocalBaserowServiceForm
             :application="application"
+            :service-type="serviceType"
             :default-values="defaultValues"
             :enable-integration-picker="enableIntegrationPicker"
             @values-changed="values = { ...values, ...$event }"
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowListRowsForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowListRowsForm.vue
index 9107b13225..3c703beb6a 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowListRowsForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowListRowsForm.vue
@@ -4,6 +4,7 @@
       <div class="col col-12">
         <LocalBaserowServiceForm
           :application="application"
+          :service-type="serviceType"
           :default-values="defaultValues"
           :enable-integration-picker="enableIntegrationPicker"
           @values-changed="values = { ...values, ...$event }"
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
index 820d7626cc..4cc9055994 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
@@ -17,10 +17,10 @@
     <LocalBaserowTableSelector
       v-if="selectedIntegration"
       v-model="fakeTableId"
-      :view-id.sync="values.view_id"
       :databases="databases"
+      :service-type="serviceType"
+      :view-id.sync="values.view_id"
       :display-view-dropdown="enableViewPicker"
-      :disallow-data-synced-tables="disallowDataSyncedTables"
     />
     <FormGroup
       v-if="enableRowId && values.integration_id"
@@ -64,6 +64,10 @@ export default {
       type: Object,
       required: true,
     },
+    serviceType: {
+      type: Object,
+      required: true,
+    },
     enableRowId: {
       type: Boolean,
       required: false,
@@ -89,15 +93,6 @@ export default {
       required: false,
       default: true,
     },
-    /**
-     * Whether to disallow the selection of data synced tables. Data sources
-     * can select them, but a create-row workflow action cannot.
-     */
-    disallowDataSyncedTables: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   data() {
     const values = { table_id: null, integration_id: null }
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowSignalTriggerServiceForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowSignalTriggerServiceForm.vue
index a539b37d74..24be1d4d47 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowSignalTriggerServiceForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowSignalTriggerServiceForm.vue
@@ -3,6 +3,7 @@
     <LocalBaserowServiceForm
       ref="serviceForm"
       :application="application"
+      :service-type="serviceType"
       :default-values="defaultValues"
       :enable-view-picker="false"
       @values-changed="emitServiceChange($event)"
@@ -26,6 +27,10 @@ export default defineComponent({
       type: Object,
       required: true,
     },
+    serviceType: {
+      type: Object,
+      required: true,
+    },
   },
   emits: ['values-changed'],
   setup(props, { emit }) {
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowTableSelector.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowTableSelector.vue
index 1bf5c041ff..cf2f0f6cc5 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowTableSelector.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowTableSelector.vue
@@ -36,15 +36,11 @@
         @input="$emit('input', $event)"
       >
         <DropdownItem
-          v-for="table in tables"
+          v-for="table in supportedServiceTables"
           :key="table.id"
           :name="table.name"
           :value="table.id"
-          :description="
-            table.is_data_sync
-              ? $t('localBaserowTableSelector.dataSyncedTableDescription')
-              : null
-          "
+          :description="getTableDescription(table)"
         >
           {{ table.name }}
         </DropdownItem>
@@ -100,6 +96,10 @@ export default {
       type: Array,
       required: true,
     },
+    serviceType: {
+      type: Object,
+      required: true,
+    },
     displayViewDropdown: {
       type: Boolean,
       default: true,
@@ -112,11 +112,6 @@ export default {
       },
       default: 'regular',
     },
-    disallowDataSyncedTables: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   data() {
     return {
@@ -130,11 +125,10 @@ export default {
       )
     },
     tables() {
-      return (
-        this.databaseSelected?.tables.filter(
-          (table) => !(this.disallowDataSyncedTables && table.is_data_sync)
-        ) || []
-      )
+      return this.databaseSelected?.tables || []
+    },
+    supportedServiceTables() {
+      return this.serviceType.supportedTables(this.tables)
     },
     views() {
       return (
@@ -159,5 +153,19 @@ export default {
       immediate: true,
     },
   },
+  methods: {
+    getTableDescription(table) {
+      if (table.is_two_way_data_sync) {
+        return this.$t(
+          'localBaserowTableSelector.twoWayDataSyncedTableDescription'
+        )
+      } else if (table.is_data_sync) {
+        return this.$t(
+          'localBaserowTableSelector.oneWayDataSyncedTableDescription'
+        )
+      }
+      return null
+    },
+  },
 }
 </script>
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowUpsertRowServiceForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowUpsertRowServiceForm.vue
index 56edeb5765..27f01db354 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowUpsertRowServiceForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowUpsertRowServiceForm.vue
@@ -1,11 +1,11 @@
 <template>
   <form @submit.prevent>
     <LocalBaserowServiceForm
+      :service-type="serviceType"
       :enable-row-id="enableRowId"
       :application="application"
       :enable-view-picker="false"
       :default-values="defaultValues"
-      :disallow-data-synced-tables="disallowDataSyncedTables"
       @table-changed="handleTableChange"
       @values-changed="emitServiceChange($event)"
     ></LocalBaserowServiceForm>
@@ -57,23 +57,17 @@ export default {
     service: {
       type: Object,
       required: false,
-      default: null,
+      default: () => ({}),
     },
-    enableRowId: {
-      type: Boolean,
+    serviceType: {
+      type: Object,
       required: false,
-      default: false,
+      default: () => ({}),
     },
-    /**
-     * Whether to disallow selecting data synced tables. It defaults to
-     * true as this is the default behaviour for the create row action
-     * form. The update row action form allows data synced tables, assuming
-     * they have writable fields.
-     */
-    disallowDataSyncedTables: {
+    enableRowId: {
       type: Boolean,
       required: false,
-      default: true,
+      default: false,
     },
   },
   data() {
diff --git a/web-frontend/modules/integrations/localBaserow/mixins/localBaserowService.js b/web-frontend/modules/integrations/localBaserow/mixins/localBaserowService.js
index 98d10c820d..f99c1fe0dd 100644
--- a/web-frontend/modules/integrations/localBaserow/mixins/localBaserowService.js
+++ b/web-frontend/modules/integrations/localBaserow/mixins/localBaserowService.js
@@ -12,6 +12,11 @@ export default {
       required: false,
       default: () => ({}),
     },
+    serviceType: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
     contextData: {
       type: Object,
       required: false,
diff --git a/web-frontend/modules/integrations/localBaserow/serviceTypes.js b/web-frontend/modules/integrations/localBaserow/serviceTypes.js
index 7f3de16be6..7a9644b18d 100644
--- a/web-frontend/modules/integrations/localBaserow/serviceTypes.js
+++ b/web-frontend/modules/integrations/localBaserow/serviceTypes.js
@@ -32,6 +32,17 @@ export class LocalBaserowTableServiceType extends ServiceType {
     return service.context_data_schema
   }
 
+  /**
+   * Given an array of tables, returns the supported tables for this service type.
+   * By default, we return all tables, but specific service types can override this
+   * method to restrict the tables that can be selected.
+   * @param {Array} tables - The array of tables to filter.
+   * @returns {Array} - The supported tables.
+   */
+  supportedTables(tables) {
+    return tables
+  }
+
   /**
    * Responsible for determining if this service is in error. It will be if the
    * `table_id` is missing.
@@ -414,6 +425,18 @@ export class LocalBaserowCreateRowWorkflowServiceType extends WorkflowActionServ
     return 'local_baserow_create_row'
   }
 
+  /**
+   * The Local Baserow create row service will only work on tables which are
+   * not data-synced, or are data-synced but are two-way synced.
+   * @param {Array} tables - The array of tables to filter.
+   * @returns {Array} - The supported tables.
+   */
+  supportedTables(tables) {
+    return tables.filter(
+      (table) => !table.is_data_sync || table.is_two_way_data_sync
+    )
+  }
+
   get icon() {
     return 'iconoir-plus'
   }
@@ -477,6 +500,18 @@ export class LocalBaserowDeleteRowWorkflowServiceType extends WorkflowActionServ
   get formComponent() {
     return LocalBaserowDeleteRowServiceForm
   }
+
+  /**
+   * The Local Baserow delete row service will only work on tables which are
+   * not data-synced, or are data-synced but are two-way synced.
+   * @param {Array} tables - The array of tables to filter.
+   * @returns {Array} - The supported tables.
+   */
+  supportedTables(tables) {
+    return tables.filter(
+      (table) => !table.is_data_sync || table.is_two_way_data_sync
+    )
+  }
 }
 
 export class LocalBaserowTriggerServiceType extends TriggerServiceTypeMixin(
diff --git a/web-frontend/modules/integrations/locales/en.json b/web-frontend/modules/integrations/locales/en.json
index f482621b94..d128cfdc65 100644
--- a/web-frontend/modules/integrations/locales/en.json
+++ b/web-frontend/modules/integrations/locales/en.json
@@ -229,7 +229,8 @@
     "tableFieldLabel": "Table",
     "chooseNoView": "Not selected",
     "databaseFieldLabel": "Database",
-    "dataSyncedTableDescription": "Data synced table"
+    "oneWayDataSyncedTableDescription": "One-way synced",
+    "twoWayDataSyncedTableDescription": "Two-way synced"
   },
   "smtpIntegrationType": {
     "smtpSummary": "SMTP - {host}:{port}"
diff --git a/web-frontend/test/unit/integrations/localBaserow/serviceTypes.spec.js b/web-frontend/test/unit/integrations/localBaserow/serviceTypes.spec.js
index c50f31017e..a2433be33c 100644
--- a/web-frontend/test/unit/integrations/localBaserow/serviceTypes.spec.js
+++ b/web-frontend/test/unit/integrations/localBaserow/serviceTypes.spec.js
@@ -1,6 +1,9 @@
 import {
   LocalBaserowListRowsServiceType,
   LocalBaserowGetRowServiceType,
+  LocalBaserowTableServiceType,
+  LocalBaserowCreateRowWorkflowServiceType,
+  LocalBaserowDeleteRowWorkflowServiceType,
 } from '@baserow/modules/integrations/localBaserow/serviceTypes'
 import { TestApp } from '@baserow/test/helpers/testApp'
 
@@ -149,4 +152,120 @@ describe('Local baserow service types', () => {
       dataProvider.getDataChunk(applicationContext, ['1', 'field_42'])
     ).toEqual('Field 42 content')
   })
+
+  test('LocalBaserowTableServiceType supportedTables returns all tables it is given.', () => {
+    const fakeApp = {}
+    const serviceType = new LocalBaserowTableServiceType(fakeApp)
+
+    const tables = [
+      {
+        id: 1,
+        name: 'Table 1',
+        is_data_sync: false,
+        is_two_way_data_sync: false,
+      },
+      {
+        id: 2,
+        name: 'Table 2',
+        is_data_sync: true,
+        is_two_way_data_sync: false,
+      },
+      {
+        id: 3,
+        name: 'Table 3',
+        is_data_sync: true,
+        is_two_way_data_sync: true,
+      },
+    ]
+
+    const result = serviceType.supportedTables(tables)
+    expect(result).toEqual(tables)
+    expect(result.length).toBe(3)
+  })
+
+  test('LocalBaserowCreateRowWorkflowServiceType supportedTables returns non data-synced tables or two-way data-synced tables.', () => {
+    const fakeApp = {}
+    const serviceType = new LocalBaserowCreateRowWorkflowServiceType(fakeApp)
+
+    const tables = [
+      {
+        id: 1,
+        name: 'Table 1',
+        is_data_sync: false,
+        is_two_way_data_sync: false,
+      },
+      {
+        id: 2,
+        name: 'Table 2',
+        is_data_sync: true,
+        is_two_way_data_sync: false,
+      },
+      {
+        id: 3,
+        name: 'Table 3',
+        is_data_sync: true,
+        is_two_way_data_sync: true,
+      },
+    ]
+
+    const result = serviceType.supportedTables(tables)
+    expect(result).toEqual([
+      {
+        id: 1,
+        name: 'Table 1',
+        is_data_sync: false,
+        is_two_way_data_sync: false,
+      },
+      {
+        id: 3,
+        name: 'Table 3',
+        is_data_sync: true,
+        is_two_way_data_sync: true,
+      },
+    ])
+    expect(result.length).toBe(2)
+  })
+
+  test('LocalBaserowDeleteRowWorkflowServiceType supportedTables returns non data-synced tables or two-way data-synced tables', () => {
+    const fakeApp = {}
+    const serviceType = new LocalBaserowDeleteRowWorkflowServiceType(fakeApp)
+
+    const tables = [
+      {
+        id: 1,
+        name: 'Table 1',
+        is_data_sync: false,
+        is_two_way_data_sync: false,
+      },
+      {
+        id: 2,
+        name: 'Table 2',
+        is_data_sync: true,
+        is_two_way_data_sync: false,
+      },
+      {
+        id: 3,
+        name: 'Table 3',
+        is_data_sync: true,
+        is_two_way_data_sync: true,
+      },
+    ]
+
+    const result = serviceType.supportedTables(tables)
+    expect(result).toEqual([
+      {
+        id: 1,
+        name: 'Table 1',
+        is_data_sync: false,
+        is_two_way_data_sync: false,
+      },
+      {
+        id: 3,
+        name: 'Table 3',
+        is_data_sync: true,
+        is_two_way_data_sync: true,
+      },
+    ])
+    expect(result.length).toBe(2)
+  })
 })