Merge branch '10.0-release' into alejandro/fix/scaffold-correct-config-file

Author: estrada9166

packages/app/cypress/e2e/settings.cy.ts

@@ -24,6 +24,27 @@ describe('App: Settings', () => {
     cy.findByText('Project ID').should('be.visible')
   })
 
+  it('shows the recordKeys section', () => {
+    cy.loginUser()
+
+    cy.visitApp()
+    cy.findByText('Settings').click()
+    cy.findByText('Project Settings').click()
+    cy.findByText('Record Key').should('be.visible')
+  })
+
+  it('opens cloud settings when clicking on "Manage Keys"', () => {
+    cy.loginUser()
+    cy.intercept('mutation-ExternalLink_OpenExternal', { 'data': { 'openExternal': true } }).as('OpenExternal')
+    cy.visitApp()
+    cy.findByText('Settings').click()
+    cy.findByText('Project Settings').click()
+    cy.findByText('Manage Keys').click()
+    cy.wait('@OpenExternal')
+    .its('request.body.variables.url')
+    .should('equal', 'http:/test.cloud/cloud-project/settings')
+  })
+
   it('can reconfigure a project', () => {
     cy.visitApp('settings')
 

packages/app/src/pages/Specs/Runner.vue

@@ -1,25 +1,27 @@
 <template>
-  <!--
-    Run Mode is a more minimal UI.
-    It does not render things like the SpecList,
-    Side and Top Nav, etc.
-    It also has no GraphQL dependency.
-  -->
-  <SpecRunnerContainerRunMode
-    v-if="isRunMode"
-    :run-mode-specs="specs"
-  />
-
-  <!--
-    Open Mode is the full Cypress runner UI -
-    including things like the SpecList,
-    Side and Top Nav, Selector Playgroundn etc.
-    It is driven by GraphQL and urql.
-  -->
-  <SpecRunnerContainerOpenMode
-    v-else-if="query.data.value?.currentProject?.specs"
-    :gql="query.data.value"
-  />
+  <div>
+    <!--
+      Run Mode is a more minimal UI.
+      It does not render things like the SpecList,
+      Side and Top Nav, etc.
+      It also has no GraphQL dependency.
+    -->
+    <SpecRunnerContainerRunMode
+      v-if="isRunMode"
+      :run-mode-specs="specs"
+    />
+
+    <!--
+      Open Mode is the full Cypress runner UI -
+      including things like the SpecList,
+      Side and Top Nav, Selector Playgroundn etc.
+      It is driven by GraphQL and urql.
+    -->
+    <SpecRunnerContainerOpenMode
+      v-else-if="query.data.value?.currentProject?.specs"
+      :gql="query.data.value"
+    />
+  </div>
 </template>
 
 <script lang="ts" setup>

packages/app/src/runner/unifiedRunner.ts

@@ -15,6 +15,7 @@ export function useUnifiedRunner () {
 
   onBeforeUnmount(() => {
     UnifiedRunnerAPI.teardown()
+    initialized.value = false
   })
 
   return {

packages/app/src/settings/project/ProjectSettings.vue

@@ -8,6 +8,7 @@
       v-for="key of props.gql.currentProject.cloudProject.recordKeys"
       :key="key.id"
       :gql="key"
+      :manage-keys-url="props.gql.currentProject.cloudProject.cloudProjectSettingsUrl"
     />
   </template>
   <SpecPatterns :gql="props.gql.currentProject" />
@@ -34,6 +35,7 @@ fragment ProjectSettings on Query {
       __typename
       ... on CloudProject {
         id
+        cloudProjectSettingsUrl
         recordKeys {
           id
           ...RecordKey

packages/app/src/settings/project/RecordKey.cy.tsx

@@ -12,7 +12,7 @@ describe('<RecordKey />', () => {
       },
       render: (gql) => (
         <div class="py-4 px-8">
-          <RecordKey gql={gql} />
+          <RecordKey gql={gql} manageKeysUrl="http://project.cypress.io/settings" />
         </div>
       ),
     })

packages/app/src/settings/project/RecordKey.vue

@@ -20,7 +20,7 @@
     </template>
     <div
       v-if="recordKey"
-      class="inline-flex justify-start gap-10px"
+      class="gap-10px inline-flex justify-start"
     >
       <CodeBox
         :code="recordKey"
@@ -45,16 +45,19 @@
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
-import { useI18n } from '@cy/i18n'
-import type { RecordKeyFragment } from '../../generated/graphql'
-import SettingsSection from '../SettingsSection.vue'
+import { gql } from '@urql/core'
 import Button from '@cy/components/Button.vue'
+import CopyButton from '@cy/components/CopyButton.vue'
+import ExternalLink from '@cy/gql-components/ExternalLink.vue'
+import { useExternalLink } from '@cy/gql-components/useExternalLink'
 import IconKey from '~icons/cy/placeholder_x16.svg'
 import IconExport from '~icons/cy/export_x16.svg'
-import { gql } from '@urql/core'
-import CopyButton from '@cy/components/CopyButton.vue'
+import type { RecordKeyFragment } from '../../generated/graphql'
+import SettingsSection from '../SettingsSection.vue'
 import CodeBox from './CodeBox.vue'
-import ExternalLink from '@packages/frontend-shared/src/gql-components/ExternalLink.vue'
+import { useI18n } from '@cy/i18n'
+
+const { t } = useI18n()
 
 gql`
 fragment RecordKey on CloudRecordKey {
@@ -65,11 +68,10 @@ fragment RecordKey on CloudRecordKey {
 
 const props = defineProps<{
   gql: RecordKeyFragment
+  manageKeysUrl: string
 }>()
 
-const openManageKeys = () => { }
-const showRecordKey = ref(false)
-const { t } = useI18n()
+const openManageKeys = useExternalLink(props.manageKeysUrl)
 
 const recordKey = computed(() => props.gql.key)
 </script>

packages/data-context/src/actions/ProjectActions.ts

@@ -305,7 +305,7 @@ export class ProjectActions {
       throw Error(`Cannot save preferences without currentProject.`)
     }
 
-    this.api.insertProjectPreferencesToCache(this.ctx.lifecycleManager.projectTitle, { ...args })
+    this.api.insertProjectPreferencesToCache(this.ctx.lifecycleManager.projectTitle, args)
   }
 
   async codeGenSpec (codeGenCandidate: string, codeGenType: CodeGenType): Promise<NexusGenObjects['ScaffoldedFile']> {

packages/graphql/schemas/schema.graphql

@@ -685,7 +685,7 @@ type Mutation {
   setProjectIdInConfigFile(projectId: String!): Query
 
   """Save the projects preferences to cache"""
-  setProjectPreferences(browserPath: String!, testingType: TestingTypeEnum!): Query!
+  setProjectPreferences(testingType: TestingTypeEnum!): Query!
 
   """Save the prompt-shown state for this project"""
   setPromptShown(slug: String!): Boolean

packages/graphql/src/schemaTypes/objectTypes/gql-Mutation.ts

@@ -316,7 +316,6 @@ export const mutation = mutationType({
       description: 'Save the projects preferences to cache',
       args: {
         testingType: nonNull(TestingTypeEnum),
-        browserPath: nonNull(stringArg()),
       },
       async resolve (_, args, ctx) {
         await ctx.actions.project.setProjectPreferences(args)

packages/launchpad/cypress/e2e/choose-a-browser.cy.ts

@@ -114,7 +114,6 @@ describe('Choose a Browser Page', () => {
       cy.get('@launchButton').click()
 
       cy.wait('@launchProject').then(({ request }) => {
-        expect(request?.body.variables.browserPath).to.contain('/test/chrome/path')
         expect(request?.body.variables.testingType).to.eq('e2e')
       })
     })

packages/launchpad/src/setup/OpenBrowser.vue

@@ -55,13 +55,13 @@ mutation OpenBrowser_ClearTestingType {
 `
 
 gql`
-mutation OpenBrowser_LaunchProject ($testingType: TestingTypeEnum!, $browserPath: String!)  {
+mutation OpenBrowser_LaunchProject ($testingType: TestingTypeEnum!)  {
   launchOpenProject {
     id
   }
   # Removing for now until we decide what the behavior should be
   # hideBrowserWindow
-  setProjectPreferences(testingType: $testingType, browserPath: $browserPath) {
+  setProjectPreferences(testingType: $testingType) {
     currentProject {
       id
       title
@@ -73,12 +73,11 @@ mutation OpenBrowser_LaunchProject ($testingType: TestingTypeEnum!, $browserPath
 const launchOpenProject = useMutation(OpenBrowser_LaunchProjectDocument)
 const clearCurrentTestingType = useMutation(OpenBrowser_ClearTestingTypeDocument)
 
-const launch = (browserPath?: string) => {
+const launch = () => {
   const testingType = query.data.value?.currentTestingType
 
-  if (browserPath && testingType) {
+  if (testingType) {
     launchOpenProject.executeMutation({
-      browserPath,
       testingType,
     })
   }

packages/launchpad/src/setup/OpenBrowserList.vue

@@ -1,7 +1,7 @@
 <template>
   <form
     v-if="browsers"
-    @submit.prevent="emit('launch', props.gql?.currentBrowser?.path)"
+    @submit.prevent="emit('launch')"
   >
     <div
       class="flex flex-wrap py-40px gap-24px justify-center"
@@ -130,7 +130,7 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   (e: 'navigated-back'): void
-  (e: 'launch', value: string | undefined): void
+  (e: 'launch'): void
 }>()
 
 const { t } = useI18n()

packages/types/src/cache.ts

@@ -5,7 +5,6 @@ export interface Cache {
 }
 
 export interface Preferences {
-  browserPath: string | null
   testingType: 'e2e' | 'component' | null
 }