Merge branch 'main' into parameter-updater

components/wizard/ModelSelector.vue

@@ -32,33 +32,6 @@
           </FormButton>
         </div>
       </div>
-      <div
-        v-if="
-          canCreateModelResult &&
-          !canCreateModelResult.project.permissions.canCreateModel.authorized
-        "
-      >
-        <CommonAlert title="Cannot create new models" color="info" hide-icon>
-          <template #description>
-            {{ canCreateModelResult.project.permissions.canCreateModel.message }}
-
-            <FormButton
-              v-if="workspaceSlug"
-              full-width
-              color="primary"
-              size="sm"
-              class="mt-2"
-              @click="
-                $openUrl(
-                  `${account.accountInfo.serverInfo.url}/settings/workspaces/${workspaceSlug}/billing`
-                )
-              "
-            >
-              Explore Plans
-            </FormButton>
-          </template>
-        </CommonAlert>
-      </div>
       <div class="relative grid grid-cols-1 gap-2">
         <CommonLoadingBar v-if="loading" loading />
 

components/wizard/ProjectSelector.vue

@@ -3,12 +3,18 @@
     <div class="space-y-2 relative">
       <div v-if="workspacesEnabled && workspaces" class="flex items-center space-x-2">
         <div class="flex-grow min-w-0">
-          <!-- NO WORKSPACE YET -->
           <div v-if="workspaces.length === 0">
             <FormButton
               full-width
               class="flex items-center"
-              @click="$openUrl('https://app.speckle.systems/workspaces/actions/create')"
+              @click="
+                $openUrl(
+                  `${activeAccount.accountInfo.serverInfo.url.replace(
+                    /\/$/,
+                    ''
+                  )}/workspaces/actions/create`
+                )
+              "
             >
               <div class="min-w-0 truncate flex-grow">
                 <span>{{ 'Create a workspace' }}</span>
@@ -72,13 +78,7 @@
             color="foundation"
           />
           <div class="flex justify-between items-center space-x-2">
-            <div
-              v-tippy="
-                canCreateProject
-                  ? 'Create new project'
-                  : canCreateProjectPermissionCheck?.message
-              "
-            >
+            <div v-if="canCreateProject" v-tippy="'Create new project'">
               <FormButton
                 color="outline"
                 :disabled="!canCreateProject"
@@ -88,6 +88,22 @@
                 <PlusIcon class="w-4 -mx-2" />
               </FormButton>
             </div>
+            <div
+              v-else
+              v-tippy="
+                canCreateProject
+                  ? 'Create new project'
+                  : canCreateProjectPermissionCheck?.message
+              "
+            >
+              <FormButton
+                color="primary"
+                :class="`p-1.5 bg-foundation rounded text-foreground border`"
+                @click="upgradePlanButtonAction"
+              >
+                <ArrowUpCircleIcon class="w-4 -mx-2" />
+              </FormButton>
+            </div>
             <CommonDialog
               v-model:open="showProjectCreateDialog"
               :title="`Create new project`"
@@ -132,28 +148,6 @@
             </div>
           </div>
         </div>
-        <div
-          v-if="
-            canCreateProjectPermissionCheck &&
-            !canCreateProjectPermissionCheck.authorized &&
-            showUpgradePlanButton
-          "
-        >
-          <CommonAlert color="info" hide-icon>
-            <template #description>
-              {{ canCreateProjectPermissionCheck.message }}
-              <FormButton
-                full-width
-                class="mt-2"
-                color="primary"
-                size="sm"
-                @click="upgradePlanButtonAction()"
-              >
-                Upgrade now
-              </FormButton>
-            </template>
-          </CommonAlert>
-        </div>
 
         <WizardPersonalProjectsWarning v-if="isPersonalProjectsAsWorkspace" />
 
