[pull] develop from baserow:develop

.env.local-dev.example

@@ -67,4 +67,4 @@ EMAIL_PORT=1025
 # Media files (path relative to the backend folder)
 # =============================================================================
 MEDIA_ROOT=media
-MEDIA_URL=http://localhost:4000/media/
+MEDIA_URL=http://localhost:8000/media/

.github/workflows/ci.yml

@@ -476,13 +476,13 @@ jobs:
           EXTRA_VITEST_PARAMS: --shard=${{ matrix.shard }}/3 --reporter=junit --outputFile=./reports/junit.xml
         run: |
           mkdir -p reports
+          set -o pipefail
           docker run \
             --name=webfrontend_test \
             -e EXTRA_VITEST_PARAMS="$EXTRA_VITEST_PARAMS" \
             ${{ needs.build-frontend.outputs.image }} ci-test | tee reports/stdout.txt
           docker cp webfrontend_test:/baserow/web-frontend/reports/junit.xml ./reports
           docker rm webfrontend_test
-          ls ./reports
 
       - name: Upload test reports
         uses: actions/upload-artifact@v4
@@ -756,7 +756,7 @@ jobs:
           CI: 1
         run: |
           cd e2e-tests
-          CI=1 npx playwright test --timeout=30000 --grep-invert=@slow --shard=${{ matrix.shard }}/2 --project=firefox
+          npx playwright test --timeout=30000 --grep-invert=@slow --shard=${{ matrix.shard }}/2 --project=firefox
 
       - name: Upload E2E test results
         uses: actions/upload-artifact@v4

docker-compose.dev.yml

