fix: update newProject ref when switching between organizations in Se…

…lectCloudProjectModal (#25730)
cypress-io · Feb 7, 2023 · a21de6b · a21de6b · cypress-bot · Feb 7, 2023
1 parent f941005
commit a21de6b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 _Released 02/14/2023 (PENDING)_
 
+**Bugfixes:**
+
+ - Fixed an issue with the Cloud project selection modal not showing the correct prompts. Fixes [#25520](https://github.com/cypress-io/cypress/issues/25520).
+
 **Features:**
 
 - Added the "Open in IDE" feature for failed tests reported from the Debug page. Addressed in [#25691](https://github.com/cypress-io/cypress/pull/25691).

diff --git a/packages/frontend-shared/src/gql-components/modals/SelectCloudProjectModal.cy.tsx b/packages/frontend-shared/src/gql-components/modals/SelectCloudProjectModal.cy.tsx
@@ -134,6 +134,20 @@ describe('<SelectCloudProjectModal />', () => {
  mountDialog()
  })
 
+ it('can switch between organizations with and without projects', () => {
+ cy.get('[data-cy="selectOrganization"]').click()
+ cy.findByRole('listbox').within(() => cy.findAllByText('Test Org 2').click())
+
+ cy.contains('button', defaultMessages.runs.connect.modal.selectProject.connectProject).should('not.exist')
+ cy.contains('button', defaultMessages.runs.connect.modal.selectProject.createProject).should('be.visible')
+
+ cy.get('[data-cy="selectOrganization"]').click()
+ cy.findByRole('listbox').within(() => cy.findAllByText('Test Org 1').click())
+
+ cy.contains('button', defaultMessages.runs.connect.modal.selectProject.createProject).should('not.exist')
+ cy.contains('button', defaultMessages.runs.connect.modal.selectProject.connectProject).should('be.visible')
+ })
+
  context('create new project', () => {
  beforeEach(() => {
  cy.contains('a', defaultMessages.runs.connect.modal.selectProject.createNewProject).click()

diff --git a/packages/frontend-shared/src/gql-components/modals/SelectCloudProjectModal.vue b/packages/frontend-shared/src/gql-components/modals/SelectCloudProjectModal.vue
@@ -344,10 +344,12 @@ watch(projectOptions, (newVal, oldVal) => {
  }
 
  if (newVal.length === 1) {
- pickedProject.value = projectOptions.value[0]
+ pickedProject.value = newVal[0]
  } else {
- pickedProject.value = projectOptions.value.find((p) => p.name === projectName.value)
+ pickedProject.value = newVal.find((p) => p.name === projectName.value)
  }
+
+ newProject.value = newVal.length === 0
 }, {
  immediate: true,
 })