[pull] develop from baserow:develop

changelog/entries/unreleased/bug/fix_enterprise_logo.json

@@ -0,0 +1,9 @@
+{
+    "type": "bug",
+    "message": "Custom enterprise logo can be set again",
+    "issue_origin": "github",
+    "issue_number": null,
+    "domain": "core",
+    "bullet_points": [],
+    "created_at": "2026-04-15"
+}

enterprise/web-frontend/modules/baserow_enterprise/components/EnterpriseLogo.vue

@@ -7,6 +7,8 @@
 </template>
 
 <script>
+import baserowLogo from '@baserow/modules/core/static/img/logo.svg?url'
+
 export default {
   name: 'EnterpriseLogo',
   methods: {
@@ -15,7 +17,6 @@ export default {
       return !!settings.co_branding_logo
     },
     getLogoUrl(parent) {
-      const baserowLogo = require('@baserow/modules/core/static/img/logo.svg?url')
       const settings = this.$store.getters['settings/get']
       if (settings.co_branding_logo) {
         return settings.co_branding_logo.url

web-frontend/modules/core/components/Logo.vue

@@ -1,13 +1,15 @@
 <template>
-  <!-- TODO MIG component :is="getComponent()" v-if="getComponent()" /-->
   <!-- must be in sync with modules/baserow_enterprise/components/EnterpriseLogo.vue -->
-  <div class="logo">
-    <img
-      src="@baserow/modules/core/static/img/logo.svg?url"
-      v-bind="$attrs"
-      :class="[$attrs.class]"
-    />
-  </div>
+  <component :is="getComponent()" v-if="getComponent()"></component>
+  <template v-else>
+    <div class="logo">
+      <img
+        src="@baserow/modules/core/static/img/logo.svg?url"
+        v-bind="$attrs"
+        :class="[$attrs.class]"
+      />
+    </div>
+  </template>
 </template>
 
 <script>