chore: cleanup pr

cypress-io · May 18, 2023 · e1f23d0 · e1f23d0
1 parent eee6aec
commit e1f23d0
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 45 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -125,39 +125,40 @@
       "require": "./index.js"
     },
     "./vue": {
+      "types": "./vue/dist/index.d.ts",
       "import": "./vue/dist/cypress-vue.esm-bundler.js",
-      "require": "./vue/dist/cypress-vue.cjs.js",
-      "types": "./vue/dist/index.d.ts"
+      "require": "./vue/dist/cypress-vue.cjs.js"
     },
     "./vue2": {
+      "types": "./vue2/dist/index.d.ts",
       "import": "./vue2/dist/cypress-vue2.esm-bundler.js",
-      "require": "./vue2/dist/cypress-vue2.cjs.js",
-      "types": "./vue2/dist/index.d.ts"
+      "require": "./vue2/dist/cypress-vue2.cjs.js"
     },
     "./package.json": {
       "import": "./package.json",
       "require": "./package.json"
     },
     "./react": {
+      "types": "./react/dist/index.d.ts",
       "import": "./react/dist/cypress-react.esm-bundler.js",
-      "require": "./react/dist/cypress-react.cjs.js",
-      "types": "./react/dist/index.d.ts"
+      "require": "./react/dist/cypress-react.cjs.js"
     },
     "./react18": {
+      "types": "./react18/dist/index.d.ts",
       "import": "./react18/dist/cypress-react.esm-bundler.js",
-      "require": "./react18/dist/cypress-react.cjs.js",
-      "types": "./react18/dist/index.d.ts"
+      "require": "./react18/dist/cypress-react.cjs.js"
     },
     "./mount-utils": {
-      "require": "./mount-utils/dist/index.js",
-      "types": "./mount-utils/dist/index.d.ts"
+      "types": "./mount-utils/dist/index.d.ts",
+      "require": "./mount-utils/dist/index.js"
     },
     "./angular": {
+      "types": "./angular/dist/index.d.ts",
       "import": "./angular/dist/index.js",
-      "require": "./angular/dist/index.js",
-      "types": "./angular/dist/index.d.ts"
+      "require": "./angular/dist/index.js"
     },
     "./svelte": {
+      "types": "./svelte/dist/index.d.ts",
       "import": "./svelte/dist/cypress-svelte.esm-bundler.js",
       "require": "./svelte/dist/cypress-svelte.cjs.js"
     }

diff --git a/packages/app/src/debug/utils/constants.ts b/packages/app/src/debug/utils/constants.ts
@@ -1,5 +1,7 @@
 export const DEBUG_TAB_MEDIUM = 'Debug Tab'
 
+export const RUNS_TAB_MEDIUM = 'Runs Tab'
+
 export const DEBUG_PROMO_CAMPAIGNS = {
   login: 'Debug Login Empty State',
   connectProject: 'Debug Connect Project Empty State',

diff --git a/packages/app/src/runs/RunsContainer.cy.tsx b/packages/app/src/runs/RunsContainer.cy.tsx
@@ -143,8 +143,8 @@ describe('<RunsContainer />', { keystrokeDelay: 0 }, () => {
         },
       })
 
-      cy.get('h3').contains('Git repository not detected')
-      cy.get('p').contains(defaultMessages.debugPage.emptyStates.ensureGitSetupCorrectly)
+      cy.get('h3').contains(defaultMessages.runs.empty.gitRepositoryNotDetected)
+      cy.get('p').contains(defaultMessages.runs.empty.ensureGitSetupCorrectly)
     })
   })
 
@@ -170,10 +170,10 @@ describe('<RunsContainer />', { keystrokeDelay: 0 }, () => {
         },
       })
 
-      cy.get('h3').contains(defaultMessages.debugPage.emptyStates.noRunsFoundForBranch)
-      cy.get('p').contains(defaultMessages.debugPage.emptyStates.noRunsForBranchMessage)
+      cy.get('h3').contains(defaultMessages.runs.empty.noRunsFoundForBranch)
+      cy.get('p').contains(defaultMessages.runs.empty.noRunsForBranchMessage)
       // The utm_source will be Binary%3A+App in production`open` mode but we assert using Binary%3A+Launchpad as this is the value in CI
-      cy.contains(defaultMessages.links.learnMoreButton).should('have.attr', 'href', 'https://on.cypress.io/git-info?utm_source=Binary%3A+Launchpad&utm_medium=Debug+Tab&utm_campaign=No+Runs+Found')
+      cy.contains(defaultMessages.links.learnMoreButton).should('have.attr', 'href', 'https://on.cypress.io/git-info?utm_source=Binary%3A+Launchpad&utm_medium=Runs+Tab&utm_campaign=No+Runs+Found')
     })
   })
 })
diff --git a/packages/app/src/runs/RunsContainer.vue b/packages/app/src/runs/RunsContainer.vue
@@ -15,9 +15,8 @@
     />
     <Warning
       v-else-if="userProjectStatusStore.cloudStatusMatches('needsRecordedRun') && userProjectStatusStore.project.isUsingGit"
-      :title="t('debugPage.emptyStates.noRunsFoundForBranch')"
-      :message="t('debugPage.emptyStates.noRunsForBranchMessage')"
-      :help-link-href="learnMoreLink"
+      :title="t('runs.empty.noRunsFoundForBranch')"
+      :message="noRunsForBranchMessage"
     />
     <RunsErrorRenderer
       v-else-if="currentProject?.cloudProject?.__typename !== 'CloudProject' || connectionFailed"
