diff --git a/packages/frontend-2/components/header/NavUserMenu.vue b/packages/frontend-2/components/header/NavUserMenu.vue index c99ea3c86..3c0f61aa5 100644 --- a/packages/frontend-2/components/header/NavUserMenu.vue +++ b/packages/frontend-2/components/header/NavUserMenu.vue @@ -142,19 +142,18 @@ import { CloudArrowDownIcon, ChatBubbleLeftRightIcon } from '@heroicons/vue/24/outline' -import { useQuery } from '@vue/apollo-composable' import { Roles } from '@speckle/shared' import type { Optional } from '@speckle/shared' import { useActiveUser } from '~~/lib/auth/composables/activeUser' import { useAuthManager } from '~~/lib/auth/composables/auth' import { loginRoute } from '~~/lib/common/helpers/route' import { useTheme, AppTheme } from '~~/lib/core/composables/theme' -import { serverVersionInfoQuery } from '~~/lib/core/graphql/queries' +import { useServerInfo } from '~/lib/core/composables/server' const { logout } = useAuthManager() const { activeUser, isGuest } = useActiveUser() const { isDarkTheme, setTheme } = useTheme() -const { result } = useQuery(serverVersionInfoQuery) +const { serverInfo } = useServerInfo() const route = useRoute() const router = useRouter() @@ -163,7 +162,7 @@ const showProfileEditDialog = ref(false) const token = computed(() => route.query.token as Optional) const Icon = computed(() => (isDarkTheme.value ? SunIcon : MoonIcon)) -const version = computed(() => result.value?.serverInfo.version) +const version = computed(() => serverInfo.value?.version) const isAdmin = computed(() => activeUser.value?.role === Roles.Server.Admin) diff --git a/packages/frontend-2/components/project/models-page/Results.vue b/packages/frontend-2/components/project/models-page/Results.vue index 5814bb8ad..5c99a1e24 100644 --- a/packages/frontend-2/components/project/models-page/Results.vue +++ b/packages/frontend-2/components/project/models-page/Results.vue @@ -5,6 +5,7 @@ v-if="gridOrList === GridListToggleValue.List" :search="finalSearch" :project="project" + :project-id="project.id" :source-apps="sourceApps" :contributors="contributors" @update:loading="finalLoading = $event" @@ -14,6 +15,7 @@ v-if="gridOrList === GridListToggleValue.Grid" :search="finalSearch" :project="project" + :project-id="project.id" :source-apps="sourceApps" :contributors="contributors" @update:loading="finalLoading = $event" diff --git a/packages/frontend-2/components/project/page/latest-items/Comments.vue b/packages/frontend-2/components/project/page/latest-items/Comments.vue index 67429aa55..057bfc9ef 100644 --- a/packages/frontend-2/components/project/page/latest-items/Comments.vue +++ b/packages/frontend-2/components/project/page/latest-items/Comments.vue @@ -1,8 +1,8 @@