Merge e58d5d2 into a3c41f9

app/components/gh-psm-tags-input.js

@@ -1,6 +1,7 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
 import {inject as service} from '@ember/service';
+import {sort} from '@ember/object/computed';
 
 export default Component.extend({
 
@@ -11,10 +12,14 @@ export default Component.extend({
     tagName: '',
 
     // internal attrs
-    availableTags: null,
+    _availableTags: null,
+
+    availableTags: sort('_availableTags.[]', function (tagA, tagB) {
+        return tagA.name.localeCompare(tagB.name);
+    }),
 
     availableTagNames: computed('availableTags.@each.name', function () {
-        return this.get('availableTags').map(tag => tag.get('name').toLowerCase());
+        return this.availableTags.map(tag => tag.name.toLowerCase());
     }),
 
     init() {
@@ -23,7 +28,7 @@ export default Component.extend({
         // to a live-query that will be immediately populated with what's in the
         // store and be updated when the above query returns
         this.store.query('tag', {limit: 'all'});
-        this.set('availableTags', this.store.peekAll('tag'));
+        this.set('_availableTags', this.store.peekAll('tag'));
     },
 
     actions: {

app/controllers/posts.js

@@ -79,7 +79,9 @@ export default Controller.extend({
     }),
 
     availableTags: computed('_availableTags.[]', function () {
-        let tags = this.get('_availableTags').filter(tag => tag.get('id') !== null);
+        let tags = this.get('_availableTags')
+            .filter(tag => tag.get('id') !== null)
+            .sort((tagA, tagB) => tagA.name.localeCompare(tagB.name));
         let options = tags.toArray();
 
         options.unshiftObject({name: 'All tags', slug: null});

app/controllers/settings/tags.js

@@ -14,21 +14,12 @@ export default Controller.extend({
     tagContentFocused: equal('keyboardFocus', 'tagContent'),
 
     filteredTags: computed('tags.@each.isNew', function () {
-        return this.get('tags').filterBy('isNew', false);
+        return this.tags.filterBy('isNew', false);
     }),
 
-    // TODO: replace with ordering by page count once supported by the API
-    sortedTags: sort('filteredTags', function (a, b) {
-        let idA = +a.get('id');
-        let idB = +b.get('id');
-
-        if (idA > idB) {
-            return 1;
-        } else if (idA < idB) {
-            return -1;
-        }
-
-        return 0;
+    // tags are sorted by name
+    sortedTags: sort('filteredTags', function (tagA, tagB) {
+        return tagA.name.localeCompare(tagB.name);
     }),
 
     actions: {

app/templates/components/gh-tag.hbs

@@ -1,14 +1,14 @@
-<div class="settings-tag" id="gh-tag-{{tag.id}}">
+<div class="settings-tag" id="gh-tag-{{tag.id}}" data-test-tag="{{tag.id}}">
     {{#link-to 'settings.tags.tag' tag class="tag-edit-button"}}
-        <span class="tag-title">{{tag.name}}</span>
-        <span class="label label-default">/{{tag.slug}}</span>
+        <span class="tag-title" data-test-name>{{tag.name}}</span>
+        <span class="label label-default" data-test-slug>/{{tag.slug}}</span>
 
         {{#if tag.isInternal}}
-            <span class="label label-blue">internal</span>
+            <span class="label label-blue" data-test-internal>internal</span>
         {{/if}}
 
-        <p class="tag-description">{{tag.description}}</p>
-        <span class="tags-count">
+        <p class="tag-description" data-test-description>{{tag.description}}</p>
+        <span class="tags-count" data-test-post-count>
             {{#link-to "posts" (query-params type=null author=null tag=tag.slug order=null)}}
                 {{tag.count.posts}}
             {{/link-to}}

tests/acceptance/content-test.js

@@ -5,6 +5,7 @@ import {
     authenticateSession,
     invalidateSession
 } from 'ghost-admin/tests/helpers/ember-simple-auth';
+import {clickTrigger} from 'ember-power-select/test-support/helpers';
 import {expect} from 'chai';
 
 describe('Acceptance: Content', function () {
@@ -124,6 +125,22 @@ describe('Acceptance: Content', function () {
 
             expect(currentURL(), 'url after double-click').to.equal(`/editor/${authorPost.id}`);
         });
+
+        it('sorts tags filter alphabetically', async function () {
+            server.create('tag', {name: 'B - Second', slug: 'second'});
+            server.create('tag', {name: 'Z - Last', slug: 'last'});
+            server.create('tag', {name: 'A - First', slug: 'first'});
+
+            await visit('/');
+            await clickTrigger('[data-test-tag-select]');
+
+            let options = find('.ember-power-select-option');
+
+            expect(options[0].textContent.trim()).to.equal('All tags');
+            expect(options[1].textContent.trim()).to.equal('A - First');
+            expect(options[2].textContent.trim()).to.equal('B - Second');
+            expect(options[3].textContent.trim()).to.equal('Z - Last');
+        });
     });
 
     describe('as author', function () {

tests/acceptance/settings/tags-test.js

@@ -180,8 +180,12 @@ describe('Acceptance: Settings - Tags', function () {
             await fillIn('.tag-settings-pane input[name="name"]', 'New Name');
             await triggerEvent('.tag-settings-pane input[name="name"]', 'blur');
 
+            // extra timeout needed for Travis - sometimes it doesn't update
+            // quick enough and an extra wait() call doesn't help
+            await timeout(100);
+
             // check we update with the data returned from the server
-            expect(find('.settings-tags .settings-tag:last .tag-title').text(), 'tag list updates on save')
+            expect(find('.settings-tag')[0].querySelector('.tag-title').textContent.trim(), 'tag list updates on save')
                 .to.equal('New Name');
             expect(find('.tag-settings-pane input[name="name"]').val(), 'settings form updates on save')
                 .to.equal('New Name');
@@ -217,7 +221,8 @@ describe('Acceptance: Settings - Tags', function () {
             // it adds the tag to the list and selects
             expect(find('.settings-tags .settings-tag').length, 'tag list count after creation')
                 .to.equal(3);
-            expect(find('.settings-tags .settings-tag:last .tag-title').text(), 'new tag list item title')
+            // new tag will be second in the list due to alphabetical sorting
+            expect(find('.settings-tags .settings-tag')[1].querySelector('.tag-title').textContent.trim(), 'new tag list item title')
                 .to.equal('New Tag');
             expect(find('a[href="/ghost/settings/tags/new-tag"]').hasClass('active'), 'highlights new tag')
                 .to.be.true;
@@ -312,5 +317,22 @@ describe('Acceptance: Settings - Tags', function () {
             expect(currentPath()).to.equal('error404');
             expect(currentURL()).to.equal('/settings/tags/unknown');
         });
+
+        it('sorts tags correctly', async function () {
+            server.create('tag', {name: 'B - Second', slug: 'second'});
+            server.create('tag', {name: 'Z - Last', slug: 'last'});
+            server.create('tag', {name: 'A - First', slug: 'first'});
+
+            await visit('settings/tags');
+
+            // second wait is needed for the vertical-collection to settle
+            await wait();
+
+            let tags = find('[data-test-tag]');
+
+            expect(tags[0].querySelector('[data-test-name]').textContent.trim()).to.equal('A - First');
+            expect(tags[1].querySelector('[data-test-name]').textContent.trim()).to.equal('B - Second');
+            expect(tags[2].querySelector('[data-test-name]').textContent.trim()).to.equal('Z - Last');
+        });
     });
 });

tests/integration/components/gh-psm-tags-input-test.js

@@ -69,7 +69,7 @@ describe.skip('Integration: Component: gh-psm-tags-input', function () {
         expect(selected[1].textContent).to.have.string('Tag Three');
     });
 
-    it('exposes all tags as options', async function () {
+    it('exposes all tags as options sorted alphabetically', async function () {
         run(() => {
             this.set('post', this.get('store').findRecord('post', 1));
         });
@@ -81,8 +81,8 @@ describe.skip('Integration: Component: gh-psm-tags-input', function () {
         let options = findAll('.ember-power-select-option');
         expect(options.length).to.equal(4);
         expect(options[0].textContent).to.have.string('Tag One');
-        expect(options[1].textContent).to.have.string('Tag Two');
-        expect(options[2].textContent).to.have.string('Tag Three');
+        expect(options[1].textContent).to.have.string('Tag Three');
+        expect(options[2].textContent).to.have.string('Tag Two');
         expect(options[3].textContent).to.have.string('#Internal Tag');
     });