@@ -202,7 +196,7 @@
 <script setup lang="ts">
 import { ChevronDownIcon, ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/outline'
 import { storeToRefs } from 'pinia'
-import { PlusIcon } from '@heroicons/vue/20/solid'
+import { PlusIcon, ArrowUpCircleIcon } from '@heroicons/vue/20/solid'
 import type { DUIAccount } from '~/store/accounts'
 import { useAccountStore } from '~/store/accounts'
 import {
@@ -493,35 +487,6 @@ const canCreateProjectPermissionCheck = computed(() => {
   return null
 })
 
-const upgradePlanButtonAction = () => {
-  if (!canCreateProjectPermissionCheck.value) return
-  if (canCreateProjectPermissionCheck.value.code === 'WorkspaceNoEditorSeat') {
-    // open url to workspace/settings/users
-    $openUrl(
-      `${account.value.accountInfo.serverInfo.url}/settings/workspaces/${selectedWorkspace.value?.slug}/members`
-    )
-    return
-  }
-  if (canCreateProjectPermissionCheck.value.code === 'WorkspaceLimitsReached') {
-    // open url to workspace/billing
-    $openUrl(
-      `${account.value.accountInfo.serverInfo.url}/settings/workspaces/${selectedWorkspace.value?.slug}/billing`
-    )
-    return
-  }
-}
-
-const showUpgradePlanButton = computed(() => {
-  if (!canCreateProjectPermissionCheck.value) return false
-  if (
-    canCreateProjectPermissionCheck.value.code === 'WorkspaceNoEditorSeat' ||
-    canCreateProjectPermissionCheck.value.code === 'WorkspaceLimitsReached'
-  ) {
-    return true
-  }
-  return false
-})
-
 const isCreatingProject = ref(false)
 const showProjectCreateDialog = ref(false)
 
@@ -610,6 +575,24 @@ const createNewPersonalProject = async (name: string) => {
   isCreatingProject.value = false
 }
 
+const upgradePlanButtonAction = () => {
+  if (!canCreateProjectPermissionCheck.value) return
+  if (canCreateProjectPermissionCheck.value.code === 'WorkspaceNoEditorSeat') {
+    // open url to workspace/settings/users
+    $openUrl(
+      `${account.value.accountInfo.serverInfo.url}/settings/workspaces/${selectedWorkspace.value?.slug}/members`
+    )
+    return
+  }
+  if (canCreateProjectPermissionCheck.value.code === 'WorkspaceLimitsReached') {
+    // open url to workspace/billing
+    $openUrl(
+      `${account.value.accountInfo.serverInfo.url}/settings/workspaces/${selectedWorkspace.value?.slug}/billing`
+    )
+    return
+  }
+}
+
 const loadMore = () => {
   fetchMore({
     variables: { cursor: projectsResult.value?.activeUser?.projects.cursor },

lib/common/generated/gql/graphql.ts

@@ -4160,6 +4160,7 @@ export type ProjectPermissionChecks = {
   canRevokeEmbedTokens: PermissionCheckResult;
   canUpdate: PermissionCheckResult;
   canUpdateAllowPublicComments: PermissionCheckResult;
+  canUpdateRole: PermissionCheckResult;
   canUseInvite: PermissionCheckResult;
 };
 
@@ -4169,6 +4170,12 @@ export type ProjectPermissionChecksCanMoveToWorkspaceArgs = {
 };
 
 
+export type ProjectPermissionChecksCanUpdateRoleArgs = {
+  targetRole?: InputMaybe<StreamRole>;
+  targetUserId?: InputMaybe<Scalars['String']['input']>;
+};
+
+
 export type ProjectPermissionChecksCanUseInviteArgs = {
   type?: InputMaybe<InviteUseType>;
 };
@@ -7025,6 +7032,8 @@ export type WorkspaceMutations = {
   updateEmbedOptions: WorkspaceEmbedOptions;
   updateRole: Workspace;
   updateSeatType: Workspace;
+  /** Update the SSO provider details for a workspace. */
+  updateSsoProvider: Scalars['Boolean']['output'];
 };
 
 
@@ -7104,6 +7113,11 @@ export type WorkspaceMutationsUpdateSeatTypeArgs = {
   input: WorkspaceUpdateSeatTypeInput;
 };
 
+
+export type WorkspaceMutationsUpdateSsoProviderArgs = {
+  input: WorkspaceSsoProviderUpdateInput;
+};
+
 export type WorkspacePaidPlanPrices = {
   __typename?: 'WorkspacePaidPlanPrices';
   business: WorkspacePlanPrice;
@@ -7399,6 +7413,15 @@ export type WorkspaceSsoProvider = {
   name: Scalars['String']['output'];
 };
 
+export type WorkspaceSsoProviderUpdateInput = {
+  clientId: Scalars['ID']['input'];
+  clientSecret: Scalars['String']['input'];
+  issuerUrl: Scalars['String']['input'];
+  providerId: Scalars['ID']['input'];
+  providerName: Scalars['String']['input'];
+  workspaceId: Scalars['ID']['input'];
+};
+
 export type WorkspaceSsoSession = {
   __typename?: 'WorkspaceSsoSession';
   createdAt: Scalars['DateTime']['output'];