Merge branch 'main' into andrew/web-3817-right-click-context-menu

packages/frontend-2/components/project/page/acc/ModelItem.vue

@@ -1,7 +1,8 @@
 <template>
   <button
-    class="group text-left relative border border-foreground-1 bg-foundation rounded p-1 hover:text-primary hover:bg-primary-muted transition cursor-pointer hover:shadow-md"
-    :class="selected ? 'border border-foreground-2 bg-foundation-focus' : ''"
+    :class="`group text-left relative border border-foreground-1 bg-foundation rounded p-1 hover:text-primary hover:bg-primary-muted transition hover:shadow-md ${
+      selected ? 'border border-foreground-2 bg-foundation-focus' : ''
+    } ${disabled ? 'cursor-not-allowed' : 'cursor-pointer'}`"
     :disabled="disabled"
   >
     <div class="flex items-center space-x-2 max-[275px]:space-x-0">

packages/frontend-2/plugins/060-dataPreload.ts

@@ -5,6 +5,7 @@ import {
 } from '~/lib/auth/graphql/queries'
 import { usePreloadApolloQueries } from '~/lib/common/composables/graphql'
 import { mainServerInfoDataQuery } from '~/lib/core/composables/server'
+import { navigationWorkspaceSwitcherQuery } from '~/lib/navigation/graphql/queries'
 
 /**
  * Prefetches data for specific routes to avoid the problem of serial API requests
@@ -26,7 +27,17 @@ export default defineNuxtPlugin(async (ctx) => {
   // Standard/global
   promises.push(
     preload({
-      queries: [{ query: activeUserQuery }, { query: mainServerInfoDataQuery }]
+      queries: [
+        { query: activeUserQuery },
+        { query: mainServerInfoDataQuery },
+        ...(isWorkspacesEnabled.value
+          ? [
+              {
+                query: navigationWorkspaceSwitcherQuery
+              }
+            ]
+          : [])
+      ]
     })
   )
 

packages/server/modules/acc/domain/constants.ts

@@ -4,7 +4,7 @@ import { StringEnum } from '@speckle/shared'
 export const ImporterAutomateFunctions = {
   svf2: {
     functionId: '4665e0b3ba',
-    functionReleaseId: '5cedfc8034'
+    functionReleaseId: '92588ce1ba'
   }
 }