From 754eb9fb9875c96c19a652c996e7b0b6553ecd75 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, 12 Feb 2026 13:36:20 +0100
Subject: [PATCH 1/3] Translation fix and other minor stuff (#4733)

---
 web-frontend/config/nuxt.config.base.ts         | 7 ++++---
 web-frontend/env-remap.mjs                      | 1 +
 web-frontend/i18n.config.ts                     | 1 -
 web-frontend/modules/automation/locales/en.json | 2 +-
 web-frontend/modules/database/routes.js         | 8 --------
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/web-frontend/config/nuxt.config.base.ts b/web-frontend/config/nuxt.config.base.ts
index 1f51190355..6d6d36a435 100644
--- a/web-frontend/config/nuxt.config.base.ts
+++ b/web-frontend/config/nuxt.config.base.ts
@@ -60,13 +60,14 @@ export default defineNuxtConfig({
   i18n: {
     strategy: 'no_prefix',
     defaultLocale: 'en',
+    langDir: 'locales',
+    locales,
+    trailingSlash: true,
     detectBrowserLanguage: {
       useCookie: true,
       cookieKey: 'i18n-language',
+      redirectOn: 'root',
     },
-    langDir: 'locales',
-    locales,
-    trailingSlash: true,
     vueI18n: './i18n.config.ts',
   },
   nitro: {
diff --git a/web-frontend/env-remap.mjs b/web-frontend/env-remap.mjs
index 3851247415..b36379012e 100644
--- a/web-frontend/env-remap.mjs
+++ b/web-frontend/env-remap.mjs
@@ -47,6 +47,7 @@ const envMapping = {
   BASEROW_DISABLE_SUPPORT: 'NUXT_PUBLIC_BASEROW_DISABLE_SUPPORT',
   BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN:
     'NUXT_PUBLIC_BASEROW_INTEGRATIONS_PERIODIC_MINUTE_MIN',
+  // TODO find a way to load these vars from private folders
   BASEROW_PREMIUM_GROUPED_AGGREGATE_SERVICE_MAX_SERIES:
     'NUXT_PUBLIC_BASEROW_PREMIUM_GROUPED_AGGREGATE_SERVICE_MAX_SERIES',
   BASEROW_PRICING_URL: 'NUXT_PUBLIC_BASEROW_PRICING_URL',
diff --git a/web-frontend/i18n.config.ts b/web-frontend/i18n.config.ts
index 3dc66abaef..4f4f5fdffa 100644
--- a/web-frontend/i18n.config.ts
+++ b/web-frontend/i18n.config.ts
@@ -1,5 +1,4 @@
 export default defineI18nConfig(() => ({
   legacy: true,
-  locale: 'en',
   fallbackLocale: 'en',
 }))
diff --git a/web-frontend/modules/automation/locales/en.json b/web-frontend/modules/automation/locales/en.json
index 44965f7f3c..767e6b5a6d 100644
--- a/web-frontend/modules/automation/locales/en.json
+++ b/web-frontend/modules/automation/locales/en.json
@@ -1,6 +1,6 @@
 {
   "automationWorkflow": {
-    "title": "Worflow"
+    "title": "Workflow"
   },
   "automationWelcomeGuidedTourStep": {
     "title": "Welcome to Baserow Automations!",
diff --git a/web-frontend/modules/database/routes.js b/web-frontend/modules/database/routes.js
index 8cb4761202..6f76b85ec0 100644
--- a/web-frontend/modules/database/routes.js
+++ b/web-frontend/modules/database/routes.js
@@ -10,14 +10,6 @@ export const routes = [
     name: 'database-table',
     path: '/database/:databaseId/table/:tableId/:viewId?',
     file: path.resolve(__dirname, 'pages/table.vue'),
-    /*props(route) {
-          const p = { ...route.params }
-          p.databaseId = parseInt(p.databaseId)
-          p.tableId = parseInt(p.tableId)
-          p.viewId = p.viewId ? parseInt(p.viewId) : null
-          console.log(p)
-          return p
-        },*/
     children: [
       {
         path: 'row/:rowId',

From afa1d8c1a57dffba1eafcac31e027f6b49193a59 Mon Sep 17 00:00:00 2001
From: Davide Silvestri <75379892+silvestrid@users.noreply.github.com>
Date: Thu, 12 Feb 2026 14:09:08 +0100
Subject: [PATCH 2/3] chore: fix AI assistant env vars (#4736)

---
 .../components/assistant/AssistantSidebarItem.vue    |  2 +-
 .../databaseOnboardingStepTypes.js                   |  2 +-
 .../modules/baserow_enterprise/module.js             | 10 +++++++---
 .../baserow_premium/components/PaidFeaturesModal.vue |  4 ++--
 .../web-frontend/modules/baserow_premium/module.js   | 12 ++++++++----
 web-frontend/modules/core/module.js                  |  3 +--
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/enterprise/web-frontend/modules/baserow_enterprise/components/assistant/AssistantSidebarItem.vue b/enterprise/web-frontend/modules/baserow_enterprise/components/assistant/AssistantSidebarItem.vue
index 81b618cacd..70edd3c0f1 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/components/assistant/AssistantSidebarItem.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/components/assistant/AssistantSidebarItem.vue
@@ -41,7 +41,7 @@ export default {
       )
     },
     isConfigured() {
-      return !!this.$config.public.baserowEnterpriseAssistantLLMModel
+      return !!this.$config.public.baserowEnterpriseAssistantLlmModel
     },
   },
   mounted() {
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/databaseOnboardingStepTypes.js b/enterprise/web-frontend/modules/baserow_enterprise/databaseOnboardingStepTypes.js
index 16ab178320..a59d533865 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/databaseOnboardingStepTypes.js
+++ b/enterprise/web-frontend/modules/baserow_enterprise/databaseOnboardingStepTypes.js
@@ -34,7 +34,7 @@ export class AIDatabaseOnboardingStepType extends DatabaseOnboardingStepType {
   isVisible() {
     // Only show if the AI-assistant is configured because it will use the
     // AI-assistant to create the database.
-    return !!this.app.$config.public.baserowEnterpriseAssistantLLMModel
+    return !!this.app.$config.public.baserowEnterpriseAssistantLlmModel
   }
 
   isValid(data, vuelidate, refs) {
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/module.js b/enterprise/web-frontend/modules/baserow_enterprise/module.js
index dcb6b17371..93bea7ad48 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/module.js
+++ b/enterprise/web-frontend/modules/baserow_enterprise/module.js
@@ -7,6 +7,7 @@ import {
 } from 'nuxt/kit'
 import { routes, rootChildRoutes } from './routes'
 import { locales } from '../../../../web-frontend/config/locales.js'
+import _ from 'lodash'
 
 export default defineNuxtModule({
   meta: {
@@ -77,9 +78,12 @@ export default defineNuxtModule({
 
     // Runtime config defaults - values can be overridden at runtime via NUXT_ prefixed env vars
     // See env-remap.mjs for the env var remapping that enables backwards compatibility
-    Object.assign(nuxt.options.runtimeConfig.public, {
-      baserowEnterpriseAssistantLLMModel: null,
-    })
+    nuxt.options.runtimeConfig.public = _.defaultsDeep(
+      nuxt.options.runtimeConfig.public,
+      {
+        baserowEnterpriseAssistantLlmModel: '',
+      }
+    )
 
     // Override Baserow's existing default.scss in favor of our own because that one
     // imports the original. We do this so that we can use the existing variables,
diff --git a/premium/web-frontend/modules/baserow_premium/components/PaidFeaturesModal.vue b/premium/web-frontend/modules/baserow_premium/components/PaidFeaturesModal.vue
index 906639b5ff..2ec2642ec0 100644
--- a/premium/web-frontend/modules/baserow_premium/components/PaidFeaturesModal.vue
+++ b/premium/web-frontend/modules/baserow_premium/components/PaidFeaturesModal.vue
@@ -51,7 +51,7 @@
         <Button
           type="primary"
           size="large"
-          :href="getPricingURL"
+          :href="pricingURL"
           target="_blank"
           tag="a"
           >{{ $t('paidFeaturesModal.viewPricing') }}</Button
@@ -97,7 +97,7 @@ export default {
     }
   },
   computed: {
-    getPricingURL() {
+    pricingURL() {
       const runtimeConfig = useRuntimeConfig()
       return (
         runtimeConfig.public.baserowPricingUrl || getPricingURL(this.instanceId)
diff --git a/premium/web-frontend/modules/baserow_premium/module.js b/premium/web-frontend/modules/baserow_premium/module.js
index 267209c328..5769440e13 100644
--- a/premium/web-frontend/modules/baserow_premium/module.js
+++ b/premium/web-frontend/modules/baserow_premium/module.js
@@ -6,6 +6,7 @@ import {
 } from 'nuxt/kit'
 import { routes } from './routes'
 import { locales } from '../../../../web-frontend/config/locales.js'
+import _ from 'lodash'
 
 export default defineNuxtModule({
   meta: {
@@ -49,9 +50,12 @@ export default defineNuxtModule({
 
     // Runtime config defaults - values can be overridden at runtime via NUXT_ prefixed env vars
     // See env-remap.mjs for the env var remapping that enables backwards compatibility
-    Object.assign(nuxt.options.runtimeConfig.public, {
-      baserowPremiumGroupedAggregateServiceMaxSeries: 3,
-      baserowPricingUrl: null,
-    })
+    nuxt.options.runtimeConfig.public = _.defaultsDeep(
+      nuxt.options.runtimeConfig.public,
+      {
+        baserowPremiumGroupedAggregateServiceMaxSeries: 3,
+        baserowPricingUrl: '',
+      }
+    )
   },
 })
diff --git a/web-frontend/modules/core/module.js b/web-frontend/modules/core/module.js
index dc94b0ac20..0df1121670 100644
--- a/web-frontend/modules/core/module.js
+++ b/web-frontend/modules/core/module.js
@@ -13,7 +13,6 @@ import {
 } from '@nuxt/kit'
 import { routes } from './routes'
 import _ from 'lodash'
-import defu from 'defu'
 import pathe from 'pathe'
 
 import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'
@@ -97,7 +96,7 @@ export default defineNuxtModule({
     // See env-remap.mjs for the env var remapping that enables backwards compatibility
     nuxt.options.runtimeConfig.privateBackendUrl = 'http://backend:8000'
 
-    nuxt.options.runtimeConfig.public = defu(
+    nuxt.options.runtimeConfig.public = _.defaultsDeep(
       nuxt.options.runtimeConfig.public,
       {
         buildDate: new Date().toISOString(),

From 1c5599bf35a7bcf0d3a7a7d4970d3f703240403e Mon Sep 17 00:00:00 2001
From: Jonathan Adeline <jonathan@baserow.io>
Date: Thu, 12 Feb 2026 17:14:13 +0400
Subject: [PATCH 3/3] Fix z-index issue with contexts and modals (#4734)

* fix: Append elements to the body instead of prepending them to ensure proper stacking order based on DOM order.

* update snapshot
---
 .../modules/core/mixins/moveToBody.js         |  6 +++--
 .../viewDecoratorContext.spec.js.snap         | 24 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/web-frontend/modules/core/mixins/moveToBody.js b/web-frontend/modules/core/mixins/moveToBody.js
index d97497a663..08b39e3d2b 100644
--- a/web-frontend/modules/core/mixins/moveToBody.js
+++ b/web-frontend/modules/core/mixins/moveToBody.js
@@ -64,9 +64,11 @@ export default {
       }
     } else if (this.$el) {
       // Because there is no parent we can directly move the component to the
-      // top of the body so it will be positioned over any other element.
+      // end of the body. Elements that mount later are appended after earlier
+      // ones so that they appear on top when sharing the same z-index (DOM
+      // order determines visual stacking for equal z-index values).
       const body = document.body
-      body.insertBefore(this.$el, body.firstChild)
+      body.appendChild(this.$el)
       this.fireMovedToBodyHandlers()
     }
 
diff --git a/web-frontend/test/unit/database/components/view/__snapshots__/viewDecoratorContext.spec.js.snap b/web-frontend/test/unit/database/components/view/__snapshots__/viewDecoratorContext.spec.js.snap
index 70df5760d6..0ea3217dc6 100644
--- a/web-frontend/test/unit/database/components/view/__snapshots__/viewDecoratorContext.spec.js.snap
+++ b/web-frontend/test/unit/database/components/view/__snapshots__/viewDecoratorContext.spec.js.snap
@@ -122,6 +122,12 @@ exports[`GridViewRows component with decoration > Should show cant add decorator
       viewDecoratorType.onlyForPremium
     </div>
   </div>
+  <div
+    data-v-app=""
+    id="__nuxt"
+  >
+    <!---->
+  </div>
   <div
     class="context"
     style="top: auto; right: auto; bottom: auto; left: auto;"
@@ -231,12 +237,6 @@ exports[`GridViewRows component with decoration > Should show cant add decorator
   </div>
   <!--v-if-->
   <!--v-if-->
-  <div
-    data-v-app=""
-    id="__nuxt"
-  >
-    <!---->
-  </div>
 </body>
 `;
 
@@ -252,6 +252,12 @@ exports[`GridViewRows component with decoration > Should show unavailable decora
       viewDecoratorType.onlyForPremium
     </div>
   </div>
+  <div
+    data-v-app=""
+    id="__nuxt"
+  >
+    <!---->
+  </div>
   <div
     class="context"
     style="top: auto; right: auto; bottom: auto; left: auto;"
@@ -367,12 +373,6 @@ exports[`GridViewRows component with decoration > Should show unavailable decora
   </div>
   <!--v-if-->
   <!--v-if-->
-  <div
-    data-v-app=""
-    id="__nuxt"
-  >
-    <!---->
-  </div>
 </body>
 `;