From 0c5fb207e912bb2b2386824d75a38f2d09237130 Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 10 Sep 2015 13:04:25 -0700 Subject: [PATCH] FIX: Fix behavior of category reorder dialog --- .../controllers/reorder-categories.js.es6 | 79 ++++++++++--------- .../templates/modal/reorder-categories.hbs | 31 ++++---- config/locales/client.en.yml | 2 + 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 index 0c7ab22caed..f33b5e02a11 100644 --- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 +++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 @@ -5,6 +5,8 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; import computed from "ember-addons/ember-computed-decorators"; import Ember from 'ember'; +const SortableArrayProxy = Ember.ArrayProxy.extend(Ember.SortableMixin); + export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { @computed("site.categories") @@ -13,24 +15,23 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { return categories.map(c => bufProxy.create({ content: c })); }, - // uses propertyDidChange() - @computed('categoriesBuffered') - categoriesGrouped(cats) { - const map = {}; - cats.forEach((cat) => { - const p = cat.get('position') || 0; - if (!map[p]) { - map[p] = {pos: p, cats: [cat]}; - } else { - map[p].cats.push(cat); + categoriesOrdered: function() { + return SortableArrayProxy.create({ + sortProperties: ['content.position'], + content: this.get('categoriesBuffered') + }); + }.property('categoriesBuffered'), + + showFixIndices: function() { + const cats = this.get('categoriesOrdered'); + const len = cats.get('length'); + for (let i = 0; i < len; i++) { + if (cats.objectAt(i).get('position') !== i) { + return true; } - }); - const result = []; - Object.keys(map).map(p => parseInt(p)).sort((a,b) => a-b).forEach(function(pos) { - result.push(map[pos]); - }); - return result; - }, + } + return false; + }.property('categoriesOrdered.@each.position'), showApplyAll: function() { let anyChanged = false; @@ -38,29 +39,22 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { return anyChanged; }.property('categoriesBuffered.@each.hasBufferedChanges'), - saveDisabled: Ember.computed.alias('showApplyAll'), + @computed('showApplyAll', 'showFixIndices') + saveDisabled(a, b) { + return a || b; + }, moveDir(cat, dir) { - const grouped = this.get('categoriesGrouped'), - curPos = cat.get('position'), - curGroupIdx = binarySearch(grouped, curPos, "pos"), - curGroup = grouped[curGroupIdx]; - - if (curGroup.cats.length === 1 && ((dir === -1 && curGroupIdx !== 0) || (dir === 1 && curGroupIdx !== (grouped.length - 1)))) { - const nextGroup = grouped[curGroupIdx + dir], - nextPos = nextGroup.pos; - cat.set('position', nextPos); - } else { - cat.set('position', curPos + dir); + const cats = this.get('categoriesOrdered'); + const curIdx = cats.indexOf(cat); + const curPos = cat.get('position'); + const desiredIdx = curIdx + dir; + if (desiredIdx >= 0 && desiredIdx < cats.get('length')) { + cat.set('position', cat.get('position') + dir); + const otherCat = cats.objectAt(desiredIdx); + otherCat.set('position', cat.get('position') - dir); + this.send('commit'); } - cat.applyBufferedChanges(); - Ember.run.next(this, () => { - this.propertyDidChange('categoriesGrouped'); - Ember.run.schedule('afterRender', this, () => { - this.set('scrollIntoViewId', cat.get('id')); - this.trigger('scrollIntoView'); - }); - }); }, actions: { @@ -72,13 +66,22 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { this.moveDir(cat, 1); }, + fixIndices() { + const cats = this.get('categoriesOrdered'); + const len = cats.get('length'); + for (let i = 0; i < len; i++) { + cats.objectAt(i).set('position', i); + } + this.send('commit'); + }, + commit() { this.get('categoriesBuffered').forEach(bc => { if (bc.get('hasBufferedChanges')) { bc.applyBufferedChanges(); } }); - this.propertyDidChange('categoriesGrouped'); + this.propertyDidChange('categoriesBuffered'); }, saveOrder() { diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs index 7a5b3172b66..b23f2572923 100644 --- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs +++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs @@ -6,28 +6,27 @@ Position Category - {{#each categoriesGrouped as |group|}} - - {{#each group.cats as |cat|}} - - - {{number-field number=cat.position}} - {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} - {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} - {{#if cat.hasBufferedChanges}} - {{d-button class="no-text" action="commit" icon="check"}} - {{/if}} - - {{category-badge cat allowUncategorized="true"}} - - {{/each}} - + {{#each categoriesOrdered as |cat|}} + + + {{number-field number=cat.position}} + {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} + {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} + {{#if cat.hasBufferedChanges}} + {{d-button class="no-text" action="commit" icon="check"}} + {{/if}} + + {{category-badge cat allowUncategorized="true"}} + {{/each}}
+ {{#if showFixIndices}} + {{d-button action="fixIndices" icon="random" label="categories.reorder.fix_order" title="categories.reorder.fix_order_tooltip"}} + {{/if}} {{#if showApplyAll}} {{d-button action="commit" icon="check" label="categories.reorder.apply_all"}} {{/if}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7799a825451..49a681770be 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -370,6 +370,8 @@ en: category: "Category" reorder: title: "Reorder Categories" + fix_order: "Fix Positions" + fix_order_tooltip: "Not all categories have a unique position number, which may cause unexpected results." save: "Save Order" apply_all: "Apply" posts: "Posts"