Merge pull request #1261 from ember-learn/jw-cm-urls-versions

Make individual pages for deprecations

Author: mansona

.eslintrc.js

@@ -54,5 +54,19 @@ module.exports = {
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },
+    {
+      // mocha tests
+      files: ['node-tests/**/*.mjs'],
+      env: {
+        browser: false,
+        node: true,
+        mocha: true,
+      },
+      plugins: ['node'],
+      extends: ['plugin:node/recommended'],
+      rules: {
+        'node/no-unpublished-import': 'off',
+      },
+    },
   ],
 };

Procfile

@@ -1,42 +1,10 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
-import { inject as service } from '@ember/service';
-import config from 'deprecation-app/config/environment';
-
 export default class ApplicationAdapter extends JSONAPIAdapter {
-  @service fastboot;
-
-  /**
-   *  FastBoot shouldn't know the host since we use prember
-   *  & it can't find the resources at the API host during build time.
-   */
-  get host() {
-    let isFastBoot = this.fastboot.isFastBoot;
-    return isFastBoot ? '' : config.apiHost;
+  urlForFindRecord(id, modelName) {
+    return `/${modelName}/${id}.json`;
   }
 
-  buildURL(modelName, id, snapshot, requestType, query) {
-    let url;
-
-    if (requestType === 'queryRecord') {
-      url = [modelName, `${query.path}.json`];
-    } else if (requestType === 'query') {
-      url = [modelName, `${query.path}-${query.version}.json`];
-    } else {
-      return this.super;
-    }
-
-    let host = this.host;
-    let prefix = this.urlPrefix();
-
-    if (prefix) {
-      url.unshift(prefix);
-    }
-
-    url = url.join('/');
-    if (!host && url && url.charAt(0) !== '/') {
-      url = '/' + url;
-    }
-
-    return url;
+  urlForQuery(query, modelName) {
+    return `/${modelName}/${query.path}-${query.version}.json`;
   }
 }

app/adapters/application.js

@@ -23,13 +23,6 @@ export default class ShowController extends Controller {
     return PROJECTS[this.content.query.path];
   }
 
-  get renderIdOrUntil() {
-    let version = this.content.query.version;
-    let versionsWithoutId = ['v1.x'];
-
-    return !versionsWithoutId.includes(version);
-  }
-
   @action
   toggleToc() {
     this.displayMobileToc = !this.displayMobileToc;

app/controllers/show.js

@@ -6,4 +6,10 @@ export default class ContentModel extends Model {
   @attr until;
   @attr since;
   @attr anchor;
+  @attr displayId;
+
+  // v1 has different meta, so conditionally render it
+  get renderUntil() {
+    return !this.since.startsWith('1.');
+  }
 }

app/models/content.js

@@ -14,4 +14,6 @@ Router.map(function () {
   this.route('show', {
     path: ':project/:version',
   });
+
+  this.route('id', { path: 'id/:id' });
 });

app/router.js

@@ -0,0 +1,10 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class IdPRoute extends Route {
+  @service store;
+
+  model(params) {
+    return this.store.findRecord('content', params.id);
+  }
+}

app/routes/id.js

@@ -1,3 +1,7 @@
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 
-export default class ApplicationSerializer extends JSONAPISerializer {}
+export default class ApplicationSerializer extends JSONAPISerializer {
+  keyForAttribute(key) {
+    return key;
+  }
+}

app/serializers/application.js

@@ -1,20 +1,9 @@
 <div class="padding-vertical-small bg-light-muted rounded-sm">
-  <h3 id="{{id-for-deprecation @model.id @model.anchor}}">
-    <a href="#{{id-for-deprecation @model.id @model.anchor}}" title={{@model.title}} class="toc-anchor">
-      §
-    </a>
-    {{markdown-to-html
-      @model.title
-      extensions="no-wrapper"
-      tagName=""
-    }}
-  </h3>
+  {{yield}}
   <div class="my-2">
-    {{#if @renderIdOrUntil}}
+    {{#if @model.renderUntil}}
       <div><span class="bold">until: </span>{{@model.until}}</div>
-    {{/if}}
-    {{#if @renderIdOrUntil}}
-      <div><span class="bold">id: </span>{{@model.id}}</div>
+      <div><span class="bold">id: </span>{{or @model.displayId @model.id}}</div>
     {{/if}}
   </div>
   <section>

app/templates/components/deprecation-article.hbs

@@ -10,7 +10,18 @@
     {{#each @sortedGroupedResults as |result|}}
       <h2 class="anchorable-toc rounded-lg padding-small">Deprecations Added in {{result.since}} </h2>
       {{#each result.contents as |content|}}
-        <DeprecationArticle @model={{content}} @renderIdOrUntil={{@renderIdOrUntil}} />
+        <DeprecationArticle @model={{content}}>
+          <h3 id="{{id-for-deprecation (or content.displayId content.id) content.anchor}}">
+            <a href="#{{id-for-deprecation (or content.displayId content.id) content.anchor}}" title={{content.title}} class="toc-anchor">
+              §
+            </a>
+            {{markdown-to-html
+              content.title
+              extensions="no-wrapper"
+              tagName=""
+            }}
+          </h3>
+        </DeprecationArticle>
       {{/each}}
     {{/each}}
   {{/if}}