Skip to content

Commit 619571e

Browse files
ryanthemanuelBarthélémy Ledoux
andauthored
fix: connect to dashboard page when there are no existing projects (#20188)
Co-authored-by: Barthélémy Ledoux <[email protected]>
1 parent 5d8f875 commit 619571e

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

packages/app/src/runs/modals/SelectCloudProjectModal.spec.tsx renamed to packages/app/src/runs/modals/SelectCloudProjectModal.cy.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,15 @@ describe('<SelectCloudProjectModal />', () => {
4040
cy.contains('a', defaultMessages.runs.connect.modal.selectProject.createNewProject).click()
4141
cy.findByLabelText(`${defaultMessages.runs.connect.modal.selectProject.projectName }*${defaultMessages.runs.connect.modal.selectProject.projectNameDisclaimer}`)
4242
.should('have.value', 'Test Project')
43+
44+
cy.contains('a', defaultMessages.runs.connect.modal.selectProject.chooseExistingProject).should('be.visible')
45+
})
46+
47+
it('can only choose an existing project if the organization has a project', () => {
48+
mountDialog()
49+
cy.get('[data-cy="selectOrganization"]').click()
50+
cy.findByRole('listbox').within(() => cy.findAllByText('Test Org 2').click())
51+
52+
cy.contains('a', defaultMessages.runs.connect.modal.selectProject.chooseExistingProject).should('not.exist')
4353
})
4454
})

packages/app/src/runs/modals/SelectCloudProjectModal.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</template>
3737
</Select>
3838
<Select
39-
v-if="!newProject && projects.length > 0"
39+
v-if="!newProject"
4040
v-model="pickedProject"
4141
class="mt-16px transition-all"
4242
:class="pickedOrganization ? undefined : 'opacity-50'"
@@ -85,6 +85,7 @@
8585
</span>
8686
</label>
8787
<a
88+
v-if="projects.length > 0"
8889
class="cursor-pointer text-indigo-500 hover:underline"
8990
@click="newProject = false"
9091
>
@@ -230,7 +231,6 @@ const emit = defineEmits<{
230231
(event: 'update-projectId-failed', projectId: string): void
231232
}>()
232233
233-
const newProject = ref(false)
234234
const projectName = ref(props.gql.currentProject?.title || '')
235235
const projectAccess = ref<'private' | 'public'>('private')
236236
const organizations = computed(() => {
@@ -244,6 +244,7 @@ const organizations = computed(() => {
244244
const pickedOrganization = ref(organizations.value.length >= 1 ? organizations.value[0] : undefined)
245245
246246
const projects = computed(() => pickedOrganization.value?.projects?.nodes || [])
247+
const newProject = ref(projects.value.length === 0)
247248
const pickedProject = ref()
248249
249250
const orgPlaceholder = t('runs.connect.modal.selectProject.placeholderOrganizations')

packages/frontend-shared/src/locales/en-US.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@
445445
"connectProject": "Connect project",
446446
"createProject": "Create project",
447447
"placeholderOrganizations": "Pick an organization",
448-
"placeholderProjects": "Pick an project",
448+
"placeholderProjects": "Pick a project",
449449
"placeholderProjectsPending": "Pick an organization first"
450450
},
451451
"connectManually": {

0 commit comments

Comments
 (0)