Merge pull request #502 from netlify/verythorough/improve-link-prompts

Improve prompts for `link` command

Author: RaeesBhatti

src/utils/link/link-by-prompt.js

@@ -8,28 +8,29 @@ const { track } = require('../telemetry')
 module.exports = async function linkPrompts(context) {
   const { api, state } = context.netlify
 
-  const SITE_NAME_PROMPT = 'Choose from a list of your sites'
-  const SITE_ID_PROMPT = `Use a site ID`
+  const SITE_NAME_PROMPT = 'Search by full or partial site name'
+  const SITE_LIST_PROMPT = 'Choose from a list of your recently updated sites'
+  const SITE_ID_PROMPT = 'Enter a site ID'
 
-  let GIT_REMOTE_PROMPT = `Use a current git remote URL`
+  let GIT_REMOTE_PROMPT = 'Use the current git remote origin URL'
   let site
   // Get git remote data if exists
   const repoInfo = await getRepoData()
 
-  const LinkChoices = [SITE_NAME_PROMPT, SITE_ID_PROMPT]
+  const LinkChoices = [SITE_NAME_PROMPT, SITE_LIST_PROMPT, SITE_ID_PROMPT]
 
   let repoUrl = ''
   if (!repoInfo.error) {
     repoUrl = `https://${repoInfo.host}/${repoInfo.remoteData.repo}`
 
-    GIT_REMOTE_PROMPT = `Use current git remote url ${repoUrl}`
+    GIT_REMOTE_PROMPT = `Use current git remote origin (${repoUrl})`
 
     // Add git GIT_REMOTE_PROMPT if in a repo. TODO refactor to non mutating
     LinkChoices.splice(0, 0, GIT_REMOTE_PROMPT)
   }
 
   context.log()
-  context.log(`${chalk.cyanBright('netlify link')} will connect a site in app.netlify.com to this folder`)
+  context.log(`${chalk.cyanBright('netlify link')} will connect this folder to a site on Netlify`)
   context.log()
   const { linkType } = await inquirer.prompt([
     {
@@ -52,11 +53,12 @@ module.exports = async function linkPrompts(context) {
         context.error(new Error(`No git remote found in this directory`))
       }
       context.log()
-      context.log(`Fetching sites and looking for site connected to "${repoUrl}" repo`)
+      context.log(`Looking for sites connected to '${repoUrl}'...`)
+      context.log()
       const sites = await api.listSites()
 
       if (isEmpty(sites)) {
-        context.error(new Error(`No sites found in your netlify account`))
+        context.error(new Error(`You don't have any sites yet. Run ${chalk.cyanBright('netlify sites:create')} to create a site.`))
       }
 
       const matchingSites = sites.filter(s => {
@@ -70,9 +72,9 @@ module.exports = async function linkPrompts(context) {
         context.log()
         context.log(`No site found with the remote ${repoInfo.repo_path}.
 
-Double check you are in the correct working directory & a remote git repo is configured.
+Double check you are in the correct working directory and a remote origin repo is configured.
 
-Run ${chalk.cyanBright('`git remote -v`')} to see a list of your git remotes.`)
+Run ${chalk.cyanBright('git remote -v')} to see a list of your git remotes.`)
 
         context.exit()
       }
@@ -81,34 +83,85 @@ Run ${chalk.cyanBright('`git remote -v`')} to see a list of your git remotes.`)
       if (matchingSites.length === 1) {
         site = matchingSites[0]
       } else if (matchingSites.length > 1) {
-        // Matches multiple sites. Users much choose which to link.
-        console.log()
-        console.log(`Found ${matchingSites.length} matching sites! Please choose one:`)
-
-        const siteChoices = matchingSites.map(site => {
-          return `${site.ssl_url} - ${site.name} - ${site.id}`
-        })
+        // Matches multiple sites. Users must choose which to link.
+        console.log(`Found ${matchingSites.length} matching sites!`)
 
         // Prompt which options
-        const { siteToConnect } = await inquirer.prompt([
+        const { selectedSite } = await inquirer.prompt([
           {
             type: 'list',
-            name: 'siteToConnect',
-            message: 'Which site do you want to link to?',
-            choices: siteChoices
+            name: 'selectedSite',
+            message: 'Which site do you want to link?',
+            choices: matchingSites.map(site => ({ 
+              name: `${site.name} - ${site.ssl_url}`, 
+              value: site 
+            }))
           }
         ])
-
-        const siteName = siteToConnect.split(' ')[0]
-        site = matchingSites.filter(site => {
-          const url = site.ssl_url || site.url
-          return siteName === url
-        })[0]
+        if (!selectedSite) {
+          context.error('No site selected')
+        }
+        site = selectedSite
       }
       break
     }
     case SITE_NAME_PROMPT: {
       kind = 'byName'
+      const { searchTerm } = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'searchTerm',
+          message: 'Enter the site name (or just part of it):'
+        }
+      ])
+      context.log(`Looking for sites with names containing '${searchTerm}'...`)
+      context.log()
+
+      let matchingSites
+      try {
+        matchingSites = await api.listSites({
+          name: searchTerm,
+          filter: 'all'
+        })
+      } catch (e) {
+        if (e.status === 404) {
+          context.error(`'${searchTerm}' not found`)
+        } else {
+          context.error(e)
+        }
+      }
+
+      if (isEmpty(matchingSites)) {
+        context.error(`No site names found containing '${searchTerm}'.
+
+Run ${chalk.cyanBright('netlify link')} again to try a new search,
+or run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
+      }
+
+      if (matchingSites.length > 1) {
+        console.log(`Found ${matchingSites.length} matching sites!`)
+        const { selectedSite } = await inquirer.prompt([
+          {
+            type: 'list',
+            name: 'selectedSite',
+            message: 'Which site do you want to link?',
+            paginated: true,
+            choices: matchingSites.map(site => ({ name: site.name, value: site }))
+          }
+        ])
+        if (!selectedSite) {
+          context.error('No site selected')
+        }
+        site = selectedSite
+      } else {
+        site = matchingSites[0]
+      }
+      break
+    }
+    case SITE_LIST_PROMPT: {
+      kind = 'fromList'
+      context.log(`Fetching recently updated sites...`)
+      context.log()
 
       let sites
       try {
@@ -117,20 +170,23 @@ Run ${chalk.cyanBright('`git remote -v`')} to see a list of your git remotes.`)
         context.error(e)
       }
 
-      if (sites.length === 0) {
-        context.error(`You don't have any sites. Use netlify 'sites:create' to create a site.`)
+      if (isEmpty(sites)) {
+        context.error(`You don't have any sites yet. Run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
       }
 
-      const siteSelection = await inquirer.prompt([
+      const { selectedSite } = await inquirer.prompt([
         {
           type: 'list',
-          name: 'siteName',
-          message: 'What is the name of the site?',
+          name: 'selectedSite',
+          message: 'Which site do you want to link?',
           paginated: true,
           choices: sites.map(site => ({ name: site.name, value: site }))
         }
       ])
-      site = siteSelection.siteName
+      if (!selectedSite) {
+        context.error('No site selected')
+      }
+      site = selectedSite
       break
     }
     case SITE_ID_PROMPT: {
@@ -139,15 +195,15 @@ Run ${chalk.cyanBright('`git remote -v`')} to see a list of your git remotes.`)
         {
           type: 'input',
           name: 'siteId',
-          message: 'What is the site-id of the site?'
+          message: 'What is the site ID?'
         }
       ])
 
       try {
         site = await api.getSite({ siteId })
       } catch (e) {
         if (e.status === 404) {
-          context.error(new Error(`Site id ${siteId} not found`))
+          context.error(new Error(`Site ID '${siteId}' not found`))
         } else {
           context.error(e)
         }