@@ -42,8 +41,8 @@
       />
       <Warning
         v-if="!userProjectStatusStore.project.isUsingGit"
-        :title="t('debugPage.emptyStates.gitRepositoryNotDetected')"
-        :message="t('debugPage.emptyStates.ensureGitSetupCorrectly')"
+        :title="t('runs.empty.gitRepositoryNotDetected')"
+        :message="t('runs.empty.ensureGitSetupCorrectly')"
       />
       <RunCard
         v-for="run of currentProject?.cloudProject?.runs?.nodes"
@@ -67,10 +66,9 @@ import { RunsContainerFragment, RunsContainer_FetchNewerRunsDocument } from '../
 import Warning from '@packages/frontend-shared/src/warning/Warning.vue'
 import RunsErrorRenderer from './RunsErrorRenderer.vue'
 import { useUserProjectStatusStore } from '@packages/frontend-shared/src/store/user-project-status-store'
-import { RUNS_PROMO_CAMPAIGNS } from './utils/constants'
+import { RUNS_PROMO_CAMPAIGNS, RUNS_TAB_MEDIUM } from './utils/constants'
 import { getUrlWithParams } from '@packages/frontend-shared/src/utils/getUrlWithParams'
 import { getUtmSource } from '@packages/frontend-shared/src/utils/getUtmSource'
-import { DEBUG_TAB_MEDIUM } from '../debug/utils/constants'
 
 const { t } = useI18n()
 
@@ -206,13 +204,20 @@ const props = defineProps<{
 const showConnectSuccessAlert = ref(false)
 const connectionFailed = computed(() => !props.gql.currentProject?.cloudProject && props.online)
 
-const learnMoreLink = getUrlWithParams({
-  url: 'https://on.cypress.io/git-info',
-  params: {
-    utm_source: getUtmSource(),
-    utm_medium: DEBUG_TAB_MEDIUM,
-    utm_campaign: 'No Runs Found',
-  },
+const noRunsForBranchMessage = computed(() => {
+  const learnMoreLink = getUrlWithParams({
+    url: 'https://on.cypress.io/git-info',
+    params: {
+      utm_source: getUtmSource(),
+      utm_medium: RUNS_TAB_MEDIUM,
+      utm_campaign: 'No Runs Found',
+    },
+  })
+
+  const message = t('runs.empty.noRunsForBranchMessage')
+  const link = `[${t('links.learnMoreButton')}](${learnMoreLink})`
+
+  return `${message} ${link}`
 })
 
 const userProjectStatusStore = useUserProjectStatusStore()

diff --git a/packages/frontend-shared/src/locales/en-US.json b/packages/frontend-shared/src/locales/en-US.json
@@ -652,7 +652,11 @@
     "empty": {
       "title": "Copy the command below to record your first run",
       "description": "Review the {0} to Cypress Cloud",
-      "link": "guide on recording runs"
+      "link": "guide on recording runs",
+      "gitRepositoryNotDetected": "Git repository not detected",
+      "ensureGitSetupCorrectly": "Cypress uses Git to associate runs with your local state. As a fallback, all runs for your project are shown. Please ensure that version control is set up correctly.",
+      "noRunsFoundForBranch": "No runs found for your branch",
+      "noRunsForBranchMessage": "Cypress uses Git to show runs for your branch. As a fallback, all runs for your project are shown. Ensure that version control is properly configured and that you are sending Git information to Cypress Cloud."
     },
     "results": {
       "skipped": "skipped",

diff --git a/packages/frontend-shared/src/warning/Warning.cy.tsx b/packages/frontend-shared/src/warning/Warning.cy.tsx
@@ -50,15 +50,14 @@ describe('<Warning />', () => {
   })
 
   it('renders with a Learn more Link', () => {
-    const link = 'https://on.cypress.io/git-info'
+    // eslint-disable-next-line prefer-template
+    const messagePlusLink = message + '[Learn more](https://on.cypress.io/git-info)'
 
     cy.mount(() => (<div class="p-4"><Warning
       title={title}
-      // Trim the message so you can validate that helpLinkHref is displaying in line
-      message={message.substring(0, 50)}
-      helpLinkHref={link}
+      message={messagePlusLink}
     /></div>))
 
-    cy.contains('Learn more').should('have.attr', 'href', link)
+    cy.contains('Learn more').should('have.attr', 'href', 'https://on.cypress.io/git-info')
   })
 })
diff --git a/packages/frontend-shared/src/warning/Warning.vue b/packages/frontend-shared/src/warning/Warning.vue
@@ -46,14 +46,12 @@ const props = withDefaults(defineProps<{
   title: string
   message: string
   details?: string | null
-  helpLinkHref?: string | null
   modelValue?: boolean
   dismissible?: boolean
   retryable?: boolean
 }>(), {
   modelValue: true,
   details: undefined,
-  helpLinkHref: undefined,
   dismissible: true,
   retryable: false,
 })
@@ -66,12 +64,6 @@ let message = computed(() => {
     return [props.message, `        ${ props.details }`].join('\n\n')
   }
 
-  if (props.helpLinkHref) {
-    const learnMoreLabel = t('links.learnMoreButton')
-
-    return `${props.message} [${learnMoreLabel}](${props.helpLinkHref})`
-  }
-
   return props.message
 })