@@ -31,7 +31,7 @@ services:
       - BASEROW_BACKEND_DEBUGGER_PORT=${BASEROW_BACKEND_DEBUGGER_PORT:-5678}
       - BASEROW_DANGEROUS_SILKY_ANALYZE_QUERIES
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4318
-      - BASEROW_EMBEDDINGS_API_URL=${BASEROW_EMBEDDINGS_API_URL:-http://embeddings:80}
+      - BASEROW_EMBEDDINGS_API_URL=${BASEROW_EMBEDDINGS_API_URL}
     build:
       dockerfile: ./backend/Dockerfile
       context: .
@@ -225,7 +225,7 @@ services:
       local:
     ports:
       - "4318:4318"
-  
+
   embeddings:
     profiles: ["ai"]
     build:
@@ -254,4 +254,3 @@ volumes:
   nuxt:
   storybook:
   cache:
-

e2e-tests/pages/baserowPage.ts

@@ -24,6 +24,7 @@ export class BaserowPage {
   }
 
   async goto(params = {}) {
+    await this.page.waitForTimeout(100); // Small delay before navigation to help with Firefox timing issues
     await this._goto(this.getFullUrl(), {
       waitUntil: "hydration",
       ...params,
@@ -37,7 +38,7 @@ export class BaserowPage {
   async changeDropdown(
     currentValue: string,
     newValue: string,
-    location?: Locator
+    location?: Locator,
   ) {
     await (location ? location : this.page)
       .locator(".dropdown__selected-text")

e2e-tests/tests/builder/builder.spec.ts

@@ -1,9 +1,8 @@
 import { expect, test } from "../baserowTest";
 
 test.describe("Builder application test suite", () => {
-  test.beforeEach(async ({ workspacePage, goto }) => {
-    await goto(workspacePage.getFullUrl(), { waitUntil: "hydration" });
-    //await workspacePage.goto();
+  test.beforeEach(async ({ workspacePage }) => {
+    await workspacePage.goto();
   });
 
   test("Can create builder application", async ({ page }) => {
@@ -14,7 +13,7 @@ test.describe("Builder application test suite", () => {
 
     await expect(
       page.locator(".page-editor").getByText("Page settings"),
-      "Check we see the default page."
+      "Check we see the default page.",
     ).toBeVisible();
   });
 
@@ -28,7 +27,7 @@ test.describe("Builder application test suite", () => {
 
     await expect(
       page.locator(".tree__link").getByText("My super application"),
-      "Checks the name of the application is displayed in the sidebar."
+      "Checks the name of the application is displayed in the sidebar.",
     ).toBeVisible();
   });
 });

e2e-tests/tests/builder/builderPage.spec.ts

@@ -23,7 +23,7 @@ test.describe("Builder page test suite", () => {
     await expect(
       page
         .locator(".preview-navigation-bar__address-bar-path")
-        .getByText("/complex/path")
+        .getByText("/complex/path"),
     ).toBeVisible();
   });
 
@@ -46,7 +46,7 @@ test.describe("Builder page test suite", () => {
 
     await page.locator(".button").getByText("Save").click();
     await expect(
-      page.getByText("The page settings have been updated.")
+      page.getByText("The page settings have been updated."),
     ).toBeVisible();
 
     await page.locator(".modal__close", { title: "Close" }).click();
@@ -55,7 +55,7 @@ test.describe("Builder page test suite", () => {
     await expect(
       page
         .locator(".preview-navigation-bar__address-bar-path")
-        .getByText("/new/path")
+        .getByText("/new/path"),
     ).toBeVisible();
   });
 
@@ -64,10 +64,10 @@ test.describe("Builder page test suite", () => {
     await page.getByText("Heading", { exact: true }).click();
 
     await expect(
-      page.locator(".modal__box").getByText("Add new element")
+      page.locator(".modal__box").getByText("Add new element"),
     ).toBeHidden();
     await expect(
-      page.locator(".element-preview__name-tag").getByText("Heading")
+      page.locator(".element-preview__name-tag").getByText("Heading"),
     ).toBeVisible();
   });
 
@@ -80,10 +80,10 @@ test.describe("Builder page test suite", () => {
     await page.getByText("Heading", { exact: true }).click();
 
     await expect(
-      page.locator(".modal__box").getByText("Add new element")
+      page.locator(".modal__box").getByText("Add new element"),
     ).toBeHidden();
     await expect(
-      page.locator(".element-preview__name-tag").getByText("Heading")
+      page.locator(".element-preview__name-tag").getByText("Heading"),
     ).toBeVisible();
   });
 
@@ -131,7 +131,7 @@ test.describe("Builder page test suite", () => {
     // Save the page
     await page.getByRole("button", { name: "Save" }).click();
     await expect(
-      page.getByText("The page settings have been updated.")
+      page.getByText("The page settings have been updated."),
     ).toBeVisible();
 
     // Close the modal
@@ -157,15 +157,18 @@ test.describe("Builder page test suite", () => {
       ],
     });
 
-    await page.getByText("linkim");
+    // Reload the page to see the newly created element
+    await builderPagePage.goto();
+
+    await expect(page.getByRole("link", { name: "linkim" })).toBeVisible();
 
     // Set the value of page parameters
     await page.getByLabel("my_param=").fill("foo");
     await page.getByLabel("my_param2=").fill("15");
 
     await expect(page.getByRole("link", { name: "linkim" })).toHaveAttribute(
       "href",
-      /\?my_param2=15&my_param=foo/
+      /\?my_param2=15&my_param=foo/,
     );
   });
 });

enterprise/web-frontend/modules/baserow_enterprise/components/crudTable/fields/HighestPaidRoleField.vue

@@ -6,7 +6,7 @@
       href="https://baserow.io/user-docs/subscriptions-overview#who-is-considered-a-user-for-billing-purposes"
       target="_blank"
     >
-      <Badge v-if="role && role.isBillable" color="cyan" class="margin-left-1"
+      <Badge v-if="roleIsBillable" color="cyan" class="margin-left-1"
         >{{ $t('highestPaidRoleField.billable') }}
       </Badge>
     </a>
@@ -33,6 +33,9 @@ export default {
     roleName() {
       return this.role ? this.role.name : ''
     },
+    roleIsBillable() {
+      return this.role ? this.role.isBillable : false
+    },
     role() {
       return this.roles.find((r) => r.uid === this.roleUID)
     },

enterprise/web-frontend/modules/baserow_enterprise/integrations/common/components/CommonOIDCSettingForm.vue

@@ -9,7 +9,12 @@
     <OpenIdConnectSettingsForm
       v-bind="$attrs"
       ref="form"
-      @values-changed="checkValidity"
+      :auth-provider="authProvider"
+      :auth-provider-type="authProviderType"
+      :auth-providers="authProviders"
+      :default-values="defaultValues"
+      :disabled="disabled"
+      @values-changed="onValuesChanged"
     >
       <template #config>
         <FormGroup
@@ -54,7 +59,7 @@ import { copyToClipboard } from '@baserow/modules/database/utils/clipboard'
 
 export default {
   name: 'CommonOIDCSettingsForm',
-  emits: ['delete'],
+  emits: ['delete', 'values-changed'],
   components: { OpenIdConnectSettingsForm, AuthProviderWithModal },
   mixins: [authProviderForm],
   props: {
@@ -80,8 +85,8 @@ export default {
 
       const userSourceUid = userSourceType.genUid(this.userSource)
 
-      const url = `${this.app.$config.public.publicBackendUrl}/api/user-source/${userSourceUid}/sso/oauth2/openid_connect/callback/`
-      const previewUrl = `${this.app.$config.public.publicBackendUrl.substr(
+      const url = `${this.$config.public.publicBackendUrl}/api/user-source/${userSourceUid}/sso/oauth2/openid_connect/callback/`
+      const previewUrl = `${this.$config.public.publicBackendUrl.substr(
         0,
         10
       )}.../user-source/${userSourceUid}/sso/...`
@@ -113,6 +118,10 @@ export default {
   },
   methods: {
     copyToClipboard,
+    onValuesChanged(values) {
+      this.checkValidity()
+      this.$emit('values-changed', values)
+    },
     checkValidity() {
       if (!this.$refs.form.isFormValid() && this.$refs.form.v$.$anyDirty) {
         this.inError = true

enterprise/web-frontend/modules/baserow_enterprise/integrations/common/components/CommonSamlSettingForm.vue

@@ -9,7 +9,12 @@
     <SamlSettingsForm
       v-bind="$attrs"
       ref="form"
-      @values-changed="checkValidity"
+      :auth-provider="authProvider"
+      :auth-provider-type="authProviderType"
+      :auth-providers="authProviders"
+      :default-values="defaultValues"
+      :disabled="disabled"
+      @values-changed="onValuesChanged"
     >
       <template #config>
         <FormGroup
@@ -77,12 +82,16 @@ export default {
       type: Object,
       required: true,
     },
+    application: {
+      type: Object,
+      required: true,
+    },
     userSource: {
       type: Object,
       required: true,
     },
   },
-  emits: ['delete'],
+  emits: ['delete', 'values-changed'],
   setup() {
     return { v$: useVuelidate({ $lazy: true }) }
   },
@@ -104,8 +113,16 @@ export default {
   },
   methods: {
     copyToClipboard,
+    onValuesChanged(values) {
+      this.checkValidity()
+      this.$emit('values-changed', values)
+    },
     checkValidity() {
-      if (!this.$refs.form.isFormValid() && this.$refs.form.v$.$anyDirty) {
+      if (
+        this.$refs.form &&
+        !this.$refs.form.isFormValid() &&
+        this.$refs.form.v$.$anyDirty
+      ) {
         this.inError = true
       } else {
         this.inError = false

enterprise/web-frontend/modules/baserow_enterprise/plugin.js

@@ -122,8 +122,8 @@ export default defineNuxtPlugin({
       new WriteFieldValuesPermissionManagerType(context)
     )
 
-    $store.registerModule('authProviderAdmin', authProviderAdminStore)
-    $store.registerModule('assistant', assistantStore)
+    $store.registerModuleNuxtSafe('authProviderAdmin', authProviderAdminStore)
+    $store.registerModuleNuxtSafe('assistant', assistantStore)
 
     $registry.register('admin', new AuthProvidersType(context))
     $registry.unregister(

enterprise/web-frontend/vitest.config.ts

@@ -1,16 +1,10 @@
+import baseConfig from '../../web-frontend/vitest.config.base'
 import { defineVitestConfig } from '@nuxt/test-utils/config'
-import path from 'path'
 
 export default defineVitestConfig({
   test: {
-    globals: true,
-    environment: 'nuxt',
+    ...baseConfig.test,
     setupFiles: ['../web-frontend/vitest.setup.ts'],
-    environmentOptions: {
-      nuxt: {
-        domEnvironment: 'happy-dom',
-      },
-    },
     include: ['../enterprise/web-frontend/test/**/*.{test,spec}.{js,ts}'],
   },
 })

premium/web-frontend/modules/baserow_premium/plugin.js

@@ -67,14 +67,6 @@ import {
 import { SingleSelectFormattingType } from '@baserow_premium/dashboard/chartFieldFormatting'
 import { GenerateAIValuesJobType } from '@baserow_premium/jobTypes'
 import { GenerateAIValuesContextItemType } from '@baserow_premium/fieldContextItemTypes'
-import en from '@baserow_premium/locales/en.json'
-import fr from '@baserow_premium/locales/fr.json'
-import nl from '@baserow_premium/locales/nl.json'
-import de from '@baserow_premium/locales/de.json'
-import es from '@baserow_premium/locales/es.json'
-import it from '@baserow_premium/locales/it.json'
-import pl from '@baserow_premium/locales/pl.json'
-import ko from '@baserow_premium/locales/ko.json'
 import { PremiumLicenseType } from '@baserow_premium/licenseTypes'
 import { PersonalViewOwnershipType } from '@baserow_premium/viewOwnershipTypes'
 import { ViewOwnershipPermissionManagerType } from '@baserow_premium/permissionManagerTypes'
@@ -144,14 +136,14 @@ export default defineNuxtPlugin({
       i18n.mergeLocaleMessage('ko', ko)
     }*/
 
-    $store.registerModule('row_comments', rowCommentsStore)
-    $store.registerModule('page/view/kanban', kanbanStore)
-    $store.registerModule('page/view/calendar', calendarStore)
-    $store.registerModule('page/view/timeline', timelineStore)
-    $store.registerModule('template/view/kanban', kanbanStore)
-    $store.registerModule('template/view/calendar', calendarStore)
-    $store.registerModule('template/view/timeline', timelineStore)
-    $store.registerModule('impersonating', impersonatingStore)
+    $store.registerModuleNuxtSafe('row_comments', rowCommentsStore)
+    $store.registerModuleNuxtSafe('page/view/kanban', kanbanStore)
+    $store.registerModuleNuxtSafe('page/view/calendar', calendarStore)
+    $store.registerModuleNuxtSafe('page/view/timeline', timelineStore)
+    $store.registerModuleNuxtSafe('template/view/kanban', kanbanStore)
+    $store.registerModuleNuxtSafe('template/view/calendar', calendarStore)
+    $store.registerModuleNuxtSafe('template/view/timeline', timelineStore)
+    $store.registerModuleNuxtSafe('impersonating', impersonatingStore)
 
     $registry.registerNamespace('aiFieldOutputType')
     $registry.registerNamespace('paidFeature')