From 463c7c05316ca659e3dfc4b6e3480ceb8b81f8f7 Mon Sep 17 00:00:00 2001
From: Peter Evans <peter@baserow.io>
Date: Thu, 19 Mar 2026 09:22:57 +0000
Subject: [PATCH 1/2] Resolve a bug which causes the AI field formula to appear
 twice. (#5004)

---
 ...issue_which_caused_ai_field_formulas_to_appear_t.json | 9 +++++++++
 .../core/components/formula/FormulaInputField.vue        | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 changelog/entries/unreleased/bug/resolved_an_issue_which_caused_ai_field_formulas_to_appear_t.json

diff --git a/changelog/entries/unreleased/bug/resolved_an_issue_which_caused_ai_field_formulas_to_appear_t.json b/changelog/entries/unreleased/bug/resolved_an_issue_which_caused_ai_field_formulas_to_appear_t.json
new file mode 100644
index 0000000000..765437189d
--- /dev/null
+++ b/changelog/entries/unreleased/bug/resolved_an_issue_which_caused_ai_field_formulas_to_appear_t.json
@@ -0,0 +1,9 @@
+{
+    "type": "bug",
+    "message": "Resolved an issue which caused AI field formulas to appear twice in the UI.",
+    "issue_origin": "github",
+    "issue_number": null,
+    "domain": "database",
+    "bullet_points": [],
+    "created_at": "2026-03-18"
+}
\ No newline at end of file
diff --git a/web-frontend/modules/core/components/formula/FormulaInputField.vue b/web-frontend/modules/core/components/formula/FormulaInputField.vue
index 07751895fe..5d87731f32 100644
--- a/web-frontend/modules/core/components/formula/FormulaInputField.vue
+++ b/web-frontend/modules/core/components/formula/FormulaInputField.vue
@@ -165,6 +165,7 @@ export default {
       hoveredFunctionNode: null,
       isHandlingModeChange: false,
       intersectionObserver: null,
+      isEditorInitialized: false,
     }
   },
   computed: {
@@ -348,6 +349,11 @@ export default {
     },
 
     mode(newMode, oldMode) {
+      // In Vue 3, watchers can fire during the initial render cycle before
+      // mounted() completes. Skip if editor hasn't been initialized yet.
+      if (!this.isEditorInitialized) {
+        return
+      }
       // Skip automatic recreation if we're handling it manually in handleModeChange
       if (this.isHandlingModeChange) {
         return
@@ -437,6 +443,7 @@ export default {
           }),
         },
       })
