Merge branch 'main' into bjorn/cnx-3262-project-collapsible-shows-up-when-user-dont-have-any-access

components/wizard/ModelSelector.vue

@@ -14,7 +14,6 @@
           color="foundation"
         />
         <div
-          v-if="isSender"
           v-tippy="
             canCreateModelResult?.project.permissions.canCreateModel.authorized
               ? 'Create new model'
@@ -84,7 +83,6 @@
           v-if="
             models?.length === 0 &&
             !!searchText &&
-            isSender &&
             canCreateModelResult?.project.permissions.canCreateModel?.authorized
           "
           full-width
@@ -106,7 +104,6 @@
       </div>
     </div>
     <CommonDialog
-      v-if="isSender"
       v-model:open="showNewModelDialog"
       title="Create new model"
       fullscreen="none"
@@ -166,9 +163,10 @@ const props = withDefaults(
     workspaceId?: string
     workspaceSlug?: string
     accountId: string
+    showNewModel?: boolean
     isSender?: boolean
   }>(),
-  { isSender: false }
+  { showNewModel: true, isSender: false }
 )
 
 const accountStore = useAccountStore()
@@ -198,7 +196,8 @@ const handleModelSelect = (model: ModelListModelItemFragment) => {
   if (existingModelProblem.value) {
     existingModelName.value = model.name
   }
-  hasNonZeroVersionsProblem.value = model.versions.totalCount !== 0 && props.isSender
+  hasNonZeroVersionsProblem.value =
+    model.versions.totalCount !== 0 && props.showNewModel // NOTE: we're using the showNewModel prop as a giveaway of whether we're in the send wizard - we do not need this extra check in the receive wizard
 
   if (!existingModelProblem.value && !hasNonZeroVersionsProblem.value) {
     return emit('next', model)

components/wizard/ProjectSelector.vue

@@ -78,70 +78,68 @@
             color="foundation"
           />
           <div class="flex justify-between items-center space-x-2">
-            <template v-if="isSender">
-              <div v-if="canCreateProject" v-tippy="'Create new project'">
-                <FormButton
-                  color="outline"
-                  :disabled="!canCreateProject"
-                  :class="`p-1.5 bg-foundation hover:bg-primary-muted rounded text-foreground border`"
-                  @click="showProjectCreateDialog = true"
-                >
-                  <PlusIcon class="w-4 -mx-2" />
-                </FormButton>
-              </div>
-              <div
-                v-else
-                v-tippy="
-                  canCreateProject
-                    ? 'Create new project'
-                    : canCreateProjectPermissionCheck?.message
-                "
+            <div v-if="canCreateProject" v-tippy="'Create new project'">
+              <FormButton
+                color="outline"
+                :disabled="!canCreateProject"
+                :class="`p-1.5 bg-foundation hover:bg-primary-muted rounded text-foreground border`"
+                @click="showProjectCreateDialog = true"
               >
-                <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`"
-                fullscreen="none"
+                <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"
               >
-                <form @submit="createProject(newProjectName as string)">
-                  <div class="text-body-2xs mb-2 ml-1">Project name</div>
-                  <FormTextInput
-                    v-model="newProjectName"
-                    class="text-xs"
-                    placeholder="A Beautiful Home, A Small Bridge..."
-                    autocomplete="off"
-                    name="name"
-                    label="Project name"
-                    color="foundation"
-                    :show-clear="!!newProjectName"
-                    :rules="[
-                      ValidationHelpers.isRequired,
-                      ValidationHelpers.isStringOfLength({ minLength: 3 })
-                    ]"
-                    full-width
-                  />
-                  <div class="mt-4 flex justify-end items-center space-x-2 w-full">
-                    <FormButton size="sm" text @click="showProjectCreateDialog = false">
-                      Cancel
-                    </FormButton>
-                    <FormButton
-                      size="sm"
-                      submit
-                      :disabled="isCreatingProject || !newProjectName"
-                    >
-                      Create
-                    </FormButton>
-                  </div>
-                </form>
-              </CommonDialog>
-            </template>
+                <ArrowUpCircleIcon class="w-4 -mx-2" />
+              </FormButton>
+            </div>
+            <CommonDialog
+              v-model:open="showProjectCreateDialog"
+              :title="`Create new project`"
+              fullscreen="none"
+            >
+              <form @submit="createProject(newProjectName as string)">
+                <div class="text-body-2xs mb-2 ml-1">Project name</div>
+                <FormTextInput
+                  v-model="newProjectName"
+                  class="text-xs"
+                  placeholder="A Beautiful Home, A Small Bridge..."
+                  autocomplete="off"
+                  name="name"
+                  label="Project name"
+                  color="foundation"
+                  :show-clear="!!newProjectName"
+                  :rules="[
+                    ValidationHelpers.isRequired,
+                    ValidationHelpers.isStringOfLength({ minLength: 3 })
+                  ]"
+                  full-width
+                />
+                <div class="mt-4 flex justify-end items-center space-x-2 w-full">
+                  <FormButton size="sm" text @click="showProjectCreateDialog = false">
+                    Cancel
+                  </FormButton>
+                  <FormButton
+                    size="sm"
+                    submit
+                    :disabled="isCreatingProject || !newProjectName"
+                  >
+                    Create
+                  </FormButton>
+                </div>
+              </form>
+            </CommonDialog>
             <div v-if="!workspacesEnabled || !workspaces" class="mt-1">
               <AccountsMenu
                 :current-selected-account-id="accountId"
@@ -170,7 +168,6 @@
           v-if="
             projects?.length === 0 &&
             !!searchText &&
-            isSender &&
             canCreateProjectPermissionCheck?.authorized
           "
           full-width
@@ -239,6 +236,7 @@ const emit = defineEmits<{
 const props = withDefaults(
   defineProps<{
     isSender: boolean
+    showNewProject?: boolean
     /**
      * For the send wizard - not allowing selecting projects we can't write to.
      */
@@ -246,6 +244,7 @@ const props = withDefaults(
     urlParseError?: string
   }>(),
   {
+    showNewProject: true,
     disableNoWriteAccessProjects: false
   }
 )