Merge branch 'master' into tailwind-prefix

Author: samselikoff

addon/components/docs-viewer/x-main/component.js

@@ -80,7 +80,7 @@ export default Component.extend({
       }
     } else {
       let file = appFiles
-        .filter(file => file.match(/template.(hbs|md)/))
+        .filter(file => file.match(/template.+(hbs|md)/))
         .find(file => file.match(path));
 
       return `${projectHref}/edit/${primaryBranch}/tests/dummy/app/${file}`;

addon/components/docs-viewer/x-main/template.hbs

@@ -26,7 +26,7 @@
       {{/if}}
     </div>
 
-    <div class="ad-w-1/2 ad-text-right">
+    <div class="ad-w-1/2 ad-text-right" data-test-next-link>
       {{#if docsRoutes.next}}
         <div class='ad-text-sm ad-text-grey-dark'>
           Next

addon/services/docs-routes.js

@@ -39,14 +39,16 @@ export default Service.extend({
     if (this.get('routeUrls.length')) {
       let router = this.get('router.router');
       let currentURL = router.get('rootURL') + router.get('url');
-      currentURL = currentURL
-        .replace('//', '/')   // dedup slashes
-        .replace(/\?.+$/, '') // remove query-params
-        .replace(/\/$/, '')   // remove trailing slash
-        .replace(/#.+$/, ''); // remove # anchor links
-      let index = this.get('routeUrls').indexOf(currentURL);
-      assert(`DocsRoutes wasn't able to correctly detect the current route. The current url is ${currentURL}`, index > -1);
-      return index;
+      currentURL = currentURL.replace('//', '/')   // dedup slashes
+      let longestIndex, longestPrefix;
+      this.get('routeUrls').forEach((url, index) => {
+        if (currentURL.indexOf(url) === 0 && (!longestPrefix || url.length > longestPrefix.length)) {
+          longestIndex = index;
+          longestPrefix = url;
+        }
+      });
+      assert(`DocsRoutes wasn't able to correctly detect the current route. The current url is ${currentURL}`, longestIndex != null);
+      return longestIndex;
     }
   }),
 

tests/acceptance/docs-route-test.js

@@ -19,4 +19,9 @@ module('Acceptance | Docs route test', function(hooks) {
 
     assert.dom('h1').hasText('DocsHero');
   });
+
+  test('I can visit a nested child route within the docs pages and still have the correct links', async function(assert) {
+    await visit('/sandbox/docs/one/child');
+    assert.dom('[data-test-next-link] > a').hasText('Two');
+  });
 });

tests/dummy/app/pods/sandbox/template.hbs

@@ -2,6 +2,8 @@
   {{#viewer.nav project=model root='sandbox' as |nav|}}
     {{nav.section 'The Sandbox'}}
     {{nav.item 'Welcome' 'sandbox.index'}}
+    {{nav.item 'One' 'sandbox.docs.one'}}
+    {{nav.item 'Two' 'sandbox.docs.two'}}
   {{/viewer.nav}}
 
   {{#viewer.main}}

tests/dummy/app/router.js

@@ -26,6 +26,12 @@ Router.map(function() {
 
   this.route('sandbox', function() {
     apiRoute(this);
+    docsRoute(this, function() {
+      this.route('one', function() {
+        this.route('child');
+      });
+      this.route('two');
+    });
   });
 
   this.route('not-found', { path: '/*path' });