+      this.isEditorInitialized = true
     },
     recreateEditor(formula = null) {
       const currentFormula =

From 6a1041fde033d8279fea665e5a7c0531c36d6631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Pardou?=
 <571533+jrmi@users.noreply.github.com>
Date: Thu, 19 Mar 2026 14:57:40 +0100
Subject: [PATCH 2/2] fix: data source create modal not being reset after
 creation (#4911)

---
 ..._not_reset_after_a_data_source_creati.json |  9 ++++++
 .../views/form/FormViewModePreviewSurvey.vue  |  3 +-
 web-frontend/locales/en.json                  |  3 +-
 .../dataSource/DataSourceCreateEditModal.vue  | 32 ++++++++++++-------
 .../page/header/DataSourceContext.vue         |  2 +-
 .../services/LocalBaserowServiceForm.vue      |  2 +-
 6 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 changelog/entries/unreleased/bug/data_source_context_was_not_reset_after_a_data_source_creati.json

diff --git a/changelog/entries/unreleased/bug/data_source_context_was_not_reset_after_a_data_source_creati.json b/changelog/entries/unreleased/bug/data_source_context_was_not_reset_after_a_data_source_creati.json
new file mode 100644
index 0000000000..5feb7c3569
--- /dev/null
+++ b/changelog/entries/unreleased/bug/data_source_context_was_not_reset_after_a_data_source_creati.json
@@ -0,0 +1,9 @@
+{
+    "type": "bug",
+    "message": "Data source context was not reset after a data source creation",
+    "issue_origin": "github",
+    "issue_number": null,
+    "domain": "builder",
+    "bullet_points": [],
+    "created_at": "2026-03-04"
+}
\ No newline at end of file
diff --git a/premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModePreviewSurvey.vue b/premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModePreviewSurvey.vue
index 59cb4e6075..22e4725966 100644
--- a/premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModePreviewSurvey.vue
+++ b/premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModePreviewSurvey.vue
@@ -55,8 +55,9 @@
                   type="primary"
                   size="large"
                   @click="next()"
-                  >Next</Button
                 >
+                  {{ $t('action.next') }}
+                </Button>
                 <template v-else-if="index >= fields.length - 1">
                   <Editable
                     ref="submitText"
diff --git a/web-frontend/locales/en.json b/web-frontend/locales/en.json
index 19dd1c7455..d72334c8af 100644
--- a/web-frontend/locales/en.json
+++ b/web-frontend/locales/en.json
@@ -58,7 +58,8 @@
     "download": "Download",
     "copyToClipboard": "Copy to clipboard",
     "reset": "Reset",
-    "hide": "Hide"
+    "hide": "Hide",
+    "next": "Next"
   },
   "adminType": {
     "settings": "Settings",
diff --git a/web-frontend/modules/builder/components/dataSource/DataSourceCreateEditModal.vue b/web-frontend/modules/builder/components/dataSource/DataSourceCreateEditModal.vue
index 3a1c647873..2a9688fe08 100644
--- a/web-frontend/modules/builder/components/dataSource/DataSourceCreateEditModal.vue
+++ b/web-frontend/modules/builder/components/dataSource/DataSourceCreateEditModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <Modal ref="modal" wide v-on="$attrs">
+  <Modal ref="modal" wide v-on="$attrs" @show="onShow">
     <h2 class="box__title">
       {{
         create
@@ -19,7 +19,7 @@
         :data-source="dataSource"
         :builder="builder"
         :page="dataSourcePage"
-        :default-values="dataSource"
+        :default-values="currentDefaultValues"
         :integrations="integrations"
         :create="create"
         :application-context-additions="{
@@ -77,18 +77,18 @@ export default {
   props: {
     dataSourceId: { type: Number, required: false, default: null },
   },
-  emits: ['updated'],
+  emits: ['updated', 'data-source-created'],
   data() {
     return {
       loading: false,
-      actualDataSourceId: this.dataSourceId,
       changed: false,
+      currentDefaultValues: {},
     }
   },
   computed: {
     submitIsDisabled() {
       return (
-        this.loading || !this.changed || this.$refs.dataSourceForm?.v$.$anyError
+        this.loading || !this.changed || this.$refs.dataSourceForm.v$.$anyError
       )
     },
     dataSources() {
@@ -108,7 +108,7 @@ export default {
       return [...this.dataSources, ...this.sharedDataSources]
     },
     create() {
-      return !this.actualDataSourceId
+      return !this.dataSourceId
     },
     isShared() {
       return !this.create && this.dataSource?.page_id === this.sharedPage.id
@@ -117,9 +117,7 @@ export default {
       if (this.create) {
         return undefined
       }
-      return this.allDataSources.find(
-        ({ id }) => id === this.actualDataSourceId
-      )
+      return this.allDataSources.find(({ id }) => id === this.dataSourceId)
     },
     integrations() {
       return this.$store.getters['integration/getIntegrations'](this.builder)
@@ -143,14 +141,22 @@ export default {
       ]
     },
   },
+  watch: {
+    dataSource(newValue) {
+      this.currentDefaultValues = { ...this.dataSource }
+    },
+  },
   methods: {
     ...mapActions({
       actionFetchIntegrations: 'integration/fetch',
       actionCreateDataSource: 'dataSource/create',
       actionUpdateDataSource: 'dataSource/update',
     }),
+    onShow() {
+      this.currentDefaultValues = { ...this.dataSource }
+    },
     onValuesChanged(values) {
-      if (!this.actualDataSourceId) {
+      if (!this.dataSourceId) {
         this.changed = true
         return
       }
@@ -159,6 +165,10 @@ export default {
       )
 
       if (differences.length) {
+        this.currentDefaultValues = {
+          ...this.currentDefaultValues,
+          ...Object.fromEntries(differences),
+        }
         this.changed = true
       }
     },
@@ -172,7 +182,7 @@ export default {
             page: this.currentPage,
             values,
           })
-          this.actualDataSourceId = createdDataSource.id
+          this.$emit('data-source-created', createdDataSource)
         } else {
           const differences = Object.fromEntries(
             Object.entries(values).filter(
diff --git a/web-frontend/modules/builder/components/page/header/DataSourceContext.vue b/web-frontend/modules/builder/components/page/header/DataSourceContext.vue
index e82d1054c2..e16e436da2 100644
--- a/web-frontend/modules/builder/components/page/header/DataSourceContext.vue
+++ b/web-frontend/modules/builder/components/page/header/DataSourceContext.vue
@@ -112,9 +112,9 @@
       </div>
     </template>
     <DataSourceCreateEditModal
-      :key="currentDataSourceId"
       ref="dataSourceCreateEditModal"
       :data-source-id="currentDataSourceId"
+      @data-source-created="currentDataSourceId = $event.id"
       @hidden="onHide"
     />
   </Context>
diff --git a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
index c03046a035..927d72835e 100644
--- a/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
+++ b/web-frontend/modules/integrations/localBaserow/components/services/LocalBaserowServiceForm.vue
@@ -146,7 +146,7 @@ export default {
       )
     },
     databases() {
-      return this.selectedIntegration?.context_data.databases || []
+      return this.selectedIntegration?.context_data?.databases || []
     },
   },
   watch: {