update commit

addon/components/ordered-filtered-table.coffee

@@ -0,0 +1,8 @@
+import Ember from 'ember'
+import layout from '../templates/components/ordered-filtered-table'
+
+export default Ember.Component.extend
+  layout: layout
+  tagName: 'table'
+  classNames: ['ui', 'compact', 'table']
+  test_name: 'Oooo'

addon/helpers/dunlop-can.coffee

@@ -7,6 +7,8 @@ import Ember from 'ember'
 #   export default DunlopCan.extend
 #     # allow all epots scoped model on read adpter permission
 #     custom_compute: (permission, type, target, roles) ->
+#       return true if 'manage-adapter-epots' in roles
+#
 #       if permission is 'read' and type is 'model' and target.match(/^epots/)
 #         return 'read-adapter-epots' in roles
 #       false

addon/templates/components/ordered-filtered-table.hbs

@@ -0,0 +1,24 @@
+<thead>
+  <tr>
+    {{#each properties as |p|}}
+      {{p.header}}
+    {{/each}}
+  </tr>
+  <tr>
+    {{#each properties as |p|}}
+      {{p.filter}}
+    {{/each}}
+  </tr>
+</thead>
+<tbody>
+{{#each content as |record|}}
+  <tr>
+    {{#each properties as |p|}}
+      {{p.display record=record}}
+    {{/each}}
+  </tr>
+{{/each}}
+</tbody>
+{{yield (hash
+  property=(component "ordered-filtered-table/property" table=self)
+)}}

addon/templates/components/ordered-filtered-table/property.emblem

@@ -0,0 +1 @@
+= yield

addon/utils/paged-remote-array.coffee

@@ -0,0 +1,22 @@
+import PagedRemoteArray from 'ember-cli-pagination/remote/paged-remote-array'
+
+export default PagedRemoteArray.extend
+  a: 42
+  #params: {}
+  filters: {}
+  init: ->
+    query = @get('filters')?.toProperties() || {}
+    @otherParams ||= {}
+    @otherParams['q'] = query
+    #@setOtherParam('q', query) # explicitly not, init does not trigger operational callbacks
+    @_super arguments...
+  reload: ->
+    query = @get('filters')?.toProperties() || {}
+    @set 'page', 1
+    @set 'lastPage', null
+    @setOtherParam('q', query)
+  paramMapping:
+    total_pages: 'total-pages'
+    total_count: 'total-count'
+
+

app/components/ordered-filtered-table.js

@@ -0,0 +1 @@
+export { default } from 'ember-cli-dunlop/components/ordered-filtered-table';

app/components/ordered-filtered-table/property.js

@@ -0,0 +1 @@
+export { default } from 'ember-cli-dunlop/components/ordered-filtered-table/property';

package.json

@@ -26,27 +26,27 @@
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "^2.4.1",
+    "ember-ajax": "^3.0.0",
-    "ember-cli": "2.12.1",
+    "ember-cli": "2.16.2",
     "ember-cli-coffeescript": "^1.16.1",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
+    "ember-cli-eslint": "^4.2.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.2",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-moment-shim": "^3.5.0",
     "ember-cli-pagination": "^3.0.2",
-    "ember-cli-qunit": "^3.1.0",
+    "ember-cli-qunit": "^4.3.0",
     "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-export-application-global": "^1.0.5",
     "ember-get-config": "^0.2.1",
-    "ember-load-initializers": "^0.6.0",
+    "ember-load-initializers": "^1.0.0",
     "ember-one-way-controls": "^2.0.1",
-    "ember-resolver": "^2.0.3",
+    "ember-resolver": "^4.5.0",
     "ember-semantic-ui-calendar": "^0.2.0",
-    "ember-simple-auth": "^1.2.2",
+    "ember-simple-auth": "^1.4.2",
-    "ember-source": "~2.12.0",
+    "ember-source": "~2.16.2",
     "ember-truth-helpers": "^1.3.0",
     "loader.js": "^4.2.3",
     "semantic-ui-ember": "^2.0.1"

tests/dummy/app/router.coffee

@@ -10,6 +10,9 @@ Router.map ->
   @route 'table-filters', ->
     @route 'test1'
     @route 'test2'
+  @route 'table-ordering', ->
+    @route 'test1'
+    @route 'test2'
   @route 'helpers', ->
     @route 'number-to-xls-header'
 

tests/dummy/app/routes/table-ordering/test1.coffee

@@ -0,0 +1,32 @@
+import Ember from 'ember'
+import PagedArray from 'ember-cli-pagination/local/paged-array'
+
+export default_filter = Ember.Object.create
+  name: ''
+  target_week: ''
+  target_date_gteq: moment()
+  target_date_lteq: null
+  s: 'name asc'
+
+test_model = [
+  {name: 'Record1'}
+]
+export default Ember.Route.extend
+  queryParams:
+    q:
+      refreshModel: true
+  setupController: (controller, model) ->
+    controller.set 'filters', default_filter
+    controller.set 'option_buttons_options', [1, 'two']
+    @_super arguments...
+
+  model: (params) ->
+    #@store.findAll('epots/migration-window-planning')
+    otherParams = {q: default_filter.toProperties()}
+    result = PagedArray.create test_model, perPage: 7
+    result.setOtherParam = (param, q) ->
+      window.last_set_param ||= {}
+      window.last_set_param[param] = q # all is allowed for the purpose of testing and time conservation :devil:
+    result
+    test_model
+

tests/dummy/app/templates/global/-top-menu.emblem

@@ -4,6 +4,8 @@
     span ember-cli-dunlop dummy 
   = link-to 'table-filters.test1' class='item'
     span Filters
+  = link-to 'table-ordering.test1' class='item'
+    span Tables
   = link-to 'helpers' class='item'
     span Helpers
 

tests/dummy/app/templates/table-ordering/test1.emblem

@@ -0,0 +1,13 @@
+h1= model.length
+= ordered-filtered-table content=model filters=filters settings=table_settings class='celled striped' as |tbl filter|
+  = tbl.head as |head|
+    = head.property key='name' as |property|
+      = property.title
+        = t property.key scope='attribtes.my_model'
+  = tbl.property as |property|
+    = property.header
+      = t 'attribtes.my_model.name'
+    = property.filter
+      = filter.input key='name'
+    = property.display
+      = property.name

tests/dummy/app/templates/table-ordering/test2.emblem

@@ -0,0 +1 @@
+h1 Test222

tests/integration/components/ordered-filtered-table-test.coffee

@@ -0,0 +1,25 @@
+import { test, moduleForComponent } from 'ember-qunit'
+import hbs from 'htmlbars-inline-precompile'
+
+moduleForComponent 'ordered-filtered-table', 'Integration | Component | ordered filtered table', {
+  integration: true
+}
+
+test 'it renders', (assert) ->
+  assert.expect 2
+
+  # Set any properties with @set 'myProperty', 'value'
+  # Handle any actions with @on 'myAction', (val) ->
+
+  @render hbs """{{ordered-filtered-table}}"""
+
+  assert.equal @$().text().trim(), ''
+
+  # Template block usage:
+  @render hbs """
+    {{#ordered-filtered-table}}
+      template block text
+    {{/ordered-filtered-table}}
+  """
+
+  assert.equal @$().text().trim(), 'template block text'

tests/integration/components/ordered-filtered-table/property-test.coffee

@@ -0,0 +1,25 @@
+import { test, moduleForComponent } from 'ember-qunit'
+import hbs from 'htmlbars-inline-precompile'
+
+moduleForComponent 'ordered-filtered-table/property', 'Integration | Component | ordered filtered table/property', {
+  integration: true
+}
+
+test 'it renders', (assert) ->
+  assert.expect 2
+
+  # Set any properties with @set 'myProperty', 'value'
+  # Handle any actions with @on 'myAction', (val) ->
+
+  @render hbs """{{ordered-filtered-table/property}}"""
+
+  assert.equal @$().text().trim(), ''
+
+  # Template block usage:
+  @render hbs """
+    {{#ordered-filtered-table/property}}
+      template block text
+    {{/ordered-filtered-table/property}}
+  """
+
+  assert.equal @$().text().trim(), 'template block text'