From de0aff29d129b99ddbbbfa9f7372dc19fd12beb5 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 21 Mar 2017 18:53:49 -0800 Subject: [PATCH 001/383] Update contact model --- app/app.js | 18 +++ app/models/contact.js | 140 +++++++++++++++--- .../control/md-button-modal/component.js | 2 + 3 files changed, 136 insertions(+), 24 deletions(-) diff --git a/app/app.js b/app/app.js index 4cd3a65ed..e9f7c38c1 100644 --- a/app/app.js +++ b/app/app.js @@ -33,6 +33,15 @@ Ember.Route.reopen({ export default App; +/** +* Models for the mdEditor data store + +* @main data-models +* @module mdeditor +* @submodule data-models +* @category docs +*/ + /** * Components used to create objects or arrays of objects. * @@ -50,3 +59,12 @@ export default App; * @main components-input * @category docs */ + + /** + * Components used as UI controls. + * + * @module mdeditor + * @submodule components-control + * @main components-control + * @category docs + */ diff --git a/app/models/contact.js b/app/models/contact.js index 18c4a3770..dcf30064a 100644 --- a/app/models/contact.js +++ b/app/models/contact.js @@ -4,62 +4,143 @@ import uuidV4 from 'npm:uuid/v4'; import Validator from 'npm:validator'; export default DS.Model.extend(Ember.Copyable, { + /** + * Contact model + * + * @class contact + * @constructor + * @extends DS.Model + * @mixin Ember.Copyable + * @module mdeditor + * @submodule data-models + */ + + /** + * The json object for the contact. The data for the contact is stored in this + * object. + * + * @attribute json + * @type {json} + * @required + */ json: DS.attr('json', { defaultValue: function () { let obj = Ember.Object.create({ 'contactId': uuidV4(), - 'organizationName': null, - 'individualName': null, + 'isOrganization': false, + 'name': null, 'positionName': null, - 'phoneBook': [], - 'address': {}, + 'memberOfOrganization': [], + 'logoGraphic': [], + 'phone': [], + 'address': [], + 'electronicMailAddress': [], 'onlineResource': [], - 'contactInstructions': null + 'hoursOfService': [], + 'contactInstructions': null, + 'contactType': null }); return obj; } }), + + /** + * The timestamp for the record + * + * @attribute dateUpdated + * @type {date} + * @default new Date() + * @required + */ dateUpdated: DS.attr('date', { defaultValue() { return new Date(); } }), - title: Ember.computed('json.individualName', 'json.organizationName', + /** + * The formatted display string for the contact + * + * @property title + * @type {String} + * @readOnly + * @category computed + * @requires json.name, json.positionName + */ + title: Ember.computed('json.name', 'json.positionName', function () { const json = this.get('json'); - return json.individualName || json.organizationName; + return json.individualName || json.positionName; }), - icon: Ember.computed('json.individualName', 'json.organizationName', + /** + * The display icon for the contact + * + * @property icon + * @type {String} + * @readOnly + * @category computed + * @requires json.isOrganization + */ + icon: Ember.computed('json.isOrganization', function () { - const name = this.get('json.individualName'); + const name = this.get('json.isOrganization'); - return name ? 'user' : 'users'; + return name ? 'users' : 'user'; }), - combinedName: Ember.computed('json.individualName', - 'json.organizationName', + /** + * The formatted (name or position) and organization(if any) of the contact. + * + * @property combinedName + * @type {String} + * @readOnly + * @category computed + * @requires json.name, json.isOrganization + */ + combinedName: Ember.computed('json.name', 'json.isOrganization', + 'json.positionName', function () { const json = this.get('json'); - let indName = json.individualName; - let orgName = json.organizationName; - let combinedName = orgName; - - if(indName && orgName) { - return combinedName += ": " + indName; + let { + name, + positionName, + isOrganization, + memberOfOrganization + } = json; + + let orgId = memberOfOrganization.length ? memberOfOrganization[0] : + null; + let combinedName = name || positionName; + let orgName; + + if(orgId) { + this.get('store') + .findRecord('contact', orgId) + .then(function (org) { + orgName = org.name; + }); } - if(indName) { - return combinedName = indName; + if(orgName && !isOrganization) { + return combinedName += ": " + combinedName; } return combinedName; }), + /** + * The trimmed varsion of the contactId. + * + * @property shortId + * @type {String} + * @readOnly + * @category computed + * @requires json.contactId + */ shortId: Ember.computed('json.contactId', function () { const contactId = this.get('json.contactId'); if(contactId && Validator.isUUID(contactId)) { @@ -69,15 +150,26 @@ export default DS.Model.extend(Ember.Copyable, { return contactId; }), + /** + * Create a copy of the record in the store. + * + * @method copy + * @chainable + * @return {DS.Model} + */ copy() { let current = this.get('json'); let json = Ember.Object.create(JSON.parse(JSON.stringify(current))); - let indName = current.individualName; - let orgName = current.organizationName; + let { + name, + positionName, + isOrganization + } = current; json.setProperties({ - organizationName: indName ? orgName : `Copy of ${orgName}`, - individualName: indName ? `Copy of ${indName}` : null, + isOrganization: isOrganization, + name: name ? `Copy of ${name}` : null, + positionName: name ? positionName : `Copy of ${positionName}`, contactId: uuidV4() }); diff --git a/app/pods/components/control/md-button-modal/component.js b/app/pods/components/control/md-button-modal/component.js index 147bf913f..d40999f88 100644 --- a/app/pods/components/control/md-button-modal/component.js +++ b/app/pods/components/control/md-button-modal/component.js @@ -6,6 +6,8 @@ export default Ember.Component.extend({ * dialog when clicked. * * @class md-button-modal + * @module mdeditor + * @submodule components-control * @constructor */ From d060ff15118146d59624ea73735130f0732778ba Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 27 Mar 2017 07:45:44 -0800 Subject: [PATCH 002/383] Add md-array-table --- .../object/md-array-table/component.js | 192 ++++++++++++++++++ .../object/md-array-table/template.hbs | 58 ++++++ .../object/md-array-table/component-test.js | 25 +++ 3 files changed, 275 insertions(+) create mode 100644 app/pods/components/object/md-array-table/component.js create mode 100644 app/pods/components/object/md-array-table/template.hbs create mode 100644 tests/integration/pods/components/object/md-array-table/component-test.js diff --git a/app/pods/components/object/md-array-table/component.js b/app/pods/components/object/md-array-table/component.js new file mode 100644 index 000000000..c3e5b35c7 --- /dev/null +++ b/app/pods/components/object/md-array-table/component.js @@ -0,0 +1,192 @@ +import Ember from 'ember'; + +const { + computed, + Component, + A, + typeOf +} = Ember; + +export default Component.extend({ + init(){ + this._super(...arguments); + this.set('value', A(this.get('value'))) + }, + /** + * mdEditor class for input and edit of arrays of objects or scalars. The + * component is rendered as an editable table. + * + * @class md-array-table + * @submodule components-object + * @constructor + */ + + /** + * The array to render in the template + * + * @property value + * @type {Array} + * @default Ember.A() + * @required + */ + value: A(), + + /** + * The template class to use for new items. This should be a constructor. + * Objects should be created by extending Ember.Object. + * ```javascript + * Ember.Object.extend({ + * foo: null, + * bar: Ember.A() + * } + * ``` + * + * @property templateClass + * @type {Any} + * @constructor + * @default String + * @required + */ + templateClass: String, + + /** + * Comma-separated list of column headers to display in the table. If not + * provided, the table header will not be created. + * + * @property columns + * @type String + */ + + /** + * Inital collapse staet fo the panel. + * + * @property isCollapsed + * @type {Boolean} + * @default undefined + */ + + /** + * Indicates whether at least one item is required is required in the value + * array. + * + * @property required + * @type {Boolean} + * @default false + */ + required: false, + + /** + * The title for the panel. Should be in singular form. + * + * @property title + * @type {String} + * @default Item + */ + title: 'Item', + + /** + * Array of column headers + * + * @property columnArray + * @type {Array} + * @readOnly + * @category computed + * @requires columns + */ + columnArray: Ember.computed('columns', function () { + let columns = this.get('columns'); + + return(typeof columns === 'string') ? columns.split(',') : null; + }), + + /** + * Uses isCollapsed if defined, otherwise inspects array length. + * + * @property collapsed + * @type {Boolean} + * @readOnly + * @category computed + * @requires isCollapsed + */ + collapsed: Ember.computed('isCollapsed', function () { + let isCollapsed = this.get('isCollapsed'); + + if(isCollapsed !== undefined) { + return isCollapsed; + } else if(this.get('value') + .length > 0) { + return false; + } else { + return true; + } + }), + + /** + * The panel id selector + * + * @property panelId + * @type {String} + * @default "panel-{this.elementId}" + * @readOnly + * @category computed + * @requires elementId + */ + panelId: computed('elementId', function () { + return 'panel-' + this.get('elementId'); + }), + + /** + * The color of the counter displayed in the panel header + * + * @property pillColor + * @type {String} + * @readOnly + * @category computed + * @requires value.[] + */ + pillColor: Ember.computed('value.[]', function () { + let count = this.get('value') + .length; + let required = this.get('required'); + return(count === 0) ? required ? 'label-danger' : 'label-warning' : + 'label-info'; + }), + + /** + * Focus the added row, or the last row on deletion. + * + * @method valueChanged + * @return none + */ + valueChanged() { + Ember.run.schedule('afterRender', this, function () { + let panel = this.$('.panel-collapse'); + let input = this.$('.panel-collapse tbody tr:last-of-type input') + .first(); + + if(panel.hasClass('in')) { + input.focus(); + } else { //add a one-time listener to wait until panel is open + panel.one('shown.bs.collapse', function () { + input.focus(); + }); + panel.collapse('show'); + } + }); + }, + + actions: { + addItem: function (value) { + const Template = this.get('templateClass'); + + value.pushObject(typeOf(Template) === 'class' ? Template.create() : + new Template()); + this.valueChanged(); + }, + + deleteItem: function (value, idx) { + value.removeAt(idx); + this.valueChanged(); + } + } +}); diff --git a/app/pods/components/object/md-array-table/template.hbs b/app/pods/components/object/md-array-table/template.hbs new file mode 100644 index 000000000..0b91fa408 --- /dev/null +++ b/app/pods/components/object/md-array-table/template.hbs @@ -0,0 +1,58 @@ +
+ +
+

+ + +

+
+ + + +
diff --git a/tests/integration/pods/components/object/md-array-table/component-test.js b/tests/integration/pods/components/object/md-array-table/component-test.js new file mode 100644 index 000000000..1b462f714 --- /dev/null +++ b/tests/integration/pods/components/object/md-array-table/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-array-table', 'Integration | Component | object/md array table', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-array-table}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-array-table}} + template block text + {{/object/md-array-table}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 09d7d47821a5dae43548a949bb4d2f5e6a3c2dc5 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 27 Mar 2017 07:45:56 -0800 Subject: [PATCH 003/383] Add md-toggle --- .../components/input/md-toggle/component.js | 24 +++++++++++ app/styles/_toggle.scss | 42 ++++++++++++++++--- .../input/md-toggle/component-test.js | 25 +++++++++++ 3 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 app/pods/components/input/md-toggle/component.js create mode 100644 tests/integration/pods/components/input/md-toggle/component-test.js diff --git a/app/pods/components/input/md-toggle/component.js b/app/pods/components/input/md-toggle/component.js new file mode 100644 index 000000000..5e695396d --- /dev/null +++ b/app/pods/components/input/md-toggle/component.js @@ -0,0 +1,24 @@ +import Toggle from 'ember-toggle/components/x-toggle/component'; + +export default Toggle.extend({ + /** + * Custom toggle switch for boolean input + * + * @class md-toggle + * @constructor + * @extends ember-toggle/components/x-toggle + * @module mdeditor + * @submodule components-input + */ + + /** + * Bound classes: + * - value + * - __true__: toggle-on + * - __false__: toggle-off + * + * @property classNameBindings + * @type {Array} + */ + classNameBindings: ['value:toggle-on:toggle-off'] +}); diff --git a/app/styles/_toggle.scss b/app/styles/_toggle.scss index 83c06b53e..62b66f6ac 100644 --- a/app/styles/_toggle.scss +++ b/app/styles/_toggle.scss @@ -1,33 +1,63 @@ -.x-toggle-default.x-toggle-btn { +.x-toggle-default.x-toggle-btn, +.x-toggle-form.x-toggle-btn { background-color: $btn-danger-bg; border-radius: .2em; padding: .16em .1em; transition: background-color .2s; } -.x-toggle:checked + .x-toggle-default.x-toggle-btn { +.x-toggle-form.x-toggle-btn { + background-color: $btn-primary-bg; +} + +.x-toggle:checked + .x-toggle-default.x-toggle-btn, +.x-toggle:checked + .x-toggle-form.x-toggle-btn { background-color: $btn-success-bg; } -.x-toggle-default.x-toggle-btn::after { +.x-toggle-default.x-toggle-btn::after, +.x-toggle-form.x-toggle-btn::after { background-color: $body-bg; border-radius: .2em; transition: left .2s; } -.x-toggle-default.small { +.x-toggle-btn.small { height: 1.6em; width: 3em; } -.x-toggle-default.medium { +.x-toggle-btn.medium { height: 2.1em; padding: 3px; width: 4em; } -.x-toggle-default.large { +.x-toggle-btn.large { height: 2.1em; padding: 4px; width: 4.7em; } + +.form-group { + .x-toggle-component { + .toggle-text { + font-weight: 500; + } + + &.toggle-on { + .on-label { + color: $btn-success-bg; + text-decoration: underline; + } + } + + &.toggle-off { + .off-label { + color: $btn-primary-bg; + text-decoration: underline; + } + } + + } +} diff --git a/tests/integration/pods/components/input/md-toggle/component-test.js b/tests/integration/pods/components/input/md-toggle/component-test.js new file mode 100644 index 000000000..3cee5deb7 --- /dev/null +++ b/tests/integration/pods/components/input/md-toggle/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('input/md-toggle', 'Integration | Component | input/md toggle', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{input/md-toggle}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#input/md-toggle}} + template block text + {{/input/md-toggle}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 233fe43d3fe12ac32534de6d9483b03f0d0c94cf Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 27 Mar 2017 07:47:09 -0800 Subject: [PATCH 004/383] Update contact templates --- app/helpers/add-em.js | 4 +- app/models/contact.js | 17 ++- .../object/md-phone-array/component.js | 118 ++---------------- .../object/md-phone-array/template.hbs | 100 ++++----------- app/pods/contact/new/id/route.js | 97 ++++++++++---- app/pods/contact/new/id/template.hbs | 40 ++++-- app/pods/contact/show/edit/template.hbs | 33 +++-- app/styles/_typography.scss | 4 + 8 files changed, 182 insertions(+), 231 deletions(-) diff --git a/app/helpers/add-em.js b/app/helpers/add-em.js index d841495e1..8b4e06737 100644 --- a/app/helpers/add-em.js +++ b/app/helpers/add-em.js @@ -1,9 +1,7 @@ import Ember from 'ember'; export function addEm(params) { - return params.reduce(function (a, b) { - return a + b; - }); + return params.reduce((a, b) => Number(a) + Number(b)); } export default Ember.Helper.helper(addEm); diff --git a/app/models/contact.js b/app/models/contact.js index dcf30064a..e2440c7bb 100644 --- a/app/models/contact.js +++ b/app/models/contact.js @@ -72,7 +72,22 @@ export default DS.Model.extend(Ember.Copyable, { function () { const json = this.get('json'); - return json.individualName || json.positionName; + return json.name || (json.isOrganization ? null : json.positionName); + }), + + /** + * The type of contact + * + * @property type + * @type {String} + * @readOnly + * @category computed + * @requires json.isOrganization + */ + type: Ember.computed('json.isOrganization', + function () { + return this.get('json.isOrganization') ? 'Organization' : + 'Individual'; }), /** diff --git a/app/pods/components/object/md-phone-array/component.js b/app/pods/components/object/md-phone-array/component.js index eb2308654..59c348688 100644 --- a/app/pods/components/object/md-phone-array/component.js +++ b/app/pods/components/object/md-phone-array/component.js @@ -1,9 +1,9 @@ -/** - * @module mdeditor - */ - import Ember from 'ember'; +const { + Object: EmObject +} = Ember; + export default Ember.Component.extend({ /** @@ -11,113 +11,21 @@ export default Ember.Component.extend({ * The class manages the maintenance of an array of phone objects. * * @class md-phone-array + * @module mdeditor * @submodule components-object * @constructor */ /** - * An array of mdJSON phone objects. + * See [md-array-table](md-array-table.html#property_templateClass). * - * @property phoneBook - * @type Array - * @required + * @property templateClass + * @type Ember.Object */ - - /** - * Indicates the initial panel collapsed state. - * - * @property isCollapsed - * @type Boolean - */ - - mdCodes: Ember.inject.service('codelist'), - phoneServices: Ember.computed(function () { - let mdCodelist = this.get('mdCodes') - .get('telephone') - .codelist; - let serviceType = []; - mdCodelist.forEach(function (telephone) { - serviceType.push(telephone['codeName']); - }); - return serviceType; - }), - - //is this neccessary? Can this be used instead: $(this)[0].get('elementId') - //or just this.$('.panel-collapse') if you just need to add a listener to - //the show.bs.* events - panelId: Ember.computed(function () { - return Ember.generateGuid(null, 'panel'); - }), - - //uses isCollapsed if defined, otherwise inspects array length - collapsed: Ember.computed('isCollapsed', function () { - let isCollapsed = this.get('isCollapsed'); - - if(isCollapsed !== undefined) { - return isCollapsed; - } else if(this.get('phoneBook') - .length > 0) { - return false; - } else { - return true; - } - }), - - //focus the added row, or the last row on deletion - phoneBookChanged() { - //https://guides.emberjs.com/v2.6.0/applications/run-loop/ - Ember.run.schedule('afterRender', this, function () { - let panel = this.$('.panel-collapse'); - let input = this.$('.panel-collapse tbody tr:last-of-type input') - .first(); - - if(panel.hasClass('in')) { - input.focus(); - } else { //add a one-time listener to wait until panel is open - panel.one('shown.bs.collapse', function () { - input.focus(); - }); - panel.collapse('show'); - } - }); - }, - - pillColor: Ember.computed('phoneBook.[]', function () { - let count = this.get('phoneBook') - .length; - return(count > 0) ? 'label-info' : 'label-warning'; - }), - - /*didInsertElement: function () { - let panel = this.get('panelId'); - let panelBtn = panel + '-btn'; - - $('#' + panel) - .on('show.bs.collapse', function () { - $('#' + panelBtn) - .removeClass('invisible'); - }); - $('#' + panel) - .on('hidden.bs.collapse', function () { - $('#' + panelBtn) - .addClass('invisible'); - }); - },*/ - - actions: { - addPhone: function (phoneBook) { - phoneBook.pushObject(Ember.Object.create({ - phoneName: "", - phoneNumber: "", - service: [] - })); - this.phoneBookChanged(); - }, - - deletePhone: function (phoneBook, idx) { - phoneBook.removeAt(idx); - this.phoneBookChanged(); - } - } + templateClass: EmObject.extend({ + phoneName: null, + phoneNumber: null, + service: [] + }) }); diff --git a/app/pods/components/object/md-phone-array/template.hbs b/app/pods/components/object/md-phone-array/template.hbs index ebfa5c05c..f3fc049da 100644 --- a/app/pods/components/object/md-phone-array/template.hbs +++ b/app/pods/components/object/md-phone-array/template.hbs @@ -1,75 +1,25 @@ -
- -
-

- - -

-
- - - -
+{{#object/md-array-table + columns="Name,Number,Services" + title="Phone" + value=value + templateClass=templateClass as |phone| +}} + + {{input/md-input value=phone.item.phoneName + placeholder="Name or location or phone"}} + + + {{input/md-input value=phone.item.phoneNumber + placeholder="Phone number"}} + + + {{input/md-codelist-multi + create=true + tooltip=true + icon=false + disabled=disabled + allowClear=true + mdCodeName="telephone" + value=phone.item.service placeholder="Choose phone type" }} + +{{/object/md-array-table}} diff --git a/app/pods/contact/new/id/route.js b/app/pods/contact/new/id/route.js index a9296db68..795153e53 100644 --- a/app/pods/contact/new/id/route.js +++ b/app/pods/contact/new/id/route.js @@ -1,16 +1,44 @@ import Ember from 'ember'; +import DS from 'ember-data'; + +const { + AdapterError +} = DS; export default Ember.Route.extend({ + /** + * The route model + * + * @method model + * @param {Object} params + * @chainable + * @return {Object} + */ model: function (params) { - // if(!params.contact_id) { - // return this.store.createRecord('contact'); - // } + let record = this.store.peekRecord('contact', params.contact_id); + + if(record) { + return record; + } return this.store.findRecord('contact', params.contact_id); }, + /** + * The breadcrumb title string. + * + * @property breadCrumb + * @type {String} + * @default null + */ breadCrumb: null, + /** + * Called when route is deactivated. + * The model is destroyed if still "new". + * + * @method deactivate + */ deactivate: function () { // We grab the model loaded in this route var model = this.currentModel; @@ -23,27 +51,26 @@ export default Ember.Route.extend({ } }, - //some test actions setupController: function (controller, model) { // Call _super for default behavior this._super(controller, model); - // setup tests for required attributes - controller.noId = Ember.computed('model.json.contactId', function () { - return model.get('json.contactId') ? false : true; - }); - controller.noName = Ember.computed('model.json.individualName', - 'model.json.organizationName', - function () { - let haveIndividual = model.get('json.individualName') ? true : - false; - let haveOrganization = model.get('json.organizationName') ? - true : false; - return !(haveIndividual || haveOrganization); - }); - controller.allowSave = Ember.computed('noId', 'noName', function () { - return(this.get('noName') || this.get('noId')); - }); + // // setup tests for required attributes + // controller.noId = Ember.computed('model.json.contactId', function () { + // return model.get('json.contactId') ? false : true; + // }); + // controller.noName = Ember.computed('model.json.individualName', + // 'model.json.organizationName', + // function () { + // let haveIndividual = model.get('json.individualName') ? true : + // false; + // let haveOrganization = model.get('json.organizationName') ? + // true : false; + // return !(haveIndividual || haveOrganization); + // }); + // controller.allowSave = Ember.computed('noId', 'noName', function () { + // return(this.get('noName') || this.get('noId')); + // }); }, // serialize: function (model) { @@ -61,9 +88,21 @@ export default Ember.Route.extend({ actions: { willTransition: function (transition) { - if (transition.targetName === 'contact.new.index') { - this.currentModel.destroyRecord(); - return true; + if(transition.targetName === 'contact.new.index') { + transition.abort(); + return true; + } + + // We grab the model loaded in this route + var model = this.currentModel; + // If we are leaving the Route we verify if the model is in + // 'isNew' state, which means it wasn't saved to the backend. + if(model && model.get('isNew')) { + // We call DS#destroyRecord() which removes it from the store + model.destroyRecord(); + transition.abort(); + this.replaceWith(transition.targetName); + return true; } }, @@ -79,6 +118,18 @@ export default Ember.Route.extend({ this.replaceWith('contacts'); return false; + }, + + error(error) { + if(error instanceof AdapterError) { + Ember.get(this, 'flashMessages') + .warning('No contact found! Re-directing to new contact...'); + // redirect to new + this.replaceWith('contact.new'); + } else { + // otherwise let the error bubble + return true; + } } } }); diff --git a/app/pods/contact/new/id/template.hbs b/app/pods/contact/new/id/template.hbs index 6b1ffec3a..8a6014305 100644 --- a/app/pods/contact/new/id/template.hbs +++ b/app/pods/contact/new/id/template.hbs @@ -1,12 +1,10 @@ -
-
+
+

Create New Contact

-

To create a new contact, enter a contact ID and an - individual name, organization name, or both.

-
+{{!--
{{#if noId}} {{/if}}
-
+
--}}
+
+ +
+ {{input/md-toggle + value=model.json.isOrganization + onToggle=(mut model.json.isOrganization) + showLabels=true + onLabel="Organization::true" + offLabel="Individual::false" + size="large" + theme="form" + }} +
+
@@ -32,21 +44,23 @@
- +
{{input/md-input - value=model.json.individualName - placeholder="Enter a name for this person"}} + value=model.json.name + placeholder="Enter a name for this contact"}}
-
- + {{#unless model.json.isOrganization}} +
+
{{input/md-input - value=model.json.organizationName - placeholder="Enter a name for this organization"}} + value=model.json.positionName + placeholder="Enter a name for this position"}}
+ {{/unless}}
diff --git a/app/pods/contact/show/edit/template.hbs b/app/pods/contact/show/edit/template.hbs index 1b2e97dbe..ae92742b9 100644 --- a/app/pods/contact/show/edit/template.hbs +++ b/app/pods/contact/show/edit/template.hbs @@ -1,24 +1,35 @@ +
+
+

Editing Contact: {{model.json.name}} {{model.json.contactId}}

+
+
- -

Editing Contact: {{model.json.contactId}}

-
{{input/md-input value=model.json.contactId placeholder="User assigned Contact ID" label="Contact ID"}} - {{input/md-input value=model.json.organizationName - placeholder="Organization Name" label="Organization Name"}} - - {{input/md-input value=model.json.individualName - placeholder="Individual Name" label="Individual Name"}} + {{input/md-input value=model.json.name + placeholder=(concat model.type " Name") label=(concat model.type " Name")}} {{input/md-input value=model.json.positionName - placeholder="If Individual Name, provide Position" label="Position Name"}} + placeholder="Position Name" label="Position Name"}} - {{object/md-phone-array phoneBook=model.json.phoneBook isCollapsed=false}} + {{object/md-phone-array value=model.json.phone isCollapsed=false}} + + {{#object/md-array-table + columns="E-mail" + title="E-mail Address" + required=true + value=model.json.electronicMailAddress as |email| + }} + + {{input/md-input value=email.item + placeholder="Enter valid e-mail address"}} + + {{/object/md-array-table}} - {{object/md-address address=model.json.address}} + {{!-- {{object/md-address address=model.json.address}} --}} {{object/md-online-resource-array model=model.json}} diff --git a/app/styles/_typography.scss b/app/styles/_typography.scss index e65770ff8..cf48e1dec 100644 --- a/app/styles/_typography.scss +++ b/app/styles/_typography.scss @@ -2,3 +2,7 @@ padding-left: .3em; padding-right: .3em; } + +.page-header { + margin: 20px 0; +} From e326029da5166317971339b6044b34a2619b2437 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 27 Mar 2017 07:47:21 -0800 Subject: [PATCH 005/383] Update packages --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 898a27d85..6a3ca44ca 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "ember-leaflet-layer-control": "0.0.1", "ember-load": "~0.0.9", "ember-load-initializers": "^0.6.0", - "ember-local-storage": "1.3.3", + "ember-local-storage": "^1.3.6", "ember-modal-dialog": "^0.9.0", "ember-models-table": "1.11.0", "ember-multiselect-checkboxes": "^0.10.2", @@ -85,7 +85,7 @@ "geojson-coords": "0.0.0", "loader.js": "^4.0.10", "lodash": "^4.17.4", - "mdcodes": "^2.0.0", + "mdcodes": "^2.1.5", "shapefile": "^0.6.2", "uuid": "^3.0.1", "validator": "^6.2.0", From 700b5d559d53c204fb063b3d39a06333d51a4ce5 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 27 Mar 2017 17:02:40 -0800 Subject: [PATCH 006/383] Update contact components, add simple-array-table --- .../components/object/md-address/component.js | 86 +++++++++-------- .../components/object/md-address/template.hbs | 92 ++++++++++--------- .../object/md-array-table/component.js | 53 +++++++---- .../object/md-array-table/template.hbs | 2 +- .../object/md-object-table/template.hbs | 8 +- .../md-online-resource-array/component.js | 20 +--- .../md-online-resource-array/template.hbs | 12 +-- .../object/md-simple-array-table/component.js | 67 ++++++++++++++ app/pods/contact/show/edit/template.hbs | 16 ++-- .../md-simple-array-table/component-test.js | 25 +++++ 10 files changed, 239 insertions(+), 142 deletions(-) create mode 100644 app/pods/components/object/md-simple-array-table/component.js create mode 100644 tests/integration/pods/components/object/md-simple-array-table/component-test.js diff --git a/app/pods/components/object/md-address/component.js b/app/pods/components/object/md-address/component.js index 7e557e5b5..c184acad2 100644 --- a/app/pods/components/object/md-address/component.js +++ b/app/pods/components/object/md-address/component.js @@ -1,49 +1,47 @@ -/** - * @module mdeditor - * @submodule components-object - */ - import Ember from 'ember'; export default Ember.Component.extend({ - - /** - * mdEditor class for input and edit of mdJSON address objects. - * - * @class md-address - * @constructor - */ - - /** - * mdJSON 'address' object to be edited. - * - * @property address - * @type Object - * @required - */ - - panelId: Ember.computed(function () { - return Ember.generateGuid(null, 'panel'); - }), - - /** - * Indicate whether the address object is not empty. - * - * @property isEmpty - * @type Boolean - */ - - notEmpty: Ember.computed('address', 'address.city', - 'address.deliveryPoint', 'address.adminsitrativeArea', - 'address.postalCode', 'address.country', - 'address.electronicMailAddress.[]', - function () { - let address = this.get('address'); - let keys = Object.keys(address); - - return keys.some(function (key) { - return !Ember.isEmpty(address[key]); - }); - }) + /** + * mdEditor class for input and edit of mdJSON 'address' object + * arrays. The class manages the maintenance of an array of address + * objects using the md-object-table class. + * + * @module mdeditor + * @submodule components-object + * @class md-address + * @constructor + * @requires md-object-table + */ + + /** + * mdJSON object containing the 'address' array. + * + * @property model + * @type Object + * @required + */ + + /** + * List of mdJSON 'address' object attributes to display in + * md-object-table to aid in choosing the address to edit or + * delete. + * The property is passed to md-object-table for configuration. + * + * @property attributes + * @type String + * @default 'name, uri' + */ + attributes: 'deliveryPoint.0,city', + + /** + * Name to place on the mdEditor panel header for entry and edit of + * 'address' objects. + * The property is passed to md-object-table for configuration. + * + * @property label + * @type String + * @default 'Address' + */ + label: 'Address' }); diff --git a/app/pods/components/object/md-address/template.hbs b/app/pods/components/object/md-address/template.hbs index c4ca8ac9e..5dffcdd2b 100644 --- a/app/pods/components/object/md-address/template.hbs +++ b/app/pods/components/object/md-address/template.hbs @@ -1,49 +1,51 @@ -
- -
-

- -

+
+ + {{#object/md-object-table + items=model.address + header=label + buttonText="Add Address" + attributes=attributes as |address| + }} + + Editing: {{address.name}} + + {{!-- {{input/md-inputs model=address.deliveryPoint + placeholder="Address line" label="Address Lines" + buttonText="Add Line"}} --}} +{{!-- + {{#object/md-simple-array-table + columns="Street" + title="Street" + required=true + value=address.deliveryPoint as |line| + }} + + {{input/md-input value=line.item.value + placeholder="Enter street address"}} + + {{/object/md-simple-array-table}} --}} + + {{input/md-input value=address.city + placeholder="City Name" label="City"}} + + {{input/md-input value=address.adminsitrativeArea + placeholder="State or Province" label="State/Province"}} + + {{input/md-input value=address.postalCode + placeholder="Zip or Postal Code" label="Postal Code"}} + + {{input/md-input value=address.country + placeholder="Country Name" label="Country"}} + +
+ {{input/md-codelist + value=address.country + width="175px" + create=true tooltip=true icon=false mdCodeName="countries" + placeholder="Enter a country code"}}
-
-
- {{input/md-inputs model=address.deliveryPoint - placeholder="Address line" label="Address Lines" - buttonText="Add Line"}} - - {{input/md-input value=address.city - placeholder="City Name" label="City"}} - - {{input/md-input value=address.adminsitrativeArea - placeholder="State or Province" label="State/Province"}} - - {{input/md-input value=address.postalCode - placeholder="Zip or Postal Code" label="Postal Code"}} - - {{input/md-input value=address.country - placeholder="Country Name" label="Country"}} - -
- {{input/md-codelist - value=address.country - width="175px" - create=true tooltip=true icon=false mdCodeName="country" - placeholder="Enter a country code"}} -
- - {{input/md-inputs model=address.electronicMailAddress - placeholder="Email Address" label="Email Addresses" - buttonText="Add Email"}} - -
-
-
+ {{/object/md-object-table}} + {{yield}}
diff --git a/app/pods/components/object/md-array-table/component.js b/app/pods/components/object/md-array-table/component.js index c3e5b35c7..59f642f42 100644 --- a/app/pods/components/object/md-array-table/component.js +++ b/app/pods/components/object/md-array-table/component.js @@ -8,12 +8,8 @@ const { } = Ember; export default Component.extend({ - init(){ - this._super(...arguments); - this.set('value', A(this.get('value'))) - }, /** - * mdEditor class for input and edit of arrays of objects or scalars. The + * mdEditor class for input and edit of arrays of objects. The * component is rendered as an editable table. * * @class md-array-table @@ -21,6 +17,14 @@ export default Component.extend({ * @constructor */ + init() { + this._super(...arguments); + + if (!this.get('value')) { + this.set('value', A()); + } + }, + /** * The array to render in the template * @@ -29,7 +33,7 @@ export default Component.extend({ * @default Ember.A() * @required */ - value: A(), + value: [], /** * The template class to use for new items. This should be a constructor. @@ -93,10 +97,10 @@ export default Component.extend({ * @category computed * @requires columns */ - columnArray: Ember.computed('columns', function () { + columnArray: computed('columns', function() { let columns = this.get('columns'); - return(typeof columns === 'string') ? columns.split(',') : null; + return (typeof columns === 'string') ? columns.split(',') : null; }), /** @@ -108,12 +112,12 @@ export default Component.extend({ * @category computed * @requires isCollapsed */ - collapsed: Ember.computed('isCollapsed', function () { + collapsed: computed('isCollapsed', function() { let isCollapsed = this.get('isCollapsed'); - if(isCollapsed !== undefined) { + if (isCollapsed !== undefined) { return isCollapsed; - } else if(this.get('value') + } else if (this.get('value') .length > 0) { return false; } else { @@ -121,6 +125,17 @@ export default Component.extend({ } }), + /** + * Alias for values + * + * @property arrayValues + * @type {Array} + * @readOnly + * @category computed + * @requires value + */ + arrayValues: computed.alias('value'), + /** * The panel id selector * @@ -131,7 +146,7 @@ export default Component.extend({ * @category computed * @requires elementId */ - panelId: computed('elementId', function () { + panelId: computed('elementId', function() { return 'panel-' + this.get('elementId'); }), @@ -144,11 +159,11 @@ export default Component.extend({ * @category computed * @requires value.[] */ - pillColor: Ember.computed('value.[]', function () { + pillColor: computed('value.[]', function() { let count = this.get('value') .length; let required = this.get('required'); - return(count === 0) ? required ? 'label-danger' : 'label-warning' : + return (count === 0) ? required ? 'label-danger' : 'label-warning' : 'label-info'; }), @@ -159,15 +174,15 @@ export default Component.extend({ * @return none */ valueChanged() { - Ember.run.schedule('afterRender', this, function () { + Ember.run.schedule('afterRender', this, function() { let panel = this.$('.panel-collapse'); let input = this.$('.panel-collapse tbody tr:last-of-type input') .first(); - if(panel.hasClass('in')) { + if (panel.hasClass('in')) { input.focus(); } else { //add a one-time listener to wait until panel is open - panel.one('shown.bs.collapse', function () { + panel.one('shown.bs.collapse', function() { input.focus(); }); panel.collapse('show'); @@ -176,7 +191,7 @@ export default Component.extend({ }, actions: { - addItem: function (value) { + addItem: function(value) { const Template = this.get('templateClass'); value.pushObject(typeOf(Template) === 'class' ? Template.create() : @@ -184,7 +199,7 @@ export default Component.extend({ this.valueChanged(); }, - deleteItem: function (value, idx) { + deleteItem: function(value, idx) { value.removeAt(idx); this.valueChanged(); } diff --git a/app/pods/components/object/md-array-table/template.hbs b/app/pods/components/object/md-array-table/template.hbs index 0b91fa408..4e2702872 100644 --- a/app/pods/components/object/md-array-table/template.hbs +++ b/app/pods/components/object/md-array-table/template.hbs @@ -28,7 +28,7 @@ {{/if}} - {{#each value as |item index|}} + {{#each arrayValues as |item index|}} {{index}} {{yield (hash item=item index=index)}} diff --git a/app/pods/components/object/md-object-table/template.hbs b/app/pods/components/object/md-object-table/template.hbs index d12b496fc..e47366483 100644 --- a/app/pods/components/object/md-object-table/template.hbs +++ b/app/pods/components/object/md-object-table/template.hbs @@ -27,7 +27,7 @@ - {{#each citems key="@index" as |item index|}} + {{#each citems as |item index|}} {{index}} {{#each attrArray as |prop|}} @@ -56,7 +56,11 @@
- {{yield saveItem (action "cancelEdit")}} + {{yield saveItem}} +
+
diff --git a/app/pods/components/object/md-online-resource-array/component.js b/app/pods/components/object/md-online-resource-array/component.js index 70e1ad292..5bc3331e0 100644 --- a/app/pods/components/object/md-online-resource-array/component.js +++ b/app/pods/components/object/md-online-resource-array/component.js @@ -25,17 +25,6 @@ export default Ember.Component.extend({ * @required */ - /** - * Name of the mdJSON 'onlineResource' array in the 'contact' object. - * The property is used to compute items2 which is passed to - * md-object-table for configuration. - * - * @property propertyArrayName - * @type String - * @default 'onlineResource' - */ - //propertyArrayName: 'onlineResource', - /** * List of mdJSON 'onlineResource' object attributes to display in * md-object-table to aid in choosing the onlineResource to edit or @@ -57,12 +46,5 @@ export default Ember.Component.extend({ * @type String * @default 'Online Resource' */ - label: 'Online Resource', - - /*items2: Ember.computed('model', function() { - if (this.get('model.' + this.get('propertyArrayName')) === undefined) { - this.set('model.' + this.get('propertyArrayName'), []); - } - return this.get('model.' + this.get('propertyArrayName')); - })*/ + label: 'Online Resource' }); diff --git a/app/pods/components/object/md-online-resource-array/template.hbs b/app/pods/components/object/md-online-resource-array/template.hbs index 9676a09aa..2b04d057a 100644 --- a/app/pods/components/object/md-online-resource-array/template.hbs +++ b/app/pods/components/object/md-online-resource-array/template.hbs @@ -1,6 +1,11 @@
- {{#object/md-object-table items=model.onlineResource header=label buttonText="Add Resource" attributes=attributes as |editing cancelEdit|}} + {{#object/md-object-table + items=model.onlineResource + header=label + buttonText="Add Resource" + attributes=attributes as |editing| + }} Editing: {{editing.name}} {{input/md-input value=editing.name label="Name" placeholder="Online Resource Name"}} @@ -17,11 +22,6 @@ label="Function" placeholder="Select function of the Online Resource" tooltip=true allowClear=true width="70%"}} -
- - {{/object/md-object-table}} {{yield}} diff --git a/app/pods/components/object/md-simple-array-table/component.js b/app/pods/components/object/md-simple-array-table/component.js new file mode 100644 index 000000000..108f83344 --- /dev/null +++ b/app/pods/components/object/md-simple-array-table/component.js @@ -0,0 +1,67 @@ +import Ember from 'ember'; +import ArrayTable from '../md-array-table/component'; + +const { + computed, + observer +} = Ember; + +export default ArrayTable.extend({ + /** + * mdEditor component for input and edit of arrays of scalars. The + * component is rendered as an editable table. + * + * @class md-simple-array-table + * @module mdeditor + * @submodule components-object + * @extends md-array-table + * @constructor + */ + + layoutName: 'components/object/md-array-table', + + /** + * Convert the input 'primitive' array to an 'ember' array of objects + * + * @property arrayValues + * @type {Array} + * @category computed + * @requires value.[] + */ + arrayValues: computed('value.[]', { + get() { + let items = this.get('value'); + + if (items === undefined) { + items = []; + items[0] = ''; + } + + return items.reduce(function(acc, value) { + acc.pushObject({ + value: value + }); + return acc; + }, []); + }, + + set(key, value) { + this.set('value', value + .filterBy('value') + .mapBy('value')); + return value; + } + }), + + /** + * Set the value when arrayValues is updated + * + * @property valuesObserver + * @type {Observer} + * @category computed + * @requires arrayValues.@each.value + */ + valuesObserver: observer('arrayValues.@each.value', function() { + this.set('arrayValues', this.get('arrayValues')); + }) +}); diff --git a/app/pods/contact/show/edit/template.hbs b/app/pods/contact/show/edit/template.hbs index ae92742b9..7a85589d0 100644 --- a/app/pods/contact/show/edit/template.hbs +++ b/app/pods/contact/show/edit/template.hbs @@ -12,24 +12,28 @@ {{input/md-input value=model.json.name placeholder=(concat model.type " Name") label=(concat model.type " Name")}} - {{input/md-input value=model.json.positionName - placeholder="Position Name" label="Position Name"}} + {{#unless model.json.isOrganization}} + {{input/md-input value=model.json.positionName + placeholder="Position Name" label="Position Name"}} + {{/unless}} {{object/md-phone-array value=model.json.phone isCollapsed=false}} - {{#object/md-array-table + {{#object/md-simple-array-table columns="E-mail" title="E-mail Address" required=true value=model.json.electronicMailAddress as |email| }} - {{input/md-input value=email.item + {{input/md-input value=email.item.value placeholder="Enter valid e-mail address"}} - {{/object/md-array-table}} + {{/object/md-simple-array-table}} - {{!-- {{object/md-address address=model.json.address}} --}} + + + {{object/md-address model=model.json}} {{object/md-online-resource-array model=model.json}} diff --git a/tests/integration/pods/components/object/md-simple-array-table/component-test.js b/tests/integration/pods/components/object/md-simple-array-table/component-test.js new file mode 100644 index 000000000..6e5d5e104 --- /dev/null +++ b/tests/integration/pods/components/object/md-simple-array-table/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-simple-array-table', 'Integration | Component | object/md simple array table', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-simple-array-table}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-simple-array-table}} + template block text + {{/object/md-simple-array-table}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 6b9e48bd1b61c8862310711e167a905d5f5e6c0f Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 28 Mar 2017 19:25:42 -0800 Subject: [PATCH 007/383] Update codelist components Support valuePath, namePath, tooltipPath --- .../input/md-codelist-multi/component.js | 6 +- .../components/input/md-codelist/component.js | 73 +++++++++++++++---- 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/app/pods/components/input/md-codelist-multi/component.js b/app/pods/components/input/md-codelist-multi/component.js index 91f7a4dfe..53aaab0d5 100644 --- a/app/pods/components/input/md-codelist-multi/component.js +++ b/app/pods/components/input/md-codelist-multi/component.js @@ -84,7 +84,7 @@ export default MdCodelist.extend({ if(value) { return codelist.filter((item) => { - return value.includes(item['codeName']); + return value.includes(item['codeId']); }); } return null; @@ -106,7 +106,7 @@ export default MdCodelist.extend({ if(value) { if(create) { value.forEach((val) => { - let found = codelist.findBy('codeName', val); + let found = codelist.findBy('codeId', val); if(found === undefined) { let newObject = this.createCode(val); codelist.pushObject(newObject); @@ -138,7 +138,7 @@ export default MdCodelist.extend({ sel = selected; } - this.set('value', sel.mapBy('codeName')); + this.set('value', sel.mapBy('codeId')); this.change(); } }); diff --git a/app/pods/components/input/md-codelist/component.js b/app/pods/components/input/md-codelist/component.js index a62f3403b..fe99c40bb 100644 --- a/app/pods/components/input/md-codelist/component.js +++ b/app/pods/components/input/md-codelist/component.js @@ -28,6 +28,38 @@ export default Select.extend({ * @required */ + /** + * Name of the attribute in the objectArray to be used for the + * select list's option value. + * + * @property valuePath + * @type String + * @default codeName + * @required + */ + valuePath: 'codeName', + /** + * Name of the attribute in the objectArray to be used for the + * select list's option name or display text. + * + * @property namePath + * @type String + * @default codename + * @required + */ + namePath: 'codeName', + + /** + * Name of the attribute in the objectArray to be used for the + * select list's tooltip. If null, no tooltip will be + * generated. + * + * @property tooltipPath + * @type String + * @default null + */ + tooltipPath: 'description', + /** * Initial value, returned value. * @@ -74,12 +106,12 @@ export default Select.extend({ * @type Ember.computed * @return PromiseObject */ - selectedItem: Ember.computed('value', function () { + selectedItem: Ember.computed('value', function() { let value = this.get('value'); return this.get('codelist') .find((item) => { - return item['codeName'] === value; + return item['codeId'] === value; }); }), @@ -91,7 +123,10 @@ export default Select.extend({ * @type Ember.computed * @return Array */ - mapped: Ember.computed('mdCodeName', function () { + mapped: Ember.computed('mdCodeName', function() { + let codeId = this.get('valuePath'); + let codeName = this.get('namePath'); + let tooltip = this.get('tooltipPath'); let codelist = []; let icons = this.get('icons'); let codelistName = this.get('mdCodeName'); @@ -100,11 +135,11 @@ export default Select.extend({ .codelist .sortBy('codeName'); - mdCodelist.forEach(function (item) { + mdCodelist.forEach(function(item) { let newObject = { - code: item['code'], - codeName: item['codeName'], - tooltip: item['description'], + codeId: item[codeId], + codeName: item[codeName], + tooltip: item[tooltip], icon: icons.get(item['codeName']) || icons.get( 'defaultList') }; @@ -122,15 +157,15 @@ export default Select.extend({ * @type Ember.computed * @return Array */ - codelist: Ember.computed('value', function () { + codelist: Ember.computed('value', function() { let codelist = this.get('mapped'); let value = this.get('value'); let create = this.get('create'); - if(value) { - if(create) { - let found = codelist.findBy('codeName', value); - if(found === undefined) { + if (value) { + if (create) { + let found = codelist.findBy('codeId', value); + if (found === undefined) { let newObject = this.createCode(value); codelist.pushObject(newObject); } @@ -149,7 +184,7 @@ export default Select.extend({ */ createCode(code) { return { - code: Math.floor(Math.random() * 100000) + 1, + codeId: code, codeName: code, description: 'Undefined' }; @@ -161,15 +196,21 @@ export default Select.extend({ * @method setValue * @param {Object} selected The object with the value(codeName) to set. */ - setValue(selected) { + /*setValue(selected) { + let valuePath = this.get('valuePath'); + let namePath = this.get('namePath'); + + if(selected) { + this.get('codelist') + } let val = selected ? selected.codeName : null; this.set('value', val); this.change(); - }, + },*/ actions: { // do the binding to value - setValue: function (selected) { + setValue: function(selected) { this.setValue(selected); }, //handle the create From db77cb893d9da067420911b11135f70dba7a5ac9 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 28 Mar 2017 19:26:07 -0800 Subject: [PATCH 008/383] Refactor md-input --- .../components/input/md-input/component.js | 2 ++ .../components/input/md-input/template.hbs | 31 ++++++------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/app/pods/components/input/md-input/component.js b/app/pods/components/input/md-input/component.js index 47ed6745e..02d53b5f5 100644 --- a/app/pods/components/input/md-input/component.js +++ b/app/pods/components/input/md-input/component.js @@ -13,6 +13,8 @@ export default Ember.Component.extend({ * @constructor */ + classNameBindings: ['label:form-group'], + /** * Value of the input. * Value sets the initial value and returns the edited result diff --git a/app/pods/components/input/md-input/template.hbs b/app/pods/components/input/md-input/template.hbs index d6dcc92da..48e2e7ec8 100644 --- a/app/pods/components/input/md-input/template.hbs +++ b/app/pods/components/input/md-input/template.hbs @@ -1,22 +1,9 @@ -{{#if label}} -
- - {{input - value=value - placeholder=placeholder - required=required - type=type - maxlength=maxlength - class=inputClass}} - {{yield}} -
-{{else}} - {{input - value=value - placeholder=placeholder - required=required - type=type - maxlength=maxlength - class=inputClass}} - {{yield}} -{{/if}} +{{#if label}}{{/if}} +{{input +value=value +placeholder=placeholder +required=required +type=type +maxlength=maxlength +class=inputClass}} +{{yield}} From 7aaec0a53d25afcb0a8c2247bb49b1cb7316eb12 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 28 Mar 2017 19:30:12 -0800 Subject: [PATCH 009/383] Update object components --- .../components/object/md-address/component.js | 4 +- .../components/object/md-address/template.hbs | 55 ++++--- .../object/md-array-table/component.js | 20 ++- .../object/md-array-table/template.hbs | 148 ++++++++++++------ .../object/md-object-table/component.js | 106 +++++++++---- .../object/md-object-table/template.hbs | 7 +- 6 files changed, 222 insertions(+), 118 deletions(-) diff --git a/app/pods/components/object/md-address/component.js b/app/pods/components/object/md-address/component.js index c184acad2..0791ab1f4 100644 --- a/app/pods/components/object/md-address/component.js +++ b/app/pods/components/object/md-address/component.js @@ -29,9 +29,9 @@ export default Ember.Component.extend({ * * @property attributes * @type String - * @default 'name, uri' + * @default '' */ - attributes: 'deliveryPoint.0,city', + attributes: 'city, adminstrativeArea, postalCode', /** * Name to place on the mdEditor panel header for entry and edit of diff --git a/app/pods/components/object/md-address/template.hbs b/app/pods/components/object/md-address/template.hbs index 5dffcdd2b..3f6b8852b 100644 --- a/app/pods/components/object/md-address/template.hbs +++ b/app/pods/components/object/md-address/template.hbs @@ -7,44 +7,53 @@ attributes=attributes as |address| }} - Editing: {{address.name}} + {{!-- Editing: {{address.name}} --}} {{!-- {{input/md-inputs model=address.deliveryPoint placeholder="Address line" label="Address Lines" buttonText="Add Line"}} --}} -{{!-- + {{#object/md-simple-array-table columns="Street" - title="Street" + title="Street Line" required=true + plain=true value=address.deliveryPoint as |line| }} {{input/md-input value=line.item.value placeholder="Enter street address"}} - {{/object/md-simple-array-table}} --}} - - {{input/md-input value=address.city - placeholder="City Name" label="City"}} - - {{input/md-input value=address.adminsitrativeArea - placeholder="State or Province" label="State/Province"}} - - {{input/md-input value=address.postalCode - placeholder="Zip or Postal Code" label="Postal Code"}} - - {{input/md-input value=address.country - placeholder="Country Name" label="Country"}} - -
- {{input/md-codelist - value=address.country - width="175px" - create=true tooltip=true icon=false mdCodeName="countries" - placeholder="Enter a country code"}} + {{/object/md-simple-array-table}} + +
+ {{input/md-input value=address.city class="col-md-6" + placeholder="City Name" label="City"}} + + {{input/md-input value=address.adminstrativeArea class="col-md-6" + placeholder="State or Province" label="State/Province"}} + + {{input/md-input value=address.postalCode class="col-md-6" + placeholder="Zip or Postal Code" label="Postal Code"}} + + {{!-- {{input/md-input value=address.country + placeholder="Country Name" label="Country"}} --}} + +
+ + {{input/md-codelist + value=address.country + namePath='description' + tooltipPath='codeName' + width="175px" + create=true tooltip=true icon=false mdCodeName="countries" + placeholder="Enter a country code"}} +
+ {{input/md-textarea value=address.description + placeholder="Address description" label="Description"}} + {{/object/md-object-table}} {{yield}} diff --git a/app/pods/components/object/md-array-table/component.js b/app/pods/components/object/md-array-table/component.js index 59f642f42..bc938b599 100644 --- a/app/pods/components/object/md-array-table/component.js +++ b/app/pods/components/object/md-array-table/component.js @@ -33,7 +33,7 @@ export default Component.extend({ * @default Ember.A() * @required */ - value: [], + value: A(), /** * The template class to use for new items. This should be a constructor. @@ -48,10 +48,10 @@ export default Component.extend({ * @property templateClass * @type {Any} * @constructor - * @default String + * @default null * @required */ - templateClass: String, + templateClass: null, /** * Comma-separated list of column headers to display in the table. If not @@ -62,13 +62,22 @@ export default Component.extend({ */ /** - * Inital collapse staet fo the panel. + * Inital collapse state fo the panel. * * @property isCollapsed * @type {Boolean} * @default undefined */ + /** + * Whether to render in a panel. + * + * @property plain + * @type {Boolean} + * @default false + */ + plain: false, + /** * Indicates whether at least one item is required is required in the value * array. @@ -194,8 +203,7 @@ export default Component.extend({ addItem: function(value) { const Template = this.get('templateClass'); - value.pushObject(typeOf(Template) === 'class' ? Template.create() : - new Template()); + value.pushObject(typeOf(Template) === 'class' ? Template.create() : null); this.valueChanged(); }, diff --git a/app/pods/components/object/md-array-table/template.hbs b/app/pods/components/object/md-array-table/template.hbs index 4e2702872..d0befe08c 100644 --- a/app/pods/components/object/md-array-table/template.hbs +++ b/app/pods/components/object/md-array-table/template.hbs @@ -1,58 +1,104 @@ -
+{{#if plain}} + + + {{#if columnArray}} + + + {{#each columnArray as |prop|}} + + {{/each}} + + + {{/if}} + + {{#each arrayValues as |item index|}} + + + {{yield (hash item=item index=index)}} + + + {{else}} + + + + {{/each}} + +
#{{uc-words prop}}
{{index}} +
+ +
+
+ +
+{{else}} +
-
-

- - -

-
+
+

+ + +

+
- -
-
+
+{{/if}} diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index 8f76733ec..ef8b607fa 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -1,17 +1,22 @@ -/** - * @module mdeditor - * @submodule components-object - */ - import Ember from 'ember'; -export default Ember.Component.extend({ +const { + computed, + Component, + observer, + generateGuid, + isEmpty +} = Ember; + +export default Component.extend({ /** * mdEditor class for managing a table of similar mdJSON objects * for selection for edit or deletion. * The class is configurable for reuse with mdJSON object arrays. * + * @module mdeditor + * @submodule components-object * @class md-object-table * @constructor */ @@ -53,55 +58,90 @@ export default Ember.Component.extend({ */ buttonText: "Add", - panelId: Ember.computed(function () { - return Ember.generateGuid(null, 'panel'); + /** + * Inital collapse state fo the panel. + * + * @property isCollapsed + * @type {Boolean} + * @default undefined + */ + + /** + * Uses isCollapsed if defined, otherwise inspects array length. + * + * @property collapsed + * @type {Boolean} + * @readOnly + * @category computed + * @requires isCollapsed + */ + collapsed: computed('isCollapsed', function() { + let isCollapsed = this.get('isCollapsed'); + let value = this.get('items'); + + if (isCollapsed !== undefined) { + return isCollapsed; + } else if (value && value.length > 0) { + return false; + } else { + return true; + } + }), + + panelId: computed(function() { + return generateGuid(null, 'panel'); }), - citems: Ember.computed(function () { + citems: computed(function() { let i = this.get('items') - .map(function (itm) { + .map(function(itm) { return Ember.Object.create(itm); }); return i; }) .property('items.@each.val', 'editing'), - attrArray: Ember.computed(function () { - return this.get('attributes') - .split(','); - }) - .property('attributes'), + attrArray: computed('attributes', function() { + return this.get('attributes') + .split(','); + }), + + attrTitleArray: computed('attrArray', function() { + return this.get('attrArray').map(function(item) { + return item.trim().dasherize().replace(/-/g, ' '); + }); + }), editing: false, - editingChanged: Ember.observer('editing', function () { + editingChanged: observer('editing', function() { // deal with the change //Ember.run.schedule('afterRender', this, function () { - let panel = this.$('.panel-collapse'); - let table = this.$('table, .object-editor'); + let panel = this.$('.md-object-table > .panel-collapse'); + let table = panel.find('> .panel-body > table, > .panel-body > .object-editor'); let items = this.get('items'); let editing = this.get('editing'); - if(editing === 'adding') { + if (editing === 'adding') { items.pushObject(this.get('saveItem')); } - if(editing === false && items.length) { + if (editing === false && items.length) { let last = Object.keys(items.get('lastObject')); //TODO: this is fixed in 2.5.1 - //https://github.com/emberjs/ember.js/issues/13050 - last = last.filter(function (itm) { + //https://github.com/emberjs/js/issues/13050 + last = last.filter(function(itm) { return itm !== 'toString'; }); - if(Ember.isEmpty(last)) { + if (isEmpty(last)) { items.popObject(); } } - if(panel.hasClass('in')) { + if (panel.hasClass('in')) { table.toggleClass('fadeOut fadeIn'); } else { //add a one-time listener to wait until panel is open - panel.one('shown.bs.collapse', function () { + panel.one('shown.bs.collapse', function() { table.toggleClass('fadeOut fadeIn'); }); panel.collapse('show'); @@ -109,13 +149,13 @@ export default Ember.Component.extend({ //}); }), - pillColor: Ember.computed('citems.[]', function () { + pillColor: computed('citems.[]', function() { let count = this.get('citems') .length; - return(count > 0) ? 'label-info' : 'label-warning'; + return (count > 0) ? 'label-info' : 'label-warning'; }), - didInsertElement: function () { + didInsertElement: function() { /*let panel = this.get('panelId'); let panelBtn = panel + '-btn'; $('#' + panel).on('show.bs.collapse', function() { @@ -127,25 +167,25 @@ export default Ember.Component.extend({ }, actions: { - deleteItem: function (items, index) { + deleteItem: function(items, index) { //if (window.confirm("Do you really want to delete this " + this.get('header') + "?")) { items.removeAt(index); //} }, - addItem: function () { - //let itm = items.pushObject(Ember.Object.create({})); + addItem: function() { + //let itm = items.pushObject(Object.create({})); let itm = Ember.Object.create({}); this.set('saveItem', itm); this.set('editing', 'adding'); }, - editItem: function (items, index) { + editItem: function(items, index) { this.set('saveItem', items.objectAt(index)); this.set('editing', 'editing'); }, - cancelEdit: function () { + cancelEdit: function() { this.set('editing', false); } } diff --git a/app/pods/components/object/md-object-table/template.hbs b/app/pods/components/object/md-object-table/template.hbs index e47366483..26b08b446 100644 --- a/app/pods/components/object/md-object-table/template.hbs +++ b/app/pods/components/object/md-object-table/template.hbs @@ -2,7 +2,8 @@

- @@ -16,12 +17,12 @@

-
+ +
- {{#layout/md-card title="E-mail" class="col-md-6 col-xxl-4"}} + {{#layout/md-card title="E-mail" class=""}} {{/layout/md-card}} +
+
- {{#layout/md-card title="Availability" class="col-md-6 col-xxl-4"}} + {{#layout/md-card title="Availability" class=""}}
    {{#each model.json.hoursOfService as |hours|}}
  • {{hours}}
    • @@ -101,9 +106,11 @@
{{/layout/md-card}}
+
- {{#layout/md-card title="Address" class="col-md-6" bodyIsRow=model.json.address.length}} +
+ {{#layout/md-card title="Address" bodyIsRow=model.json.address.length}} {{#each model.json.address as |address|}}
@@ -116,8 +123,9 @@ No addresses provided. {{/each}} {{/layout/md-card}} - - {{#layout/md-card title="Online Resource" class="col-md-6"}} +
+
+ {{#layout/md-card title="Online Resource"}}
@@ -148,6 +156,7 @@ {{/layout/md-card}} +
From 419b1a217a184785b8ed0221403c908a42e1df1e Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 17 May 2017 17:35:18 -0800 Subject: [PATCH 083/383] Move ISO Topic categories to keywords Add iso_topicCategory codelist to keyword service. Closes #106 --- app/pods/record/show/edit/main/template.hbs | 3 +- app/services/keyword.js | 45 +++++++++++++++++---- app/services/profile.js | 1 - package.json | 2 +- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/app/pods/record/show/edit/main/template.hbs b/app/pods/record/show/edit/main/template.hbs index b0a67c743..f84074ca7 100644 --- a/app/pods/record/show/edit/main/template.hbs +++ b/app/pods/record/show/edit/main/template.hbs @@ -20,11 +20,12 @@ profilePath="record.main.status" }} - {{input/md-codelist-multi + {{!-- {{input/md-codelist-multi value=resource.topicCategory label="ISO Topic Category" create=false tooltip=true icon=false mdCodeName="topicCategory" placeholder="Select one or more topic categories" profilePath="record.main.topicCategory" + }} --}} }} {{/layout/md-card}} diff --git a/app/services/keyword.js b/app/services/keyword.js index 08ece6970..ff8988fd9 100644 --- a/app/services/keyword.js +++ b/app/services/keyword.js @@ -1,24 +1,25 @@ import Ember from 'ember'; import GCMD from 'npm:gcmd-keywords'; +import ISO from 'npm:mdcodes/resources/js/iso_topicCategory'; let service = Ember.Object.create({ thesaurus: Ember.A(), findById(id) { return this.get('thesaurus') - .find(function (t) { + .find(function(t) { return t.citation.identifier[0].identifier === id; }); } }); let type = { - 'Platforms': 'platform', - 'Instruments': 'instrument' - }; + 'Platforms': 'platform', + 'Instruments': 'instrument' +}; - Object.keys(GCMD) - .forEach(function (key) { - if(Array.isArray(GCMD[key])) { +Object.keys(GCMD) + .forEach(function(key) { + if (Array.isArray(GCMD[key])) { service.get('thesaurus') .pushObject({ citation: { @@ -42,4 +43,34 @@ let type = { } }); +let isoKeywords = ISO.codelist.map((topic) => { + return { + label: topic.codeName, + definition: topic.description, + uuid: topic.code + }; + +}); + +service.get('thesaurus') + .pushObject({ + citation: { + date: [{ + date: '2014-04', + dateType: 'revision' + }], + title: 'ISO 19115 Topic Category', + edition: 'ISO 19115-1:2014', + onlineResource: [{ + uri: 'https://doi.org/10.18123/D6RP4M' + }], + identifier: [{ + identifier: 'ISO 19115 Topic Category' + }] + }, + keywords: isoKeywords, + keywordType: 'isoTopicCategory', + label: 'ISO Topic Category' + }); + export default Ember.Service.extend(service); diff --git a/app/services/profile.js b/app/services/profile.js index 5eda26654..b7ad584b4 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -84,7 +84,6 @@ export default Ember.Service.extend({ main: { recordId: true, status: true, - topicCategory: true, resourceType: true, description: true, abstract: true, diff --git a/package.json b/package.json index c16bb112c..28de92007 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "geojson-coords": "0.0.0", "loader.js": "^4.0.10", "lodash.has": "^4.5.2", - "mdcodes": "^2.1.5", + "mdcodes": "^2.1.6", "moment-timezone": "^0.5.13", "object-hash": "^1.1.7", "shapefile": "^0.6.2", From c2d11d8e41d127d69d314550b013c0157dbc35d9 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 17 May 2017 17:36:49 -0800 Subject: [PATCH 084/383] Add md-locale component --- .../components/object/md-locale/component.js | 56 +++++++++++++++++++ .../components/object/md-locale/template.hbs | 43 ++++++++++++++ .../object/md-locale/component-test.js | 25 +++++++++ 3 files changed, 124 insertions(+) create mode 100644 app/pods/components/object/md-locale/component.js create mode 100644 app/pods/components/object/md-locale/template.hbs create mode 100644 tests/integration/pods/components/object/md-locale/component-test.js diff --git a/app/pods/components/object/md-locale/component.js b/app/pods/components/object/md-locale/component.js new file mode 100644 index 000000000..180f6e746 --- /dev/null +++ b/app/pods/components/object/md-locale/component.js @@ -0,0 +1,56 @@ +import Ember from 'ember'; +import Template from 'mdeditor/mixins/object-template'; +import { + validator, + buildValidations +} from 'ember-cp-validations'; + +const { + Component, + get, + set, + Object: EmObject +} = Ember; + +const Validations = buildValidations({ + 'language': validator('presence', { + presence: true, + ignoreBlank: true + }), + 'characterSet': validator('presence', { + presence: true, + ignoreBlank: true + }) +}); + +export default Component.extend(Template, { + init() { + this._super(...arguments); + + let model = get(this, 'model'); + let modelPath = get(this, 'modelPath'); + let value = modelPath ? get(model, modelPath) : model; + + value = this.applyTemplate(value); + + if (modelPath) { + set(model, modelPath, value); + } + + set(this, 'value', value); + }, + +//value:{}, + /** + * This templateClass to apply to the supplied model or model.modelPath. + * + * @property templateClass + * @type Ember.Object + */ + templateClass: EmObject.extend(Validations, { + init() { + this._super(...arguments); + //this.set('uri', null); + } + }) +}); diff --git a/app/pods/components/object/md-locale/template.hbs b/app/pods/components/object/md-locale/template.hbs new file mode 100644 index 000000000..4a126fcbd --- /dev/null +++ b/app/pods/components/object/md-locale/template.hbs @@ -0,0 +1,43 @@ +
+
+ {{input/md-codelist + path="language" + model=value + create=true + tooltip=true + icon=false + disabled=disabled + mdCodeName="language" + label="Language" + showValidations=true + placeholder="Select or enter a language code." + }} +
+
+ {{input/md-codelist + path="characterSet" + model=value + create=false + tooltip=true + icon=false + disabled=disabled + mdCodeName="characterSet" + label="Character Set" + showValidations=true + placeholder="Select character set." + }} +
+
+ {{input/md-codelist + value=value.country + create=false + tooltip=true + icon=false + disabled=disabled + mdCodeName="countries" + label="Country" + placeholder="Select country code." + }} +
+
+{{yield}} diff --git a/tests/integration/pods/components/object/md-locale/component-test.js b/tests/integration/pods/components/object/md-locale/component-test.js new file mode 100644 index 000000000..d3975e2d7 --- /dev/null +++ b/tests/integration/pods/components/object/md-locale/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-locale', 'Integration | Component | object/md locale', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-locale}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-locale}} + template block text + {{/object/md-locale}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 770eff9dee5eebcb24868d5bc0389f750345df9b Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 17 May 2017 17:37:46 -0800 Subject: [PATCH 085/383] Update components, object-template mixin --- app/mixins/object-template.js | 26 ++++++++++++++++--- .../components/input/md-select/component.js | 3 ++- .../object/md-array-table/component.js | 2 +- .../object/md-object-table/component.js | 2 +- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/mixins/object-template.js b/app/mixins/object-template.js index 602f32bdc..17e9cd849 100644 --- a/app/mixins/object-template.js +++ b/app/mixins/object-template.js @@ -22,6 +22,26 @@ export default Mixin.create({ * @submodule mixins */ + /** + * Apply the 'template' to the object. + * + * @method applyTemplate + * @param {Object} object The object to apply the template to. + * @return {Ember.Object} + */ + applyTemplate(object) { + let value = object || {}; + let Template = this.get('templateClass'); + + if (Template) { + let owner = getOwner(this); + + return merge(Template.create(owner.ownerInjection()), value); + } + + return object; + }, + /** * Apply the object 'template' to each object in the array. * @@ -29,12 +49,12 @@ export default Mixin.create({ * @param {Array} propertyName The array of objects to apply the template to. * @return {Array} */ - applyTemplate(propertyName) { + applyTemplateArray(propertyName) { let property = this.get(propertyName); - if(isArray(property)) { + if (isArray(property)) { let Template = this.get('templateClass'); - if(Template) { + if (Template) { let owner = getOwner(this); property.forEach((item, idx, items) => { diff --git a/app/pods/components/input/md-select/component.js b/app/pods/components/input/md-select/component.js index 5c1728a5a..621e78932 100644 --- a/app/pods/components/input/md-select/component.js +++ b/app/pods/components/input/md-select/component.js @@ -10,6 +10,7 @@ const { Component, defineProperty, computed, + isNone, isBlank, assert } = Ember; @@ -21,7 +22,7 @@ export default Component.extend({ let model = this.get('model'); let path = this.get('path'); - if (isBlank(model) !== isBlank(path)) { + if (isNone(model) !== isNone(path)) { assert( `You must supply both model and path to ${this.toString()} or neither.` ); diff --git a/app/pods/components/object/md-array-table/component.js b/app/pods/components/object/md-array-table/component.js index b9510e4e6..4b10228c0 100644 --- a/app/pods/components/object/md-array-table/component.js +++ b/app/pods/components/object/md-array-table/component.js @@ -25,7 +25,7 @@ export default Component.extend(Template, { init() { this._super(...arguments); - this.applyTemplate('value'); + this.applyTemplateArray('value'); /*const Validation = this.get('validation'); diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index fc4c60d12..4effd5771 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -28,7 +28,7 @@ export default Component.extend(Template, { init() { this._super(...arguments); - this.applyTemplate('items'); + this.applyTemplateArray('items'); }, attributeBindings: ['data-spy'], From 4d750fd054d0457cf387d7e4ec660cf954b2ed85 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 17 May 2017 17:38:05 -0800 Subject: [PATCH 086/383] Update record routes, profile --- app/pods/record/show/edit/main/template.hbs | 10 ++++++++++ app/pods/records/route.js | 8 ++------ app/services/profile.js | 3 +++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/pods/record/show/edit/main/template.hbs b/app/pods/record/show/edit/main/template.hbs index f84074ca7..f6bdcbb12 100644 --- a/app/pods/record/show/edit/main/template.hbs +++ b/app/pods/record/show/edit/main/template.hbs @@ -26,7 +26,17 @@ placeholder="Select one or more topic categories" profilePath="record.main.topicCategory" }} --}} + + {{#layout/md-card + title="Default Locale" + shadow=false + data-spy=false + required=true + path="record.main.defaultResourceLocale" }} + {{object/md-locale model=resource modelPath="defaultResourceLocale"}} + {{/layout/md-card}} + {{/layout/md-card}}
diff --git a/app/pods/records/route.js b/app/pods/records/route.js index 6e47fbcaf..a36e4e3be 100644 --- a/app/pods/records/route.js +++ b/app/pods/records/route.js @@ -17,9 +17,7 @@ export default Ember.Route.extend({ actions: { deleteItem: function(item) { - let message = - "Do you really want to delete this record?"; - this._deleteItem(item, message); + this._deleteItem(item); }, editItem: function(item) { @@ -28,9 +26,7 @@ export default Ember.Route.extend({ }, // action methods - _deleteItem(item, message) { - if (window.confirm(message)) { + _deleteItem(item) { item.destroyRecord(); - } } }); diff --git a/app/services/profile.js b/app/services/profile.js index b7ad584b4..ac875536f 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -84,7 +84,9 @@ export default Ember.Service.extend({ main: { recordId: true, status: true, + defaultResourceLocale: true, resourceType: true, + pointOfContact: true, description: true, abstract: true, shortAbstract: true, @@ -121,6 +123,7 @@ export default Ember.Service.extend({ components: { record: { main: { + description: false, supplementalInfo: false, purpose: false, environmentDescription: false From db905429e9d318fb9dff991bdd618f7572b75ce2 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 17 May 2017 20:06:21 -0800 Subject: [PATCH 087/383] Set locale default --- app/models/record.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/models/record.js b/app/models/record.js index 3b375c202..cb53b5cf2 100644 --- a/app/models/record.js +++ b/app/models/record.js @@ -72,9 +72,13 @@ export default Model.extend(Validations, Copyable, { }, 'pointOfContact': [], 'abstract': '', - 'shortAbstract':'', + 'shortAbstract': '', 'status': [], - 'language': ['eng; USA'] + 'defaultResourceLocale': { + 'characterSet': 'UTF-8', + 'country': 'USA', + 'language': 'eng' + }, } }, 'metadataRepository': [], @@ -91,11 +95,11 @@ export default Model.extend(Validations, Copyable, { }), title: computed('json.metadata.resourceInfo.citation.title', - function () { + function() { return this.get('json.metadata.resourceInfo.citation.title'); }), - icon: computed('json.metadata.resourceInfo.resourceType.[]', function () { + icon: computed('json.metadata.resourceInfo.resourceType.[]', function() { const type = this.get( 'json.metadata.resourceInfo.resourceType.0.type') || ''; const list = Ember.getOwner(this) @@ -117,9 +121,9 @@ export default Model.extend(Validations, Copyable, { * @category computed * @requires recordId */ - shortId: Ember.computed('recordId', function () { + shortId: Ember.computed('recordId', function() { const recordId = this.get('recordId'); - if(recordId) { + if (recordId) { let index = recordId.indexOf('-'); return recordId.substring(0, index > -1 ? index : 8); From 2d9ff082373329a5e92fe389e88f8458f7c9b99b Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 17 May 2017 20:06:37 -0800 Subject: [PATCH 088/383] Fix delete all features --- app/pods/record/show/edit/spatial/extent/route.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/pods/record/show/edit/spatial/extent/route.js b/app/pods/record/show/edit/spatial/extent/route.js index fde6f21e2..e04650d05 100644 --- a/app/pods/record/show/edit/spatial/extent/route.js +++ b/app/pods/record/show/edit/spatial/extent/route.js @@ -55,6 +55,8 @@ export default Ember.Route.extend({ arr.replace(idx, 1, EmberObject.create(l)); }); + this.set('layers', layers); + return model; }, @@ -78,8 +80,7 @@ export default Ember.Route.extend({ .click(); }, deleteAllFeatures() { - let features = this.currentRouteModel() - .get('layers'); + let features = this.get('layers'); let group = this.controller .get('featureGroup'); From 6787892f2c2439d99e9a7b75fc44e8a2766df912 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 17 May 2017 20:07:07 -0800 Subject: [PATCH 089/383] Update templates and profiles --- app/pods/dashboard/template.hbs | 173 +++----------------- app/pods/record/new/id/template.hbs | 5 +- app/pods/record/show/edit/main/template.hbs | 8 +- app/services/codelist.js | 4 + app/services/profile.js | 53 +++++- 5 files changed, 86 insertions(+), 157 deletions(-) diff --git a/app/pods/dashboard/template.hbs b/app/pods/dashboard/template.hbs index 820457970..6d9034ef3 100644 --- a/app/pods/dashboard/template.hbs +++ b/app/pods/dashboard/template.hbs @@ -1,151 +1,28 @@ -
-
- Generic placeholder thumbnail -

Label

- Something else -
-
- Generic placeholder thumbnail -

Label

- Something else -
-
- Generic placeholder thumbnail -

Label

- Something else -
-
- Generic placeholder thumbnail -

Label

- Something else -
+
+
+ {{#layout/md-card class="card-inverse card-primary text-center" + }} + {{model.0.length}} Records + {{/layout/md-card}}
+
+ {{#layout/md-card class="card-inverse card-success text-center" + }} + {{model.1.length}} Contacts + {{/layout/md-card}} +
+
+ {{#layout/md-card class="card-inverse card-info text-center" + }} + {{model.2.length}} Dictionaries + {{/layout/md-card}} +
+
-

Section title

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#HeaderHeaderHeaderHeader
1,001Loremipsumdolorsit
1,002ametconsecteturadipiscingelit
1,003IntegernecodioPraesent
1,003liberoSedcursusante
1,004dapibusdiamSednisi
1,005Nullaquissemat
1,006nibhelementumimperdietDuis
1,007sagittisipsumPraesentmauris
1,008Fuscenectellussed
1,009auguesemperportaMauris
1,010massaVestibulumlaciniaarcu
1,011egetnullaClassaptent
1,012tacitisociosquadlitora
1,013torquentperconubianostra
1,014perinceptoshimenaeosCurabitur
1,015sodalesligulainlibero
+
+
+

+ mdditor +

+
diff --git a/app/pods/record/new/id/template.hbs b/app/pods/record/new/id/template.hbs index 93cb95a9b..4c0e6d7fd 100644 --- a/app/pods/record/new/id/template.hbs +++ b/app/pods/record/new/id/template.hbs @@ -1,11 +1,12 @@
-
+

Create New Record

-
+
diff --git a/app/pods/record/show/edit/main/template.hbs b/app/pods/record/show/edit/main/template.hbs index f6bdcbb12..b11f86357 100644 --- a/app/pods/record/show/edit/main/template.hbs +++ b/app/pods/record/show/edit/main/template.hbs @@ -32,7 +32,7 @@ shadow=false data-spy=false required=true - path="record.main.defaultResourceLocale" + profilePath="record.main.defaultLocale" }} {{object/md-locale model=resource modelPath="defaultResourceLocale"}} {{/layout/md-card}} @@ -99,7 +99,11 @@ }} {{/layout/md-card}} - {{#object/md-simple-array-table data-spy="Credit" title="Credit" value=resource.credit as |credit| }} + {{#object/md-simple-array-table + data-spy="Credit" + title="Credit" + profilePath="record.main.credit" + value=resource.credit as |credit| }} {{input/md-input value=credit.item.value placeholder="Additional credits for the resource."}} diff --git a/app/services/codelist.js b/app/services/codelist.js index 790153d8f..e72078b4e 100644 --- a/app/services/codelist.js +++ b/app/services/codelist.js @@ -31,6 +31,10 @@ codelist.profile = { code: '002', codeName: 'basic', description: 'This profile includes metadata properties required for a minimal metadata record.' + }, { + code: '003', + codeName: 'publication', + description: 'This profile is intended to be used for publications or journal articles.' }] }; diff --git a/app/services/profile.js b/app/services/profile.js index ac875536f..b8b9aa4f5 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -77,14 +77,13 @@ export default Ember.Service.extend({ }, { title: 'Grid', target: 'record.show.edit.grid' - }], components: { record: { main: { recordId: true, status: true, - defaultResourceLocale: true, + defaultLocale: true, resourceType: true, pointOfContact: true, description: true, @@ -92,7 +91,47 @@ export default Ember.Service.extend({ shortAbstract: true, supplementalInfo: true, purpose: true, - environmentDescription:true + environmentDescription:true, + credit:true + } + } + } + }, + publication: { + secondaryNav: [{ + title: 'Main', + target: 'record.show.edit.main' + + }, { + title: 'Metadata', + target: 'record.show.edit.metadata' + + }, { + title: 'Keywords', + target: 'record.show.edit.keywords' + + }, { + title: 'Spatial', + target: 'record.show.edit.spatial' + + }, { + title: 'Distribution', + target: 'record.show.edit.distribution' + + }, { + title: 'Associated', + target: 'record.show.edit.associated' + + }, { + title: 'Documents', + target: 'record.show.edit.documents' + + }], + components: { + record: { + main: { + supplementalInfo: false, + environmentDescription:false } } } @@ -123,10 +162,14 @@ export default Ember.Service.extend({ components: { record: { main: { - description: false, + recordId: false, + defaultLocale: false, + description: true, + shortAbstract: false, supplementalInfo: false, purpose: false, - environmentDescription: false + environmentDescription: false, + credit: false } } } From c191d583d2af24a78c9638fc8ab79f9b38e58254 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 18 May 2017 00:35:28 -0800 Subject: [PATCH 090/383] Update dashboard, components, styles --- .../components/layout/md-card/component.js | 9 + .../components/layout/md-card/template.hbs | 2 +- app/pods/dashboard/template.hbs | 157 +++++++++++++++--- app/styles/_breadcrumb.scss | 10 +- app/styles/_dashboard.scss | 20 +++ app/styles/_scrollspy.scss | 1 + app/styles/_typography.scss | 8 + app/styles/app.scss | 1 + 8 files changed, 178 insertions(+), 30 deletions(-) create mode 100644 app/styles/_dashboard.scss diff --git a/app/pods/components/layout/md-card/component.js b/app/pods/components/layout/md-card/component.js index 7c0be9e4a..c4b867269 100644 --- a/app/pods/components/layout/md-card/component.js +++ b/app/pods/components/layout/md-card/component.js @@ -58,6 +58,15 @@ export default Component.extend({ */ shadow: true, + /** + * If true, the card-block class will be added. + * + * @property block + * @type {Boolean} + * @default true + */ + block: true, + /** * If true, the collapse control will be added to the card header. * diff --git a/app/pods/components/layout/md-card/template.hbs b/app/pods/components/layout/md-card/template.hbs index 2f0aadc8a..17087b0e4 100644 --- a/app/pods/components/layout/md-card/template.hbs +++ b/app/pods/components/layout/md-card/template.hbs @@ -12,6 +12,6 @@
{{/if}} -
diff --git a/app/pods/records/nav/template.hbs b/app/pods/records/nav/template.hbs index 971ced825..55c7a186c 100644 --- a/app/pods/records/nav/template.hbs +++ b/app/pods/records/nav/template.hbs @@ -1,4 +1,4 @@ -
  • +{{!--
  • {{#link-to "translate"}} Translate @@ -11,5 +11,5 @@ Publish {{tooltip-on-element text="Publish" side="bottom" class="md-nav-tip"}} {{/link-to}} -
    • + --}} {{outlet}} diff --git a/app/pods/records/template.hbs b/app/pods/records/template.hbs index 11a01a5a0..82a94e09a 100644 --- a/app/pods/records/template.hbs +++ b/app/pods/records/template.hbs @@ -40,6 +40,13 @@
    + {{else}} + + + {{#link-to "record.new" class="btn btn-primary btn-lg" }} + {{fa-icon "plus"}} Create a Record{{/link-to}} + + {{/each}} diff --git a/app/router.js b/app/router.js index 50fe8a609..434d1434a 100644 --- a/app/router.js +++ b/app/router.js @@ -38,11 +38,11 @@ Router.map(function () { }); this.route('alternate', { - //path: 'alternate/:citationid' + path: 'alternate/:citation_id' }, function() { - this.route('index', { - path: 'alternate/:citation_id' - }); + // this.route('index', { + // path: 'alternate/:citation_id' + // }); this.route('identifier', { path: 'identifier/:identifier_id' }); diff --git a/app/services/profile.js b/app/services/profile.js index 59b499276..926454754 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -66,7 +66,7 @@ export default Ember.Service.extend({ target: 'record.show.edit.extent' }, { - title: 'Quality', + title: 'Lineage', target: 'record.show.edit.quality' }, { @@ -81,14 +81,14 @@ export default Ember.Service.extend({ title: 'Documents', target: 'record.show.edit.documents' - }, { + }, /*{ title: 'Coverage', target: 'record.show.edit.coverages' }, { title: 'Grid', target: 'record.show.edit.grid' - }], + }*/], components: { record: { main: { @@ -109,10 +109,16 @@ export default Ember.Service.extend({ alternateTitle: true, date: true, edition: true, + onlineResource: true, responsibleParty: true, presentationForm: true, otherCitationDetails: true, graphic: true, + series: { + name: true, + issue: true, + page: true + }, identifier: { identifier: true, namespace: true, @@ -150,10 +156,44 @@ export default Ember.Service.extend({ alternateTitle: true, date: true, edition: true, + onlineResource: true, + responsibleParty: true, + presentationForm: true, + otherCitationDetails: true, + graphic: true, + series: { + name: true, + issue: true, + page: true + }, + identifier: { + identifier: true, + namespace: true, + version: true, + description: true, + authority: { + title: true, + alternateTitle: true, + date: true, + responsibleParty: true + } + } + }, + alternateMetadata: { + title: true, + alternateTitle: true, + date: true, + edition: false, responsibleParty: true, + onlineResource: true, presentationForm: true, otherCitationDetails: true, graphic: true, + series: { + name: true, + issue: true, + page: true + }, identifier: { identifier: true, namespace: true, @@ -166,6 +206,13 @@ export default Ember.Service.extend({ responsibleParty: true } } + }, + maintenance: { + frequency: true, + date: true, + contact: true, + note: true, + scope: true, } } } diff --git a/app/styles/_card_custom.scss b/app/styles/_card_custom.scss index 9dc447b2d..50e317d76 100644 --- a/app/styles/_card_custom.scss +++ b/app/styles/_card_custom.scss @@ -24,6 +24,11 @@ } .card-footer { + .btn { + margin-bottom: 5px; + margin-top: 5px; + } + .btn:focus { outline: none; } diff --git a/app/styles/_jsonview.scss b/app/styles/_jsonview.scss index d721e5616..191278be0 100644 --- a/app/styles/_jsonview.scss +++ b/app/styles/_jsonview.scss @@ -14,9 +14,10 @@ } .md-jsmodal-container.ember-modal-dialog { - z-index: 2100; margin-top: 5vh; + max-width: 1200px; width: 90vw; + z-index: 2100; .md-viewer-body { height: 75vh; @@ -24,6 +25,6 @@ } @media (min-width: 420px) { - width: 40vw; + width: 70vw; } } diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index ef6bc26c3..f4a3e9bb4 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -5,7 +5,7 @@ html { } body { - position: relative; + //position: relative; } .inline-block { diff --git a/app/transitions.js b/app/transitions.js index f7ced7a40..5872beb98 100644 --- a/app/transitions.js +++ b/app/transitions.js @@ -27,6 +27,13 @@ export default function() { this.reverse('toRight') //,this.debug() ); + this.transition( + this.toRoute('record.show.edit.metadata.alternate.identifier'), + this.fromRoute('record.show.edit.metadata.alternate.index'), + this.use('toLeft'), + this.reverse('toRight') + //,this.debug() + ); this.transition( this.toRoute('record.show.edit.metadata.parent'), this.fromRoute('record.show.edit.metadata.index'), diff --git a/package.json b/package.json index 57005c4e2..5651cc865 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "ember-multiselect-checkboxes": "^0.10.2", "ember-pollboy": "0.6.1", "ember-power-select-with-create": "0.4.3", + "ember-power-select": "^1.8.5", "ember-resize": "^0.0.17", "ember-resolver": "^2.0.3", "ember-route-action-helper": "^2.0.0", diff --git a/tests/integration/pods/components/object/md-maintenance/component-test.js b/tests/integration/pods/components/object/md-maintenance/component-test.js new file mode 100644 index 000000000..b89f79679 --- /dev/null +++ b/tests/integration/pods/components/object/md-maintenance/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-maintenance', 'Integration | Component | object/md maintenance', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-maintenance}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-maintenance}} + template block text + {{/object/md-maintenance}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 5fa162dd656c665759794e595b892e2ea734cbd8 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 13 Jul 2017 01:11:23 -0700 Subject: [PATCH 159/383] Refactor subbar-link to allow route-action Fixes problem wih link-to and liquid-fire. https://github.com/ember-animation/liquid-fire/issues/347 --- app/pods/components/control/subbar-link/template.hbs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/pods/components/control/subbar-link/template.hbs b/app/pods/components/control/subbar-link/template.hbs index 0bc2546b7..7224d8ed0 100644 --- a/app/pods/components/control/subbar-link/template.hbs +++ b/app/pods/components/control/subbar-link/template.hbs @@ -1,2 +1,6 @@ -{{#link-to route class="btn btn-lg btn-primary btn-block md-btn-responsive" }} {{fa-icon icon}} {{text}}{{/link-to}} +{{#if route}} + {{#link-to route class="btn btn-lg btn-primary btn-block md-btn-responsive" }} {{fa-icon icon}} {{text}}{{/link-to}} +{{else}} + +{{/if}} {{yield}} From b501dd499bcc707618c2f4be63c0844a179a6a3c Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 13 Jul 2017 01:12:15 -0700 Subject: [PATCH 160/383] Add md-lineage, md-process-step --- .../components/object/md-lineage/component.js | 44 ++++++++++++++ .../object/md-lineage/preview/component.js | 4 ++ .../object/md-lineage/preview/template.hbs | 1 + .../components/object/md-lineage/template.hbs | 37 ++++++++++++ .../object/md-process-step/component.js | 46 +++++++++++++++ .../object/md-process-step/template.hbs | 59 +++++++++++++++++++ .../object/md-lineage/component-test.js | 25 ++++++++ .../md-lineage/preview/component-test.js | 25 ++++++++ .../object/md-process-step/component-test.js | 25 ++++++++ 9 files changed, 266 insertions(+) create mode 100644 app/pods/components/object/md-lineage/component.js create mode 100644 app/pods/components/object/md-lineage/preview/component.js create mode 100644 app/pods/components/object/md-lineage/preview/template.hbs create mode 100644 app/pods/components/object/md-lineage/template.hbs create mode 100644 app/pods/components/object/md-process-step/component.js create mode 100644 app/pods/components/object/md-process-step/template.hbs create mode 100644 tests/integration/pods/components/object/md-lineage/component-test.js create mode 100644 tests/integration/pods/components/object/md-lineage/preview/component-test.js create mode 100644 tests/integration/pods/components/object/md-process-step/component-test.js diff --git a/app/pods/components/object/md-lineage/component.js b/app/pods/components/object/md-lineage/component.js new file mode 100644 index 000000000..60181e6fe --- /dev/null +++ b/app/pods/components/object/md-lineage/component.js @@ -0,0 +1,44 @@ +import Ember from 'ember'; + +const { + Component, + set, + get, + getWithDefault, + run: { + once + } +} = Ember; + +export default Component.extend({ + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(function () { + set(model, 'scope', getWithDefault(model, 'scope', {})); + set(model, 'citation', getWithDefault(model, 'citation', [])); + set(model, 'processStep', getWithDefault(model, 'processStep', [])); + }); + }, + + tagName: 'form', + + /** + * The string representing the path in the profile object for the citation. + * + * @property profilePath + * @type {String} + * @default "false" + * @required + */ + + /** + * The object to use as the data model for the citation. + * + * @property model + * @type {Object} + * @required + */ +}); diff --git a/app/pods/components/object/md-lineage/preview/component.js b/app/pods/components/object/md-lineage/preview/component.js new file mode 100644 index 000000000..926b61300 --- /dev/null +++ b/app/pods/components/object/md-lineage/preview/component.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ +}); diff --git a/app/pods/components/object/md-lineage/preview/template.hbs b/app/pods/components/object/md-lineage/preview/template.hbs new file mode 100644 index 000000000..c2a30b61b --- /dev/null +++ b/app/pods/components/object/md-lineage/preview/template.hbs @@ -0,0 +1 @@ +{{item.statement}} diff --git a/app/pods/components/object/md-lineage/template.hbs b/app/pods/components/object/md-lineage/template.hbs new file mode 100644 index 000000000..d0974b4f5 --- /dev/null +++ b/app/pods/components/object/md-lineage/template.hbs @@ -0,0 +1,37 @@ +{{input/md-textarea + value=model.statement + profilePath=(concat profilePath ".statement") + label="Statement" + placeholder="A general statement of the actions taken to verify, transform, repair, and integrate the resource." + data-spy="Statement" +}} + +{{object/md-objectroute-table + items=model.processStep + header="Process Step" + buttonText="Add Step" + ellipsis=ellipsis + templateClass=templateClass + editItem=editProcessStep + attributes="stepId,description" + profilePath=(concat profilePath ".processStep") data-spy="Process Step" +}} + +{{object/md-citation-array model=model.citation + profilePath=(concat profilePath ".citation") data-spy="Lineage Citation" + editItem=editCitation label="Citation" +}} + +{{input/md-codelist + value=model.scope.scopeCode + label="Scope" + create=true + tooltip=true + icon=true + mdCodeName="scope" + closeOnSelect=false + placeholder="Select type of resource." + profilePath=(concat profilePath ".scope") + data-spy="Scope" +}} +{{yield}} diff --git a/app/pods/components/object/md-process-step/component.js b/app/pods/components/object/md-process-step/component.js new file mode 100644 index 000000000..24bd57552 --- /dev/null +++ b/app/pods/components/object/md-process-step/component.js @@ -0,0 +1,46 @@ +import Ember from 'ember'; + +const { + Component, + set, + get, + getWithDefault, + run: { + once + } +} = Ember; + +export default Component.extend({ + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(this, function () { + set(model, 'stepId', getWithDefault(model, 'stepId', get(this, 'itemId'))); + set(model, 'timePeriod', getWithDefault(model, 'timePeriod', {})); + set(model, 'scope', getWithDefault(model, 'scope', {})); + set(model, 'reference', getWithDefault(model, 'reference', [])); + set(model, 'processor', getWithDefault(model, 'processor', [])); + }); + }, + + tagName: 'form', + + /** + * The string representing the path in the profile object for the processStep. + * + * @property profilePath + * @type {String} + * @default "false" + * @required + */ + + /** + * The object to use as the data model for the processStep. + * + * @property model + * @type {Object} + * @required + */ +}); diff --git a/app/pods/components/object/md-process-step/template.hbs b/app/pods/components/object/md-process-step/template.hbs new file mode 100644 index 000000000..3fbad1f7c --- /dev/null +++ b/app/pods/components/object/md-process-step/template.hbs @@ -0,0 +1,59 @@ +{{input/md-input + value=model.stepId + model=null + valuePath=null + label="Step ID" + data-spy="Step ID" + placeholder="Enter an identifer for the step." + required=false + profilePath=(concat profilePath ".stepId") + }} + +{{input/md-textarea + value=model.description + required=true + profilePath=(concat profilePath ".description") + label="Description" + placeholder="Description of the process or methodology step." + data-spy="Step Description" + showValidations=true +}} +{{!-- +{{object/md-objectroute-table + items=model.processStep + header="Process Step" + buttonText="Add Step" + ellipsis=ellipsis + templateClass=templateClass + editItem=editProcessStep + attributes="stepId, description" +}} --}} + +{{object/md-party + title="Processors" + data-spy="Processors" + class=(if embedded "md-embedded") + collapsible=true collapsed=false + required=false + value=model.processor + profilePath=(concat profilePath ".processor") +}} + +{{object/md-citation-array model=model.reference + profilePath=(concat profilePath ".reference") data-spy="Step Reference" + editItem=editCitation label="Step Reference" +}} + +{{input/md-codelist + value=model.scope.scopeCode + label="Scope" + create=true + tooltip=true + icon=true + mdCodeName="scope" + closeOnSelect=false + placeholder="Select type of resource." + profilePath=(concat profilePath ".scope") + data-spy="Scope" +}} +{{yield}} diff --git a/tests/integration/pods/components/object/md-lineage/component-test.js b/tests/integration/pods/components/object/md-lineage/component-test.js new file mode 100644 index 000000000..2f0b4bc2f --- /dev/null +++ b/tests/integration/pods/components/object/md-lineage/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-lineage', 'Integration | Component | object/md lineage', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-lineage}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-lineage}} + template block text + {{/object/md-lineage}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-lineage/preview/component-test.js b/tests/integration/pods/components/object/md-lineage/preview/component-test.js new file mode 100644 index 000000000..1fcb92b26 --- /dev/null +++ b/tests/integration/pods/components/object/md-lineage/preview/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-lineage/preview', 'Integration | Component | object/md lineage/preview', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-lineage/preview}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-lineage/preview}} + template block text + {{/object/md-lineage/preview}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-process-step/component-test.js b/tests/integration/pods/components/object/md-process-step/component-test.js new file mode 100644 index 000000000..0cfb17571 --- /dev/null +++ b/tests/integration/pods/components/object/md-process-step/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-process-step', 'Integration | Component | object/md process step', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-process-step}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-process-step}} + template block text + {{/object/md-process-step}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From a20587a37465004fd43948eb524bb8fbe3be7076 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 13 Jul 2017 01:13:11 -0700 Subject: [PATCH 161/383] Remove quality route, add lineage --- app/models/contact.js | 5 +- .../components/input/md-input/component.js | 65 ++++++++++++------- .../components/input/md-textarea/component.js | 4 ++ .../components/input/md-textarea/template.hbs | 2 - app/pods/components/md-translate/component.js | 2 +- .../object/md-citation/component.js | 11 +++- .../object/md-citation/template.hbs | 3 + .../object/md-object-table/component.js | 5 +- .../object/md-object-table/template.hbs | 6 +- .../show/edit/{quality => funding}/route.js | 0 .../record/show/edit/funding/template.hbs | 1 + .../record/show/edit/lineage/index/route.js | 30 +++++++++ .../show/edit/lineage/index/template.hbs | 16 +++++ .../citation/identifier/route.js | 52 +++++++++++++++ .../citation/identifier/template.hbs | 20 ++++++ .../lineageobject/citation/index/route.js | 21 ++++++ .../lineageobject/citation/index/template.hbs | 19 ++++++ .../lineage/lineageobject/citation/route.js | 55 ++++++++++++++++ .../lineageobject/citation/template.hbs | 1 + .../edit/lineage/lineageobject/index/route.js | 37 +++++++++++ .../lineage/lineageobject/index/template.hbs | 16 +++++ .../show/edit/lineage/lineageobject/route.js | 55 ++++++++++++++++ .../lineageobject/step/citation/route.js | 63 ++++++++++++++++++ .../lineageobject/step/citation/template.hbs | 18 +++++ .../lineage/lineageobject/step/index/route.js | 32 +++++++++ .../lineageobject/step/index/template.hbs | 16 +++++ .../edit/lineage/lineageobject/step/route.js | 64 ++++++++++++++++++ .../lineage/lineageobject/step/template.hbs | 1 + .../edit/lineage/lineageobject/template.hbs | 1 + app/pods/record/show/edit/lineage/route.js | 4 ++ .../record/show/edit/lineage/template.hbs | 5 ++ .../metadata/alternate/identifier/route.js | 5 ++ .../alternate/identifier/template.hbs | 2 +- .../record/show/edit/quality/template.hbs | 23 ------- app/router.js | 40 +++++++++--- app/services/profile.js | 8 ++- app/styles/_table.scss | 4 ++ app/transitions.js | 32 ++++++++- .../record/show/edit/funding/route-test.js | 11 ++++ .../citation/identifier/route-test.js | 11 ++++ .../citation/index/route-test.js | 11 ++++ .../lineageobject/citation/route-test.js | 11 ++++ .../lineage/lineageobject/index/route-test.js | 11 ++++ .../edit/lineage/lineageobject/route-test.js | 11 ++++ .../lineageobject/step/citation/route-test.js | 11 ++++ .../lineageobject/step/index/route-test.js | 11 ++++ .../lineage/lineageobject/step/route-test.js | 11 ++++ .../show/edit/quality/index/route-test.js | 11 ++++ 48 files changed, 785 insertions(+), 69 deletions(-) rename app/pods/record/show/edit/{quality => funding}/route.js (100%) create mode 100644 app/pods/record/show/edit/funding/template.hbs create mode 100644 app/pods/record/show/edit/lineage/index/route.js create mode 100644 app/pods/record/show/edit/lineage/index/template.hbs create mode 100644 app/pods/record/show/edit/lineage/lineageobject/citation/identifier/route.js create mode 100644 app/pods/record/show/edit/lineage/lineageobject/citation/identifier/template.hbs create mode 100644 app/pods/record/show/edit/lineage/lineageobject/citation/index/route.js create mode 100644 app/pods/record/show/edit/lineage/lineageobject/citation/index/template.hbs create mode 100644 app/pods/record/show/edit/lineage/lineageobject/citation/route.js create mode 100644 app/pods/record/show/edit/lineage/lineageobject/citation/template.hbs create mode 100644 app/pods/record/show/edit/lineage/lineageobject/index/route.js create mode 100644 app/pods/record/show/edit/lineage/lineageobject/index/template.hbs create mode 100644 app/pods/record/show/edit/lineage/lineageobject/route.js create mode 100644 app/pods/record/show/edit/lineage/lineageobject/step/citation/route.js create mode 100644 app/pods/record/show/edit/lineage/lineageobject/step/citation/template.hbs create mode 100644 app/pods/record/show/edit/lineage/lineageobject/step/index/route.js create mode 100644 app/pods/record/show/edit/lineage/lineageobject/step/index/template.hbs create mode 100644 app/pods/record/show/edit/lineage/lineageobject/step/route.js create mode 100644 app/pods/record/show/edit/lineage/lineageobject/step/template.hbs create mode 100644 app/pods/record/show/edit/lineage/lineageobject/template.hbs create mode 100644 app/pods/record/show/edit/lineage/route.js create mode 100644 app/pods/record/show/edit/lineage/template.hbs delete mode 100644 app/pods/record/show/edit/quality/template.hbs create mode 100644 tests/unit/pods/record/show/edit/funding/route-test.js create mode 100644 tests/unit/pods/record/show/edit/lineage/lineageobject/citation/identifier/route-test.js create mode 100644 tests/unit/pods/record/show/edit/lineage/lineageobject/citation/index/route-test.js create mode 100644 tests/unit/pods/record/show/edit/lineage/lineageobject/citation/route-test.js create mode 100644 tests/unit/pods/record/show/edit/lineage/lineageobject/index/route-test.js create mode 100644 tests/unit/pods/record/show/edit/lineage/lineageobject/route-test.js create mode 100644 tests/unit/pods/record/show/edit/lineage/lineageobject/step/citation/route-test.js create mode 100644 tests/unit/pods/record/show/edit/lineage/lineageobject/step/index/route-test.js create mode 100644 tests/unit/pods/record/show/edit/lineage/lineageobject/step/route-test.js create mode 100644 tests/unit/pods/record/show/edit/quality/index/route-test.js diff --git a/app/models/contact.js b/app/models/contact.js index 5d46ef36a..cf46fa890 100644 --- a/app/models/contact.js +++ b/app/models/contact.js @@ -244,7 +244,10 @@ const Contact = Model.extend(Validations, Copyable, { if(orgId) { let contacts = this.get('store').peekAll('contact'); let org = contacts.findBy('json.contactId', orgId); - orgName = org.name; + + if(org) { + orgName = org.name; + } } if(orgName && !isOrganization) { diff --git a/app/pods/components/input/md-input/component.js b/app/pods/components/input/md-input/component.js index 8232c030a..ef232c370 100644 --- a/app/pods/components/input/md-input/component.js +++ b/app/pods/components/input/md-input/component.js @@ -17,6 +17,17 @@ export default Component.extend({ /** * Input, edit, display a single item * + * ```handlebars + * \{{input/md-input + * value=val + * model=null + * valuePath=null + * label="Name" + * placeholder="Enter name." + * required=false + * }} + * ``` + * * @class md-input * @constructor */ @@ -27,14 +38,14 @@ export default Component.extend({ let model = this.get('model'); let valuePath = this.get('valuePath'); - if (isBlank(model) !== isBlank(valuePath)) { + if(isBlank(model) !== isBlank(valuePath)) { assert( `You must supply both model and valuePath to ${this.toString()} or neither.` ); } - if (!isBlank(model)) { - if (this.get(`model.${valuePath}`) === undefined) { + if(!isBlank(model)) { + if(this.get(`model.${valuePath}`) === undefined) { Ember.debug( `model.${valuePath} is undefined in ${this.toString()}.` ); @@ -45,42 +56,52 @@ export default Component.extend({ defineProperty(this, 'value', computed.alias(`model.${valuePath}`)); defineProperty(this, 'validation', computed.alias( - `model.validations.attrs.${valuePath}`).readOnly()); + `model.validations.attrs.${valuePath}`) + .readOnly()); defineProperty(this, 'required', computed( - 'validation.options.presence.presence', - 'validation.options.presence.disabled', - function() { - return this.get('validation.options.presence.presence') && - !this.get('validation.options.presence.disabled'); - }).readOnly()); + 'validation.options.presence.presence', + 'validation.options.presence.disabled', + function () { + return this.get('validation.options.presence.presence') && + !this.get('validation.options.presence.disabled'); + }) + .readOnly()); defineProperty(this, 'notValidating', computed.not( - 'validation.isValidating').readOnly()); + 'validation.isValidating') + .readOnly()); - defineProperty(this, 'hasContent', computed.notEmpty('value').readOnly()); + defineProperty(this, 'hasContent', computed.notEmpty('value') + .readOnly()); defineProperty(this, 'hasWarnings', computed.notEmpty( - 'validation.warnings').readOnly()); + 'validation.warnings') + .readOnly()); defineProperty(this, 'isValid', computed.and('hasContent', - 'validation.isTruelyValid').readOnly()); + 'validation.isTruelyValid') + .readOnly()); defineProperty(this, 'shouldDisplayValidations', computed.or( - 'showValidations', 'didValidate', - 'hasContent').readOnly()); + 'showValidations', 'didValidate', + 'hasContent') + .readOnly()); defineProperty(this, 'showErrorClass', computed.and('notValidating', - 'showErrorMessage', - 'hasContent', 'validation').readOnly()); + 'showErrorMessage', + 'hasContent', 'validation') + .readOnly()); defineProperty(this, 'showErrorMessage', computed.and( - 'shouldDisplayValidations', - 'validation.isInvalid').readOnly()); + 'shouldDisplayValidations', + 'validation.isInvalid') + .readOnly()); defineProperty(this, 'showWarningMessage', computed.and( - 'shouldDisplayValidations', - 'hasWarnings', 'isValid').readOnly()); + 'shouldDisplayValidations', + 'hasWarnings', 'isValid') + .readOnly()); } }, diff --git a/app/pods/components/input/md-textarea/component.js b/app/pods/components/input/md-textarea/component.js index 58adbf138..717a50405 100644 --- a/app/pods/components/input/md-textarea/component.js +++ b/app/pods/components/input/md-textarea/component.js @@ -14,6 +14,10 @@ export default Ember.Component.extend({ * @constructor */ + attributeBindings: ['data-spy'], + classNames: ['md-textarea'], + classNameBindings: ['label:form-group', 'required'], + /** * Initial value, returned value. * diff --git a/app/pods/components/input/md-textarea/template.hbs b/app/pods/components/input/md-textarea/template.hbs index 9def24776..973278141 100644 --- a/app/pods/components/input/md-textarea/template.hbs +++ b/app/pods/components/input/md-textarea/template.hbs @@ -1,4 +1,3 @@ -
    {{#if label}} {{/if}} @@ -14,4 +13,3 @@ max-height=maxheight class=class}} {{yield}} -
    diff --git a/app/pods/components/md-translate/component.js b/app/pods/components/md-translate/component.js index 5d3fc9366..81382c3f0 100644 --- a/app/pods/components/md-translate/component.js +++ b/app/pods/components/md-translate/component.js @@ -49,7 +49,7 @@ export default Component.extend({ type: 'application/json', tip: 'Alaska Data Integration working group (ADIwg) metadata format' }, { - name: 'sbJSON(beta)', + name: 'sbJSON', value: 'sbJson', type: 'application/json', tip: 'USGS ScienceBase metadata format' diff --git a/app/pods/components/object/md-citation/component.js b/app/pods/components/object/md-citation/component.js index f70ec26b3..752282c2d 100644 --- a/app/pods/components/object/md-citation/component.js +++ b/app/pods/components/object/md-citation/component.js @@ -54,5 +54,14 @@ export default Component.extend({ * @type {Boolean} * @default "false" */ - embedded: false + embedded: false, + + /** + * Indicates whether the citation identifier Component should be rendered. + * + * @property noIdentifier + * @type {Boolean} + * @default "false" + */ + noIdentifier: false }); diff --git a/app/pods/components/object/md-citation/template.hbs b/app/pods/components/object/md-citation/template.hbs index 37511c419..b8475b06d 100644 --- a/app/pods/components/object/md-citation/template.hbs +++ b/app/pods/components/object/md-citation/template.hbs @@ -72,10 +72,13 @@ data-spy="Online Resource"}} {{#unless embedded}} + + {{#unless noIdentifier}} {{object/md-identifier-array model=model.identifier profilePath=(concat profilePath ".identifier") data-spy="Identifier" editItem=editIdentifier }} + {{/unless}} {{#layout/md-card collapsible=true title="Series" profilePath=(concat profilePath ".series") data-spy="Series"}} {{input/md-input diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index 84b7b2575..dbc15f658 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -173,8 +173,9 @@ export default Component.extend(Template, { }),*/ attrArray: computed('attributes', function () { - return this.get('attributes') - .split(','); + let attr = this.get('attributes'); + + return attr ? attr.split(',') : null; }), attrTitleArray: computed('attrArray', function () { diff --git a/app/pods/components/object/md-object-table/template.hbs b/app/pods/components/object/md-object-table/template.hbs index ebb1541b1..6aa33353a 100644 --- a/app/pods/components/object/md-object-table/template.hbs +++ b/app/pods/components/object/md-object-table/template.hbs @@ -47,7 +47,7 @@ {{/if}} {{/each}} {{/if}} - + {{#if item.validations.isInvalid}} {{fa-icon "exclamation-circle" fixedWidth=true}} @@ -60,11 +60,11 @@ {{/if}} -   - diff --git a/app/pods/record/show/edit/quality/route.js b/app/pods/record/show/edit/funding/route.js similarity index 100% rename from app/pods/record/show/edit/quality/route.js rename to app/pods/record/show/edit/funding/route.js diff --git a/app/pods/record/show/edit/funding/template.hbs b/app/pods/record/show/edit/funding/template.hbs new file mode 100644 index 000000000..c24cd6895 --- /dev/null +++ b/app/pods/record/show/edit/funding/template.hbs @@ -0,0 +1 @@ +{{outlet}} diff --git a/app/pods/record/show/edit/lineage/index/route.js b/app/pods/record/show/edit/lineage/index/route.js new file mode 100644 index 000000000..214edd633 --- /dev/null +++ b/app/pods/record/show/edit/lineage/index/route.js @@ -0,0 +1,30 @@ +import Ember from 'ember'; + +const { + Route, + set, + getWithDefault, + get +} = Ember; + +export default Route.extend({ + afterModel(m) { + this._super(...arguments); + + let model = get(m, 'json.metadata'); + set(model, 'resourceLineage', getWithDefault(model, 'resourceLineage', [])); + }, + actions: { + editLineage(id) { + this.transitionTo('record.show.edit.lineage.lineageobject', id); + }//, + // templateClass() { + // return Ember.Object.extend({ + // init() { + // this._super(...arguments); + // //this.set('authority', {}); + // } + // }); + // } + } +}); diff --git a/app/pods/record/show/edit/lineage/index/template.hbs b/app/pods/record/show/edit/lineage/index/template.hbs new file mode 100644 index 000000000..978bd380b --- /dev/null +++ b/app/pods/record/show/edit/lineage/index/template.hbs @@ -0,0 +1,16 @@ +{{log model.json.metadata.resourceLineage}} + +

    + Editing Lineage + {{control/md-status model=parentModel}} +

    + +{{object/md-objectroute-table + items=model.json.metadata.resourceLineage + header="Lineage" + shadow=true + buttonText="Add Lineage Object" + ellipsis=ellipsis + previewTemplate="object/md-lineage/preview" + editItem=(route-action "editLineage") +}} diff --git a/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/route.js b/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/route.js new file mode 100644 index 000000000..90c8f777b --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/route.js @@ -0,0 +1,52 @@ +import Ember from 'ember'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +const { + Route, + get, + isEmpty, + isArray +} = Ember; + +export default Route.extend(ScrollTo, { + model(params) { + this.set('identifierId', params.identifier_id); + + return this.setupModel(); + }, + + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor('record.show.edit')); + this.controllerFor('record.show.edit') + .setProperties({ + onCancel: this.setupModel + }); + }, + + setupModel() { + let identifierId = get(this, 'identifierId'); + let model = this.modelFor('record.show.edit.lineage.lineageobject.citation'); + let identifiers = get(model, 'identifier'); + let identifier = identifierId && isArray(identifiers) ? identifiers.get(identifierId) : undefined; + + //make sure the identifier exists + if (isEmpty(identifier)) { + Ember.get(this, 'flashMessages') + .warning('No identifier found! Re-directing to Citation...'); + this.replaceWith('record.show.edit.lineage.lineageobject.citation'); + + return; + } + + return identifier; + }, + actions: { + goBack(){ + this.transitionTo('record.show.edit.lineage.lineageobject.citation'); + } + } +}); diff --git a/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/template.hbs new file mode 100644 index 000000000..66d73d4fd --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/template.hbs @@ -0,0 +1,20 @@ +

    + Editing Alternate Identifier: {{model.identifier}} + {{control/md-status model=(compute (route-action "parentModel"))}} +

    + +
    + {{object/md-identifier + model=model + profilePath="record.metadata.lineage.lineageobject.citation.identifier" + data-spy="Identifier" + }} + {{outlet}} +
    + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" text="Back to Alternate" icon="arrow-left" click=(route-action "goBack")) +}} +{{to-elsewhere named="md-scroll-spy-record-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/lineage/lineageobject/citation/index/route.js b/app/pods/record/show/edit/lineage/lineageobject/citation/index/route.js new file mode 100644 index 000000000..0a77cd197 --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/citation/index/route.js @@ -0,0 +1,21 @@ +import Ember from 'ember'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +const { + Route +} = Ember; + +export default Route.extend(ScrollTo, { + actions: { + editIdentifier(index) { + this.transitionTo('record.show.edit.lineage.lineageobject.citation.identifier', + index) + .then(function () { + this.setScrollTo('identifier'); + }.bind(this)); + }, + goBack(){ + this.transitionTo('record.show.edit.lineage.lineageobject'); + } + } +}); diff --git a/app/pods/record/show/edit/lineage/lineageobject/citation/index/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/citation/index/template.hbs new file mode 100644 index 000000000..e93826f7e --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/citation/index/template.hbs @@ -0,0 +1,19 @@ +

    Editing Citation + {{control/md-status model=(compute (route-action "parentModel"))}} +

    +{{#with model as |citation|}} +
    + {{object/md-citation + model=citation + profilePath="record.metadata.resourceLineage.citation" + editIdentifier=(route-action "editIdentifier") + }} + {{outlet}} +
    +{{/with}} +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" text="Back to Lineage Object" icon="arrow-left" click=(route-action "goBack")) +}} +{{to-elsewhere named="md-scroll-spy-record-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/lineage/lineageobject/citation/route.js b/app/pods/record/show/edit/lineage/lineageobject/citation/route.js new file mode 100644 index 000000000..6bdb417a8 --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/citation/route.js @@ -0,0 +1,55 @@ +import Ember from 'ember'; + +const { + Route, + get, + isEmpty, + isArray +} = Ember; + +export default Route.extend({ + model(params, transition) { + this.set('citationId', params.citation_id); + this.set('lineageId', transition.params[ + 'record.show.edit.lineage.lineageobject'].lineage_id); + + return this.setupModel(); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor('record.show.edit')); + this.controllerFor('record.show.edit') + .setProperties({ + onCancel: this.setupModel + }); + }, + + setupModel() { + let citationId = get(this, 'citationId'); + let lineageId = get(this, 'lineageId'); + let model = this.modelFor('record.show.edit'); + let citations = model.get( + 'json.metadata.resourceLineage.' + lineageId + '.citation'); + let citation = citationId && isArray(citations) ? citations.get( + citationId) : undefined; + + //make sure the identifier exists + if(isEmpty(citation)) { + Ember.get(this, 'flashMessages') + .warning('No citation found! Re-directing...'); + this.replaceWith('record.show.edit.lineage.lineageobject'); + + return; + } + + return citation; + }, + actions: { + parentModel() { + return this.modelFor('record.show.edit'); + } + } +}); diff --git a/app/pods/record/show/edit/lineage/lineageobject/citation/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/citation/template.hbs new file mode 100644 index 000000000..915dcd11e --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/citation/template.hbs @@ -0,0 +1 @@ +{{liquid-outlet class="liquid-spy"}} diff --git a/app/pods/record/show/edit/lineage/lineageobject/index/route.js b/app/pods/record/show/edit/lineage/lineageobject/index/route.js new file mode 100644 index 000000000..e9db1e81a --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/index/route.js @@ -0,0 +1,37 @@ +import Ember from 'ember'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +const { + Route, + get +} = Ember; + +export default Route.extend(ScrollTo, { + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'record.show.edit.main')); + this.controller.set('lineageId', get(this.controllerFor( + 'record.show.edit.lineage.lineageobject'), 'lineageId')); + }, + actions: { + editCitation(index) { + this.transitionTo('record.show.edit.lineage.lineageobject.citation', + index) + .then( + function () { + this.setScrollTo('citation'); + }.bind(this)); + }, + editProcessStep(index) { + this.transitionTo('record.show.edit.lineage.lineageobject.step', + index) + .then( + function () { + this.setScrollTo('process-step'); + }.bind(this)); + } + } +}); diff --git a/app/pods/record/show/edit/lineage/lineageobject/index/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/index/template.hbs new file mode 100644 index 000000000..eab51abdd --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/index/template.hbs @@ -0,0 +1,16 @@ +

    + Editing Lineage #{{lineageId}} + {{control/md-status model=parentModel}} +

    + +{{object/md-lineage model=model profilePath="record.lineage" + editCitation=(route-action "editCitation") + editProcessStep=(route-action "editProcessStep") +}} + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" text="Back to Lineage List" icon="arrow-left" route="record.show.edit.lineage") +}} +{{to-elsewhere named="md-scroll-spy-record-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/lineage/lineageobject/route.js b/app/pods/record/show/edit/lineage/lineageobject/route.js new file mode 100644 index 000000000..68713b663 --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/route.js @@ -0,0 +1,55 @@ +import Ember from 'ember'; + +const { + Route, + get, + isEmpty, + isArray, + computed +} = Ember; + +export default Route.extend({ + breadCrumb: computed('lineageId', function () { + return { + title: get(this, 'lineageId'), + linkable: true + }; + }), + + model(params) { + this.set('lineageId', params.lineage_id); + + return this.setupModel(); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + //this.controller.set('parentModel', this.modelFor('record.show.edit.main')); + this.controller.set('lineageId', get(this, 'lineageId')); + this.controllerFor('record.show.edit') + .setProperties({ + onCancel: this.setupModel + }); + }, + + setupModel() { + let lineageId = get(this, 'lineageId'); + let model = this.modelFor('record.show.edit'); + let objects = model.get('json.metadata.resourceLineage'); + let lineage = lineageId && isArray(objects) ? objects.get(lineageId) : + undefined; + + //make sure the identifier exists + if(isEmpty(lineage)) { + Ember.get(this, 'flashMessages') + .warning('No lineage object found! Re-directing to list...'); + this.replaceWith('record.show.edit.lineage'); + + return; + } + + return lineage; + } +}); diff --git a/app/pods/record/show/edit/lineage/lineageobject/step/citation/route.js b/app/pods/record/show/edit/lineage/lineageobject/step/citation/route.js new file mode 100644 index 000000000..195e9e346 --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/step/citation/route.js @@ -0,0 +1,63 @@ +import Ember from 'ember'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +const { + Route, + get, + isEmpty, + isArray +} = Ember; + +export default Route.extend(ScrollTo, { + model(params, transition) { + this.set('citationId', params.citation_id); + this.set('stepId', transition.params[ + 'record.show.edit.lineage.lineageobject.step'].step_id); + this.set('lineageId', transition.params[ + 'record.show.edit.lineage.lineageobject'].lineage_id); + + return this.setupModel(); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor('record.show.edit')); + this.controller.set('stepId', get(this, 'stepId')); + this.controllerFor('record.show.edit') + .setProperties({ + onCancel: this.setupModel + }); + }, + + setupModel() { + let citationId = get(this, 'citationId'); + let lineageId = get(this, 'lineageId'); + let stepId = get(this, 'stepId'); + let model = this.modelFor('record.show.edit'); + let citations = model.get( + `json.metadata.resourceLineage.${lineageId}.processStep.${stepId}.reference`); + let citation = citationId && isArray(citations) ? citations.get( + citationId) : undefined; + + //make sure the identifier exists + if(isEmpty(citation)) { + Ember.get(this, 'flashMessages') + .warning('No citation found! Re-directing...'); + this.replaceWith('record.show.edit.lineage.lineageobject.step'); + + return; + } + + return citation; + }, + actions: { + parentModel() { + return this.modelFor('record.show.edit'); + }, + goBack(){ + this.transitionTo('record.show.edit.lineage.lineageobject.step'); + } + } +}); diff --git a/app/pods/record/show/edit/lineage/lineageobject/step/citation/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/step/citation/template.hbs new file mode 100644 index 000000000..076bb9a16 --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/step/citation/template.hbs @@ -0,0 +1,18 @@ +

    Editing Step #{{stepId}} Citation + {{control/md-status model=(compute (route-action "parentModel"))}} +

    +{{#with model as |citation|}} +
    + {{object/md-citation + model=citation + profilePath="record.metadata.resourceLineage.processStep.reference" + }} + {{outlet}} +
    +{{/with}} +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" text=(concat "Back to Step #" stepId) icon="arrow-left" click=(route-action "goBack")) +}} +{{to-elsewhere named="md-scroll-spy-record-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/lineage/lineageobject/step/index/route.js b/app/pods/record/show/edit/lineage/lineageobject/step/index/route.js new file mode 100644 index 000000000..7266a99c5 --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/step/index/route.js @@ -0,0 +1,32 @@ +import Ember from 'ember'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +const { + Route, + get +} = Ember; + +export default Route.extend(ScrollTo, { + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'record.show.edit.main')); + this.controller.set('stepId', get(this.controllerFor( + 'record.show.edit.lineage.lineageobject.step'), 'stepId')); + }, + actions: { + editCitation(index) { + this.transitionTo('record.show.edit.lineage.lineageobject.step.citation', + index) + .then( + function () { + this.setScrollTo('citation'); + }.bind(this)); + }, + goBack(){ + this.transitionTo('record.show.edit.lineage.lineageobject'); + } + } +}); diff --git a/app/pods/record/show/edit/lineage/lineageobject/step/index/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/step/index/template.hbs new file mode 100644 index 000000000..c6965e7ea --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/step/index/template.hbs @@ -0,0 +1,16 @@ +

    + Editing Process Step #{{stepId}} + {{control/md-status model=parentModel}} +

    + +{{object/md-process-step model=model profilePath="record.lineage.processStep" + itemId=stepId + editCitation=(route-action "editCitation") +}} + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" text="Back to Lineage" icon="arrow-left" click=(route-action "goBack")) +}} +{{to-elsewhere named="md-scroll-spy-record-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/lineage/lineageobject/step/route.js b/app/pods/record/show/edit/lineage/lineageobject/step/route.js new file mode 100644 index 000000000..a96a24937 --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/step/route.js @@ -0,0 +1,64 @@ +import Ember from 'ember'; + +const { + Route, + get, + isEmpty, + isArray, + computed +} = Ember; + +export default Route.extend({ + model(params, transition) { + this.set('stepId', params.step_id); + this.set('lineageId', transition.params[ + 'record.show.edit.lineage.lineageobject'].lineage_id); + + return this.setupModel(); + }, + + breadCrumb: computed('stepId', function () { + return { + title: 'Step ' + get(this, 'stepId'), + linkable: true + }; + }), + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor('record.show.edit')); + this.controller.set('stepId', get(this, 'stepId')); + this.controllerFor('record.show.edit') + .setProperties({ + onCancel: this.setupModel + }); + }, + + setupModel() { + let stepId = get(this, 'stepId'); + let lineageId = get(this, 'lineageId'); + let model = this.modelFor('record.show.edit'); + let steps = model.get( + 'json.metadata.resourceLineage.' + lineageId + '.processStep'); + let step = stepId && isArray(steps) ? steps.get( + stepId) : undefined; + + //make sure the identifier exists + if(isEmpty(step)) { + Ember.get(this, 'flashMessages') + .warning('No Process Step found! Re-directing...'); + this.replaceWith('record.show.edit.lineage.lineageobject'); + + return; + } + + return step; + }, + actions: { + parentModel() { + return this.modelFor('record.show.edit'); + } + } +}); diff --git a/app/pods/record/show/edit/lineage/lineageobject/step/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/step/template.hbs new file mode 100644 index 000000000..915dcd11e --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/step/template.hbs @@ -0,0 +1 @@ +{{liquid-outlet class="liquid-spy"}} diff --git a/app/pods/record/show/edit/lineage/lineageobject/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/template.hbs new file mode 100644 index 000000000..915dcd11e --- /dev/null +++ b/app/pods/record/show/edit/lineage/lineageobject/template.hbs @@ -0,0 +1 @@ +{{liquid-outlet class="liquid-spy"}} diff --git a/app/pods/record/show/edit/lineage/route.js b/app/pods/record/show/edit/lineage/route.js new file mode 100644 index 000000000..26d9f3124 --- /dev/null +++ b/app/pods/record/show/edit/lineage/route.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/pods/record/show/edit/lineage/template.hbs b/app/pods/record/show/edit/lineage/template.hbs new file mode 100644 index 000000000..83bd09112 --- /dev/null +++ b/app/pods/record/show/edit/lineage/template.hbs @@ -0,0 +1,5 @@ +
    +
    + {{liquid-outlet class=""}} +
    +
    diff --git a/app/pods/record/show/edit/metadata/alternate/identifier/route.js b/app/pods/record/show/edit/metadata/alternate/identifier/route.js index 86cc0d730..f6b8762a9 100644 --- a/app/pods/record/show/edit/metadata/alternate/identifier/route.js +++ b/app/pods/record/show/edit/metadata/alternate/identifier/route.js @@ -43,5 +43,10 @@ export default Route.extend(ScrollTo, { } return identifier; + }, + actions: { + goBack(){ + this.transitionTo('record.show.edit.metadata.alternate'); + } } }); diff --git a/app/pods/record/show/edit/metadata/alternate/identifier/template.hbs b/app/pods/record/show/edit/metadata/alternate/identifier/template.hbs index 386c88f17..a00b735be 100644 --- a/app/pods/record/show/edit/metadata/alternate/identifier/template.hbs +++ b/app/pods/record/show/edit/metadata/alternate/identifier/template.hbs @@ -15,7 +15,7 @@ {{to-elsewhere named="md-subbar-extra" - send=(component "control/subbar-link" text="Back to Alternate" icon="arrow-left" route="record.show.edit.metadata.alternate") + send=(component "control/subbar-link" text="Back to Alternate" icon="arrow-left" click=(route-action "goBack")) }} {{to-elsewhere named="md-scroll-spy-record-edit" send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/quality/template.hbs b/app/pods/record/show/edit/quality/template.hbs deleted file mode 100644 index 3a496d2d4..000000000 --- a/app/pods/record/show/edit/quality/template.hbs +++ /dev/null @@ -1,23 +0,0 @@ -{{outlet}} - - -{{#layout/md-card class="construction card-inverse card-warning" shadow=false}} -
    -
    - {{fa-icon "exclamation-triangle" size=2}} -
    -
    - Page Under
    Construction     -
    -
    -{{/layout/md-card}} diff --git a/app/router.js b/app/router.js index 434d1434a..c6f716dc6 100644 --- a/app/router.js +++ b/app/router.js @@ -6,7 +6,7 @@ const Router = Ember.Router.extend({ rootURL: config.rootURL }); -Router.map(function () { +Router.map(function() { this.route('dashboard'); this.route('export'); this.route('import'); @@ -18,7 +18,7 @@ Router.map(function () { //records this.route('records'); //record - this.route('record', function () { + this.route('record', function() { this.route('new', function() { this.route('id', { path: '/:record_id' @@ -27,8 +27,8 @@ Router.map(function () { this.route('show', { path: ':record_id' }, - function () { - this.route('edit', function () { + function() { + this.route('edit', function() { this.route('metadata', function() { this.route('identifier'); this.route('parent', function() { @@ -58,7 +58,26 @@ Router.map(function () { path: 'spatial/:extent_id' }); }); - this.route('quality'); + this.route('lineage', function() { + this.route('lineageobject', { + path: ':lineage_id' + }, function() { + this.route('citation', { + path: 'citation/:citation_id' + }, function() { + this.route('identifier', { + path: 'identifier/:identifier_id' + }); + }); + this.route('step', { + path: 'step/:step_id' + }, function() { + this.route('citation', { + path: 'citation/:citation_id' + }); + }); + }); + }); this.route('distribution'); this.route('associated'); this.route('documents'); @@ -71,6 +90,7 @@ Router.map(function () { }); }); }); + this.route('funding'); }); this.route('translate'); } @@ -79,7 +99,7 @@ Router.map(function () { //contacts this.route('contacts'); //contact - this.route('contact', function () { + this.route('contact', function() { this.route('new', function() { this.route('id', { path: '/:contact_id' @@ -88,7 +108,7 @@ Router.map(function () { this.route('show', { path: ':contact_id' - }, function () { + }, function() { this.route('edit'); }); @@ -96,7 +116,7 @@ Router.map(function () { //dictionary this.route('dictionaries'); //dictionary - this.route('dictionary', function () { + this.route('dictionary', function() { this.route('new', function() { this.route('id', { path: '/:dictionary_id' @@ -104,8 +124,8 @@ Router.map(function () { }); this.route('show', { path: ':dictionary_id' - }, function () { - this.route('edit', function () { + }, function() { + this.route('edit', function() { this.route('domains'); this.route('entities'); }); diff --git a/app/services/profile.js b/app/services/profile.js index 926454754..566617758 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -67,7 +67,7 @@ export default Ember.Service.extend({ }, { title: 'Lineage', - target: 'record.show.edit.quality' + target: 'record.show.edit.lineage' }, { title: 'Distribution', @@ -81,7 +81,11 @@ export default Ember.Service.extend({ title: 'Documents', target: 'record.show.edit.documents' - }, /*{ + }, { + title: 'Funding', + target: 'record.show.edit.funding' + + }/*, { title: 'Coverage', target: 'record.show.edit.coverages' diff --git a/app/styles/_table.scss b/app/styles/_table.scss index 70a77f315..35ab8d0d7 100644 --- a/app/styles/_table.scss +++ b/app/styles/_table.scss @@ -49,6 +49,10 @@ .md-preview-image img { max-height: 100px; } + + .md-row-actions { + min-width: 150px; + } } .md-logo-preview { diff --git a/app/transitions.js b/app/transitions.js index 5872beb98..9f5aaf34f 100644 --- a/app/transitions.js +++ b/app/transitions.js @@ -1,4 +1,4 @@ -export default function() { +export default function () { this.transition( this.toRoute('record.show.edit.main.citation'), this.fromRoute('record.show.edit.main.index'), @@ -46,4 +46,34 @@ export default function() { this.use('toLeft'), this.reverse('toRight') ); + this.transition( + this.toRoute('record.show.edit.lineage.lineageobject'), + this.fromRoute('record.show.edit.lineage.index'), + this.use('toLeft'), + this.reverse('toRight') + ); + this.transition( + this.toRoute('record.show.edit.lineage.lineageobject.citation'), + this.fromRoute('record.show.edit.lineage.lineageobject.index'), + this.use('toLeft'), + this.reverse('toRight') + ); + this.transition( + this.toRoute('record.show.edit.lineage.lineageobject.citation.identifier'), + this.fromRoute('record.show.edit.lineage.lineageobject.citation.index'), + this.use('toLeft'), + this.reverse('toRight') + ); + this.transition( + this.toRoute('record.show.edit.lineage.lineageobject.step'), + this.fromRoute('record.show.edit.lineage.lineageobject.index'), + this.use('toLeft'), + this.reverse('toRight') + ); + this.transition( + this.toRoute('record.show.edit.lineage.lineageobject.step.citation'), + this.fromRoute('record.show.edit.lineage.lineageobject.step.index'), + this.use('toLeft'), + this.reverse('toRight') + ); } diff --git a/tests/unit/pods/record/show/edit/funding/route-test.js b/tests/unit/pods/record/show/edit/funding/route-test.js new file mode 100644 index 000000000..dcd782d97 --- /dev/null +++ b/tests/unit/pods/record/show/edit/funding/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/funding', 'Unit | Route | record/show/edit/funding', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/identifier/route-test.js b/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/identifier/route-test.js new file mode 100644 index 000000000..21d041481 --- /dev/null +++ b/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/identifier/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/lineage/lineageobject/citation/identifier', 'Unit | Route | record/show/edit/lineage/lineageobject/citation/identifier', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/index/route-test.js b/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/index/route-test.js new file mode 100644 index 000000000..2a957c5af --- /dev/null +++ b/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/lineage/lineageobject/citation/index', 'Unit | Route | record/show/edit/lineage/lineageobject/citation/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/route-test.js b/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/route-test.js new file mode 100644 index 000000000..378150397 --- /dev/null +++ b/tests/unit/pods/record/show/edit/lineage/lineageobject/citation/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/lineage/lineageobject/citation', 'Unit | Route | record/show/edit/lineage/lineageobject/citation', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/lineage/lineageobject/index/route-test.js b/tests/unit/pods/record/show/edit/lineage/lineageobject/index/route-test.js new file mode 100644 index 000000000..d08daab69 --- /dev/null +++ b/tests/unit/pods/record/show/edit/lineage/lineageobject/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/lineage/lineageobject/index', 'Unit | Route | record/show/edit/lineage/lineageobject/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/lineage/lineageobject/route-test.js b/tests/unit/pods/record/show/edit/lineage/lineageobject/route-test.js new file mode 100644 index 000000000..3346c8314 --- /dev/null +++ b/tests/unit/pods/record/show/edit/lineage/lineageobject/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/lineage/lineageobject', 'Unit | Route | record/show/edit/lineage/lineageobject', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/lineage/lineageobject/step/citation/route-test.js b/tests/unit/pods/record/show/edit/lineage/lineageobject/step/citation/route-test.js new file mode 100644 index 000000000..417df4d55 --- /dev/null +++ b/tests/unit/pods/record/show/edit/lineage/lineageobject/step/citation/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/lineage/lineageobject/step/citation', 'Unit | Route | record/show/edit/lineage/lineageobject/step/citation', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/lineage/lineageobject/step/index/route-test.js b/tests/unit/pods/record/show/edit/lineage/lineageobject/step/index/route-test.js new file mode 100644 index 000000000..de38cee94 --- /dev/null +++ b/tests/unit/pods/record/show/edit/lineage/lineageobject/step/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/lineage/lineageobject/step/index', 'Unit | Route | record/show/edit/lineage/lineageobject/step/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/lineage/lineageobject/step/route-test.js b/tests/unit/pods/record/show/edit/lineage/lineageobject/step/route-test.js new file mode 100644 index 000000000..6b7c589ac --- /dev/null +++ b/tests/unit/pods/record/show/edit/lineage/lineageobject/step/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/lineage/lineageobject/step', 'Unit | Route | record/show/edit/lineage/lineageobject/step', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/quality/index/route-test.js b/tests/unit/pods/record/show/edit/quality/index/route-test.js new file mode 100644 index 000000000..9e73598be --- /dev/null +++ b/tests/unit/pods/record/show/edit/quality/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/quality/index', 'Unit | Route | record/show/edit/quality/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); From 17219ba05cdb519f5ac70c67f75eae3190de9fbe Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 13 Jul 2017 09:01:33 -0700 Subject: [PATCH 162/383] Add spatial extents to record.show --- app/pods/record/show/index/route.js | 7 +++ app/pods/record/show/index/template.hbs | 57 ++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/app/pods/record/show/index/route.js b/app/pods/record/show/index/route.js index da97961e1..ba33a1457 100644 --- a/app/pods/record/show/index/route.js +++ b/app/pods/record/show/index/route.js @@ -5,6 +5,13 @@ export default Route.extend({ actions: { linkTo(route){ this.transitionTo(route); + }, + setupMap(features, m) { + let map = m.target; + let bounds = L.geoJson(features) + .getBounds(); + + map.fitBounds(bounds); } } }); diff --git a/app/pods/record/show/index/template.hbs b/app/pods/record/show/index/template.hbs index ed947b252..1a114980d 100644 --- a/app/pods/record/show/index/template.hbs +++ b/app/pods/record/show/index/template.hbs @@ -13,7 +13,8 @@ }} {{/if}} - + + {{#layout/md-card shadow=false muted=true title="Main" bodyIsRow=false collapsible=true btnText="Edit" btnClass="success" @@ -78,6 +79,60 @@ {{/layout/md-card}} {{/layout/md-card}} + + {{#layout/md-card shadow=false muted=true title="Spatial Extent" bodyIsRow=false + collapsible=true + btnText="Edit" btnClass="success" + btnAction=(route-action "linkTo" "record.show.edit.extent") btnIcon="pencil" + }} + +
    + {{#each resource.extent as |extent index|}} +
    +
    +

    + Spatial Extent #{{index}} +

    +
    +
    + +

    + {{get-property extent "description"}} +

    +
    +
    + {{#if extent.geographicExtent.0.geographicElement.length}} + {{#leaflet-map lat=0 lng=0 zoom=2 maxZoom=18 onLoad=(route-action "setupMap" extent.geographicExtent.0.geographicElement)}} + {{!-- Specify child layer components here --}} + {{#layer-group name="Terrain" baselayer=true default=true}} + {{tile-layer url="http://{s}.tile.stamen.com/terrain/{z}/{x}/{y}.png" attribution=mapAttribution}} + {{/layer-group}} + + {{#feature-group name="Features" default=true}} + {{#each extent.geographicExtent.0.geographicElement as |l|}} + {{geojson-layer geoJSON=l}} + {{/each}} + {{/feature-group}} + + {{layer-control}} + {{/leaflet-map}} + {{else}} +
    + No Features to display. +
    + {{/if}} +
    +
    + {{else}} +

    No spatial extents found. +

    + {{/each}} +
    + + {{/layout/md-card}} + {{outlet}}
    From 64fca3dd19bbf3bb1b2082e9b471e6cd4dc51774 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 25 Jul 2017 18:07:06 -0700 Subject: [PATCH 163/383] Fix import --- app/pods/import/route.js | 73 +++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/app/pods/import/route.js b/app/pods/import/route.js index 09308de19..cb39ef3fe 100644 --- a/app/pods/import/route.js +++ b/app/pods/import/route.js @@ -85,16 +85,18 @@ export default Route.extend({ type: 'records' })); - dataDictionary.forEach((item) => { - data.pushObject(template.create({ - attributes: { - json: JSON.stringify({ - dataDictionary: item - }) - }, - type: 'dictionaries' - })); - }); + if(dataDictionary) { + dataDictionary.forEach((item) => { + data.pushObject(template.create({ + attributes: { + json: JSON.stringify({ + dataDictionary: item + }) + }, + type: 'dictionaries' + })); + }); + } return data; }, @@ -172,31 +174,34 @@ export default Route.extend({ let json; new Promise((resolve, reject) => { - try { - json = JSON.parse(file.data); - } catch(e) { - reject( - `Failed to parse file: ${file.name}. Is it valid JSON?`); - } - - resolve({ - json: json, - file: file, - route: this + try { + json = JSON.parse(file.data); + } catch(e) { + reject( + `Failed to parse file: ${file.name}. Is it valid JSON?`); + } + + resolve({ + json: json, + file: file, + route: this + }); + }) + .then((data) => { + //determine file type and map + this.mapJSON(data); + + }) + .catch((reason) => { + //catch any errors + get(this, 'flashMessages') + .danger(reason); + return false; + }) + .finally(() => { + $('.import-file-picker input:file') + .val(''); }); - }).then((data) => { - //determine file type and map - this.mapJSON(data); - - }).catch((reason) => { - //catch any errors - get(this, 'flashMessages') - .danger(reason); - return false; - }).finally(() => { - $('.import-file-picker input:file') - .val(''); - }); }, From 2ed4ac7051631caf08208e5c134aa32bf839a680 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 25 Jul 2017 18:08:17 -0700 Subject: [PATCH 164/383] Update profile --- app/services/profile.js | 107 +++++++++++++++++++++++++++------------- 1 file changed, 74 insertions(+), 33 deletions(-) diff --git a/app/services/profile.js b/app/services/profile.js index 566617758..5f2000846 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -50,49 +50,51 @@ export default Ember.Service.extend({ full: { profile: null, secondaryNav: [{ - title: 'Main', - target: 'record.show.edit.main' + title: 'Main', + target: 'record.show.edit.main' - }, { - title: 'Metadata', - target: 'record.show.edit.metadata' + }, { + title: 'Metadata', + target: 'record.show.edit.metadata' - }, { - title: 'Keywords', - target: 'record.show.edit.keywords' + }, { + title: 'Keywords', + target: 'record.show.edit.keywords' - }, { - title: 'Extent', - target: 'record.show.edit.extent' + }, { + title: 'Extent', + target: 'record.show.edit.extent' - }, { - title: 'Lineage', - target: 'record.show.edit.lineage' + }, { + title: 'Lineage', + target: 'record.show.edit.lineage' - }, { - title: 'Distribution', - target: 'record.show.edit.distribution' + }, { + title: 'Distribution', + target: 'record.show.edit.distribution' - }, { - title: 'Associated', - target: 'record.show.edit.associated' + }, { + title: 'Associated', + target: 'record.show.edit.associated' - }, { - title: 'Documents', - target: 'record.show.edit.documents' + }, { + title: 'Documents', + target: 'record.show.edit.documents' - }, { - title: 'Funding', - target: 'record.show.edit.funding' + }, { + title: 'Funding', + target: 'record.show.edit.funding' - }/*, { - title: 'Coverage', - target: 'record.show.edit.coverages' + } + /*, { + title: 'Coverage', + target: 'record.show.edit.coverages' - }, { - title: 'Grid', - target: 'record.show.edit.grid' - }*/], + }, { + title: 'Grid', + target: 'record.show.edit.grid' + }*/ + ], components: { record: { main: { @@ -218,6 +220,45 @@ export default Ember.Service.extend({ note: true, scope: true, } + }, + lineage: { + statement: true, + processStep: { + stepId: true, + description: true, + processor: true, + reference: true, + scope: true + }, + scope: true, + citation: { + title: true, + alternateTitle: true, + date: true, + edition: true, + onlineResource: true, + responsibleParty: true, + presentationForm: true, + otherCitationDetails: true, + graphic: true, + series: { + name: true, + issue: true, + page: true + }, + identifier: { + identifier: true, + namespace: true, + version: true, + description: true, + authority: { + title: true, + alternateTitle: true, + date: true, + responsibleParty: true + } + } + } } } } From 3e17243b2afe4e08dd1bbc9df58fcb50f96f3a6f Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 25 Jul 2017 18:09:12 -0700 Subject: [PATCH 165/383] Update record.new.id route --- app/pods/record/new/id/route.js | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/app/pods/record/new/id/route.js b/app/pods/record/new/id/route.js index b2180cbf6..7fe135ad8 100644 --- a/app/pods/record/new/id/route.js +++ b/app/pods/record/new/id/route.js @@ -1,11 +1,17 @@ import Ember from 'ember'; import DS from 'ember-data'; +const { + inject, + get, + Route +} = Ember; + const { AdapterError } = DS; -export default Ember.Route.extend({ +export default Route.extend({ model(params) { let record = this.store.peekRecord('record', params.record_id); @@ -18,6 +24,13 @@ export default Ember.Route.extend({ breadCrumb: null, + /** + * The profile service + * + * @return {Ember.Service} profile + */ + profile: inject.service(), + deactivate() { // We grab the model loaded in this route let model = this.currentRouteModel(); @@ -51,7 +64,7 @@ export default Ember.Route.extend({ // }, actions: { - willTransition: function (transition) { + willTransition: function(transition) { if(transition.targetName === 'record.new.index') { transition.abort(); return true; @@ -94,7 +107,7 @@ export default Ember.Route.extend({ error(error) { if(error instanceof AdapterError) { - Ember.get(this, 'flashMessages') + get(this, 'flashMessages') .warning('No record found! Re-directing to new record...'); // redirect to new this.replaceWith('record.new'); @@ -102,6 +115,16 @@ export default Ember.Route.extend({ // otherwise let the error bubble return true; } + }, + /** + * Update the record profile + * + * @name updateProfile + * @param {String} profile The new profile. + */ + updateProfile(profile) { + this.get('profile') + .set('active', profile); } } From c828709a600b58bf602e4065d8df6c8d7c378dd3 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 26 Jul 2017 09:20:52 -0800 Subject: [PATCH 166/383] Add issue template --- ISSUE_TEMPLATE.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..3d7a84fc3 --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,39 @@ +### Before submitting an issue to I have first: + +- [ ] read the [contribution guidelines](https://github.com/adiwg/mdEditor/blob/develop/CONTRIBUTING.md) +- [ ] searched for similar already [existing issue](https://github.com/adiwg/mdEditor/issues) +- [ ] read the documentation and [wiki](https://github.com/adiwg/mdEditor/wiki) + +If you have performed all the above, continue describing the issue with template below. + +Please: + +- *be as explicit has you can* +- *if reporting a bug* + - *describe the problem and its symptoms* + - *explain how to reproduce* +- *attach whatever information that can help understanding the context (screen capture, log files)* +- *do your best to use correct English (re-read yourself)* + +## Issue +**mdEditor Version** (find version under settings): + +**mdEditor Web Address** (enter the URL): + +### Issue Description: + +*Provide a general description of the problem. If issue is a feature request, tell us why this feature is useful.* + +### Steps to reproduce (Bug reports only): + + 1. _____ + 2. _____ + 3. _____ + +### Observed Results (Bug reports only): + + *What happened? This could be a description, log output, etc.* + +### Expected Results (Bug reports only): + + *What did you expect to happen?* From c187de9eba1e2e379434effa9e0817b37844ffcc Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 27 Jul 2017 06:11:09 -0800 Subject: [PATCH 167/383] Add md-time-period --- .../object/md-time-period/component.js | 96 +++++++++++++++ .../object/md-time-period/template.hbs | 113 ++++++++++++++++++ .../object/md-time-period/component-test.js | 25 ++++ 3 files changed, 234 insertions(+) create mode 100644 app/pods/components/object/md-time-period/component.js create mode 100644 app/pods/components/object/md-time-period/template.hbs create mode 100644 tests/integration/pods/components/object/md-time-period/component-test.js diff --git a/app/pods/components/object/md-time-period/component.js b/app/pods/components/object/md-time-period/component.js new file mode 100644 index 000000000..8a9d2c899 --- /dev/null +++ b/app/pods/components/object/md-time-period/component.js @@ -0,0 +1,96 @@ +import Ember from 'ember'; + +import { + validator, + buildValidations +} from 'ember-cp-validations'; + +const { + Component, + computed, + set, + get, + getWithDefault, + run: { + once + } +} = Ember; + +const Validations = buildValidations({ + 'startDateTime': [ + validator('presence', { + presence: true, + disabled: computed.notEmpty('model.endDateTime'), + ignoreBlank: true + }) + ], + 'endDateTime': [ + validator('date', { + onOrAfter: computed.alias('model.startDateTime'), + isWarning: true + }), + validator('presence', { + presence: true, + disabled: computed.notEmpty('model.startDateTime'), + ignoreBlank: true + }) + ] +}); + +export default Component.extend(Validations, { + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(function () { + set(model, 'periodName', getWithDefault(model, + 'periodName', [])); + set(model, 'timeInterval', getWithDefault(model, 'timeInterval', {})); + set(model, 'duration', getWithDefault(model, 'duration', {})); + // set(model, 'presentationForm', getWithDefault(model, + // 'presentationForm', [])); + // set(model, 'onlineResource', getWithDefault(model, + // 'onlineResource', [])); + // set(model, 'identifier', getWithDefault(model, 'identifier', [])); + // set(model, 'graphic', getWithDefault(model, 'graphic', [])); + }); + }, + tagName: 'form', + + /** + * The profile path for the component + * + * @property profilePath + * @type {String} + */ + + startDateTime: computed.alias('model.startDateTime'), + endDateTime: computed.alias('model.endDateTime'), + timeUnit: [{ + name: 'year', + value: 'year' + }, + { + name: 'month', + value: 'month' + }, + { + name: 'day', + value: 'day' + }, + { + name: 'hour', + value: 'hour' + }, + { + name: 'minute', + value: 'minute' + }, + { + name: 'second', + value: 'second' + } + ] + +}); diff --git a/app/pods/components/object/md-time-period/template.hbs b/app/pods/components/object/md-time-period/template.hbs new file mode 100644 index 000000000..cb0dbe685 --- /dev/null +++ b/app/pods/components/object/md-time-period/template.hbs @@ -0,0 +1,113 @@ +{{#layout/md-card + title="Time Period" + collapsible=true + collapsed=collapsed + data-spy="Time Period" + shadow=true +}} + +{{#layout/md-card shadow=false muted=false plain=true}} +
    + + {{input/md-datetime + valuePath="startDateTime" + model=this + showValidations=true + forceDateOutput=true + label="Start Date" + showClear=true + format="YYYY-MM-DD HH:mm:ss" + placeholder="Enter start dateTime" + }} + + {{input/md-datetime + valuePath="endDateTime" + model=this + showValidations=true + forceDateOutput=true + showClear=true + label="End Date" + format="YYYY-MM-DD HH:mm:ss" + placeholder="Enter end dateTime" + }} +
    +{{/layout/md-card}} + +{{input/md-input + value=model.id + label="Id" + placeholder="Enter a unique identifier for the time period." + required=false + profilePath=(concat profilePath ".id") + }} + + {{input/md-textarea + value=model.description + profilePath=(concat profilePath ".description") + label="Description" + placeholder="A brief description providing relevant information about the time period." + }} + + {{#layout/md-card shadow=false muted=false plain=true}} + {{#object/md-simple-array-table + title="Time Period Name" + data-spy=false + plain=true + value=model.periodName as |val| + }} + + {{input/md-input value=val.item.value + placeholder="Enter Name"}} + + {{/object/md-simple-array-table}} + {{/layout/md-card}} + + {{#layout/md-card shadow=false muted=false plain=true}} +
    + + {{input/md-input + type="number" + model=model + valuePath="timeInterval.interval" + step="0.01" + label="Interval Amount" + placeholder="Enter amount of time for the interval." + required=true + profilePath=(concat profilePath ".timeInterval.interval") + }} + {{input/md-select + create=false + objectArray=timeUnit + valuePath="value" + namePath="name" + label="Time Unit" + required=true + tooltip=fasle + icon=false + allowClear=true + value=model.timeInterval.units + placeholder="Choose unit of time" + }} +
    + {{/layout/md-card}} + + {{#layout/md-card shadow=false muted=false plain=true bodyIsRow=true}} + +
    +
    + {{#each (array "years" "months" "days" "hours" "minutes" "seconds") as |unit|}} + {{input/md-input + class="col-sm-6 col-md-4 col-lg-2" + valuePath=(concat "duration." unit) + model=model + type="number" + label=(uc-words unit) + placeholder=(concat "Enter " unit) + profilePath=(concat profilePath ".duration." unit) + }} + {{/each}} +
    +
    + {{/layout/md-card}} +{{yield}} +{{/layout/md-card}} diff --git a/tests/integration/pods/components/object/md-time-period/component-test.js b/tests/integration/pods/components/object/md-time-period/component-test.js new file mode 100644 index 000000000..49efb7860 --- /dev/null +++ b/tests/integration/pods/components/object/md-time-period/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-time-period', 'Integration | Component | object/md time period', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-time-period}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-time-period}} + template block text + {{/object/md-time-period}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 7866746f4bc0fe7ddd4adfcee9b13b795c257647 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 27 Jul 2017 06:11:38 -0800 Subject: [PATCH 168/383] Add record.show.edit.dictionary --- app/pods/record/show/edit/dictionary/route.js | 7 ++++++ .../record/show/edit/dictionary/template.hbs | 23 +++++++++++++++++++ .../record/show/edit/dictionary/route-test.js | 11 +++++++++ 3 files changed, 41 insertions(+) create mode 100644 app/pods/record/show/edit/dictionary/route.js create mode 100644 app/pods/record/show/edit/dictionary/template.hbs create mode 100644 tests/unit/pods/record/show/edit/dictionary/route-test.js diff --git a/app/pods/record/show/edit/dictionary/route.js b/app/pods/record/show/edit/dictionary/route.js new file mode 100644 index 000000000..7821c6973 --- /dev/null +++ b/app/pods/record/show/edit/dictionary/route.js @@ -0,0 +1,7 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + breadCrumb: { + title: 'Dictionaries' + }, +}); diff --git a/app/pods/record/show/edit/dictionary/template.hbs b/app/pods/record/show/edit/dictionary/template.hbs new file mode 100644 index 000000000..3a496d2d4 --- /dev/null +++ b/app/pods/record/show/edit/dictionary/template.hbs @@ -0,0 +1,23 @@ +{{outlet}} + + +{{#layout/md-card class="construction card-inverse card-warning" shadow=false}} +
    +
    + {{fa-icon "exclamation-triangle" size=2}} +
    +
    + Page Under
    Construction     +
    +
    +{{/layout/md-card}} diff --git a/tests/unit/pods/record/show/edit/dictionary/route-test.js b/tests/unit/pods/record/show/edit/dictionary/route-test.js new file mode 100644 index 000000000..9d1502a86 --- /dev/null +++ b/tests/unit/pods/record/show/edit/dictionary/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/dictionary', 'Unit | Route | record/show/edit/dictionary', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); From df8baba8452435bf9b7dc002b38ba721e09a0267 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 27 Jul 2017 06:13:39 -0800 Subject: [PATCH 169/383] Respect preserveRootOnly on child objects --- app/services/cleaner.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/cleaner.js b/app/services/cleaner.js index bee1ba920..85f931aaa 100644 --- a/app/services/cleaner.js +++ b/app/services/cleaner.js @@ -79,6 +79,7 @@ export default Service.extend({ if(typeOf(obj[key]) === 'object' || typeOf(obj[key]) === 'instance') { let objOpt = assign(opt, { + preserveArrays: !opt.preserveRootOnly, target: {} }); const res = this.clean(obj[key], objOpt); From 47c4ae2b1e3c1e2431d3dbb6cd39617078c6015d Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 27 Jul 2017 06:14:58 -0800 Subject: [PATCH 170/383] Refactor record.show.edit.keywords --- app/pods/record/show/edit/keywords/route.js | 57 +++++++++++++-------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/app/pods/record/show/edit/keywords/route.js b/app/pods/record/show/edit/keywords/route.js index 17c82b057..dcb4acc83 100644 --- a/app/pods/record/show/edit/keywords/route.js +++ b/app/pods/record/show/edit/keywords/route.js @@ -1,12 +1,14 @@ import Ember from 'ember'; -import has from 'npm:lodash.has'; +//import has from 'npm:lodash.has'; const { Route, A, set, - Object: EmObject, + //Object: EmObject, NativeArray, + getWithDefault, + //assign, copy, inject } = Ember; @@ -18,27 +20,38 @@ export default Route.extend({ let json = model.get('json'); let info = json.metadata.resourceInfo; - set(info,'keyword', !info.hasOwnProperty('keyword') ? A() : NativeArray.apply( - info.keyword)); + set(info, 'keyword', !info.hasOwnProperty('keyword') ? A() : + NativeArray.apply( + info.keyword)); //check to see if custom list - info.keyword.forEach((k, idx, arr) => { - if(!has(k, 'thesaurus')) { - set(k, 'thesaurus', {}); - } - if(!has(k, 'thesaurus.identifier')) { - set(k, 'thesaurus.identifier', [{ + info.keyword.forEach((k) => { + set(k, 'thesaurus', getWithDefault(k, 'thesaurus', {})); + set(k, 'thesaurus.identifier', getWithDefault(k, + 'thesaurus.identifier', [{ identifier: 'custom' - }]); - } - if(!has(k, 'thesaurus.date')) { - set(k, 'thesaurus.date', [{}]); - } - if(!has(k, 'thesaurus.onlineResource')) { - set(k, 'thesaurus.onlineResource', [{}]); - } + }])); + set(k, 'thesaurus.date', getWithDefault(k, 'thesaurus.date', [{}])); + set(k, 'thesaurus.onlineResource', getWithDefault(k, + 'thesaurus.onlineResource', [{}])); + + // if(!has(k, 'thesaurus')) { + // set(k, 'thesaurus', {}); + // } + // if(!has(k, 'thesaurus.identifier')) { + // set(k, 'thesaurus.identifier', [{ + // identifier: 'custom' + // }]); + // } + // if(!has(k, 'thesaurus.date')) { + // set(k, 'thesaurus.date', [{}]); + // } + // if(!has(k, 'thesaurus.onlineResource')) { + // set(k, 'thesaurus.onlineResource', [{}]); + // } - arr.replace(idx, 1, EmObject.create(k)); + //let obj = arr.objectAt(idx); + //assign(obj, EmObject.create(k)); }); return model; @@ -46,12 +59,12 @@ export default Route.extend({ subbar: 'control/subbar-keywords', - clearSubbar: function () { + clearSubbar: function() { this.controllerFor('record.show.edit') .set('subbar', null); }.on('deactivate'), - setupController: function () { + setupController: function() { // Call _super for default behavior this._super(...arguments); @@ -114,7 +127,7 @@ export default Route.extend({ let me = this; me.transitionTo(me.get('routeName')) - .then(function () { + .then(function() { me.setupController(); }); } From ff455369080c9cf0f252c7ef3e163edf73f985da Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 27 Jul 2017 06:15:43 -0800 Subject: [PATCH 171/383] Update routes and components --- app/models/record.js | 3 + .../components/input/md-datetime/component.js | 16 +++++- .../components/input/md-datetime/template.hbs | 57 ++++++++++--------- .../components/input/md-input/component.js | 24 +++++++- .../components/input/md-input/template.hbs | 1 + .../components/layout/md-card/component.js | 15 ++++- .../object/md-identifier/component.js | 2 +- .../components/object/md-lineage/component.js | 15 ++++- .../components/object/md-lineage/template.hbs | 3 +- .../object/md-process-step/component.js | 10 ++++ .../object/md-process-step/template.hbs | 5 ++ .../citation/identifier/template.hbs | 2 +- app/pods/record/show/edit/main/index/route.js | 18 ++++-- .../record/show/edit/main/index/template.hbs | 5 ++ app/router.js | 1 + app/services/profile.js | 4 ++ app/styles/_card_custom.scss | 10 ++++ app/styles/_form_elements.scss | 10 +++- 18 files changed, 159 insertions(+), 42 deletions(-) diff --git a/app/models/record.js b/app/models/record.js index 6b24114d6..ae7f819a9 100644 --- a/app/models/record.js +++ b/app/models/record.js @@ -81,6 +81,9 @@ export default Model.extend(Validations, Copyable, { // country: USA, // language: eng }, + timePeriod: { + periodName: [] + }, extent: [], keyword: [] } diff --git a/app/pods/components/input/md-datetime/component.js b/app/pods/components/input/md-datetime/component.js index d0ade0dd8..db1be649c 100644 --- a/app/pods/components/input/md-datetime/component.js +++ b/app/pods/components/input/md-datetime/component.js @@ -61,7 +61,7 @@ export default Component.extend({ 'validation.isValidating') .readOnly()); - defineProperty(this, 'hasContent', computed.notEmpty('value') + defineProperty(this, 'hasContent', computed.notEmpty('date') .readOnly()); defineProperty(this, 'hasWarnings', computed.notEmpty( @@ -133,9 +133,18 @@ export default Component.extend({ */ label: null, + /** + * On show, will set the picker to the current date/time + * + * @property useCurrent + * @type Boolean + * @default false + */ + useCurrent: false, + /** * Icons to be used by the datetime picker and calendar. - * Icons can be set for time, date, up, down, previous, next, + * Icons can be set for time, date, up, down, previous, next, clear, * and close. * The default icons are chosen from Font Awesome icons * @@ -150,7 +159,8 @@ export default Component.extend({ down: "fa fa-chevron-down", previous: "fa fa-angle-double-left", next: "fa fa-angle-double-right", - close: "fa fa-times" + close: "fa fa-times", + clear: "fa fa-trash" } }); diff --git a/app/pods/components/input/md-datetime/template.hbs b/app/pods/components/input/md-datetime/template.hbs index 8d17178c1..a3f498d05 100644 --- a/app/pods/components/input/md-datetime/template.hbs +++ b/app/pods/components/input/md-datetime/template.hbs @@ -1,30 +1,35 @@ {{#if label}} {{/if}} -{{bs-datetimepicker - date=date - format=format - dateIcon="fa fa-calendar" - icons=calendarIcons - forceDateOutput=forceDateOutput - updateDate=(action (mut date)) -}} - - {{#if showErrorMessage}} - - {{fa-icon "exclamation-circle"}} - {{#tooltip-on-element side="right" class="md-tooltip danger"}} - {{v-get model valuePath 'message'}} - {{/tooltip-on-element}} - - {{/if}} +
    + {{bs-datetimepicker + date=date + format=format + dateIcon="fa fa-calendar" + icons=calendarIcons + forceDateOutput=forceDateOutput + placeholder=placeholder + showClear=showClear + useCurrent=useCurrent + updateDate=(action (mut date)) + }} + + {{#if showErrorMessage}} + + {{fa-icon "exclamation-circle"}} + {{#tooltip-on-element side="right" class="md-tooltip danger"}} + {{v-get model valuePath 'message'}} + {{/tooltip-on-element}} + + {{/if}} - {{#if showWarningMessage}} - - {{fa-icon "exclamation-triangle"}} - {{#tooltip-on-element side="right" class="md-tooltip warning"}} - {{v-get model valuePath 'warningMessage'}} - {{/tooltip-on-element}} - - {{/if}} - + {{#if showWarningMessage}} + + {{fa-icon "exclamation-triangle"}} + {{#tooltip-on-element side="right" class="md-tooltip warning"}} + {{v-get model valuePath 'warningMessage'}} + {{/tooltip-on-element}} + + {{/if}} + +
    diff --git a/app/pods/components/input/md-input/component.js b/app/pods/components/input/md-input/component.js index ef232c370..599cc6321 100644 --- a/app/pods/components/input/md-input/component.js +++ b/app/pods/components/input/md-input/component.js @@ -53,7 +53,27 @@ export default Component.extend({ //Ember.run.once(()=>model.set(valuePath, "")); } - defineProperty(this, 'value', computed.alias(`model.${valuePath}`)); + if(this.get('type') === 'number') { + let attribute = `model.${valuePath}`; + + defineProperty(this, 'value', computed(attribute, { + get() { + let val = this.get(attribute); + + return val ? val.toString() : ''; + }, + + set(key, value) { + let parse = this.get('step') ? parseFloat : parseInt; + + this.set(attribute, parse(value, 10)); + + return value; + } + })); + } else { + defineProperty(this, 'value', computed.alias(`model.${valuePath}`)); + } defineProperty(this, 'validation', computed.alias( `model.validations.attrs.${valuePath}`) @@ -62,7 +82,7 @@ export default Component.extend({ defineProperty(this, 'required', computed( 'validation.options.presence.presence', 'validation.options.presence.disabled', - function () { + function() { return this.get('validation.options.presence.presence') && !this.get('validation.options.presence.disabled'); }) diff --git a/app/pods/components/input/md-input/template.hbs b/app/pods/components/input/md-input/template.hbs index 3037b7061..7fe900c51 100644 --- a/app/pods/components/input/md-input/template.hbs +++ b/app/pods/components/input/md-input/template.hbs @@ -5,6 +5,7 @@ placeholder=placeholder required=required type=type + step=step maxlength=maxlength class=inputClass disabled=disabled diff --git a/app/pods/components/layout/md-card/component.js b/app/pods/components/layout/md-card/component.js index 2d0c96c11..efee81705 100644 --- a/app/pods/components/layout/md-card/component.js +++ b/app/pods/components/layout/md-card/component.js @@ -9,6 +9,18 @@ export default Component.extend({ /** * Component that renders a Bootstrap card. * + * ```handlebars + * \{{#layout/md-card + * title="title" + * collapsible=true + * collapsed=false + * profilePath="card" + * data-spy="Card" + * shadow=true + * }} + * Content + * {{/layout/md-card}} + * ``` * @module mdeditor * @submodule components-layout * @class md-card @@ -116,6 +128,7 @@ export default Component.extend({ * @property bodyIsRow * @type {Boolean} * @default undefined + */ /** * Bootstrap button class to apply to header buttton @@ -124,7 +137,7 @@ export default Component.extend({ * @type {String} * @default 'primary' */ - default: 'primary', + btnClass: 'primary', /** * Icon to display in heder button diff --git a/app/pods/components/object/md-identifier/component.js b/app/pods/components/object/md-identifier/component.js index c60002d58..64f04d521 100644 --- a/app/pods/components/object/md-identifier/component.js +++ b/app/pods/components/object/md-identifier/component.js @@ -24,7 +24,7 @@ export default Component.extend(Validations, { init() { this._super(...arguments); - let model = getWithDefault(this, 'model', {}); + let model = getWithDefault(this, 'model', {}) || {}; set(model, 'authority', getWithDefault(model, 'authority', {})); set(this, 'model', model); }, diff --git a/app/pods/components/object/md-lineage/component.js b/app/pods/components/object/md-lineage/component.js index 60181e6fe..776facda8 100644 --- a/app/pods/components/object/md-lineage/component.js +++ b/app/pods/components/object/md-lineage/component.js @@ -16,7 +16,7 @@ export default Component.extend({ let model = get(this, 'model'); - once(function () { + once(function() { set(model, 'scope', getWithDefault(model, 'scope', {})); set(model, 'citation', getWithDefault(model, 'citation', [])); set(model, 'processStep', getWithDefault(model, 'processStep', [])); @@ -41,4 +41,17 @@ export default Component.extend({ * @type {Object} * @required */ + + /** + * See [md-array-table](md-array-table.html#property_templateClass). + * + * @property stepTemplateClass + * @type Ember.Object + */ + stepTemplateClass: Ember.Object.extend({ + init() { + this._super(...arguments); + this.set('timePeriod', {}); + } + }) }); diff --git a/app/pods/components/object/md-lineage/template.hbs b/app/pods/components/object/md-lineage/template.hbs index d0974b4f5..eae186eda 100644 --- a/app/pods/components/object/md-lineage/template.hbs +++ b/app/pods/components/object/md-lineage/template.hbs @@ -4,6 +4,7 @@ label="Statement" placeholder="A general statement of the actions taken to verify, transform, repair, and integrate the resource." data-spy="Statement" + required=true }} {{object/md-objectroute-table @@ -11,7 +12,7 @@ header="Process Step" buttonText="Add Step" ellipsis=ellipsis - templateClass=templateClass + templateClass=stepTemplateClass editItem=editProcessStep attributes="stepId,description" profilePath=(concat profilePath ".processStep") data-spy="Process Step" diff --git a/app/pods/components/object/md-process-step/component.js b/app/pods/components/object/md-process-step/component.js index 24bd57552..bec6e65d3 100644 --- a/app/pods/components/object/md-process-step/component.js +++ b/app/pods/components/object/md-process-step/component.js @@ -11,6 +11,16 @@ const { } = Ember; export default Component.extend({ + init(){ + this._super(...arguments); + + let model = get(this, 'model'); + + once(this, function () { + set(model, 'timePeriod', getWithDefault(model, 'timePeriod', {})); + }); + }, + didReceiveAttrs() { this._super(...arguments); diff --git a/app/pods/components/object/md-process-step/template.hbs b/app/pods/components/object/md-process-step/template.hbs index 3fbad1f7c..a63db82f5 100644 --- a/app/pods/components/object/md-process-step/template.hbs +++ b/app/pods/components/object/md-process-step/template.hbs @@ -44,6 +44,11 @@ editItem=editCitation label="Step Reference" }} +{{object/md-time-period model=model.timePeriod + profilePath=(concat profilePath ".timePeriod") data-spy="Time Period" + label="Time Period" +}} + {{input/md-codelist value=model.scope.scopeCode label="Scope" diff --git a/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/template.hbs index 66d73d4fd..7dc559b83 100644 --- a/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/template.hbs +++ b/app/pods/record/show/edit/lineage/lineageobject/citation/identifier/template.hbs @@ -14,7 +14,7 @@ {{to-elsewhere named="md-subbar-extra" - send=(component "control/subbar-link" text="Back to Alternate" icon="arrow-left" click=(route-action "goBack")) + send=(component "control/subbar-link" text="Back to Lineage Citation" icon="arrow-left" click=(route-action "goBack")) }} {{to-elsewhere named="md-scroll-spy-record-edit" send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/main/index/route.js b/app/pods/record/show/edit/main/index/route.js index b3d27851b..f7b10452b 100644 --- a/app/pods/record/show/edit/main/index/route.js +++ b/app/pods/record/show/edit/main/index/route.js @@ -1,15 +1,25 @@ import Ember from 'ember'; import ScrollTo from 'mdeditor/mixins/scroll-to'; const { - Route + Route, + get, + getWithDefault, + set } = Ember; export default Route.extend(ScrollTo, { + afterModel(m) { + this._super(...arguments); + + let model = get(m, 'json.metadata.resourceInfo'); + set(model, 'timePeriod', getWithDefault(model, 'timePeriod', {})); + }, actions: { editCitation(scrollTo) { - this.transitionTo('record.show.edit.main.citation').then(function () { - this.setScrollTo(scrollTo); - }.bind(this)); + this.transitionTo('record.show.edit.main.citation') + .then(function () { + this.setScrollTo(scrollTo); + }.bind(this)); } } }); diff --git a/app/pods/record/show/edit/main/index/template.hbs b/app/pods/record/show/edit/main/index/template.hbs index 835baf921..65b975423 100644 --- a/app/pods/record/show/edit/main/index/template.hbs +++ b/app/pods/record/show/edit/main/index/template.hbs @@ -70,6 +70,11 @@ editCitation="editCitation" }} + {{object/md-time-period model=resource.timePeriod + profilePath="record.main.timePeriod" data-spy="Time Period" + label="Time Period" + }} + {{#layout/md-card title="Description" collapsible=true collapsed=false profilePath="record.main.description" }} diff --git a/app/router.js b/app/router.js index c6f716dc6..19ea61113 100644 --- a/app/router.js +++ b/app/router.js @@ -91,6 +91,7 @@ Router.map(function() { }); }); this.route('funding'); + this.route('dictionary'); }); this.route('translate'); } diff --git a/app/services/profile.js b/app/services/profile.js index 5f2000846..e81e04e1e 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -85,6 +85,10 @@ export default Ember.Service.extend({ title: 'Funding', target: 'record.show.edit.funding' + }, { + title: 'Dictionaries', + target: 'record.show.edit.dictionary' + } /*, { title: 'Coverage', diff --git a/app/styles/_card_custom.scss b/app/styles/_card_custom.scss index 50e317d76..8ca9a9402 100644 --- a/app/styles/_card_custom.scss +++ b/app/styles/_card_custom.scss @@ -46,6 +46,16 @@ &.muted .card-block { color: $text-muted; } + + .form-inline { + > * { + padding-right: 1em; + } + + > label { + padding-right: 2em; + } + } } .md-card-chevron a { diff --git a/app/styles/_form_elements.scss b/app/styles/_form_elements.scss index ae60613d5..7b1c937a9 100644 --- a/app/styles/_form_elements.scss +++ b/app/styles/_form_elements.scss @@ -44,6 +44,12 @@ } } +.md-select { + .ember-power-select-trigger { + min-width: 125px; + } +} + .md-button-column { line-height: $input-height-base; } @@ -93,8 +99,8 @@ form { } .md-datetime { - max-width: 200px; - min-width: 160px; + max-width: 220px; + min-width: 190px; } .md-codelist { From 8d77d85bccae7ba585f3bd06674bc1fe4f78da45 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 28 Jul 2017 07:37:31 -0800 Subject: [PATCH 172/383] Update record.show.edit.main.index, md-time-period --- app/pods/components/object/md-time-period/component.js | 8 ++++++++ app/pods/components/object/md-time-period/template.hbs | 2 +- app/pods/record/show/edit/main/index/route.js | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/pods/components/object/md-time-period/component.js b/app/pods/components/object/md-time-period/component.js index 8a9d2c899..add4af633 100644 --- a/app/pods/components/object/md-time-period/component.js +++ b/app/pods/components/object/md-time-period/component.js @@ -17,6 +17,13 @@ const { } = Ember; const Validations = buildValidations({ + 'intervalAmount': [ + validator('presence', { + presence: true, + //disabled: computed.notEmpty('model.endDateTime'), + ignoreBlank: true + }) + ], 'startDateTime': [ validator('presence', { presence: true, @@ -67,6 +74,7 @@ export default Component.extend(Validations, { startDateTime: computed.alias('model.startDateTime'), endDateTime: computed.alias('model.endDateTime'), + intervalAmount: computed.alias('model.interval.interval'), timeUnit: [{ name: 'year', value: 'year' diff --git a/app/pods/components/object/md-time-period/template.hbs b/app/pods/components/object/md-time-period/template.hbs index cb0dbe685..a8c060a86 100644 --- a/app/pods/components/object/md-time-period/template.hbs +++ b/app/pods/components/object/md-time-period/template.hbs @@ -72,8 +72,8 @@ step="0.01" label="Interval Amount" placeholder="Enter amount of time for the interval." - required=true profilePath=(concat profilePath ".timeInterval.interval") + showValidations=true }} {{input/md-select create=false diff --git a/app/pods/record/show/edit/main/index/route.js b/app/pods/record/show/edit/main/index/route.js index f7b10452b..f6c2fb411 100644 --- a/app/pods/record/show/edit/main/index/route.js +++ b/app/pods/record/show/edit/main/index/route.js @@ -13,6 +13,8 @@ export default Route.extend(ScrollTo, { let model = get(m, 'json.metadata.resourceInfo'); set(model, 'timePeriod', getWithDefault(model, 'timePeriod', {})); + set(model, 'pointOfContact', getWithDefault(model, 'pointOfContact', [])); + set(model, 'status', getWithDefault(model, 'status', [])); }, actions: { editCitation(scrollTo) { From d61fa070a07e29bdf18e157157ce407291081773 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 28 Jul 2017 07:39:45 -0800 Subject: [PATCH 173/383] Typo --- app/pods/components/object/md-time-period/component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pods/components/object/md-time-period/component.js b/app/pods/components/object/md-time-period/component.js index add4af633..c4bbfcac0 100644 --- a/app/pods/components/object/md-time-period/component.js +++ b/app/pods/components/object/md-time-period/component.js @@ -74,7 +74,7 @@ export default Component.extend(Validations, { startDateTime: computed.alias('model.startDateTime'), endDateTime: computed.alias('model.endDateTime'), - intervalAmount: computed.alias('model.interval.interval'), + intervalAmount: computed.alias('model.timeInterval.interval'), timeUnit: [{ name: 'year', value: 'year' From 13d5c846274df0093ca2e9d28077aa10046697f7 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 28 Jul 2017 07:46:11 -0800 Subject: [PATCH 174/383] Update record.show.edit.main.index, md-time-period --- app/pods/components/object/md-time-period/template.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pods/components/object/md-time-period/template.hbs b/app/pods/components/object/md-time-period/template.hbs index a8c060a86..881b8d4ed 100644 --- a/app/pods/components/object/md-time-period/template.hbs +++ b/app/pods/components/object/md-time-period/template.hbs @@ -67,8 +67,8 @@ {{input/md-input type="number" - model=model - valuePath="timeInterval.interval" + model=this + valuePath="intervalAmount" step="0.01" label="Interval Amount" placeholder="Enter amount of time for the interval." From b0006cdbfd791a5ee30af35de0d6b73c99097b95 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 31 Jul 2017 16:11:40 -0800 Subject: [PATCH 175/383] Fix bs-datetimepicker Override bs-datetimepicker to use run loop to prevent render errors. --- .../components/bs-datetimepicker/component.js | 18 +++ .../components/input/md-datetime/component.js | 38 ++++- .../components/input/md-datetime/template.hbs | 3 +- .../object/md-time-period/component.js | 26 +++- .../object/md-time-period/template.hbs | 131 ++++++++++-------- .../bs-datetimepicker/component-test.js | 25 ++++ 6 files changed, 175 insertions(+), 66 deletions(-) create mode 100644 app/pods/components/bs-datetimepicker/component.js create mode 100644 tests/integration/pods/components/bs-datetimepicker/component-test.js diff --git a/app/pods/components/bs-datetimepicker/component.js b/app/pods/components/bs-datetimepicker/component.js new file mode 100644 index 000000000..aa9b71378 --- /dev/null +++ b/app/pods/components/bs-datetimepicker/component.js @@ -0,0 +1,18 @@ +import Ember from 'ember'; +import Picker from 'ember-bootstrap-datetimepicker/components/bs-datetimepicker'; + +const { + run: { + once + } +} = Ember; + +export default Picker.extend({ + didReceiveAttrs() { + // let arg=arguments; + // once(this, () => { + // this._super(...arg); + // }); + once(this, this._updateDateTimePicker); + }, +}); diff --git a/app/pods/components/input/md-datetime/component.js b/app/pods/components/input/md-datetime/component.js index db1be649c..bb93ee236 100644 --- a/app/pods/components/input/md-datetime/component.js +++ b/app/pods/components/input/md-datetime/component.js @@ -4,12 +4,18 @@ */ import Ember from 'ember'; +import moment from 'moment'; const { Component, defineProperty, computed, isBlank, + set, + get, + run: { + once + }, assert } = Ember; @@ -42,7 +48,17 @@ export default Component.extend({ ); } - defineProperty(this, 'date', computed.alias(`model.${valuePath}`)); + defineProperty(this, 'date', computed(`model.${valuePath}`, { + get() { + return moment(get(this, `model.${valuePath}`)); + }, + set(key, value) { + once(this, () => { + this.set(`model.${valuePath}`, value); + }); + return value; + } + })); defineProperty(this, 'validation', computed.alias( `model.validations.attrs.${valuePath}`) @@ -51,7 +67,7 @@ export default Component.extend({ defineProperty(this, 'required', computed( 'validation.options.presence.presence', 'validation.options.presence.disabled', - function () { + function() { return this.get('validation.options.presence.presence') && !this.get('validation.options.presence.disabled'); }) @@ -104,7 +120,7 @@ export default Component.extend({ * @default null * @return String */ - date: null, + //date: null, /** * Format of date string for property 'date'. @@ -161,6 +177,20 @@ export default Component.extend({ next: "fa fa-angle-double-right", close: "fa fa-times", clear: "fa fa-trash" - } + }, + + actions: { + updateDate(date) { + let utc = moment(date); + + //utc.add(utc.utcOffset(), 'minutes'); + if(utc && utc.toISOString() !== this.get('date')) { + + //once(this, function() { + set(this, 'date', utc.toISOString()); + //}); + } + } + } }); diff --git a/app/pods/components/input/md-datetime/template.hbs b/app/pods/components/input/md-datetime/template.hbs index a3f498d05..10317b913 100644 --- a/app/pods/components/input/md-datetime/template.hbs +++ b/app/pods/components/input/md-datetime/template.hbs @@ -11,7 +11,8 @@ placeholder=placeholder showClear=showClear useCurrent=useCurrent - updateDate=(action (mut date)) + textFieldRequired=required + updateDate=(action "updateDate") }} {{#if showErrorMessage}} diff --git a/app/pods/components/object/md-time-period/component.js b/app/pods/components/object/md-time-period/component.js index c4bbfcac0..7ce67d0bc 100644 --- a/app/pods/components/object/md-time-period/component.js +++ b/app/pods/components/object/md-time-period/component.js @@ -50,7 +50,7 @@ export default Component.extend(Validations, { let model = get(this, 'model'); - once(function () { + once(function() { set(model, 'periodName', getWithDefault(model, 'periodName', [])); set(model, 'timeInterval', getWithDefault(model, 'timeInterval', {})); @@ -72,8 +72,28 @@ export default Component.extend(Validations, { * @type {String} */ - startDateTime: computed.alias('model.startDateTime'), - endDateTime: computed.alias('model.endDateTime'), + startDateTime: computed('model.startDateTime', { + get(){ + return get(this, 'model.startDateTime'); + }, + set(key, value) { + once(this,function() { + set(this, 'model.startDateTime', value); + return value; + }); + } + }), + endDateTime: computed('model.endDateTime', { + get(){ + return get(this, 'model.endDateTime'); + }, + set(key, value) { + once(this,function() { + set(this, 'model.endDateTime', value); + return value; + }); + } + }), intervalAmount: computed.alias('model.timeInterval.interval'), timeUnit: [{ name: 'year', diff --git a/app/pods/components/object/md-time-period/template.hbs b/app/pods/components/object/md-time-period/template.hbs index 881b8d4ed..089183cf0 100644 --- a/app/pods/components/object/md-time-period/template.hbs +++ b/app/pods/components/object/md-time-period/template.hbs @@ -1,39 +1,39 @@ -{{#layout/md-card - title="Time Period" +{{#layout/md-card title="Time Period" collapsible=true collapsed=collapsed data-spy="Time Period" shadow=true -}} + }} -{{#layout/md-card shadow=false muted=false plain=true}} -
    - - {{input/md-datetime - valuePath="startDateTime" - model=this - showValidations=true - forceDateOutput=true - label="Start Date" - showClear=true - format="YYYY-MM-DD HH:mm:ss" - placeholder="Enter start dateTime" - }} - - {{input/md-datetime - valuePath="endDateTime" - model=this - showValidations=true - forceDateOutput=true - showClear=true - label="End Date" - format="YYYY-MM-DD HH:mm:ss" - placeholder="Enter end dateTime" - }} -
    -{{/layout/md-card}} + {{#layout/md-card shadow=false + muted=false + plain=true}} +
    + + {{input/md-datetime + valuePath="startDateTime" + model=this + showValidations=true + forceDateOutput=true + label="Start Date" + showClear=true + format="YYYY-MM-DD HH:mm:ss" + placeholder="Enter start dateTime" + }} + {{input/md-datetime + valuePath="endDateTime" + model=this + showValidations=true + forceDateOutput=true + showClear=true + label="End Date" + format="YYYY-MM-DD HH:mm:ss" + placeholder="Enter end dateTime" + }} +
    + {{/layout/md-card}} -{{input/md-input + {{input/md-input value=model.id label="Id" placeholder="Enter a unique identifier for the time period." @@ -48,24 +48,28 @@ placeholder="A brief description providing relevant information about the time period." }} - {{#layout/md-card shadow=false muted=false plain=true}} - {{#object/md-simple-array-table - title="Time Period Name" - data-spy=false - plain=true - value=model.periodName as |val| - }} - - {{input/md-input value=val.item.value + {{#layout/md-card shadow=false + muted=false + plain=true}} + {{#object/md-simple-array-table title="Time Period Name" + data-spy=false + plain=true + value=model.periodName + as + |val| + }} + + {{input/md-input value=val.item.value placeholder="Enter Name"}} - - {{/object/md-simple-array-table}} - {{/layout/md-card}} + + {{/object/md-simple-array-table}} + {{/layout/md-card}} - {{#layout/md-card shadow=false muted=false plain=true}} -
    - - {{input/md-input + {{#layout/md-card shadow=false + muted=false + plain=true}} +
    + {{input/md-input type="number" model=this valuePath="intervalAmount" @@ -88,15 +92,26 @@ value=model.timeInterval.units placeholder="Choose unit of time" }} -
    - {{/layout/md-card}} +
    + {{/layout/md-card}} - {{#layout/md-card shadow=false muted=false plain=true bodyIsRow=true}} - -
    -
    - {{#each (array "years" "months" "days" "hours" "minutes" "seconds") as |unit|}} - {{input/md-input + {{#layout/md-card shadow=false + muted=false + plain=true + bodyIsRow=true}} + +
    +
    + {{#each (array + "years" + "months" + "days" + "hours" + "minutes" + "seconds") + as + |unit|}} + {{input/md-input class="col-sm-6 col-md-4 col-lg-2" valuePath=(concat "duration." unit) model=model @@ -105,9 +120,9 @@ placeholder=(concat "Enter " unit) profilePath=(concat profilePath ".duration." unit) }} - {{/each}} -
    + {{/each}} +
    - {{/layout/md-card}} -{{yield}} + {{/layout/md-card}} + {{yield}} {{/layout/md-card}} diff --git a/tests/integration/pods/components/bs-datetimepicker/component-test.js b/tests/integration/pods/components/bs-datetimepicker/component-test.js new file mode 100644 index 000000000..ae0646817 --- /dev/null +++ b/tests/integration/pods/components/bs-datetimepicker/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('bs-datetimepicker', 'Integration | Component | bs datetimepicker', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{bs-datetimepicker}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#bs-datetimepicker}} + template block text + {{/bs-datetimepicker}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 4fc5bf227d5fb9b666e27086f8afcf025145aae2 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 1 Aug 2017 16:37:26 -0800 Subject: [PATCH 176/383] Scroll html instead of body --- app/pods/components/control/md-scroll-spy/component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pods/components/control/md-scroll-spy/component.js b/app/pods/components/control/md-scroll-spy/component.js index a7938faa9..f6fa24de5 100644 --- a/app/pods/components/control/md-scroll-spy/component.js +++ b/app/pods/components/control/md-scroll-spy/component.js @@ -147,10 +147,10 @@ export default Component.extend({ let $anchor = $(id); if($anchor.length === 0) { - $('body').scrollTop(0 - get(this, 'offset')); + $('html').scrollTop(0 - get(this, 'offset')); return; } - $('body').scrollTop($anchor.offset().top - get(this, 'offset')); + $('html').scrollTop($anchor.offset().top - get(this, 'offset')); if(hilite) { $('[href=#' + id + ']') From c0b132a3f13cfbcfb4d45ab08424414743484adf Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 1 Aug 2017 18:48:25 -0800 Subject: [PATCH 177/383] Add support for associatedResources Add components md-associated, preview Add new routes --- .../object/md-associated/component.js | 4 ++ .../object/md-associated/preview/component.js | 4 ++ .../object/md-associated/preview/template.hbs | 8 +++ .../object/md-associated/template.hbs | 1 + .../md-citation/preview/body/component.js | 4 ++ .../md-citation/preview/body/template.hbs | 55 ++++++++++++++++++ .../object/md-citation/preview/template.hbs | 56 +------------------ .../show/edit/associated/index/route.js | 39 +++++++++++++ .../show/edit/associated/index/template.hbs | 14 +++++ .../edit/associated/resource/index/route.js | 29 ++++++++++ .../associated/resource/index/template.hbs | 43 ++++++++++++++ .../show/edit/associated/resource/route.js | 55 ++++++++++++++++++ .../edit/associated/resource/template.hbs | 1 + .../record/show/edit/associated/template.hbs | 28 ++-------- .../record/show/edit/lineage/index/route.js | 9 +++ app/router.js | 6 +- app/transitions.js | 6 ++ .../object/md-associated/component-test.js | 25 +++++++++ .../md-associated/preview/component-test.js | 25 +++++++++ .../preview/body/component-test.js | 25 +++++++++ .../show/edit/associated/index/route-test.js | 11 ++++ .../associated/resource/index/route-test.js | 11 ++++ .../edit/associated/resource/route-test.js | 11 ++++ 23 files changed, 391 insertions(+), 79 deletions(-) create mode 100644 app/pods/components/object/md-associated/component.js create mode 100644 app/pods/components/object/md-associated/preview/component.js create mode 100644 app/pods/components/object/md-associated/preview/template.hbs create mode 100644 app/pods/components/object/md-associated/template.hbs create mode 100644 app/pods/components/object/md-citation/preview/body/component.js create mode 100644 app/pods/components/object/md-citation/preview/body/template.hbs create mode 100644 app/pods/record/show/edit/associated/index/route.js create mode 100644 app/pods/record/show/edit/associated/index/template.hbs create mode 100644 app/pods/record/show/edit/associated/resource/index/route.js create mode 100644 app/pods/record/show/edit/associated/resource/index/template.hbs create mode 100644 app/pods/record/show/edit/associated/resource/route.js create mode 100644 app/pods/record/show/edit/associated/resource/template.hbs create mode 100644 tests/integration/pods/components/object/md-associated/component-test.js create mode 100644 tests/integration/pods/components/object/md-associated/preview/component-test.js create mode 100644 tests/integration/pods/components/object/md-citation/preview/body/component-test.js create mode 100644 tests/unit/pods/record/show/edit/associated/index/route-test.js create mode 100644 tests/unit/pods/record/show/edit/associated/resource/index/route-test.js create mode 100644 tests/unit/pods/record/show/edit/associated/resource/route-test.js diff --git a/app/pods/components/object/md-associated/component.js b/app/pods/components/object/md-associated/component.js new file mode 100644 index 000000000..926b61300 --- /dev/null +++ b/app/pods/components/object/md-associated/component.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ +}); diff --git a/app/pods/components/object/md-associated/preview/component.js b/app/pods/components/object/md-associated/preview/component.js new file mode 100644 index 000000000..926b61300 --- /dev/null +++ b/app/pods/components/object/md-associated/preview/component.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ +}); diff --git a/app/pods/components/object/md-associated/preview/template.hbs b/app/pods/components/object/md-associated/preview/template.hbs new file mode 100644 index 000000000..bf30eb304 --- /dev/null +++ b/app/pods/components/object/md-associated/preview/template.hbs @@ -0,0 +1,8 @@ +{{#with item as |model|}} +
    + {{control/md-definition title="Association Type" text=model.associationType}} + {{control/md-definition title="Initiative Type" text=model.initiativeType}} +
    + + {{object/md-citation/preview/body citation=model.resourceCitation}} +{{/with}} diff --git a/app/pods/components/object/md-associated/template.hbs b/app/pods/components/object/md-associated/template.hbs new file mode 100644 index 000000000..889d9eead --- /dev/null +++ b/app/pods/components/object/md-associated/template.hbs @@ -0,0 +1 @@ +{{yield}} diff --git a/app/pods/components/object/md-citation/preview/body/component.js b/app/pods/components/object/md-citation/preview/body/component.js new file mode 100644 index 000000000..926b61300 --- /dev/null +++ b/app/pods/components/object/md-citation/preview/body/component.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ +}); diff --git a/app/pods/components/object/md-citation/preview/body/template.hbs b/app/pods/components/object/md-citation/preview/body/template.hbs new file mode 100644 index 000000000..b258632fb --- /dev/null +++ b/app/pods/components/object/md-citation/preview/body/template.hbs @@ -0,0 +1,55 @@ +
    +
    + {{control/md-definition title="Title" text=citation.title}} +
    +
    + {{#control/md-definition title="Alternate Titles" }} + {{#each citation.alternateTitle as |title|}} + {{title}} +
    + {{else}} + No alternate titles assigned. + {{/each}} + {{/control/md-definition}} +
    +
    +
    + {{#control/md-definition title="Dates" }} + {{#each citation.date as |date|}} + {{format-date date.date format="MMMM Do YYYY"}} + ({{date.dateType}}) +
    + {{else}} + No dates assigned. + {{/each}} + {{/control/md-definition}} +
    +
    + {{#control/md-definition title="Identifier" }} + {{#each citation.identifier as |id|}} + {{id.identifier}} {{if id.namespace (concat "(" id.namespace ")")}} +
    + {{else}} + No identifiers assigned. + {{/each}} + {{/control/md-definition}} +
    +
    +
    + {{#control/md-definition title="Responsible Party" }} + {{#each citation.responsibleParty as |party|}} + {{{if party.role party.role "No Roles assigned."}}} + ( + {{#each party.party as |contact index|}} + {{if index ", "}} {{control/md-contact-link contactId=contact.contactId}} + {{else}} + No Contacts assigned. + {{/each}} + ) +
    + {{else}} + No responsibility assigned. + {{/each}} + {{/control/md-definition}} +
    +
    diff --git a/app/pods/components/object/md-citation/preview/template.hbs b/app/pods/components/object/md-citation/preview/template.hbs index d55eee6d0..14fd7f2d3 100644 --- a/app/pods/components/object/md-citation/preview/template.hbs +++ b/app/pods/components/object/md-citation/preview/template.hbs @@ -2,62 +2,8 @@ profilePath=profilePath required=required muted=muted btnText="Edit" btnClass="success" btnAction=(route-action editCitation (dasherize title)) btnIcon="pencil" }} -
    -
    - {{control/md-definition title="Title" text=citation.title}} -
    -
    - {{#control/md-definition title="Alternate Titles" }} - {{#each citation.alternateTitle as |title|}} - {{title}} -
    - {{else}} - No alternate titles assigned. - {{/each}} - {{/control/md-definition}} -
    -
    -
    - {{#control/md-definition title="Dates" }} - {{#each citation.date as |date|}} - {{format-date date.date format="MMMM Do YYYY"}} - ({{date.dateType}}) -
    - {{else}} - No dates assigned. - {{/each}} - {{/control/md-definition}} -
    -
    - {{#control/md-definition title="Identifier" }} - {{#each citation.identifier as |id|}} - {{id.identifier}} {{if id.namespace (concat "(" id.namespace ")")}} -
    - {{else}} - No identifiers assigned. - {{/each}} - {{/control/md-definition}} -
    -
    -
    - {{#control/md-definition title="Responsible Party" }} - {{#each citation.responsibleParty as |party|}} - {{{if party.role party.role "No Roles assigned."}}} - ( - {{#each party.party as |contact index|}} - {{if index ", "}} {{control/md-contact-link contactId=contact.contactId}} - {{else}} - No Contacts assigned. - {{/each}} - ) -
    - {{else}} - No responsibility assigned. - {{/each}} - {{/control/md-definition}} -
    -
    +{{object/md-citation/preview/body citation=citation}} {{!--
    {{#layout/md-card title="Responsible Party" class="card-table" data-spy=false shadow=false diff --git a/app/pods/record/show/edit/associated/index/route.js b/app/pods/record/show/edit/associated/index/route.js new file mode 100644 index 000000000..8802665bd --- /dev/null +++ b/app/pods/record/show/edit/associated/index/route.js @@ -0,0 +1,39 @@ +import Ember from 'ember'; + +const { + Route, + set, + getWithDefault, + get +} = Ember; + +export default Route.extend({ + afterModel(m) { + this._super(...arguments); + + let model = get(m, 'json.metadata'); + set(model, 'associatedResource', getWithDefault(model, 'associatedResource', [])); + }, + + setupController: function() { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'record.show.edit')); + }, + + actions: { + editResource(id) { + this.transitionTo('record.show.edit.associated.resource', id); + } //, + // templateClass() { + // return Ember.Object.extend({ + // init() { + // this._super(...arguments); + // //this.set('authority', {}); + // } + // }); + // } + } +}); diff --git a/app/pods/record/show/edit/associated/index/template.hbs b/app/pods/record/show/edit/associated/index/template.hbs new file mode 100644 index 000000000..44f841e15 --- /dev/null +++ b/app/pods/record/show/edit/associated/index/template.hbs @@ -0,0 +1,14 @@ +

    + Editing Associated Resource + {{control/md-status model=parentModel}} +

    + +{{object/md-objectroute-table + items=model.json.metadata.associatedResource + header="Associated Resource" + shadow=true + buttonText="Add Resource" + ellipsis=ellipsis + previewTemplate="object/md-associated/preview" + editItem=(route-action "editResource") +}} diff --git a/app/pods/record/show/edit/associated/resource/index/route.js b/app/pods/record/show/edit/associated/resource/index/route.js new file mode 100644 index 000000000..587ccedd5 --- /dev/null +++ b/app/pods/record/show/edit/associated/resource/index/route.js @@ -0,0 +1,29 @@ +import Ember from 'ember'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +const { + Route, + get +} = Ember; + +export default Route.extend(ScrollTo, { + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'record.show.edit')); + this.controller.set('resourceId', get(this.controllerFor( + 'record.show.edit.associated.resource'), 'resourceId')); + }, + actions: { + // editCitation(index) { + // this.transitionTo('record.show.edit.lineage.lineageobject.citation', + // index) + // .then( + // function () { + // this.setScrollTo('citation'); + // }.bind(this)); + // } + } +}); diff --git a/app/pods/record/show/edit/associated/resource/index/template.hbs b/app/pods/record/show/edit/associated/resource/index/template.hbs new file mode 100644 index 000000000..2cefd04c9 --- /dev/null +++ b/app/pods/record/show/edit/associated/resource/index/template.hbs @@ -0,0 +1,43 @@ +

    + Editing Associated Resource #{{resourceId}} + {{control/md-status model=parentModel}} +

    + +
    + {{input/md-codelist + label="Association Type" + create=true + tooltip=true + icon=false + disabled=false + allowClear=true + showValidations=true + mdCodeName="associationType" + path="associationType" + model=model + placeholder="Choose Type of Association" + profilePath="record.associated.associationType" + }} + + {{input/md-codelist + label="Initiative Type" + create=true + tooltip=true + icon=false + disabled=false + allowClear=true + showValidations=true + mdCodeName="initiativeType" + path="initiativeType" + model=model + placeholder="Choose Type of Initiative" + profilePath="record.associated.initiativeType" + }} +
    + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" text="Back to Resource List" icon="arrow-left" route="record.show.edit.associated") +}} +{{to-elsewhere named="md-scroll-spy-record-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/associated/resource/route.js b/app/pods/record/show/edit/associated/resource/route.js new file mode 100644 index 000000000..ae079d9a2 --- /dev/null +++ b/app/pods/record/show/edit/associated/resource/route.js @@ -0,0 +1,55 @@ +import Ember from 'ember'; + +const { + Route, + get, + isEmpty, + isArray, + computed +} = Ember; + +export default Route.extend({ + breadCrumb: computed('resourceId', function () { + return { + title: get(this, 'resourceId'), + linkable: true + }; + }), + + model(params) { + this.set('resourceId', params.resource_id); + + return this.setupModel(); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + //this.controller.set('parentModel', this.modelFor('record.show.edit.main')); + this.controller.set('resourceId', get(this, 'resourceId')); + this.controllerFor('record.show.edit') + .setProperties({ + onCancel: this.setupModel + }); + }, + + setupModel() { + let resourceId = get(this, 'resourceId'); + let model = this.modelFor('record.show.edit'); + let objects = model.get('json.metadata.associatedResource'); + let resource = resourceId && isArray(objects) ? objects.get(resourceId) : + undefined; + + //make sure the identifier exists + if(isEmpty(resource)) { + Ember.get(this, 'flashMessages') + .warning('No Associated Resource object found! Re-directing to list...'); + this.replaceWith('record.show.edit.associated'); + + return; + } + + return resource; + } +}); diff --git a/app/pods/record/show/edit/associated/resource/template.hbs b/app/pods/record/show/edit/associated/resource/template.hbs new file mode 100644 index 000000000..915dcd11e --- /dev/null +++ b/app/pods/record/show/edit/associated/resource/template.hbs @@ -0,0 +1 @@ +{{liquid-outlet class="liquid-spy"}} diff --git a/app/pods/record/show/edit/associated/template.hbs b/app/pods/record/show/edit/associated/template.hbs index 3a496d2d4..83bd09112 100644 --- a/app/pods/record/show/edit/associated/template.hbs +++ b/app/pods/record/show/edit/associated/template.hbs @@ -1,23 +1,5 @@ -{{outlet}} - - -{{#layout/md-card class="construction card-inverse card-warning" shadow=false}} -
    -
    - {{fa-icon "exclamation-triangle" size=2}} -
    -
    - Page Under
    Construction     -
    -
    -{{/layout/md-card}} +
    +
    + {{liquid-outlet class=""}} +
    +
    diff --git a/app/pods/record/show/edit/lineage/index/route.js b/app/pods/record/show/edit/lineage/index/route.js index 214edd633..1363e8cf7 100644 --- a/app/pods/record/show/edit/lineage/index/route.js +++ b/app/pods/record/show/edit/lineage/index/route.js @@ -14,6 +14,15 @@ export default Route.extend({ let model = get(m, 'json.metadata'); set(model, 'resourceLineage', getWithDefault(model, 'resourceLineage', [])); }, + + setupController: function() { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'record.show.edit')); + }, + actions: { editLineage(id) { this.transitionTo('record.show.edit.lineage.lineageobject', id); diff --git a/app/router.js b/app/router.js index 19ea61113..78daa78c8 100644 --- a/app/router.js +++ b/app/router.js @@ -79,7 +79,11 @@ Router.map(function() { }); }); this.route('distribution'); - this.route('associated'); + this.route('associated', function() { + this.route('resource', { + path: ':resource_id' + }, function() {}); + }); this.route('documents'); this.route('coverages'); this.route('grid'); diff --git a/app/transitions.js b/app/transitions.js index 9f5aaf34f..a1e5f70c5 100644 --- a/app/transitions.js +++ b/app/transitions.js @@ -76,4 +76,10 @@ export default function () { this.use('toLeft'), this.reverse('toRight') ); + this.transition( + this.toRoute('record.show.edit.associated.resource'), + this.fromRoute('record.show.edit.associated.index'), + this.use('toLeft'), + this.reverse('toRight') + ); } diff --git a/tests/integration/pods/components/object/md-associated/component-test.js b/tests/integration/pods/components/object/md-associated/component-test.js new file mode 100644 index 000000000..aef855306 --- /dev/null +++ b/tests/integration/pods/components/object/md-associated/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-associated', 'Integration | Component | object/md associated', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-associated}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-associated}} + template block text + {{/object/md-associated}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-associated/preview/component-test.js b/tests/integration/pods/components/object/md-associated/preview/component-test.js new file mode 100644 index 000000000..e4261f0eb --- /dev/null +++ b/tests/integration/pods/components/object/md-associated/preview/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-associated/preview', 'Integration | Component | object/md associated/preview', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-associated/preview}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-associated/preview}} + template block text + {{/object/md-associated/preview}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-citation/preview/body/component-test.js b/tests/integration/pods/components/object/md-citation/preview/body/component-test.js new file mode 100644 index 000000000..6959edc9b --- /dev/null +++ b/tests/integration/pods/components/object/md-citation/preview/body/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-citation/preview/body', 'Integration | Component | object/md citation/preview/body', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-citation/preview/body}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-citation/preview/body}} + template block text + {{/object/md-citation/preview/body}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/unit/pods/record/show/edit/associated/index/route-test.js b/tests/unit/pods/record/show/edit/associated/index/route-test.js new file mode 100644 index 000000000..079644cbf --- /dev/null +++ b/tests/unit/pods/record/show/edit/associated/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/associated/index', 'Unit | Route | record/show/edit/associated/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/associated/resource/index/route-test.js b/tests/unit/pods/record/show/edit/associated/resource/index/route-test.js new file mode 100644 index 000000000..3d1fd140d --- /dev/null +++ b/tests/unit/pods/record/show/edit/associated/resource/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/associated/resource/index', 'Unit | Route | record/show/edit/associated/resource/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/associated/resource/route-test.js b/tests/unit/pods/record/show/edit/associated/resource/route-test.js new file mode 100644 index 000000000..bcecf056c --- /dev/null +++ b/tests/unit/pods/record/show/edit/associated/resource/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/associated/resource', 'Unit | Route | record/show/edit/associated/resource', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); From f708538939295168fb817507fa09d1cb3b9c213a Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 2 Aug 2017 19:06:13 -0800 Subject: [PATCH 178/383] Improve support for associatedResources --- .../object/md-associated/component.js | 59 ++++++++++++++- .../object/md-associated/preview/component.js | 16 ++++- .../object/md-associated/preview/template.hbs | 10 ++- .../object/md-associated/template.hbs | 72 +++++++++++++++++++ .../object/md-citation/component.js | 7 +- .../associated/resource/index/template.hbs | 34 +-------- app/pods/record/show/edit/main/index/route.js | 1 + app/styles/_validation.scss | 2 +- 8 files changed, 164 insertions(+), 37 deletions(-) diff --git a/app/pods/components/object/md-associated/component.js b/app/pods/components/object/md-associated/component.js index 926b61300..b6a638462 100644 --- a/app/pods/components/object/md-associated/component.js +++ b/app/pods/components/object/md-associated/component.js @@ -1,4 +1,61 @@ import Ember from 'ember'; +import { + validator, + buildValidations +} from 'ember-cp-validations'; -export default Ember.Component.extend({ +const { + Component, + computed, + set, + get, + getWithDefault, + run: { + once + } +} = Ember; + +const Validations = buildValidations({ + 'associationType': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ] +}); + +export default Component.extend(Validations, { + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(this, function() { + set(model, 'scope', getWithDefault(model, 'scope', {})); + set(model, 'resourceType', getWithDefault(model, 'resourceType', [])); + set(model, 'resourceCitation', getWithDefault(model, 'resourceCitation', {})); + set(model, 'metadataCitation', getWithDefault(model, 'metadataCitation', {})); + }); + }, + + tagName: 'form', + + /** + * The string representing the path in the profile object for the resource. + * + * @property profilePath + * @type {String} + * @default "false" + * @required + */ + + /** + * The object to use as the data model for the resource. + * + * @property model + * @type {Object} + * @required + */ + + associationType: computed.alias('model.associationType') }); diff --git a/app/pods/components/object/md-associated/preview/component.js b/app/pods/components/object/md-associated/preview/component.js index 926b61300..a3b872c1e 100644 --- a/app/pods/components/object/md-associated/preview/component.js +++ b/app/pods/components/object/md-associated/preview/component.js @@ -1,4 +1,18 @@ import Ember from 'ember'; -export default Ember.Component.extend({ +const { + Component +} = Ember; + +export default Component.extend({ + classNameBindings: ['muted:text-muted'], + + /** + * Whether to render the text muted. + * + * @property muted + * @type {Boolean} + * @default "true" + */ + muted: true }); diff --git a/app/pods/components/object/md-associated/preview/template.hbs b/app/pods/components/object/md-associated/preview/template.hbs index bf30eb304..870ebab5e 100644 --- a/app/pods/components/object/md-associated/preview/template.hbs +++ b/app/pods/components/object/md-associated/preview/template.hbs @@ -1,7 +1,13 @@ {{#with item as |model|}}
    - {{control/md-definition title="Association Type" text=model.associationType}} - {{control/md-definition title="Initiative Type" text=model.initiativeType}} +
    +
    + {{control/md-definition title="Association Type" text=model.associationType}} +
    +
    + {{control/md-definition title="Initiative Type" text=model.initiativeType}} +
    +
    {{object/md-citation/preview/body citation=model.resourceCitation}} diff --git a/app/pods/components/object/md-associated/template.hbs b/app/pods/components/object/md-associated/template.hbs index 889d9eead..be89b65e0 100644 --- a/app/pods/components/object/md-associated/template.hbs +++ b/app/pods/components/object/md-associated/template.hbs @@ -1 +1,73 @@ +{{input/md-codelist + label="Association Type" + create=true + tooltip=true + icon=false + disabled=false + allowClear=true + showValidations=true + mdCodeName="associationType" + path="associationType" + model=this + placeholder="Choose Type of Association" + profilePath=(concat profilePath ".associationType") +}} + +{{input/md-codelist + label="Initiative Type" + create=true + tooltip=true + icon=false + disabled=false + allowClear=true + showValidations=true + mdCodeName="initiativeType" + path="initiativeType" + model=model + placeholder="Choose Type of Initiative" + profilePath=(concat profilePath ".initiativeType") +}} + +
    + {{object/md-resource-type-array + plain=false + value=model.resourceType + required=true + data-spy="Resource Types" + profilePath=(concat profilePath ".resourceType") + }} +
    + +{{#layout/md-card + title="Associated Resource Citation" + profilePath=(concat profilePath '.resourceCitation') + shadow=true + collapsible=true + required=true +}} +{{#with model.resourceCitation as |citation|}} + {{object/md-citation + model=citation + profilePath=(concat profilePath '.resourceCitation') + embedded=true + }} +{{/with}} +{{/layout/md-card}} + +{{#layout/md-card + title="Associated Metadata Citation" + profilePath=(concat profilePath '.metadataCitation') + shadow=true + collapsible=true + collapsed=true +}} +{{#with model.metadataCitation as |metdata|}} + {{object/md-citation + model=metdata + profilePath=(concat profilePath '.metadataCitation') + embedded=true + }} +{{/with}} +{{/layout/md-card}} + {{yield}} diff --git a/app/pods/components/object/md-citation/component.js b/app/pods/components/object/md-citation/component.js index 752282c2d..572fe8aea 100644 --- a/app/pods/components/object/md-citation/component.js +++ b/app/pods/components/object/md-citation/component.js @@ -16,14 +16,19 @@ export default Component.extend({ let model = get(this, 'model'); - once(function () { + once(this, function() { set(model, 'responsibleParty', getWithDefault(model, 'responsibleParty', [])); + set(model, 'date', getWithDefault(model, + 'date', [])); + set(model, 'alternateTitle', getWithDefault(model, + 'alternateTitle', [])); set(model, 'presentationForm', getWithDefault(model, 'presentationForm', [])); set(model, 'onlineResource', getWithDefault(model, 'onlineResource', [])); set(model, 'identifier', getWithDefault(model, 'identifier', [])); + set(model, 'otherCitationDetails', getWithDefault(model, 'otherCitationDetails', [])); set(model, 'graphic', getWithDefault(model, 'graphic', [])); set(model, 'series', getWithDefault(model, 'series', {})); }); diff --git a/app/pods/record/show/edit/associated/resource/index/template.hbs b/app/pods/record/show/edit/associated/resource/index/template.hbs index 2cefd04c9..464849643 100644 --- a/app/pods/record/show/edit/associated/resource/index/template.hbs +++ b/app/pods/record/show/edit/associated/resource/index/template.hbs @@ -3,37 +3,9 @@ {{control/md-status model=parentModel}} -
    - {{input/md-codelist - label="Association Type" - create=true - tooltip=true - icon=false - disabled=false - allowClear=true - showValidations=true - mdCodeName="associationType" - path="associationType" - model=model - placeholder="Choose Type of Association" - profilePath="record.associated.associationType" - }} - - {{input/md-codelist - label="Initiative Type" - create=true - tooltip=true - icon=false - disabled=false - allowClear=true - showValidations=true - mdCodeName="initiativeType" - path="initiativeType" - model=model - placeholder="Choose Type of Initiative" - profilePath="record.associated.initiativeType" - }} -
    +{{object/md-associated model=model + profilePath="record.associated" +}} {{to-elsewhere named="md-subbar-extra" diff --git a/app/pods/record/show/edit/main/index/route.js b/app/pods/record/show/edit/main/index/route.js index f6c2fb411..b3f76b684 100644 --- a/app/pods/record/show/edit/main/index/route.js +++ b/app/pods/record/show/edit/main/index/route.js @@ -15,6 +15,7 @@ export default Route.extend(ScrollTo, { set(model, 'timePeriod', getWithDefault(model, 'timePeriod', {})); set(model, 'pointOfContact', getWithDefault(model, 'pointOfContact', [])); set(model, 'status', getWithDefault(model, 'status', [])); + set(model, 'credit', getWithDefault(model, 'credit', [])); }, actions: { editCitation(scrollTo) { diff --git a/app/styles/_validation.scss b/app/styles/_validation.scss index ed5d7a7bf..c6a278635 100644 --- a/app/styles/_validation.scss +++ b/app/styles/_validation.scss @@ -1,5 +1,5 @@ .required > .card-header .card-title::after, -form .required label::after, +form .required > label::after, label.required::after { @extend sup; color: $brand-danger; From 5065e0635fcf9c49156f4654acf2db8a37ee4711 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 3 Aug 2017 17:47:23 -0800 Subject: [PATCH 179/383] Docs --- .../object/md-object-table/component.js | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index dbc15f658..ec28d53cf 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -1,8 +1,3 @@ -/** - * @submodule components-object - * @module mdeditor - */ - import Ember from 'ember'; import Template from 'mdeditor/mixins/object-template'; @@ -23,7 +18,22 @@ export default Component.extend(Template, { * for selection for edit or deletion. * The class is configurable for reuse with mdJSON object arrays. * + * ```handlebars + * \{{#object/md-object-table + * items=model + * header=label + * buttonText=buttonText + * templateClass=templateClass + * previewTemplate=previewTemplate + * attributes=attributes as |editing| + * }} + * + * {{/object/md-object-table}} + * ``` + * * @class md-object-table + * @submodule components-object + * @module mdeditor * @constructor * @uses object-template */ From 17ac114a1b02faf535533ee6cec6e9a64885731b Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 10:54:05 -0800 Subject: [PATCH 180/383] Add components subbar-citation identifier-object-table md-select-table --- .../control/md-select-table/component.js | 99 +++++++++++++++++++ .../control/subbar-citation/component.js | 4 + .../control/subbar-citation/template.hbs | 7 ++ .../md-identifier-object-table/component.js | 52 ++++++++++ .../md-identifier-object-table/template.hbs | 46 +++++++++ app/styles/_table.scss | 21 ++++ .../control/md-select-table/component-test.js | 25 +++++ .../control/subbar-citation/component-test.js | 25 +++++ .../component-test.js | 25 +++++ 9 files changed, 304 insertions(+) create mode 100644 app/pods/components/control/md-select-table/component.js create mode 100644 app/pods/components/control/subbar-citation/component.js create mode 100644 app/pods/components/control/subbar-citation/template.hbs create mode 100644 app/pods/components/object/md-identifier-object-table/component.js create mode 100644 app/pods/components/object/md-identifier-object-table/template.hbs create mode 100644 tests/integration/pods/components/control/md-select-table/component-test.js create mode 100644 tests/integration/pods/components/control/subbar-citation/component-test.js create mode 100644 tests/integration/pods/components/object/md-identifier-object-table/component-test.js diff --git a/app/pods/components/control/md-select-table/component.js b/app/pods/components/control/md-select-table/component.js new file mode 100644 index 000000000..2d3c5ee1a --- /dev/null +++ b/app/pods/components/control/md-select-table/component.js @@ -0,0 +1,99 @@ +import Ember from 'ember'; +import Table from 'ember-models-table/components/models-table'; + +const { + get +} = Ember; + +export default Table.extend({ + /** + * @module mdeditor + * @submodule components-control + */ + + /** + * Table with action on row click. Used to select objects(records). + * + *```handlebars + * \{{control/md-select-table + * data=model.data + * columns=model.columns + * }} + * ``` + * + * @class md-select-table + * @extends models-table + */ + + classNames: ['md-select-table'], + + /** + * Array of table records + * + * @property data + * @type {Array} + * @default [] + * @required + */ + + /** + * Array of column configs for the table. + * See http://onechiporenko.github.io/ember-models-table + * + * ```javascript + * [{ + * propertyName: 'id', + * title: 'ID' + * }, { + * title: '', + * template: 'components/leaflet-table/actions', + * className: 'text-center text-nowrap' + * }] + * ``` + * + * @property columns + * @type {Array} + * @required + * @default [] + */ + + filteringIgnoreCase: true, + //rowTemplate: 'components/control/md-select-table/row', + + customIcons: { + 'sort-asc': 'fa fa-caret-up', + 'sort-desc': 'fa fa-caret-down', + 'column-visible': 'fa fa-check-square-o', + 'column-hidden': 'fa fa-square-o', + 'nav-first': 'fa fa-fast-backward', + 'nav-prev': 'fa fa-backward', + 'nav-next': 'fa fa-forward', + 'nav-last': 'fa fa-fast-forward', + 'caret': 'fa fa-caret-down' + }, + customClasses: { + 'table': 'table table-striped table-bordered table-condensed table-hover' + }, + + /** + * Callback on row selection. + * + * @method select + * @param {Array} selected Selected items. + * @return {Array} + */ + select(selected) { + console.info(selected); + return selected; + }, + + actions: { + clickOnRow() { + this._super(...arguments); + + let sel = get(this, '_selectedItems'); + + this.get('select')(sel); + } + } +}); diff --git a/app/pods/components/control/subbar-citation/component.js b/app/pods/components/control/subbar-citation/component.js new file mode 100644 index 000000000..926b61300 --- /dev/null +++ b/app/pods/components/control/subbar-citation/component.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ +}); diff --git a/app/pods/components/control/subbar-citation/template.hbs b/app/pods/components/control/subbar-citation/template.hbs new file mode 100644 index 000000000..7cd8f2f9c --- /dev/null +++ b/app/pods/components/control/subbar-citation/template.hbs @@ -0,0 +1,7 @@ +
    + + {{#link-to route class="btn btn-lg btn-primary btn-block md-btn-responsive" }} {{fa-icon icon}} {{text}}{{/link-to}} + {{yield}} +
    diff --git a/app/pods/components/object/md-identifier-object-table/component.js b/app/pods/components/object/md-identifier-object-table/component.js new file mode 100644 index 000000000..dc8f3cea9 --- /dev/null +++ b/app/pods/components/object/md-identifier-object-table/component.js @@ -0,0 +1,52 @@ +import Identifier from '../md-identifier-array/component'; + +export default Identifier.extend({ + /** + * mdEditor class for input and edit of mdJSON 'identifier' object + * arrays. + * The class manages the maintenance of an array of identifier + * objects using the md-object-table class. + * + * @module mdeditor + * @submodule components-object + * @class md-identifier-object-table + * @uses md-object-table + * @constructor + */ + + /** + * Label for the panel + * + * @property label + * @type {String} + * @default undefined + */ + + /** + * Array of identifiers + * + * @property model + * @type {Array} + * @default undefined + */ + + /** + * Attributes displayed in the preview table. + * + * @property attributes + * @type {String} + * @default 'identifier,namespace' + */ + attributes: 'identifier,namespace', + + ellipsis: true, + + /** + * Default profile visibility + * + * @property visibility + * @type {Boolean} + * @default false + */ + visibility: false +}); diff --git a/app/pods/components/object/md-identifier-object-table/template.hbs b/app/pods/components/object/md-identifier-object-table/template.hbs new file mode 100644 index 000000000..5e0827c35 --- /dev/null +++ b/app/pods/components/object/md-identifier-object-table/template.hbs @@ -0,0 +1,46 @@ +{{#object/md-object-table + items=model + header=label + buttonText="Add Identifier" + ellipsis=ellipsis + templateClass=templateClass + attributes=attributes + as |editing| +}} +{{input/md-input + value=editing.identifier + placeholder="Enter the identifier for the resource." + label="Identifier" + required=true + profilePath=(concat profilePath 'identifier') +}} + +{{input/md-codelist + label="Namespace" + placeholder="Select or type a namespace for the identifier." + create=true + required=false + tooltip=true + icon=false + disabled=disabled + allowClear=true + mdCodeName="namespace" + valuePath="code" + value=editing.namespace + profilePath=(concat profilePath 'namespace') +}} + +{{input/md-input + value=editing.version + placeholder="Enter the version for the identifier." + label="Version" + profilePath=(concat profilePath 'version') +}} + +{{input/md-textarea + value=editing.description + profilePath=(concat profilePath 'description') + label="Description" + placeholder="Enter a description of the identifier." +}} +{{/object/md-object-table}} diff --git a/app/styles/_table.scss b/app/styles/_table.scss index 35ab8d0d7..fbeef773a 100644 --- a/app/styles/_table.scss +++ b/app/styles/_table.scss @@ -58,3 +58,24 @@ .md-logo-preview { max-height: 50px; } + +.md-select-table { + .inner-table-wrapper { + margin-top: 1.25em; + } + + .table-header { + color: $gray-darker; + transition: color .5s linear; + + &:hover { + color: $brand-info; + cursor: pointer; + } + } + + .table-hover > tbody > tr:hover { + background-color: lighten($brand-primary, 50); + cursor: pointer; + } +} diff --git a/tests/integration/pods/components/control/md-select-table/component-test.js b/tests/integration/pods/components/control/md-select-table/component-test.js new file mode 100644 index 000000000..bb3cef490 --- /dev/null +++ b/tests/integration/pods/components/control/md-select-table/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('control/md-select-table', 'Integration | Component | control/md select table', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{control/md-select-table}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#control/md-select-table}} + template block text + {{/control/md-select-table}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/control/subbar-citation/component-test.js b/tests/integration/pods/components/control/subbar-citation/component-test.js new file mode 100644 index 000000000..55e4c9588 --- /dev/null +++ b/tests/integration/pods/components/control/subbar-citation/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('control/subbar-citation', 'Integration | Component | control/subbar citation', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{control/subbar-citation}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#control/subbar-citation}} + template block text + {{/control/subbar-citation}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-identifier-object-table/component-test.js b/tests/integration/pods/components/object/md-identifier-object-table/component-test.js new file mode 100644 index 000000000..4fce8235a --- /dev/null +++ b/tests/integration/pods/components/object/md-identifier-object-table/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-identifier-object-table', 'Integration | Component | object/md identifier object table', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-identifier-object-table}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-identifier-object-table}} + template block text + {{/object/md-identifier-object-table}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From bae16e20ec4f6d3c3d59453dea3858b9823979ba Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 10:55:03 -0800 Subject: [PATCH 181/383] Update scroll-spy --- app/pods/components/control/md-scroll-spy/component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pods/components/control/md-scroll-spy/component.js b/app/pods/components/control/md-scroll-spy/component.js index f6fa24de5..e932e0f5c 100644 --- a/app/pods/components/control/md-scroll-spy/component.js +++ b/app/pods/components/control/md-scroll-spy/component.js @@ -147,10 +147,10 @@ export default Component.extend({ let $anchor = $(id); if($anchor.length === 0) { - $('html').scrollTop(0 - get(this, 'offset')); + $('html, body').scrollTop(0 - get(this, 'offset')); return; } - $('html').scrollTop($anchor.offset().top - get(this, 'offset')); + $('html, body').scrollTop($anchor.offset().top - get(this, 'offset')); if(hilite) { $('[href=#' + id + ']') From 51f3a957eeba9ab680a73f4757f0b4d188286bfc Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 10:55:29 -0800 Subject: [PATCH 182/383] Update mixins/object-template --- app/mixins/object-template.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/mixins/object-template.js b/app/mixins/object-template.js index bd7edea58..026361600 100644 --- a/app/mixins/object-template.js +++ b/app/mixins/object-template.js @@ -64,9 +64,12 @@ export default Mixin.create({ property.forEach((item, idx, items) => { run.once(() => { - items.replace(idx, 1, merge(Template.create(owner.ownerInjection(), + let newItem = merge(Template.create(owner.ownerInjection(), defaults || {}), - item)); + item); + + items.removeObject(item); + items.insertAt(idx, newItem); }); }); } From df0d3b8b56e841c2b835fed134a31cb2e50e7bdf Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 10:57:00 -0800 Subject: [PATCH 183/383] Add support for visibility config to components --- app/app.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/app.js b/app/app.js index c7cf12de9..f569c6d3c 100644 --- a/app/app.js +++ b/app/app.js @@ -18,7 +18,8 @@ const { get, getWithDefault, defineProperty, - computed + computed, + isNone } = Ember; let App; @@ -51,6 +52,8 @@ Component.reopen({ let profile = get(this, 'profile'); let path = get(this, 'profilePath'); + let visibility = get(this, 'visibility'); + let isVisible = isNone(visibility) ? true : visibility; if(path !== undefined) { defineProperty(this, 'isVisible', computed( @@ -60,7 +63,7 @@ Component.reopen({ '.components.' + path; - return getWithDefault(profile, fullPath, true); + return getWithDefault(profile, fullPath, isVisible); })); } } From a21c167423588afd6367f0b4d08d4386c08cd327 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 10:57:23 -0800 Subject: [PATCH 184/383] Fix jshint error --- app/pods/record/show/index/route.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/pods/record/show/index/route.js b/app/pods/record/show/index/route.js index ba33a1457..7cf4dfc28 100644 --- a/app/pods/record/show/index/route.js +++ b/app/pods/record/show/index/route.js @@ -1,6 +1,9 @@ import Ember from 'ember'; + const { Route } = Ember; +/* global L */ + export default Route.extend({ actions: { linkTo(route){ From cb5377efdfca429d12a389e7199e0f4517fc4659 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 10:58:58 -0800 Subject: [PATCH 185/383] Add simpleIdentifier option to citation --- .../object/md-associated/template.hbs | 15 +++++--------- .../object/md-citation/component.js | 7 ++++--- .../object/md-citation/template.hbs | 20 ++++++++++++------- .../object/md-identifier-array/component.js | 3 ++- .../object/md-object-table/component.js | 1 + 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/app/pods/components/object/md-associated/template.hbs b/app/pods/components/object/md-associated/template.hbs index be89b65e0..88b036714 100644 --- a/app/pods/components/object/md-associated/template.hbs +++ b/app/pods/components/object/md-associated/template.hbs @@ -11,6 +11,7 @@ model=this placeholder="Choose Type of Association" profilePath=(concat profilePath ".associationType") + data-spy="Association Type" }} {{input/md-codelist @@ -38,24 +39,17 @@ }}
    -{{#layout/md-card - title="Associated Resource Citation" - profilePath=(concat profilePath '.resourceCitation') - shadow=true - collapsible=true - required=true -}} + {{#with model.resourceCitation as |citation|}} {{object/md-citation model=citation profilePath=(concat profilePath '.resourceCitation') - embedded=true + simpleIdentifier=true }} {{/with}} -{{/layout/md-card}} {{#layout/md-card - title="Associated Metadata Citation" + title="Metadata Citation" profilePath=(concat profilePath '.metadataCitation') shadow=true collapsible=true @@ -66,6 +60,7 @@ model=metdata profilePath=(concat profilePath '.metadataCitation') embedded=true + simpleIdentifier=true }} {{/with}} {{/layout/md-card}} diff --git a/app/pods/components/object/md-citation/component.js b/app/pods/components/object/md-citation/component.js index 572fe8aea..c474f9b00 100644 --- a/app/pods/components/object/md-citation/component.js +++ b/app/pods/components/object/md-citation/component.js @@ -62,11 +62,12 @@ export default Component.extend({ embedded: false, /** - * Indicates whether the citation identifier Component should be rendered. + * Indicates whether the citation identifier Component should be rendered using + * the inline form: md-identifier-object-table. * - * @property noIdentifier + * @property simpleIdentifier * @type {Boolean} * @default "false" */ - noIdentifier: false + simpleIdentifier: false }); diff --git a/app/pods/components/object/md-citation/template.hbs b/app/pods/components/object/md-citation/template.hbs index b8475b06d..eb372bebe 100644 --- a/app/pods/components/object/md-citation/template.hbs +++ b/app/pods/components/object/md-citation/template.hbs @@ -71,15 +71,21 @@ class=(if embedded "md-embedded") data-spy="Online Resource"}} -{{#unless embedded}} - {{#unless noIdentifier}} - {{object/md-identifier-array model=model.identifier - profilePath=(concat profilePath ".identifier") data-spy="Identifier" - editItem=editIdentifier - }} - {{/unless}} +{{object/md-identifier-array model=model.identifier + profilePath=(concat profilePath ".identifier") data-spy="Identifier" + editItem=editIdentifier + class="md-embedded" + visibility=(if simpleIdentifier false true) +}} +{{object/md-identifier-object-table model=model.identifier + profilePath=(concat profilePath ".identifierSimple") data-spy="Identifier" + visibility=(if simpleIdentifier true false) + class="md-embedded" +}} + +{{#unless embedded}} {{#layout/md-card collapsible=true title="Series" profilePath=(concat profilePath ".series") data-spy="Series"}} {{input/md-input value=model.series.seriesName diff --git a/app/pods/components/object/md-identifier-array/component.js b/app/pods/components/object/md-identifier-array/component.js index 743a7539e..6ffbb95df 100644 --- a/app/pods/components/object/md-identifier-array/component.js +++ b/app/pods/components/object/md-identifier-array/component.js @@ -19,11 +19,12 @@ export default Component.extend({ * mdEditor class for input and edit of mdJSON 'identifier' object * arrays. * The class manages the maintenance of an array of identifier - * objects using the md-object-table class. + * objects using the md-objectroute-table class. * * @module mdeditor * @submodule components-object * @class md-identifier-array + * @uses md-objectroute-table * @constructor */ diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index ec28d53cf..8fb8b3896 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -25,6 +25,7 @@ export default Component.extend(Template, { * buttonText=buttonText * templateClass=templateClass * previewTemplate=previewTemplate + * ellipsis=ellipsis * attributes=attributes as |editing| * }} * From 5ab7c08a058f9d722db8ecaeb022993868d2f184 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 11:01:52 -0800 Subject: [PATCH 186/383] Add subbar --- .../record/show/edit/associated/resource/index/template.hbs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/pods/record/show/edit/associated/resource/index/template.hbs b/app/pods/record/show/edit/associated/resource/index/template.hbs index 464849643..dc5eca158 100644 --- a/app/pods/record/show/edit/associated/resource/index/template.hbs +++ b/app/pods/record/show/edit/associated/resource/index/template.hbs @@ -9,7 +9,11 @@ {{to-elsewhere named="md-subbar-extra" - send=(component "control/subbar-link" text="Back to Resource List" icon="arrow-left" route="record.show.edit.associated") + send=(component "control/subbar-citation" + text="Back to Resource List" + icon="arrow-left" + route="record.show.edit.associated" + ) }} {{to-elsewhere named="md-scroll-spy-record-edit" send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} From 0d2070b5f17c78fc9d9c2212178cb4e7a5960098 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 18:43:52 -0800 Subject: [PATCH 187/383] Add md-slider --- .../components/layout/md-slider/component.js | 22 +++++++++ .../components/layout/md-slider/template.hbs | 11 +++++ app/styles/_layout.scss | 45 +++++++++++++++++-- app/templates/application.hbs | 9 ++++ .../layout/md-slider/component-test.js | 25 +++++++++++ 5 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 app/pods/components/layout/md-slider/component.js create mode 100644 app/pods/components/layout/md-slider/template.hbs create mode 100644 tests/integration/pods/components/layout/md-slider/component-test.js diff --git a/app/pods/components/layout/md-slider/component.js b/app/pods/components/layout/md-slider/component.js new file mode 100644 index 000000000..537ca5dbb --- /dev/null +++ b/app/pods/components/layout/md-slider/component.js @@ -0,0 +1,22 @@ +import Ember from 'ember'; + +const { + Component, + $ +} = Ember; + +export default Component.extend({ + classNames: ['md-slider'], + classNameBindings: ['visible:in'], + visible: false, + + didReceiveAttrs() { + $('body').toggleClass('slider', this.get('visible') === true); + + }, + actions: { + toggleVisibility() { + this.toggleProperty('visible'); + } + } +}); diff --git a/app/pods/components/layout/md-slider/template.hbs b/app/pods/components/layout/md-slider/template.hbs new file mode 100644 index 000000000..89d9ecd20 --- /dev/null +++ b/app/pods/components/layout/md-slider/template.hbs @@ -0,0 +1,11 @@ + +
    + {{#from-elsewhere name="md-slider-content" as |slider|}} +

    {{slider.title}}

    +
    + {{component slider.body}} + {{/from-elsewhere}} +
    +{{yield}} diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index f4a3e9bb4..f6e646967 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -6,6 +6,9 @@ html { body { //position: relative; + &.slider { + overflow: hidden; + } } .inline-block { @@ -67,6 +70,45 @@ body { z-index: 1000; } +.md-slider { + @include transition(width .5s ease); + background: $body-bg none repeat scroll 0 0; + height: 100vh; + overflow: auto; + position: fixed; + right: 0; + width: 0; + z-index: 10000; + + &.in { + width: 100%; + + .close { + opacity: .3; + + &:hover{ + opacity: .8; + } + } + + > .md-slider-body { + @include transition(opacity .5s ease .5s); + opacity: 1; + } + } + + > .md-slider-body { + opacity: 0; + padding: 10px; + } + + .close { + @include transition(all .5s ease); + color: $brand-primary; + margin: 10px; + opacity: 0; + } +} #md-page-content-wrapper { padding: 0 1px 1px; @@ -92,7 +134,6 @@ body { .md-scroll-spy { margin-top: 1em; } - @media(min-width: $screen-sm-min) { padding: 10px; position: fixed; @@ -101,7 +142,6 @@ body { display: inline-block; } } - @media(max-width: $screen-lg-min) { margin-left: -10px; } @@ -124,7 +164,6 @@ footer { .footer-container { left: -#{$sidebar-width}px; position: relative; - @media(max-width: $screen-sm-min) { left: 0; } diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 95fa9fb30..658d2dfa7 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -16,6 +16,15 @@
    + + + {{#layout/md-slider visible=showSlider}} + {{!--
    + {{from-elsewhere name="md-slider-content"}} +
    --}} + {{/layout/md-slider}} + +
    {{layout/md-nav-sidebar items=model}} {{md-help}} diff --git a/tests/integration/pods/components/layout/md-slider/component-test.js b/tests/integration/pods/components/layout/md-slider/component-test.js new file mode 100644 index 000000000..a29a4ba67 --- /dev/null +++ b/tests/integration/pods/components/layout/md-slider/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('layout/md-slider', 'Integration | Component | layout/md slider', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{layout/md-slider}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#layout/md-slider}} + template block text + {{/layout/md-slider}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 2307ef42f6f34c47c1d6cb7676858b801377c6f5 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 7 Aug 2017 18:44:35 -0800 Subject: [PATCH 188/383] Add resource slider to associated.resource --- app/models/record.js | 3 ++ .../control/md-select-table/component.js | 1 + .../control/subbar-citation/component.js | 3 ++ .../control/subbar-citation/template.hbs | 2 +- .../edit/associated/resource/index/route.js | 36 ++++++++++++++----- .../associated/resource/index/template.hbs | 14 ++++++++ 6 files changed, 50 insertions(+), 9 deletions(-) diff --git a/app/models/record.js b/app/models/record.js index ae7f819a9..9717e86d6 100644 --- a/app/models/record.js +++ b/app/models/record.js @@ -119,6 +119,9 @@ export default Model.extend(Validations, Copyable, { recordId: computed.alias( 'json.metadata.metadataInfo.metadataIdentifier.identifier'), + defaultType: computed.alias( + 'json.metadata.resourceInfo.resourceType.0.type'), + /** * The trimmed varsion of the recordId. * diff --git a/app/pods/components/control/md-select-table/component.js b/app/pods/components/control/md-select-table/component.js index 2d3c5ee1a..3e5c51a89 100644 --- a/app/pods/components/control/md-select-table/component.js +++ b/app/pods/components/control/md-select-table/component.js @@ -18,6 +18,7 @@ export default Table.extend({ * \{{control/md-select-table * data=model.data * columns=model.columns + * select=callback * }} * ``` * diff --git a/app/pods/components/control/subbar-citation/component.js b/app/pods/components/control/subbar-citation/component.js index 926b61300..6c3eb4614 100644 --- a/app/pods/components/control/subbar-citation/component.js +++ b/app/pods/components/control/subbar-citation/component.js @@ -1,4 +1,7 @@ import Ember from 'ember'; export default Ember.Component.extend({ + selectResource(){ + return this; + } }); diff --git a/app/pods/components/control/subbar-citation/template.hbs b/app/pods/components/control/subbar-citation/template.hbs index 7cd8f2f9c..65dd51e62 100644 --- a/app/pods/components/control/subbar-citation/template.hbs +++ b/app/pods/components/control/subbar-citation/template.hbs @@ -1,5 +1,5 @@
    - {{#link-to route class="btn btn-lg btn-primary btn-block md-btn-responsive" }} {{fa-icon icon}} {{text}}{{/link-to}} diff --git a/app/pods/record/show/edit/associated/resource/index/route.js b/app/pods/record/show/edit/associated/resource/index/route.js index 587ccedd5..4c926ec75 100644 --- a/app/pods/record/show/edit/associated/resource/index/route.js +++ b/app/pods/record/show/edit/associated/resource/index/route.js @@ -7,6 +7,16 @@ const { } = Ember; export default Route.extend(ScrollTo, { + sliderColumns:[{ + propertyName: 'recordId', + title: 'ID' + }, { + propertyName: 'title', + title: 'Title' + }, { + propertyName: 'defaultType', + title: 'Type' + }], setupController: function () { // Call _super for default behavior this._super(...arguments); @@ -17,13 +27,23 @@ export default Route.extend(ScrollTo, { 'record.show.edit.associated.resource'), 'resourceId')); }, actions: { - // editCitation(index) { - // this.transitionTo('record.show.edit.lineage.lineageobject.citation', - // index) - // .then( - // function () { - // this.setScrollTo('citation'); - // }.bind(this)); - // } + insertResource(selected){ + console.log(selected); + let app = this.controllerFor('application'); + + app.set('showSlider', false); + }, + selectResource(){ + let app = this.controllerFor('application'); + + this.controller.set('slider', 'md-select-table'); + app.set('showSlider', true); + }, + sliderData(){ + return this.store.peekAll('record'); + }, + sliderColumns(){ + return this.get('sliderColumns'); + } } }); diff --git a/app/pods/record/show/edit/associated/resource/index/template.hbs b/app/pods/record/show/edit/associated/resource/index/template.hbs index dc5eca158..060714700 100644 --- a/app/pods/record/show/edit/associated/resource/index/template.hbs +++ b/app/pods/record/show/edit/associated/resource/index/template.hbs @@ -13,7 +13,21 @@ text="Back to Resource List" icon="arrow-left" route="record.show.edit.associated" + selectResource=(route-action "selectResource") ) }} + +{{to-elsewhere + named="md-slider-content" + send=(hash + title="Click row to select a resource record" + body=(component "control/md-select-table" + select=(route-action "insertResource") + data=(compute (route-action "sliderData")) + columns=(compute (route-action "sliderColumns")) + ) + ) +}} + {{to-elsewhere named="md-scroll-spy-record-edit" send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} From 955bb7732d6f36487e87268e4a33807fae9f1f4a Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 8 Aug 2017 15:55:04 -0800 Subject: [PATCH 189/383] Fix object-template --- app/mixins/object-template.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/mixins/object-template.js b/app/mixins/object-template.js index 026361600..6d76b1c6b 100644 --- a/app/mixins/object-template.js +++ b/app/mixins/object-template.js @@ -62,13 +62,14 @@ export default Mixin.create({ if(Template) { let owner = getOwner(this); - property.forEach((item, idx, items) => { - run.once(() => { + run.once(this, () => { + property.forEach((item, idx, items) => { + items.removeAt(idx); + let newItem = merge(Template.create(owner.ownerInjection(), defaults || {}), item); - items.removeObject(item); items.insertAt(idx, newItem); }); }); From 7a357e45744dbed3a8d509b7b89fa118f51e6247 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 8 Aug 2017 15:56:22 -0800 Subject: [PATCH 190/383] Add overflow to breadcrumbs --- app/styles/_breadcrumb.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/styles/_breadcrumb.scss b/app/styles/_breadcrumb.scss index 46550919a..82adede70 100644 --- a/app/styles/_breadcrumb.scss +++ b/app/styles/_breadcrumb.scss @@ -6,4 +6,9 @@ a { text-decoration: none; } + + li { + @include text-overflow(); + max-width: 175px; + } } From 0284bbce6c8af3ac4f2cc6a396e946941408cbc6 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 8 Aug 2017 15:56:59 -0800 Subject: [PATCH 191/383] Update components --- app/pods/components/object/md-citation/template.hbs | 4 ++-- app/pods/components/object/md-identifier/template.hbs | 1 + app/pods/components/object/md-object-table/component.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/pods/components/object/md-citation/template.hbs b/app/pods/components/object/md-citation/template.hbs index eb372bebe..39a988d11 100644 --- a/app/pods/components/object/md-citation/template.hbs +++ b/app/pods/components/object/md-citation/template.hbs @@ -75,14 +75,14 @@ {{object/md-identifier-array model=model.identifier profilePath=(concat profilePath ".identifier") data-spy="Identifier" editItem=editIdentifier - class="md-embedded" + class=(if embedded "md-embedded") visibility=(if simpleIdentifier false true) }} {{object/md-identifier-object-table model=model.identifier profilePath=(concat profilePath ".identifierSimple") data-spy="Identifier" visibility=(if simpleIdentifier true false) - class="md-embedded" + class=(if embedded "md-embedded") }} {{#unless embedded}} diff --git a/app/pods/components/object/md-identifier/template.hbs b/app/pods/components/object/md-identifier/template.hbs index 39ebaeaca..4e869c484 100644 --- a/app/pods/components/object/md-identifier/template.hbs +++ b/app/pods/components/object/md-identifier/template.hbs @@ -47,6 +47,7 @@ model=model.authority profilePath=(concat profilePath '.authority') embedded=true + simpleIdentifier=true }} {{/layout/md-card}} {{yield}} diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index 8fb8b3896..cb4419fc6 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -39,7 +39,7 @@ export default Component.extend(Template, { * @uses object-template */ - init() { + didReceiveAttrs() { this._super(...arguments); this.applyTemplateArray('items'); From 1ab04cd3afaed913e2340d90f3690a0e17cdc236 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 8 Aug 2017 15:57:34 -0800 Subject: [PATCH 192/383] Update associated.resource --- .../edit/associated/resource/index/route.js | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/pods/record/show/edit/associated/resource/index/route.js b/app/pods/record/show/edit/associated/resource/index/route.js index 4c926ec75..68b6860c7 100644 --- a/app/pods/record/show/edit/associated/resource/index/route.js +++ b/app/pods/record/show/edit/associated/resource/index/route.js @@ -3,11 +3,12 @@ import ScrollTo from 'mdeditor/mixins/scroll-to'; const { Route, - get + get, + merge } = Ember; export default Route.extend(ScrollTo, { - sliderColumns:[{ + sliderColumns: [{ propertyName: 'recordId', title: 'ID' }, { @@ -17,7 +18,7 @@ export default Route.extend(ScrollTo, { propertyName: 'defaultType', title: 'Type' }], - setupController: function () { + setupController: function() { // Call _super for default behavior this._super(...arguments); @@ -27,22 +28,29 @@ export default Route.extend(ScrollTo, { 'record.show.edit.associated.resource'), 'resourceId')); }, actions: { - insertResource(selected){ + insertResource(selected) { console.log(selected); let app = this.controllerFor('application'); + let rec = selected[0]; + if(rec) { + let resource = get(this, 'currentModel'); + + // merge(get(resource, 'resourceCitation'), + // get(rec, 'json.metadata.resourceInfo.citation')); + } app.set('showSlider', false); }, - selectResource(){ + selectResource() { let app = this.controllerFor('application'); this.controller.set('slider', 'md-select-table'); app.set('showSlider', true); }, - sliderData(){ + sliderData() { return this.store.peekAll('record'); }, - sliderColumns(){ + sliderColumns() { return this.get('sliderColumns'); } } From bd618e2dfbd47bd82651f9ccf7fae53ec5f36bc6 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Tue, 8 Aug 2017 23:10:20 -0800 Subject: [PATCH 193/383] Reduce box-shadow --- app/pods/components/layout/md-card/component.js | 2 +- app/pods/components/object/md-array-table/template.hbs | 2 +- app/pods/components/object/md-object-table/component.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pods/components/layout/md-card/component.js b/app/pods/components/layout/md-card/component.js index efee81705..4da46fe4c 100644 --- a/app/pods/components/layout/md-card/component.js +++ b/app/pods/components/layout/md-card/component.js @@ -28,7 +28,7 @@ export default Component.extend({ */ classNames: ['md-card', 'card'], - classNameBindings: ['shadow:box-shadow--8dp', 'scroll:scroll-card', + classNameBindings: ['shadow:box-shadow--4dp', 'scroll:scroll-card', 'maximizable', 'fullScreen', 'required', 'muted' ], attributeBindings: ['data-spy'], diff --git a/app/pods/components/object/md-array-table/template.hbs b/app/pods/components/object/md-array-table/template.hbs index 8154e5c1d..9ce0c68b4 100644 --- a/app/pods/components/object/md-array-table/template.hbs +++ b/app/pods/components/object/md-array-table/template.hbs @@ -45,7 +45,7 @@ {{else}} -
    +

    diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index cb4419fc6..ff1ad7f5d 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -46,7 +46,7 @@ export default Component.extend(Template, { }, attributeBindings: ['data-spy'], - classNameBindings: ['shadow:box-shadow--8dp'], + classNameBindings: ['shadow:box-shadow--4dp'], //classNames: ['md-object-table', 'panel', 'panel-default'], //reset the 'editing' flag From 3c447f4349d0aa496030483fc7a233f20f13baf2 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 9 Aug 2017 09:36:55 -0800 Subject: [PATCH 194/383] Copy metadataCitation --- .../edit/associated/resource/index/route.js | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/app/pods/record/show/edit/associated/resource/index/route.js b/app/pods/record/show/edit/associated/resource/index/route.js index 68b6860c7..117f00523 100644 --- a/app/pods/record/show/edit/associated/resource/index/route.js +++ b/app/pods/record/show/edit/associated/resource/index/route.js @@ -1,10 +1,15 @@ import Ember from 'ember'; import ScrollTo from 'mdeditor/mixins/scroll-to'; +import { + formatCitation +} from 'mdeditor/pods/components/object/md-citation/component'; const { Route, get, - merge + set, + Object: EmObject, + getWithDefault } = Ember; export default Route.extend(ScrollTo, { @@ -32,13 +37,25 @@ export default Route.extend(ScrollTo, { console.log(selected); let app = this.controllerFor('application'); let rec = selected[0]; + let info = get(rec, 'json.metadata.metadataInfo') || {}; + let metadata = { + 'title': `Metadata for ${get(rec,'title')}`, + 'responsibleParty': getWithDefault(info, 'metadataContact', []), + 'date': getWithDefault(info, 'metadataDate', []), + 'onlineResource': getWithDefault(info, 'metadataOnlineResource', []), + 'identifier': [getWithDefault(info, 'metadataIdentifier', {})], + }; if(rec) { let resource = get(this, 'currentModel'); + let citation = get(rec, 'json.metadata.resourceInfo.citation') || {}; - // merge(get(resource, 'resourceCitation'), - // get(rec, 'json.metadata.resourceInfo.citation')); + set(resource, 'resourceCitation', EmObject.create(formatCitation( + citation))); + set(resource, 'metadataCitation', EmObject.create(formatCitation( + metadata))); } + app.set('showSlider', false); }, selectResource() { From 500d301cbc01100f9f71c433e39cd8f6279d5691 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 9 Aug 2017 09:37:15 -0800 Subject: [PATCH 195/383] Update components --- .../control/subbar-citation/template.hbs | 5 +++ .../input/md-markdown-area/component.js | 12 ++++-- .../layout/md-nav-sidebar/template.hbs | 6 ++- .../object/md-citation/component.js | 43 ++++++++++++------- .../object/md-citation/template.hbs | 1 + .../object/md-identifier-array/component.js | 5 ++- .../md-identifier-object-table/template.hbs | 11 ++++- .../object/md-identifier/component.js | 15 ++++++- .../object/md-identifier/template.hbs | 25 ++++++----- app/pods/dashboard/template.hbs | 2 +- .../record/show/edit/main/index/template.hbs | 12 +++--- app/templates/application.hbs | 2 +- 12 files changed, 96 insertions(+), 43 deletions(-) diff --git a/app/pods/components/control/subbar-citation/template.hbs b/app/pods/components/control/subbar-citation/template.hbs index 65dd51e62..762aa9fbf 100644 --- a/app/pods/components/control/subbar-citation/template.hbs +++ b/app/pods/components/control/subbar-citation/template.hbs @@ -1,6 +1,11 @@
    {{#link-to route class="btn btn-lg btn-primary btn-block md-btn-responsive" }} {{fa-icon icon}} {{text}}{{/link-to}} {{yield}} diff --git a/app/pods/components/input/md-markdown-area/component.js b/app/pods/components/input/md-markdown-area/component.js index 27b82c12e..bdb1074ca 100644 --- a/app/pods/components/input/md-markdown-area/component.js +++ b/app/pods/components/input/md-markdown-area/component.js @@ -38,7 +38,7 @@ export default Component.extend({ const oldEditorSetOption = editor.codemirror.setOption; - editor.codemirror.setOption = function (option, value) { + editor.codemirror.setOption = function(option, value) { oldEditorSetOption.apply(this, arguments); if(option === 'fullScreen') { @@ -117,7 +117,7 @@ export default Component.extend({ * @category computed * @requires placeholder */ - options: computed('placeholder', function () { + options: computed('placeholder', function() { return { placeholder: get(this, 'placeholder'), status: [{ @@ -146,7 +146,7 @@ export default Component.extend({ * @category computed * @requires value */ - length: computed('value', function () { + length: computed('value', function() { return get(this, 'value') ? get(this, 'value') .length : 0; }) @@ -160,10 +160,14 @@ export default Component.extend({ * @category computed * @requires value|maxlength */ - errorClass: computed('value', 'maxlength', function () { + errorClass: computed('value', 'maxlength', function() { let length = get(this, 'length'); let max = get(this, 'maxlength'); + if(get(this, 'required') && length < 1) { + return 'error'; + } + if(!max || length <= max - 25) { return ''; } diff --git a/app/pods/components/layout/md-nav-sidebar/template.hbs b/app/pods/components/layout/md-nav-sidebar/template.hbs index 350b5bddb..3507524f6 100644 --- a/app/pods/components/layout/md-nav-sidebar/template.hbs +++ b/app/pods/components/layout/md-nav-sidebar/template.hbs @@ -23,13 +23,14 @@

    +
    {{#each class as |record|}} -
    {{#link-to (concat meta.type ".show.edit") record class=(concat "btn btn-" record.status) disabledWhen=record.isNew + draggable="false" }} {{fa-icon "pencil"}} {{/link-to}} @@ -39,12 +40,13 @@ record class="sidebar-row" disabledWhen=record.isNew activeClass=(concat "active text-" record.status) + draggable="false" }} {{record.title}} {{/link-to}}
    -
    {{/each}} +
    diff --git a/app/pods/components/object/md-citation/component.js b/app/pods/components/object/md-citation/component.js index c474f9b00..1b833b7b5 100644 --- a/app/pods/components/object/md-citation/component.js +++ b/app/pods/components/object/md-citation/component.js @@ -10,27 +10,34 @@ const { } } = Ember; -export default Component.extend({ +const formatCitation = function(model) { + set(model, 'responsibleParty', getWithDefault(model, + 'responsibleParty', [])); + set(model, 'date', getWithDefault(model, + 'date', [])); + set(model, 'alternateTitle', getWithDefault(model, + 'alternateTitle', [])); + set(model, 'presentationForm', getWithDefault(model, + 'presentationForm', [])); + set(model, 'onlineResource', getWithDefault(model, + 'onlineResource', [])); + set(model, 'identifier', getWithDefault(model, 'identifier', [])); + set(model, 'otherCitationDetails', getWithDefault(model, + 'otherCitationDetails', [])); + set(model, 'graphic', getWithDefault(model, 'graphic', [])); + set(model, 'series', getWithDefault(model, 'series', {})); + + return model; +}; + +const theComp = Component.extend({ didReceiveAttrs() { this._super(...arguments); let model = get(this, 'model'); once(this, function() { - set(model, 'responsibleParty', getWithDefault(model, - 'responsibleParty', [])); - set(model, 'date', getWithDefault(model, - 'date', [])); - set(model, 'alternateTitle', getWithDefault(model, - 'alternateTitle', [])); - set(model, 'presentationForm', getWithDefault(model, - 'presentationForm', [])); - set(model, 'onlineResource', getWithDefault(model, - 'onlineResource', [])); - set(model, 'identifier', getWithDefault(model, 'identifier', [])); - set(model, 'otherCitationDetails', getWithDefault(model, 'otherCitationDetails', [])); - set(model, 'graphic', getWithDefault(model, 'graphic', [])); - set(model, 'series', getWithDefault(model, 'series', {})); + formatCitation(model); }); }, tagName: 'form', @@ -71,3 +78,9 @@ export default Component.extend({ */ simpleIdentifier: false }); + +export { + formatCitation, + theComp as + default +}; diff --git a/app/pods/components/object/md-citation/template.hbs b/app/pods/components/object/md-citation/template.hbs index 39a988d11..91b198eb8 100644 --- a/app/pods/components/object/md-citation/template.hbs +++ b/app/pods/components/object/md-citation/template.hbs @@ -82,6 +82,7 @@ {{object/md-identifier-object-table model=model.identifier profilePath=(concat profilePath ".identifierSimple") data-spy="Identifier" visibility=(if simpleIdentifier true false) + short=simpleIdentifier class=(if embedded "md-embedded") }} diff --git a/app/pods/components/object/md-identifier-array/component.js b/app/pods/components/object/md-identifier-array/component.js index 6ffbb95df..ef84edb01 100644 --- a/app/pods/components/object/md-identifier-array/component.js +++ b/app/pods/components/object/md-identifier-array/component.js @@ -1,4 +1,7 @@ import Ember from 'ember'; +import { + Validations +} from '../md-identifier/component'; const { A, @@ -67,7 +70,7 @@ export default Component.extend({ * @property templateClass * @type Ember.Object */ - templateClass: Ember.Object.extend({ + templateClass: Ember.Object.extend(Validations, { init() { this._super(...arguments); this.set('authority', {}); diff --git a/app/pods/components/object/md-identifier-object-table/template.hbs b/app/pods/components/object/md-identifier-object-table/template.hbs index 5e0827c35..949fb72e3 100644 --- a/app/pods/components/object/md-identifier-object-table/template.hbs +++ b/app/pods/components/object/md-identifier-object-table/template.hbs @@ -7,7 +7,14 @@ attributes=attributes as |editing| }} -{{input/md-input + +{{object/md-identifier + model=editing + short=short + profilePath=(concat profilePath 'identifier') +}} + +{{!-- {{input/md-input value=editing.identifier placeholder="Enter the identifier for the resource." label="Identifier" @@ -42,5 +49,5 @@ profilePath=(concat profilePath 'description') label="Description" placeholder="Enter a description of the identifier." -}} +}} --}} {{/object/md-object-table}} diff --git a/app/pods/components/object/md-identifier/component.js b/app/pods/components/object/md-identifier/component.js index 64f04d521..0fe6cd653 100644 --- a/app/pods/components/object/md-identifier/component.js +++ b/app/pods/components/object/md-identifier/component.js @@ -20,7 +20,7 @@ const Validations = buildValidations({ ] }); -export default Component.extend(Validations, { +const theComp = Component.extend(Validations, { init() { this._super(...arguments); @@ -40,5 +40,18 @@ export default Component.extend(Validations, { * @required */ + /** + * Render short form of the identifier template, i.e. no authority + * + * @property short + * @type {Boolean} + */ + identifier: computed.alias('model.identifier') }); + +export { + Validations, + theComp as + default +}; diff --git a/app/pods/components/object/md-identifier/template.hbs b/app/pods/components/object/md-identifier/template.hbs index 4e869c484..40a0453ac 100644 --- a/app/pods/components/object/md-identifier/template.hbs +++ b/app/pods/components/object/md-identifier/template.hbs @@ -23,6 +23,7 @@ profilePath=(concat profilePath '.namespace') }} + {{input/md-input value=model.version placeholder="Enter the version for the identifier." @@ -37,17 +38,19 @@ placeholder="Enter a description of the identifier." }} -{{#layout/md-card - title="Authority" - profilePath=(concat profilePath '.authority') - shadow=true - collapsible=true -}} - {{object/md-citation - model=model.authority +{{#unless short}} + {{#layout/md-card + title="Authority" profilePath=(concat profilePath '.authority') - embedded=true - simpleIdentifier=true + shadow=true + collapsible=true }} -{{/layout/md-card}} + {{object/md-citation + model=model.authority + profilePath=(concat profilePath '.authority') + embedded=true + simpleIdentifier=true + }} + {{/layout/md-card}} +{{/unless}} {{yield}} diff --git a/app/pods/dashboard/template.hbs b/app/pods/dashboard/template.hbs index 446d7ad77..d9975ce11 100644 --- a/app/pods/dashboard/template.hbs +++ b/app/pods/dashboard/template.hbs @@ -95,7 +95,7 @@

    mdditor Version 1.0 will be - released June 2017. September 2017. Follow progress or {{#layout/md-card title="Basic Information" collapsible=true collapsed=false profilePath="record.main.basicInformation" data-spy="Basic Information" + required=true }} {{input/md-input-confirm valuePath='recordId' @@ -70,13 +71,9 @@ editCitation="editCitation" }} - {{object/md-time-period model=resource.timePeriod - profilePath="record.main.timePeriod" data-spy="Time Period" - label="Time Period" - }} - {{#layout/md-card title="Description" collapsible=true collapsed=false profilePath="record.main.description" + required=true }} {{input/md-markdown-area value=resource.abstract @@ -116,6 +113,11 @@ }} {{/layout/md-card}} + {{object/md-time-period model=resource.timePeriod + profilePath="record.main.timePeriod" data-spy="Time Period" + label="Time Period" + }} + {{#object/md-simple-array-table data-spy="Credit" title="Credit" diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 658d2dfa7..85f2b8f67 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -60,7 +60,7 @@ If you are having problems, you might want to {{#link-to "settings"}} clear your localstorage{{/link-to}} which will delete all records. This application is NOT - INTENDED FOR PRODUCTION USE until Version 1.0 (June 2017). + INTENDED FOR PRODUCTION USE until Version 1.0 (September 2017).

    Current Version: {{control/md-repo-link}} From 2da0fdebcfe3b71f73a14510449fc16d68c988e7 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 9 Aug 2017 17:18:12 -0800 Subject: [PATCH 196/383] Update layout, add col_xxxl styles --- .../components/layout/md-card/template.hbs | 4 +- .../main/citation/identifier/template.hbs | 4 +- .../edit/main/citation/index/template.hbs | 4 +- .../record/show/edit/main/index/template.hbs | 2 +- .../alternate/identifier/template.hbs | 4 +- .../metadata/alternate/index/template.hbs | 4 +- .../edit/metadata/identifier/template.hbs | 4 +- .../show/edit/metadata/index/template.hbs | 2 +- .../metadata/parent/identifier/template.hbs | 4 +- .../edit/metadata/parent/index/template.hbs | 4 +- app/pods/record/show/edit/template.hbs | 18 +-- app/pods/record/show/index/template.hbs | 2 +- app/pods/record/show/nav/template.hbs | 2 +- app/pods/record/show/translate/template.hbs | 2 +- app/styles/_col_xxxl.scss | 108 ++++++++++++++++++ app/styles/app.scss | 1 + app/templates/application.hbs | 2 +- 17 files changed, 132 insertions(+), 39 deletions(-) create mode 100644 app/styles/_col_xxxl.scss diff --git a/app/pods/components/layout/md-card/template.hbs b/app/pods/components/layout/md-card/template.hbs index 839c71ac1..558a0c868 100644 --- a/app/pods/components/layout/md-card/template.hbs +++ b/app/pods/components/layout/md-card/template.hbs @@ -13,12 +13,12 @@ {{title}} {{/if}} {{#if maximizable}} - + {{fa-icon windowIcon size=1 click=(action "toggleFullScreen")}} {{/if}} {{#if btnText}} - diff --git a/app/pods/record/show/edit/main/citation/identifier/template.hbs b/app/pods/record/show/edit/main/citation/identifier/template.hbs index e00f3bba1..0c7d9258e 100644 --- a/app/pods/record/show/edit/main/citation/identifier/template.hbs +++ b/app/pods/record/show/edit/main/citation/identifier/template.hbs @@ -1,11 +1,11 @@ -

    +

    Editing Identifier: {{model.identifier}} {{control/md-status model=parentModel}}

    {{object/md-identifier - class="col-sm-11 col-md-offset-1" + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" model=model profilePath="record.main.citation.identifier" data-spy="Identifier" diff --git a/app/pods/record/show/edit/main/citation/index/template.hbs b/app/pods/record/show/edit/main/citation/index/template.hbs index 175db4cf8..6dd39f684 100644 --- a/app/pods/record/show/edit/main/citation/index/template.hbs +++ b/app/pods/record/show/edit/main/citation/index/template.hbs @@ -1,10 +1,10 @@ -

    Editing Citation +

    Editing Citation {{control/md-status model=model}}

    {{#with model.json.metadata.resourceInfo.citation as |citation|}}
    {{object/md-citation - class="col-sm-11 col-md-offset-1" + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" model=citation profilePath="record.main.citation" editIdentifier=(route-action "editIdentifier") diff --git a/app/pods/record/show/edit/main/index/template.hbs b/app/pods/record/show/edit/main/index/template.hbs index 1e077c36b..ae93f2e5f 100644 --- a/app/pods/record/show/edit/main/index/template.hbs +++ b/app/pods/record/show/edit/main/index/template.hbs @@ -1,6 +1,6 @@ {{#with model.json.metadata.resourceInfo as |resource|}}
    -
    + {{#layout/md-card title="Basic Information" collapsible=true collapsed=false profilePath="record.main.basicInformation" data-spy="Basic Information" required=true diff --git a/app/pods/record/show/edit/metadata/alternate/identifier/template.hbs b/app/pods/record/show/edit/metadata/alternate/identifier/template.hbs index a00b735be..f378811e3 100644 --- a/app/pods/record/show/edit/metadata/alternate/identifier/template.hbs +++ b/app/pods/record/show/edit/metadata/alternate/identifier/template.hbs @@ -1,11 +1,11 @@ -

    +

    Editing Alternate Identifier: {{model.identifier}} {{control/md-status model=(compute (route-action "parentModel"))}}

    {{object/md-identifier - class="col-sm-11 col-md-offset-1" + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" model=model profilePath="record.metadata.alternateMetadata.identifier" data-spy="Identifier" diff --git a/app/pods/record/show/edit/metadata/alternate/index/template.hbs b/app/pods/record/show/edit/metadata/alternate/index/template.hbs index 07d029d46..6023103a5 100644 --- a/app/pods/record/show/edit/metadata/alternate/index/template.hbs +++ b/app/pods/record/show/edit/metadata/alternate/index/template.hbs @@ -1,10 +1,10 @@ -

    Editing Alternate Metadata Reference +

    Editing Alternate Metadata Reference {{control/md-status model=(compute (route-action "parentModel"))}}

    {{#with model as |citation|}}
    {{object/md-citation - class="col-sm-11 col-md-offset-1" + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" model=citation profilePath="record.metadata.alternateMetadata" editIdentifier=(route-action "editIdentifier") diff --git a/app/pods/record/show/edit/metadata/identifier/template.hbs b/app/pods/record/show/edit/metadata/identifier/template.hbs index 2bbba7c76..71464a9c0 100644 --- a/app/pods/record/show/edit/metadata/identifier/template.hbs +++ b/app/pods/record/show/edit/metadata/identifier/template.hbs @@ -1,11 +1,11 @@ -

    +

    Editing Metadata Identifier: {{model.identifier}} {{control/md-status model=parentModel}}

    {{object/md-identifier - class="col-sm-11 col-md-offset-1" + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" model=model profilePath="record.metadata.identifier" data-spy="Identifier" diff --git a/app/pods/record/show/edit/metadata/index/template.hbs b/app/pods/record/show/edit/metadata/index/template.hbs index e1a86d551..a602c1505 100644 --- a/app/pods/record/show/edit/metadata/index/template.hbs +++ b/app/pods/record/show/edit/metadata/index/template.hbs @@ -1,6 +1,6 @@ {{#with model.json.metadata.metadataInfo as |metadata|}}
    - + {{#layout/md-card title="Basic Information" collapsible=true collapsed=false profilePath="record.metadata.basicInformation" data-spy="Basic Information" }} diff --git a/app/pods/record/show/edit/metadata/parent/identifier/template.hbs b/app/pods/record/show/edit/metadata/parent/identifier/template.hbs index 0fffe4971..6f5a2cc30 100644 --- a/app/pods/record/show/edit/metadata/parent/identifier/template.hbs +++ b/app/pods/record/show/edit/metadata/parent/identifier/template.hbs @@ -1,11 +1,11 @@ -

    +

    Editing Identifier: {{model.identifier}} {{control/md-status model=parentModel}}

    {{object/md-identifier - class="col-sm-11 col-md-offset-1" + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" model=model profilePath="record.metadata.parent.identifier" data-spy="Identifier" diff --git a/app/pods/record/show/edit/metadata/parent/index/template.hbs b/app/pods/record/show/edit/metadata/parent/index/template.hbs index 23c229501..da0b949ee 100644 --- a/app/pods/record/show/edit/metadata/parent/index/template.hbs +++ b/app/pods/record/show/edit/metadata/parent/index/template.hbs @@ -1,10 +1,10 @@ -

    Editing Parent Metadata Citation +

    Editing Parent Metadata Citation {{control/md-status model=model}}

    {{#with model.json.metadata.metadataInfo.parentMetadata as |citation|}}
    {{object/md-citation - class="col-sm-11 col-md-offset-1" + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" model=citation profilePath="record.metadata.parentMetadata" editIdentifier=(route-action "editIdentifier") diff --git a/app/pods/record/show/edit/template.hbs b/app/pods/record/show/edit/template.hbs index 8bcc66382..077e408ba 100644 --- a/app/pods/record/show/edit/template.hbs +++ b/app/pods/record/show/edit/template.hbs @@ -1,25 +1,9 @@
    - {{!--
    -
    -

    - Editing Record: {{model.title}} {{model.shortId}} - - {{#if model.hasDirtyHash}} - {{fa-icon "exclamation-circle"}} - {{tooltip-on-element text='This record has been modified!' side="right" - class="md-tooltip danger" - }} - {{/if}} - -

    -
    -
    -
    --}} {{outlet}}
    -
    +
    {{control/md-crud-buttons model=model doSave="saveRecord" diff --git a/app/pods/record/show/index/template.hbs b/app/pods/record/show/index/template.hbs index 1a114980d..d66014790 100644 --- a/app/pods/record/show/index/template.hbs +++ b/app/pods/record/show/index/template.hbs @@ -136,7 +136,7 @@ {{outlet}}
    -
    +
    {{#control/md-crud-buttons model=model doDelete="destroyRecord" doCopy="copyRecord" }} {{#link-to "record.show.edit" model.id class="btn btn-lg btn-success" }} {{fa-icon "pencil"}} Edit{{/link-to}} diff --git a/app/pods/record/show/nav/template.hbs b/app/pods/record/show/nav/template.hbs index 08460d18d..4a2ef603e 100644 --- a/app/pods/record/show/nav/template.hbs +++ b/app/pods/record/show/nav/template.hbs @@ -7,7 +7,7 @@
  • - + {{#link-to "publish"}} Publish {{tooltip-on-element text="Publish" side="bottom" class="md-nav-tip"}} diff --git a/app/pods/record/show/translate/template.hbs b/app/pods/record/show/translate/template.hbs index 71dd70eeb..f1497e57e 100644 --- a/app/pods/record/show/translate/template.hbs +++ b/app/pods/record/show/translate/template.hbs @@ -1,5 +1,5 @@
    -
    +

    Translate Record

    {{md-translate model=model store=store}}
    diff --git a/app/styles/_col_xxxl.scss b/app/styles/_col_xxxl.scss new file mode 100644 index 000000000..d0b8e5f6a --- /dev/null +++ b/app/styles/_col_xxxl.scss @@ -0,0 +1,108 @@ +$screen-xxxl: 1920px !default; +$screen-xxxl-min: $screen-xxxl !default; +$screen-xxxl-desktop: $screen-xxxl-min !default; +$screen-xxl-max: ($screen-xxxl-min - 1) !default; +$container-xxxlarge-desktop: (2010px + $grid-gutter-width) !default; +$container-xxxl: $container-xxxlarge-desktop !default; + +.container { + // @include container-fixed; No need for, already done. + @media (min-width: $screen-xxxl-min) { + width: $container-xxxl; + } +} + +// xxxlarge grid +// +// Columns, offsets, pushes, and pulls for the large desktop device range. + +@media (min-width: $screen-xxxl-min) { + @include make-grid(xxxl); +} + +// Generate the xxxlarge columns +@mixin make-xxxl-column($columns, $gutter: $grid-gutter-width) { + position: relative; + min-height: 1px; + padding-left: ($gutter / 2); + padding-right: ($gutter / 2); + + @media (min-width: $screen-xxxl-min) { + float: left; + width: percentage(($columns / $grid-columns)); + } +} +@mixin make-xxxl-column-offset($columns) { + @media (min-width: $screen-xxxl-min) { + margin-left: percentage(($columns / $grid-columns)); + } +} +@mixin make-xxxl-column-push($columns) { + @media (min-width: $screen-xxxl-min) { + left: percentage(($columns / $grid-columns)); + } +} +@mixin make-xxxl-column-pull($columns) { + @media (min-width: $screen-xxxl-min) { + right: percentage(($columns / $grid-columns)); + } +} + +@mixin make-grid-columns($i: 1, $list: ".col-xxxl-#{$i}") { + @for $i from (1 + 1) through $grid-columns { + $list: "#{$list}, .col-xxxl-#{$i}"; + } + #{$list} { + position: relative; + // Prevent columns from collapsing when empty + min-height: 1px; + // Inner gutter via padding + padding-left: ($grid-gutter-width / 2); + padding-right: ($grid-gutter-width / 2); + } +} + +@include make-grid-columns; + +@include responsive-invisibility('.visible-xxxl'); + +.visible-xxxl-block, +.visible-xxxl-inline, +.visible-xxxl-inline-block { + display: none !important; +} + +@media (min-width: $screen-xxxl-min) { + @include responsive-invisibility('.visible-xxl'); + @include responsive-visibility('.visible-xxxl'); +} +.visible-xxxl-block { + @media (min-width: $screen-xxxl-min) { + display: block !important; + } +} +.visible-xxxl-inline { + @media (min-width: $screen-xxxl-min) { + display: inline !important; + } +} +.visible-xxxl-inline-block { + @media (min-width: $screen-xxxl-min) { + display: inline-block !important; + } +} + +@media (min-width: $screen-xxl-min) and (max-width: $screen-xxl-max) { + @include responsive-invisibility('.hidden-xxl'); +} + +@media (min-width: $screen-xxxl-min) { + @include responsive-invisibility('.hidden-xxxl'); + @include responsive-visibility('.hidden-xxl'); + + .visible-xxl-block, + .visible-xxl-inline, + .visible-xxl-inline-block { + display: none !important; + } +} diff --git a/app/styles/app.scss b/app/styles/app.scss index 656061c61..6c0524366 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -2,6 +2,7 @@ $grid-float-breakpoint: 532px !default; @import 'bootstrap_custom'; @import 'col_xxl'; +@import 'col_xxxl'; @import 'power_select_custom'; @import 'ember-power-select/themes/bootstrap'; @import 'card'; diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 85f2b8f67..5d41c6da5 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -44,7 +44,7 @@
    - {{layout/md-footer}} + {{layout/md-footer class="hidden-print"}}
    {{ember-load-remover}} From bc1094cbd859938409d386c8b98f639fb4573140 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 9 Aug 2017 17:47:39 -0800 Subject: [PATCH 197/383] Add documents, spatial routes --- app/pods/record/show/edit/associated/template.hbs | 2 +- app/pods/record/show/edit/documents/citation/route.js | 4 ++++ .../record/show/edit/documents/citation/template.hbs | 1 + app/pods/record/show/edit/documents/index/route.js | 4 ++++ .../record/show/edit/documents/index/template.hbs | 1 + app/pods/record/show/edit/lineage/template.hbs | 2 +- app/pods/record/show/edit/spatial/index/route.js | 4 ++++ app/pods/record/show/edit/spatial/index/template.hbs | 1 + app/pods/record/show/edit/spatial/route.js | 4 ++++ app/pods/record/show/edit/spatial/template.hbs | 1 + app/router.js | 7 ++++++- app/services/profile.js | 4 ++++ .../record/show/edit/documents/citation/route-test.js | 11 +++++++++++ .../record/show/edit/documents/index/route-test.js | 11 +++++++++++ .../pods/record/show/edit/spatial/index/route-test.js | 11 +++++++++++ .../unit/pods/record/show/edit/spatial/route-test.js | 4 ++-- 16 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 app/pods/record/show/edit/documents/citation/route.js create mode 100644 app/pods/record/show/edit/documents/citation/template.hbs create mode 100644 app/pods/record/show/edit/documents/index/route.js create mode 100644 app/pods/record/show/edit/documents/index/template.hbs create mode 100644 app/pods/record/show/edit/spatial/index/route.js create mode 100644 app/pods/record/show/edit/spatial/index/template.hbs create mode 100644 app/pods/record/show/edit/spatial/route.js create mode 100644 app/pods/record/show/edit/spatial/template.hbs create mode 100644 tests/unit/pods/record/show/edit/documents/citation/route-test.js create mode 100644 tests/unit/pods/record/show/edit/documents/index/route-test.js create mode 100644 tests/unit/pods/record/show/edit/spatial/index/route-test.js diff --git a/app/pods/record/show/edit/associated/template.hbs b/app/pods/record/show/edit/associated/template.hbs index 83bd09112..f45004d5d 100644 --- a/app/pods/record/show/edit/associated/template.hbs +++ b/app/pods/record/show/edit/associated/template.hbs @@ -1,5 +1,5 @@
    -
    +
    {{liquid-outlet class=""}}
    diff --git a/app/pods/record/show/edit/documents/citation/route.js b/app/pods/record/show/edit/documents/citation/route.js new file mode 100644 index 000000000..26d9f3124 --- /dev/null +++ b/app/pods/record/show/edit/documents/citation/route.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/pods/record/show/edit/documents/citation/template.hbs b/app/pods/record/show/edit/documents/citation/template.hbs new file mode 100644 index 000000000..c24cd6895 --- /dev/null +++ b/app/pods/record/show/edit/documents/citation/template.hbs @@ -0,0 +1 @@ +{{outlet}} diff --git a/app/pods/record/show/edit/documents/index/route.js b/app/pods/record/show/edit/documents/index/route.js new file mode 100644 index 000000000..26d9f3124 --- /dev/null +++ b/app/pods/record/show/edit/documents/index/route.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/pods/record/show/edit/documents/index/template.hbs b/app/pods/record/show/edit/documents/index/template.hbs new file mode 100644 index 000000000..c24cd6895 --- /dev/null +++ b/app/pods/record/show/edit/documents/index/template.hbs @@ -0,0 +1 @@ +{{outlet}} diff --git a/app/pods/record/show/edit/lineage/template.hbs b/app/pods/record/show/edit/lineage/template.hbs index 83bd09112..f45004d5d 100644 --- a/app/pods/record/show/edit/lineage/template.hbs +++ b/app/pods/record/show/edit/lineage/template.hbs @@ -1,5 +1,5 @@
    -
    +
    {{liquid-outlet class=""}}
    diff --git a/app/pods/record/show/edit/spatial/index/route.js b/app/pods/record/show/edit/spatial/index/route.js new file mode 100644 index 000000000..26d9f3124 --- /dev/null +++ b/app/pods/record/show/edit/spatial/index/route.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/pods/record/show/edit/spatial/index/template.hbs b/app/pods/record/show/edit/spatial/index/template.hbs new file mode 100644 index 000000000..c24cd6895 --- /dev/null +++ b/app/pods/record/show/edit/spatial/index/template.hbs @@ -0,0 +1 @@ +{{outlet}} diff --git a/app/pods/record/show/edit/spatial/route.js b/app/pods/record/show/edit/spatial/route.js new file mode 100644 index 000000000..26d9f3124 --- /dev/null +++ b/app/pods/record/show/edit/spatial/route.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/pods/record/show/edit/spatial/template.hbs b/app/pods/record/show/edit/spatial/template.hbs new file mode 100644 index 000000000..c24cd6895 --- /dev/null +++ b/app/pods/record/show/edit/spatial/template.hbs @@ -0,0 +1 @@ +{{outlet}} diff --git a/app/router.js b/app/router.js index 78daa78c8..eccd24d0c 100644 --- a/app/router.js +++ b/app/router.js @@ -84,7 +84,11 @@ Router.map(function() { path: ':resource_id' }, function() {}); }); - this.route('documents'); + this.route('documents', function() { + this.route('citation', { + path: 'documents/:citation_id' + }); + }); this.route('coverages'); this.route('grid'); this.route('main', function() { @@ -96,6 +100,7 @@ Router.map(function() { }); this.route('funding'); this.route('dictionary'); + this.route('spatial', function() {}); }); this.route('translate'); } diff --git a/app/services/profile.js b/app/services/profile.js index e81e04e1e..d036ae5e3 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -65,6 +65,10 @@ export default Ember.Service.extend({ title: 'Extent', target: 'record.show.edit.extent' + }, { + title: 'Spatial', + target: 'record.show.edit.spatial' + }, { title: 'Lineage', target: 'record.show.edit.lineage' diff --git a/tests/unit/pods/record/show/edit/documents/citation/route-test.js b/tests/unit/pods/record/show/edit/documents/citation/route-test.js new file mode 100644 index 000000000..14d5a04dc --- /dev/null +++ b/tests/unit/pods/record/show/edit/documents/citation/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/documents/citation', 'Unit | Route | record/show/edit/documents/citation', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/documents/index/route-test.js b/tests/unit/pods/record/show/edit/documents/index/route-test.js new file mode 100644 index 000000000..7ba5edcba --- /dev/null +++ b/tests/unit/pods/record/show/edit/documents/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/documents/index', 'Unit | Route | record/show/edit/documents/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/spatial/index/route-test.js b/tests/unit/pods/record/show/edit/spatial/index/route-test.js new file mode 100644 index 000000000..30c005bce --- /dev/null +++ b/tests/unit/pods/record/show/edit/spatial/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/spatial/index', 'Unit | Route | record/show/edit/spatial/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/record/show/edit/spatial/route-test.js b/tests/unit/pods/record/show/edit/spatial/route-test.js index 83dcc4a61..b11d97c9c 100644 --- a/tests/unit/pods/record/show/edit/spatial/route-test.js +++ b/tests/unit/pods/record/show/edit/spatial/route-test.js @@ -1,11 +1,11 @@ import { moduleFor, test } from 'ember-qunit'; -moduleFor('route:record/show/edit/extent', 'Unit | Route | record/edit/extent', { +moduleFor('route:record/show/edit/spatial', 'Unit | Route | record/show/edit/spatial', { // Specify the other units that are required for this test. // needs: ['controller:foo'] }); test('it exists', function(assert) { - var route = this.subject(); + let route = this.subject(); assert.ok(route); }); From d7e19200f85f857cd8fce5d67018b2895808bf84 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 10 Aug 2017 16:47:59 -0800 Subject: [PATCH 198/383] Support for additional documentation --- .../md-citation/preview/body/template.hbs | 10 ++-- .../object/md-citation/preview/template.hbs | 33 ----------- .../object/md-citation/template.hbs | 10 +++- .../object/md-documentation/component.js | 59 +++++++++++++++++++ .../md-documentation/preview/component.js | 18 ++++++ .../md-documentation/preview/template.hbs | 19 ++++++ .../object/md-documentation/template.hbs | 17 ++++++ .../object/md-object-table/component.js | 12 ++++ .../object/md-object-table/template.hbs | 45 ++++++++------ .../object/md-objectroute-table/component.js | 12 +++- .../show/edit/associated/index/template.hbs | 1 + .../edit/documents/citation/index/route.js | 19 ++++++ .../documents/citation/index/template.hbs | 20 +++++++ .../show/edit/documents/citation/route.js | 53 ++++++++++++++++- .../show/edit/documents/citation/template.hbs | 2 +- .../record/show/edit/documents/index/route.js | 30 +++++++++- .../show/edit/documents/index/template.hbs | 16 ++++- .../record/show/edit/documents/template.hbs | 28 ++------- .../lineageobject/step/citation/template.hbs | 1 + app/router.js | 2 +- app/services/profile.js | 26 ++++++++ app/styles/_table.scss | 18 +++++- .../object/md-documentation/component-test.js | 25 ++++++++ .../preview/component-test.js | 25 ++++++++ .../documents/citation/index/route-test.js | 11 ++++ 25 files changed, 423 insertions(+), 89 deletions(-) create mode 100644 app/pods/components/object/md-documentation/component.js create mode 100644 app/pods/components/object/md-documentation/preview/component.js create mode 100644 app/pods/components/object/md-documentation/preview/template.hbs create mode 100644 app/pods/components/object/md-documentation/template.hbs create mode 100644 app/pods/record/show/edit/documents/citation/index/route.js create mode 100644 app/pods/record/show/edit/documents/citation/index/template.hbs create mode 100644 tests/integration/pods/components/object/md-documentation/component-test.js create mode 100644 tests/integration/pods/components/object/md-documentation/preview/component-test.js create mode 100644 tests/unit/pods/record/show/edit/documents/citation/index/route-test.js diff --git a/app/pods/components/object/md-citation/preview/body/template.hbs b/app/pods/components/object/md-citation/preview/body/template.hbs index b258632fb..5e3f58cd7 100644 --- a/app/pods/components/object/md-citation/preview/body/template.hbs +++ b/app/pods/components/object/md-citation/preview/body/template.hbs @@ -1,8 +1,8 @@
    -
    +
    {{control/md-definition title="Title" text=citation.title}}
    -
    +
    {{#control/md-definition title="Alternate Titles" }} {{#each citation.alternateTitle as |title|}} {{title}} @@ -13,7 +13,7 @@ {{/control/md-definition}}
    -
    +
    {{#control/md-definition title="Dates" }} {{#each citation.date as |date|}} {{format-date date.date format="MMMM Do YYYY"}} @@ -24,7 +24,7 @@ {{/each}} {{/control/md-definition}}
    -
    +
    {{#control/md-definition title="Identifier" }} {{#each citation.identifier as |id|}} {{id.identifier}} {{if id.namespace (concat "(" id.namespace ")")}} @@ -35,7 +35,7 @@ {{/control/md-definition}}
    -
    +
    {{#control/md-definition title="Responsible Party" }} {{#each citation.responsibleParty as |party|}} {{{if party.role party.role "No Roles assigned."}}} diff --git a/app/pods/components/object/md-citation/preview/template.hbs b/app/pods/components/object/md-citation/preview/template.hbs index 14fd7f2d3..8b00d3f2d 100644 --- a/app/pods/components/object/md-citation/preview/template.hbs +++ b/app/pods/components/object/md-citation/preview/template.hbs @@ -4,39 +4,6 @@ }} {{object/md-citation/preview/body citation=citation}} -{{!--
    - {{#layout/md-card title="Responsible Party" class="card-table" - data-spy=false shadow=false - }} -
    - - - - - - - - - {{#each citation.responsibleParty as |party|}} - - - - - {{else}} - - {{/each}} - -
    RoleName
    {{get-dash party "role"}} - {{#each party.party as |contact|}} - {{control/md-contact-link contactId=contact.contactId}} -
    - {{else}} - No Contacts assigned. - {{/each}} -
    No Responsibility assigned.
    -
    - {{/layout/md-card}} -
    --}} {{yield}}
    diff --git a/app/pods/components/object/md-citation/template.hbs b/app/pods/components/object/md-citation/template.hbs index 91b198eb8..91bd05719 100644 --- a/app/pods/components/object/md-citation/template.hbs +++ b/app/pods/components/object/md-citation/template.hbs @@ -2,6 +2,7 @@ profilePath=(concat profilePath ".basicInformation") data-spy="Basic Information" class=(if embedded "md-embedded") shadow=(if embedded false true) + required=true }} {{input/md-input value=model.title @@ -82,7 +83,14 @@ {{object/md-identifier-object-table model=model.identifier profilePath=(concat profilePath ".identifierSimple") data-spy="Identifier" visibility=(if simpleIdentifier true false) - short=simpleIdentifier + short=shortIdentifier + class=(if embedded "md-embedded") +}} + +{{object/md-identifier-object-table model=model.identifier + profilePath=(concat profilePath ".identifierShort") data-spy="Identifier" + visibility=false + short=true class=(if embedded "md-embedded") }} diff --git a/app/pods/components/object/md-documentation/component.js b/app/pods/components/object/md-documentation/component.js new file mode 100644 index 000000000..824406389 --- /dev/null +++ b/app/pods/components/object/md-documentation/component.js @@ -0,0 +1,59 @@ +import Ember from 'ember'; +import { + validator, + buildValidations +} from 'ember-cp-validations'; + +const { + Component, + computed, + set, + get, + getWithDefault, + run: { + once + } +} = Ember; + +const Validations = buildValidations({ + 'resourceType': [ + validator('array-required', { + track: ['type'] + }) + ] +}); + +export default Component.extend(Validations, { + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(this, function() { + set(model, 'resourceType', getWithDefault(model, 'resourceType', [])); + set(model, 'citation', getWithDefault(model, 'citation', [])); + }); + }, + + tagName: 'form', + + /** + * The string representing the path in the profile object for the resource. + * + * @property profilePath + * @type {String} + * @default "false" + * @required + */ + + /** + * The object to use as the data model for the resource. + * + * @property model + * @type {Object} + * @required + */ + + citation: computed.alias('model.citation'), + resourceType: computed.alias('model.resourceType') +}); diff --git a/app/pods/components/object/md-documentation/preview/component.js b/app/pods/components/object/md-documentation/preview/component.js new file mode 100644 index 000000000..a3b872c1e --- /dev/null +++ b/app/pods/components/object/md-documentation/preview/component.js @@ -0,0 +1,18 @@ +import Ember from 'ember'; + +const { + Component +} = Ember; + +export default Component.extend({ + classNameBindings: ['muted:text-muted'], + + /** + * Whether to render the text muted. + * + * @property muted + * @type {Boolean} + * @default "true" + */ + muted: true +}); diff --git a/app/pods/components/object/md-documentation/preview/template.hbs b/app/pods/components/object/md-documentation/preview/template.hbs new file mode 100644 index 000000000..c5e21d6a7 --- /dev/null +++ b/app/pods/components/object/md-documentation/preview/template.hbs @@ -0,0 +1,19 @@ +{{#with item as |model|}} +
    + {{#control/md-definition title="Resource Type(s)" }} + {{#each model.resourceType as |type|}} + {{type.type}}: + {{#if type.name}} + {{type.name}} + {{else}} + Not named + {{/if}} +
    + {{else}} + No types assigned! + {{/each}} + {{/control/md-definition}} +
    + + {{object/md-citation/preview/body citation=(object-at 0 model.citation)}} +{{/with}} diff --git a/app/pods/components/object/md-documentation/template.hbs b/app/pods/components/object/md-documentation/template.hbs new file mode 100644 index 000000000..06d8f5c7f --- /dev/null +++ b/app/pods/components/object/md-documentation/template.hbs @@ -0,0 +1,17 @@ +
    + {{object/md-resource-type-array + plain=false + value=model.resourceType + required=true + data-spy="Resource Types" + profilePath=(concat profilePath ".resourceType") + }} +
    + +{{object/md-citation + model=(object-at 0 model.citation) + profilePath=(concat profilePath '.citation') + simpleIdentifier=true +}} + +{{yield}} diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index ff1ad7f5d..be17520a7 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -124,6 +124,14 @@ export default Component.extend(Template, { */ buttonText: "Add", + /** + * Render the row actions vertically. + * + * @property verticalButtons + * @type {Boolean} + * @default undefined + */ + /** * Inital collapse state for the panel. * @@ -175,6 +183,10 @@ export default Component.extend(Template, { return 'panel-' + this.get('elementId'); }), + btnSize: computed('verticalButtons', function () { + return this.get('verticalButtons') ? 'md' : 'xs'; + }), + /*citems: computed('items.@each.val', function () { let i = this.get('items') .map(function (itm) { diff --git a/app/pods/components/object/md-object-table/template.hbs b/app/pods/components/object/md-object-table/template.hbs index 6aa33353a..fd6394478 100644 --- a/app/pods/components/object/md-object-table/template.hbs +++ b/app/pods/components/object/md-object-table/template.hbs @@ -47,26 +47,33 @@ {{/if}} {{/each}} {{/if}} - - {{#if item.validations.isInvalid}} - - {{fa-icon "exclamation-circle" fixedWidth=true}} - {{#tooltip-on-element side="right" class="md-tooltip danger"}} - This item has errors. - {{/tooltip-on-element}} - - {{else}} - + + {{else}} diff --git a/app/pods/components/object/md-objectroute-table/component.js b/app/pods/components/object/md-objectroute-table/component.js index 6b3228811..5c4382170 100644 --- a/app/pods/components/object/md-objectroute-table/component.js +++ b/app/pods/components/object/md-objectroute-table/component.js @@ -3,7 +3,7 @@ import Table from '../md-object-table/component'; const { typeOf, - getOwner + getOwner, isBlank, assert } = Ember; export default Table.extend({ @@ -31,12 +31,20 @@ export default Table.extend({ const Template = this.get('templateClass'); const owner = getOwner(this); + let editItem = this.get('editItem'); let items = this.get('items'); let itm = typeOf(Template) === 'class' ? Template.create(owner.ownerInjection()) : Ember.Object.create({}); + if(isBlank(editItem)) { + assert( + `You must supply an editItem method to ${this.toString()}.` + ); + } + items.pushObject(itm); - this.get('editItem')(items.indexOf(itm)); + + editItem(items.indexOf(itm)); }, editItem: function(items, index) { diff --git a/app/pods/record/show/edit/associated/index/template.hbs b/app/pods/record/show/edit/associated/index/template.hbs index 44f841e15..4902136a3 100644 --- a/app/pods/record/show/edit/associated/index/template.hbs +++ b/app/pods/record/show/edit/associated/index/template.hbs @@ -11,4 +11,5 @@ ellipsis=ellipsis previewTemplate="object/md-associated/preview" editItem=(route-action "editResource") + verticalButtons=true }} diff --git a/app/pods/record/show/edit/documents/citation/index/route.js b/app/pods/record/show/edit/documents/citation/index/route.js new file mode 100644 index 000000000..7bea64c6d --- /dev/null +++ b/app/pods/record/show/edit/documents/citation/index/route.js @@ -0,0 +1,19 @@ +import Ember from 'ember'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +const { + Route, + get +} = Ember; + +export default Route.extend(ScrollTo, { + setupController: function() { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'record.show.edit')); + this.controller.set('citationId', get(this.controllerFor( + 'record.show.edit.documents.citation'), 'citationId')); + } +}); diff --git a/app/pods/record/show/edit/documents/citation/index/template.hbs b/app/pods/record/show/edit/documents/citation/index/template.hbs new file mode 100644 index 000000000..9b3e0465f --- /dev/null +++ b/app/pods/record/show/edit/documents/citation/index/template.hbs @@ -0,0 +1,20 @@ +

    + Editing Additional Document #{{citationId}} + {{control/md-status model=parentModel}} +

    + +{{object/md-documentation model=model + profilePath="record.documents" +}} + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" + text="Back to Document List" + icon="arrow-left" + route="record.show.edit.documents" + ) +}} + +{{to-elsewhere named="md-scroll-spy-record-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/record/show/edit/documents/citation/route.js b/app/pods/record/show/edit/documents/citation/route.js index 26d9f3124..a492cc6b4 100644 --- a/app/pods/record/show/edit/documents/citation/route.js +++ b/app/pods/record/show/edit/documents/citation/route.js @@ -1,4 +1,55 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +const { + Route, + get, + isEmpty, + isArray, + computed +} = Ember; + +export default Route.extend({ + breadCrumb: computed('citationId', function () { + return { + title: get(this, 'citationId'), + linkable: true + }; + }), + + model(params) { + this.set('citationId', params.citation_id); + + return this.setupModel(); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + //this.controller.set('parentModel', this.modelFor('record.show.edit.main')); + this.controller.set('citationId', get(this, 'citationId')); + this.controllerFor('record.show.edit') + .setProperties({ + onCancel: this.setupModel + }); + }, + + setupModel() { + let citationId = get(this, 'citationId'); + let model = this.modelFor('record.show.edit'); + let objects = model.get('json.metadata.additionalDocumentation'); + let resource = citationId && isArray(objects) ? objects.get(citationId) : + undefined; + + //make sure the identifier exists + if(isEmpty(resource)) { + Ember.get(this, 'flashMessages') + .warning('No Document object found! Re-directing to list...'); + this.replaceWith('record.show.edit.documents'); + + return; + } + + return resource; + } }); diff --git a/app/pods/record/show/edit/documents/citation/template.hbs b/app/pods/record/show/edit/documents/citation/template.hbs index c24cd6895..915dcd11e 100644 --- a/app/pods/record/show/edit/documents/citation/template.hbs +++ b/app/pods/record/show/edit/documents/citation/template.hbs @@ -1 +1 @@ -{{outlet}} +{{liquid-outlet class="liquid-spy"}} diff --git a/app/pods/record/show/edit/documents/index/route.js b/app/pods/record/show/edit/documents/index/route.js index 26d9f3124..38e458d3d 100644 --- a/app/pods/record/show/edit/documents/index/route.js +++ b/app/pods/record/show/edit/documents/index/route.js @@ -1,4 +1,32 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +const { + Route, + set, + getWithDefault, + get +} = Ember; + +export default Route.extend({ + afterModel(m) { + this._super(...arguments); + + let model = get(m, 'json.metadata'); + set(model, 'additionalDocumentation', getWithDefault(model, + 'additionalDocumentation', [])); + }, + + setupController: function() { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'record.show.edit')); + }, + + actions: { + editDocument(id) { + this.transitionTo('record.show.edit.documents.citation', id); + } + } }); diff --git a/app/pods/record/show/edit/documents/index/template.hbs b/app/pods/record/show/edit/documents/index/template.hbs index c24cd6895..d62900ff9 100644 --- a/app/pods/record/show/edit/documents/index/template.hbs +++ b/app/pods/record/show/edit/documents/index/template.hbs @@ -1 +1,15 @@ -{{outlet}} +

    + Editing Additional Documentation + {{control/md-status model=parentModel}} +

    + +{{object/md-objectroute-table + items=model.json.metadata.additionalDocumentation + header="Additional Documents" + shadow=true + verticalButtons=true + buttonText="Add Document" + ellipsis=true + previewTemplate="object/md-documentation/preview" + editItem=(route-action "editDocument") +}} diff --git a/app/pods/record/show/edit/documents/template.hbs b/app/pods/record/show/edit/documents/template.hbs index 3a496d2d4..f45004d5d 100644 --- a/app/pods/record/show/edit/documents/template.hbs +++ b/app/pods/record/show/edit/documents/template.hbs @@ -1,23 +1,5 @@ -{{outlet}} - - -{{#layout/md-card class="construction card-inverse card-warning" shadow=false}} -
    -
    - {{fa-icon "exclamation-triangle" size=2}} -
    -
    - Page Under
    Construction     -
    -
    -{{/layout/md-card}} +
    +
    + {{liquid-outlet class=""}} +
    +
    diff --git a/app/pods/record/show/edit/lineage/lineageobject/step/citation/template.hbs b/app/pods/record/show/edit/lineage/lineageobject/step/citation/template.hbs index 076bb9a16..aaff32a39 100644 --- a/app/pods/record/show/edit/lineage/lineageobject/step/citation/template.hbs +++ b/app/pods/record/show/edit/lineage/lineageobject/step/citation/template.hbs @@ -6,6 +6,7 @@ {{object/md-citation model=citation profilePath="record.metadata.resourceLineage.processStep.reference" + simpleIdentifier=true }} {{outlet}}
    diff --git a/app/router.js b/app/router.js index eccd24d0c..ebb0b55c0 100644 --- a/app/router.js +++ b/app/router.js @@ -87,7 +87,7 @@ Router.map(function() { this.route('documents', function() { this.route('citation', { path: 'documents/:citation_id' - }); + }, function() {}); }); this.route('coverages'); this.route('grid'); diff --git a/app/services/profile.js b/app/services/profile.js index d036ae5e3..fe64ecc12 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -267,6 +267,32 @@ export default Ember.Service.extend({ } } } + }, + documents: { + resourceType: true, + citation: { + title: true, + alternateTitle: true, + date: true, + edition: true, + onlineResource: true, + responsibleParty: true, + presentationForm: true, + otherCitationDetails: true, + graphic: true, + series: { + name: true, + issue: true, + page: true + }, + identifierSimple: false, + identifierShort: { + identifier: true, + namespace: true, + version: true, + description: true + } + } } } } diff --git a/app/styles/_table.scss b/app/styles/_table.scss index fbeef773a..09420fbe1 100644 --- a/app/styles/_table.scss +++ b/app/styles/_table.scss @@ -52,6 +52,22 @@ .md-row-actions { min-width: 150px; + + .btn-toolbar { + text-align: right; + + .btn-group { + float: none; + } + } + + &.vertical { + width: 150px; + + .md-error { + font-size: 1.5em; + } + } } } @@ -66,7 +82,7 @@ .table-header { color: $gray-darker; - transition: color .5s linear; + transition: color 0.5s linear; &:hover { color: $brand-info; diff --git a/tests/integration/pods/components/object/md-documentation/component-test.js b/tests/integration/pods/components/object/md-documentation/component-test.js new file mode 100644 index 000000000..c9d3fb3e3 --- /dev/null +++ b/tests/integration/pods/components/object/md-documentation/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-documentation', 'Integration | Component | object/md documentation', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-documentation}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-documentation}} + template block text + {{/object/md-documentation}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-documentation/preview/component-test.js b/tests/integration/pods/components/object/md-documentation/preview/component-test.js new file mode 100644 index 000000000..5503784f3 --- /dev/null +++ b/tests/integration/pods/components/object/md-documentation/preview/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-documentation/preview', 'Integration | Component | object/md documentation/preview', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-documentation/preview}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-documentation/preview}} + template block text + {{/object/md-documentation/preview}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/unit/pods/record/show/edit/documents/citation/index/route-test.js b/tests/unit/pods/record/show/edit/documents/citation/index/route-test.js new file mode 100644 index 000000000..b7925b59b --- /dev/null +++ b/tests/unit/pods/record/show/edit/documents/citation/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/show/edit/documents/citation/index', 'Unit | Route | record/show/edit/documents/citation/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); From e38c8674735175cc68dbd99f1de0f15099113d1f Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 10 Aug 2017 19:16:48 -0800 Subject: [PATCH 199/383] Update scroll-spy --- app/pods/components/control/md-scroll-spy/component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pods/components/control/md-scroll-spy/component.js b/app/pods/components/control/md-scroll-spy/component.js index e932e0f5c..397c25685 100644 --- a/app/pods/components/control/md-scroll-spy/component.js +++ b/app/pods/components/control/md-scroll-spy/component.js @@ -52,7 +52,7 @@ export default Component.extend({ * @category computed * @requires */ - links: computed(function () { + links: computed('refresh', function () { //console.info('computed links'); let liquid = ''; @@ -72,7 +72,7 @@ export default Component.extend({ links.pushObject({ id: $link.attr('id'), - text: $link.data('spy'), + text: $link.attr('data-spy'), embedded: $link.hasClass('md-embedded') }); }); From f409124b914b669500b685150427d4421a42b98f Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 10 Aug 2017 19:18:22 -0800 Subject: [PATCH 200/383] Add toggle thesaurus, scroll-spy to edit.keywords --- .../object/md-keyword-list/template.hbs | 5 ++++- app/pods/record/show/edit/keywords/route.js | 16 ++++++++++++--- .../record/show/edit/keywords/template.hbs | 14 ++++++++++--- app/styles/_keywords.scss | 20 +++++++++++++++++++ 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/app/pods/components/object/md-keyword-list/template.hbs b/app/pods/components/object/md-keyword-list/template.hbs index a0b27df77..89e6b5af2 100644 --- a/app/pods/components/object/md-keyword-list/template.hbs +++ b/app/pods/components/object/md-keyword-list/template.hbs @@ -36,6 +36,9 @@ + @@ -55,7 +58,7 @@ {{/each}} {{#if editThesaurus}}
  • -
    • diff --git a/app/pods/record/show/edit/keywords/route.js b/app/pods/record/show/edit/keywords/route.js index dcb4acc83..a744d2f08 100644 --- a/app/pods/record/show/edit/keywords/route.js +++ b/app/pods/record/show/edit/keywords/route.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -//import has from 'npm:lodash.has'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; const { Route, @@ -10,10 +10,11 @@ const { getWithDefault, //assign, copy, - inject + inject, + $ } = Ember; -export default Route.extend({ +export default Route.extend(ScrollTo, { keyword: inject.service(), model() { let model = this.modelFor('record.show.edit'); @@ -81,6 +82,8 @@ export default Route.extend({ let the = this.currentRouteModel().get( 'json.metadata.resourceInfo.keyword'); + $("html, body").animate({ scrollTop: $(document).height() }, "slow"); + the.pushObject({ keyword: [], keywordType: 'theme', @@ -91,11 +94,15 @@ export default Route.extend({ }, fullPath: true }); + + this.controller.set('refresh', the.get('length')); + this.controller.set('scrollTo', 'thesaurus-' + (the.get('length')-1)); }, deleteThesaurus(id) { let the = this.currentRouteModel().get( 'json.metadata.resourceInfo.keyword'); the.removeAt(id); + this.controller.set('refresh', the.get('length')); }, editThesaurus(id) { this.transitionTo('record.show.edit.keywords.thesaurus', id); @@ -123,6 +130,9 @@ export default Route.extend({ model.removeObject(obj); } }, + hideThesaurus(el) { + $(el).closest('.md-keywords-container').toggleClass('hide-thesaurus'); + }, toList() { let me = this; diff --git a/app/pods/record/show/edit/keywords/template.hbs b/app/pods/record/show/edit/keywords/template.hbs index dc3eb1f26..8095afe36 100644 --- a/app/pods/record/show/edit/keywords/template.hbs +++ b/app/pods/record/show/edit/keywords/template.hbs @@ -1,9 +1,9 @@
    {{#each model.json.metadata.resourceInfo.keyword as |thesaurus index|}} -
    +

    - Thesaurus #{{index}} + {{concat "Thesaurus #" index}}

    {{input/md-select-thesaurus class="md-keywords-select" thesaurus=thesaurus @@ -30,7 +30,12 @@ {{object/md-keyword-citation model=thesaurus }}
    - {{object/md-keyword-list model=thesaurus id=index addKeyword=(route-action "addKeyword") deleteKeyword=(route-action "deleteKeyword") editThesaurus=(route-action "editThesaurus") }} + {{object/md-keyword-list model=thesaurus listId=index + addKeyword=(route-action "addKeyword") + deleteKeyword=(route-action "deleteKeyword") + editThesaurus=(route-action "editThesaurus") + hideThesaurus=(route-action "hideThesaurus") + }}
    {{/with}} @@ -45,3 +50,6 @@
    {{outlet}} + + {{to-elsewhere named="md-scroll-spy-record-edit" + send=(component "control/md-scroll-spy" refresh=refresh scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/styles/_keywords.scss b/app/styles/_keywords.scss index 9f0b6d559..de143e2a0 100644 --- a/app/styles/_keywords.scss +++ b/app/styles/_keywords.scss @@ -1,6 +1,21 @@ .md-keywords-container { border: 1px solid $gray-lighter; padding: 15px; + + &.hide-thesaurus { + .md-keywords-thesaurus { + left: -100px; + margin-left: -100px; + opacity: 0; + overflow-x: hidden; + position: fixed; + } + + .md-keywords-list { + @include transition(width .5s ease .25s); + width: 100%; + } + } } .md-keywords-select { @@ -15,6 +30,11 @@ } } +//.md-keywords-list, +.md-keywords-thesaurus { + @include transition(all .5s ease); +} + .md-keyword-tree { > .tree-trunk > .tree-branch:first-child > .tree-leaf { border-top: 0; From 4a467b3c0d42191bd736dfe7158f1ab637ac78a9 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 11 Aug 2017 14:12:43 -0800 Subject: [PATCH 201/383] Update bootstrap style --- app/styles/_bootstrap_custom.scss | 11 +++++++++++ app/styles/_breadcrumb.scss | 7 ++++++- app/styles/_form_elements.scss | 4 ++-- app/styles/_layout.scss | 2 +- app/styles/_mdeditor_font.scss | 2 +- app/styles/_navbars.scss | 5 +++++ app/styles/_sidebar_nav.scss | 11 ++++++----- app/styles/app.scss | 4 ++++ 8 files changed, 36 insertions(+), 10 deletions(-) diff --git a/app/styles/_bootstrap_custom.scss b/app/styles/_bootstrap_custom.scss index 8ec7a5d53..f7f797596 100644 --- a/app/styles/_bootstrap_custom.scss +++ b/app/styles/_bootstrap_custom.scss @@ -2,8 +2,19 @@ // Copyright 2011-2015 Twitter, Inc. // Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) // Core variables and mixins + +//== Colors +// + +$brand-primary: #325d88 !default; +$brand-success: #93c54b !default; +$brand-info: #29abe0 !default; +$brand-warning: #f47c3c !default; +$brand-danger: #d9534f !default; + @import 'bootstrap/variables'; +$navbar-inverse-bg: lighten($gray-darker, 4); //see https://v4-alpha.getbootstrap.com/content/reboot/#native-font-stack $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; diff --git a/app/styles/_breadcrumb.scss b/app/styles/_breadcrumb.scss index 82adede70..6cc4c2e9e 100644 --- a/app/styles/_breadcrumb.scss +++ b/app/styles/_breadcrumb.scss @@ -1,5 +1,6 @@ .breadcrumb { - background-color: lighten($brand-primary, 50); + background-color: lighten($brand-primary, 55); + border-radius: 0; font-size: 12px; margin-bottom: 0; @@ -10,5 +11,9 @@ li { @include text-overflow(); max-width: 175px; + + + li::before { + color: $gray-light; + } } } diff --git a/app/styles/_form_elements.scss b/app/styles/_form_elements.scss index 7b1c937a9..a7b7afae8 100644 --- a/app/styles/_form_elements.scss +++ b/app/styles/_form_elements.scss @@ -64,13 +64,13 @@ form { .table-striped { > tbody > tr:nth-of-type(odd) { - background-color: lighten($brand-primary, 52); + background-color: lighten($brand-info, 45); } } .table-hover { > tbody > tr:hover { - background-color: lighten($brand-primary, 50); + background-color: lighten($brand-info, 42); } } diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index f6e646967..abbb4245c 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -148,7 +148,7 @@ body { } footer { - background-color: $gray-darker; + background-color: $navbar-inverse-bg; //background-color: lighten($brand-primary, 50); border-left: 1px solid; bottom: 0; diff --git a/app/styles/_mdeditor_font.scss b/app/styles/_mdeditor_font.scss index 1b0848980..2bb19d3f8 100644 --- a/app/styles/_mdeditor_font.scss +++ b/app/styles/_mdeditor_font.scss @@ -26,7 +26,7 @@ } .md-icon-mdeditor { - color: $brand-primary; + color: darken($brand-info, 10); } .navbar-inverse .md-icon-mdeditor:hover { diff --git a/app/styles/_navbars.scss b/app/styles/_navbars.scss index 64151ac49..e3f54fb0f 100644 --- a/app/styles/_navbars.scss +++ b/app/styles/_navbars.scss @@ -88,6 +88,11 @@ display: inline-block; min-width: 125px; } + + .ember-power-select-trigger{ + line-height: 2em; + min-height: 2em; + } } #md-wrapper.toggled { diff --git a/app/styles/_sidebar_nav.scss b/app/styles/_sidebar_nav.scss index aea8a31c1..836a0cd61 100644 --- a/app/styles/_sidebar_nav.scss +++ b/app/styles/_sidebar_nav.scss @@ -5,9 +5,9 @@ width: 275px; height: 100vh; margin: 0; - padding: 53px 0 10px; + padding: 53px 0 26px; list-style: outside none none; - background-color: $gray-darker; + background-color: $navbar-inverse-bg; li { line-height: 40px; @@ -45,7 +45,7 @@ } > .sidebar-brand { - background-color: $gray-darker; + background-color: $navbar-inverse-bg; border-top: 1px solid $body-bg; display: none; font-size: 18px; @@ -58,7 +58,7 @@ z-index: 1000; a { - color: lighten($gray-dark, 40); + color: $navbar-inverse-link-color;; &:hover { background: none repeat scroll 0 0; @@ -92,7 +92,7 @@ overflow-x: hidden; overflow-y: auto; height: 100%; - margin: 0 0 15px; + margin: 0 0 0px; background-color: $gray-darker; .panel { @@ -165,6 +165,7 @@ padding: 0; text-overflow: ellipsis; white-space: nowrap; + border-radius: 0; &:hover { background-color: lighten($brand-primary, 46.5); diff --git a/app/styles/app.scss b/app/styles/app.scss index 6c0524366..8a96847e3 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -1,6 +1,10 @@ //** Point at which the navbar becomes uncollapsed. $grid-float-breakpoint: 532px !default; + @import 'bootstrap_custom'; + +$md-nav-background: lighten($gray-darker, 4); + @import 'col_xxl'; @import 'col_xxxl'; @import 'power_select_custom'; From d6ba1020030e20b0d175040107a1185e93744632 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 11 Aug 2017 19:39:22 -0800 Subject: [PATCH 202/383] Add spotlight --- .../control/md-spotlight/component.js | 46 ++++++++++++++++++ .../components/layout/md-card/component.js | 21 +++++++-- .../components/layout/md-card/template.hbs | 22 +++++++-- .../object/md-object-table/component.js | 47 +++++++++++++------ .../object/md-object-table/template.hbs | 7 +++ app/styles/_modal.scss | 20 +++++++- app/styles/_power_select_custom.scss | 2 +- .../control/md-spotlight/component-test.js | 25 ++++++++++ 8 files changed, 164 insertions(+), 26 deletions(-) create mode 100644 app/pods/components/control/md-spotlight/component.js create mode 100644 tests/integration/pods/components/control/md-spotlight/component-test.js diff --git a/app/pods/components/control/md-spotlight/component.js b/app/pods/components/control/md-spotlight/component.js new file mode 100644 index 000000000..08133ea84 --- /dev/null +++ b/app/pods/components/control/md-spotlight/component.js @@ -0,0 +1,46 @@ +import Ember from 'ember'; +import ModalDialog from 'ember-modal-dialog/components/tether-dialog'; + +const { + $, + isPresent +} = Ember; + +export default ModalDialog.extend({ + containerClassNames: ['md-spotlight-modal'], + overlayClassNames: ['md-modal-overlay'], + targetAttachment: 'none', + //spotlightTargetId: null, + translucentOverlay: true, + clickOutsideToClose: false, + + willInsertElement() { + $('.md-modal-overlay').click(); + }, + didInsertElement() { + this._super(...arguments); + + let id = this.get('spotlightTargetId'); + + if(isPresent(id)) { + $('body').addClass('md-no-liquid'); + $('#' + id).addClass('md-spotlight-target'); + } + + }, + actions: { + close() { + console.info(this); + + let id = this.get('spotlightTargetId'); + + if(isPresent(id)) { + $('body').removeClass('md-no-liquid'); + $('#' + id).removeClass('md-spotlight-target'); + } + + this.get('onClose')(); + this._super(...arguments); + } + } +}); diff --git a/app/pods/components/layout/md-card/component.js b/app/pods/components/layout/md-card/component.js index 4da46fe4c..0d81fe62e 100644 --- a/app/pods/components/layout/md-card/component.js +++ b/app/pods/components/layout/md-card/component.js @@ -42,7 +42,7 @@ export default Component.extend({ * @category computed * @requires elementId */ - cardId: computed('elementId', function () { + cardId: computed('elementId', function() { return 'card-' + this.get('elementId'); }) .readOnly(), @@ -171,14 +171,29 @@ export default Component.extend({ */ 'data-spy': computed.oneWay('title'), - windowIcon: computed('fullScreen', function () { + windowIcon: computed('fullScreen', function() { return this.get('fullScreen') ? 'compress' : 'expand'; }), - isCollapsible: computed('fullScreen', 'collapsible', function () { + isCollapsible: computed('fullScreen', 'collapsible', function() { return !this.get('fullScreen') && this.get('collapsible'); }), + didInsertElement() { + this._super(...arguments); + + if(this.get('collapsible')) { + let card = this.$(' > .card-collapse'); + + card.on('shown.bs.collapse', function() { + card.get(0).scrollIntoView({ + block: "end", + behavior: "smooth" + }); + }); + } + }, + actions: { toggleFullScreen() { this.toggleProperty('fullScreen'); diff --git a/app/pods/components/layout/md-card/template.hbs b/app/pods/components/layout/md-card/template.hbs index 558a0c868..7cf71445a 100644 --- a/app/pods/components/layout/md-card/template.hbs +++ b/app/pods/components/layout/md-card/template.hbs @@ -17,15 +17,27 @@ {{fa-icon windowIcon size=1 click=(action "toggleFullScreen")}} {{/if}} - {{#if btnText}} - + {{/if}} + - {{/if}} +
    {{/if}} + +{{#if spotlight}} + {{control/md-spotlight + spotlightTargetId=elementId + onClose=(action (toggle "spotlight" this)) + }} +{{/if}} diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index be17520a7..a8bab7268 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -8,7 +8,7 @@ const { isEmpty, typeOf, getOwner, - A + A,$ } = Ember; export default Component.extend(Template, { @@ -166,7 +166,7 @@ export default Component.extend(Template, { * @category computed * @requires isCollapsed */ - collapsed: computed('isCollapsed', 'items.[]', function () { + collapsed: computed('isCollapsed', 'items.[]', function() { let isCollapsed = this.get('isCollapsed'); let value = this.get('items'); @@ -179,12 +179,12 @@ export default Component.extend(Template, { } }), - panelId: computed('items.@each.val', 'editing', function () { + panelId: computed('items.@each.val', 'editing', function() { return 'panel-' + this.get('elementId'); }), - btnSize: computed('verticalButtons', function () { - return this.get('verticalButtons') ? 'md' : 'xs'; + btnSize: computed('verticalButtons', function() { + return this.get('verticalButtons') ? 'md' : 'xs'; }), /*citems: computed('items.@each.val', function () { @@ -195,15 +195,15 @@ export default Component.extend(Template, { return i; }),*/ - attrArray: computed('attributes', function () { + attrArray: computed('attributes', function() { let attr = this.get('attributes'); return attr ? attr.split(',') : null; }), - attrTitleArray: computed('attrArray', function () { + attrTitleArray: computed('attrArray', function() { return this.get('attrArray') - .map(function (item) { + .map(function(item) { return item.trim() .dasherize() .replace(/-/g, ' '); @@ -212,7 +212,7 @@ export default Component.extend(Template, { editing: false, - editingChanged: observer('editing', function () { + editingChanged: observer('editing', function() { // deal with the change //Ember.run.schedule('afterRender', this, function () { let panel = this.$('> .md-object-table > .panel-collapse'); @@ -234,28 +234,43 @@ export default Component.extend(Template, { } if(panel.hasClass('in')) { + let out = editing ? table[0] : table[1]; + let inn = editing ? table[1] : table[0]; + $(out).fadeOut(100, function() { + $(inn).fadeIn(100, function() { + panel.get(0).scrollIntoView({ + block: "end", + behavior: "smooth" + }); + }); + }); + table.toggleClass('fadeOut fadeIn'); } else { //add a one-time listener to wait until panel is open - panel.one('shown.bs.collapse', function () { + panel.one('shown.bs.collapse', function() { table.toggleClass('fadeOut fadeIn'); + panel.get(0).scrollIntoView({ + block: "end", + behavior: "smooth" + }); }); panel.collapse('show'); } //}); }), - pillColor: computed('items.[]', function () { + pillColor: computed('items.[]', function() { let count = this.get('items') .length; return(count > 0) ? 'label-info' : 'label-warning'; }), actions: { - deleteItem: function (items, index) { + deleteItem: function(items, index) { items.removeAt(index); }, - addItem: function () { + addItem: function() { const Template = this.get('templateClass'); const owner = getOwner(this); @@ -264,14 +279,16 @@ export default Component.extend(Template, { this.set('saveItem', itm); this.set('editing', 'adding'); + this.set('spotlight', true); }, - editItem: function (items, index) { + editItem: function(items, index) { this.set('saveItem', items.objectAt(index)); this.set('editing', 'editing'); + this.set('spotlight', true); }, - cancelEdit: function () { + cancelEdit: function() { this.set('editing', false); } } diff --git a/app/pods/components/object/md-object-table/template.hbs b/app/pods/components/object/md-object-table/template.hbs index fd6394478..69ba9aa54 100644 --- a/app/pods/components/object/md-object-table/template.hbs +++ b/app/pods/components/object/md-object-table/template.hbs @@ -101,3 +101,10 @@
    • + +{{#if spotlight}} + {{control/md-spotlight + spotlightTargetId=elementId + onClose=(action (toggle "spotlight" this)) + }} +{{/if}} diff --git a/app/styles/_modal.scss b/app/styles/_modal.scss index 6e636de47..d0d47b42a 100644 --- a/app/styles/_modal.scss +++ b/app/styles/_modal.scss @@ -25,7 +25,7 @@ .md-modal-overlay.translucent { background-color: rgba($gray-lighter, .85); - z-index: 2000; + z-index: 1100; } .md-modal-close { @@ -36,7 +36,7 @@ color: $gray-dark; display: none; font-size: 14px; - opacity: .8; + opacity: 0.8; padding: 1px; position: absolute; right: -1em; @@ -58,3 +58,19 @@ display: block; } } + +.md-no-liquid { + .liquid-container, + .liquid-child { + transform: none !important; + } + + .md-flash { + animation: none !important; + } +} + +.md-spotlight-target { + position: relative; + z-index: 1101; +} diff --git a/app/styles/_power_select_custom.scss b/app/styles/_power_select_custom.scss index e16045707..dd269439e 100644 --- a/app/styles/_power_select_custom.scss +++ b/app/styles/_power_select_custom.scss @@ -17,5 +17,5 @@ $ember-power-select-selected-background: lighten($brand-primary, 45) !default; } div.ember-basic-dropdown-content { - z-index: 1002; + z-index: 1102; } diff --git a/tests/integration/pods/components/control/md-spotlight/component-test.js b/tests/integration/pods/components/control/md-spotlight/component-test.js new file mode 100644 index 000000000..2dd245390 --- /dev/null +++ b/tests/integration/pods/components/control/md-spotlight/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('control/md-spotlight', 'Integration | Component | control/md spotlight', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{control/md-spotlight}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#control/md-spotlight}} + template block text + {{/control/md-spotlight}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From ef3efc57feae6589bcd3ec0eb47996fa4f28e555 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Sat, 12 Aug 2017 16:09:40 -0800 Subject: [PATCH 203/383] Add spotlight service --- .../components/layout/md-card/component.js | 11 ++++- .../components/layout/md-card/template.hbs | 9 +---- .../object/md-object-table/component.js | 40 +++++++++++++------ .../object/md-object-table/template.hbs | 8 ---- app/pods/contact/show/template.hbs | 2 +- app/pods/record/show/index/template.hbs | 2 +- app/routes/application.js | 16 +++++++- app/services/spotlight.js | 17 ++++++++ app/styles/_modal.scss | 11 +++-- app/templates/application.hbs | 7 ++++ package.json | 3 +- tests/unit/services/spotlight-test.js | 12 ++++++ 12 files changed, 101 insertions(+), 37 deletions(-) create mode 100644 app/services/spotlight.js create mode 100644 tests/unit/services/spotlight-test.js diff --git a/app/pods/components/layout/md-card/component.js b/app/pods/components/layout/md-card/component.js index 0d81fe62e..f5572bab6 100644 --- a/app/pods/components/layout/md-card/component.js +++ b/app/pods/components/layout/md-card/component.js @@ -2,7 +2,11 @@ import Ember from 'ember'; const { Component, - computed + computed, + get, + inject: { + service + }, } = Ember; export default Component.extend({ @@ -27,6 +31,8 @@ export default Component.extend({ * @constructor */ + spotlight: service(), + classNames: ['md-card', 'card'], classNameBindings: ['shadow:box-shadow--4dp', 'scroll:scroll-card', 'maximizable', 'fullScreen', 'required', 'muted' @@ -197,6 +203,9 @@ export default Component.extend({ actions: { toggleFullScreen() { this.toggleProperty('fullScreen'); + }, + spotlight(id) { + get(this, 'spotlight').setTarget(id); } } }); diff --git a/app/pods/components/layout/md-card/template.hbs b/app/pods/components/layout/md-card/template.hbs index 7cf71445a..c56e6f900 100644 --- a/app/pods/components/layout/md-card/template.hbs +++ b/app/pods/components/layout/md-card/template.hbs @@ -24,7 +24,7 @@ {{btnText}} {{/if}} -
    @@ -34,10 +34,3 @@ - -{{#if spotlight}} - {{control/md-spotlight - spotlightTargetId=elementId - onClose=(action (toggle "spotlight" this)) - }} -{{/if}} diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index a8bab7268..8d9350d4d 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -1,5 +1,6 @@ import Ember from 'ember'; import Template from 'mdeditor/mixins/object-template'; +import InViewportMixin from 'ember-in-viewport'; const { computed, @@ -8,10 +9,14 @@ const { isEmpty, typeOf, getOwner, - A,$ + A, + $, + inject: { + service + } } = Ember; -export default Component.extend(Template, { +export default Component.extend(InViewportMixin, Template, { /** * mdEditor class for managing a table of similar mdJSON objects @@ -39,6 +44,8 @@ export default Component.extend(Template, { * @uses object-template */ + spotlight: service(), + didReceiveAttrs() { this._super(...arguments); @@ -212,6 +219,15 @@ export default Component.extend(Template, { editing: false, + scrollTo(el) { + if(this.get('viewportEntered')) { + el.scrollIntoView({ + block: "end", + behavior: "smooth" + }); + } + }, + editingChanged: observer('editing', function() { // deal with the change //Ember.run.schedule('afterRender', this, function () { @@ -220,6 +236,8 @@ export default Component.extend(Template, { '> .panel-body > table, > .panel-body > .object-editor'); let items = this.get('items'); let editing = this.get('editing'); + let el = this.get('element'); + let comp = this; if(editing === 'adding') { items.pushObject(this.get('saveItem')); @@ -236,12 +254,10 @@ export default Component.extend(Template, { if(panel.hasClass('in')) { let out = editing ? table[0] : table[1]; let inn = editing ? table[1] : table[0]; + $(out).fadeOut(100, function() { $(inn).fadeIn(100, function() { - panel.get(0).scrollIntoView({ - block: "end", - behavior: "smooth" - }); + comp.scrollTo(el); }); }); @@ -249,10 +265,7 @@ export default Component.extend(Template, { } else { //add a one-time listener to wait until panel is open panel.one('shown.bs.collapse', function() { table.toggleClass('fadeOut fadeIn'); - panel.get(0).scrollIntoView({ - block: "end", - behavior: "smooth" - }); + comp.scrollTo(el); }); panel.collapse('show'); } @@ -273,19 +286,22 @@ export default Component.extend(Template, { addItem: function() { const Template = this.get('templateClass'); const owner = getOwner(this); + const spotlight = this.get('spotlight'); let itm = typeOf(Template) === 'class' ? Template.create(owner.ownerInjection()) : Ember.Object.create({}); this.set('saveItem', itm); this.set('editing', 'adding'); - this.set('spotlight', true); + spotlight.setTarget(this.get('elementId')); }, editItem: function(items, index) { + const spotlight = this.get('spotlight'); + this.set('saveItem', items.objectAt(index)); this.set('editing', 'editing'); - this.set('spotlight', true); + spotlight.setTarget(this.get('elementId')); }, cancelEdit: function() { diff --git a/app/pods/components/object/md-object-table/template.hbs b/app/pods/components/object/md-object-table/template.hbs index 69ba9aa54..501b16eaa 100644 --- a/app/pods/components/object/md-object-table/template.hbs +++ b/app/pods/components/object/md-object-table/template.hbs @@ -99,12 +99,4 @@
    -
    - -{{#if spotlight}} - {{control/md-spotlight - spotlightTargetId=elementId - onClose=(action (toggle "spotlight" this)) - }} -{{/if}} diff --git a/app/pods/contact/show/template.hbs b/app/pods/contact/show/template.hbs index a2c234d10..5a53a7f0a 100644 --- a/app/pods/contact/show/template.hbs +++ b/app/pods/contact/show/template.hbs @@ -1,4 +1,4 @@ -
    +

    {{#if model.defaultLogo}} diff --git a/app/pods/record/show/index/template.hbs b/app/pods/record/show/index/template.hbs index d66014790..672cc5501 100644 --- a/app/pods/record/show/index/template.hbs +++ b/app/pods/record/show/index/template.hbs @@ -1,5 +1,5 @@ {{#with model.json.metadata.resourceInfo as |resource|}} -
    +

    {{fa-icon model.icon class="text-muted"}} diff --git a/app/routes/application.js b/app/routes/application.js index 6b389f7aa..913ae3ea9 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -7,7 +7,10 @@ const { Object: EmberObject, guidFor, RSVP, - Logger + Logger, + inject: { + service + } } = Ember; export default Route.extend({ @@ -27,6 +30,8 @@ export default Route.extend({ }); }, + spotlight: service(), + /** * Models for sidebar navigation * @@ -72,6 +77,13 @@ export default Route.extend({ return RSVP.map(promises, mapFn); }, + setupController(controller, model) { + // Call _super for default behavior + this._super(controller, model); + // Implement your custom setup after + controller.set('spotlight', this.get('spotlight')); + }, + /** * The current model for the route * @method currentRouteModel @@ -82,7 +94,7 @@ export default Route.extend({ error(error) { Logger.error(error); - if (error.status === 404) { + if(error.status === 404) { return this.transitionTo('not-found'); } diff --git a/app/services/spotlight.js b/app/services/spotlight.js new file mode 100644 index 000000000..b92be8341 --- /dev/null +++ b/app/services/spotlight.js @@ -0,0 +1,17 @@ +import Ember from 'ember'; + +const { + Service, + setProperties +} = Ember; + +export default Service.extend({ + show: false, + elementId: undefined, + setTarget(id) { + setProperties(this, { + show: true, + elementId: id + }); + } +}); diff --git a/app/styles/_modal.scss b/app/styles/_modal.scss index d0d47b42a..71e58faf6 100644 --- a/app/styles/_modal.scss +++ b/app/styles/_modal.scss @@ -48,7 +48,6 @@ opacity: 1; } } - @media (min-width: 420px) { .md-modal-container.ember-modal-dialog { width: 375px; @@ -60,8 +59,8 @@ } .md-no-liquid { - .liquid-container, - .liquid-child { + .liquid-child, + .liquid-container { transform: none !important; } @@ -74,3 +73,9 @@ position: relative; z-index: 1101; } + +.md-no-spotlight { + .md-btn-spotlight { + display: none; + } +} diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 5d41c6da5..f83722e7f 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -66,3 +66,10 @@ Current Version: {{control/md-repo-link}}

    {{/control/md-modal}} + +{{#if spotlight.show}} + {{control/md-spotlight + spotlightTargetId=spotlight.elementId + onClose=(action (toggle "spotlight.show" this)) + }} +{{/if}} diff --git a/package.json b/package.json index 5651cc865..919c3d2a8 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "ember-elsewhere": "1.0.1", "ember-export-application-global": "^1.0.5", "ember-font-awesome": "^3.0.3", + "ember-in-viewport": "2.1.1", "ember-leaflet": "2.2.8-beta.3", "ember-leaflet-layer-control": "0.0.1", "ember-load": "~0.0.9", @@ -74,8 +75,8 @@ "ember-models-table": "1.11.0", "ember-multiselect-checkboxes": "^0.10.2", "ember-pollboy": "0.6.1", - "ember-power-select-with-create": "0.4.3", "ember-power-select": "^1.8.5", + "ember-power-select-with-create": "0.4.3", "ember-resize": "^0.0.17", "ember-resolver": "^2.0.3", "ember-route-action-helper": "^2.0.0", diff --git a/tests/unit/services/spotlight-test.js b/tests/unit/services/spotlight-test.js new file mode 100644 index 000000000..b84c68e88 --- /dev/null +++ b/tests/unit/services/spotlight-test.js @@ -0,0 +1,12 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('service:spotlight', 'Unit | Service | spotlight', { + // Specify the other units that are required for this test. + // needs: ['service:foo'] +}); + +// Replace this with your real tests. +test('it exists', function(assert) { + let service = this.subject(); + assert.ok(service); +}); From 8ebb7faea3f39a0cf17050e61be5542b64b5d23f Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Sat, 12 Aug 2017 16:10:19 -0800 Subject: [PATCH 204/383] Update breadcrumb style --- app/pods/record/index/route.js | 8 ++++++++ app/pods/record/index/template.hbs | 1 + app/styles/_bootstrap_custom.scss | 1 + app/styles/_breadcrumb.scss | 7 +++++++ tests/unit/pods/record/index/route-test.js | 11 +++++++++++ 5 files changed, 28 insertions(+) create mode 100644 app/pods/record/index/route.js create mode 100644 app/pods/record/index/template.hbs create mode 100644 tests/unit/pods/record/index/route-test.js diff --git a/app/pods/record/index/route.js b/app/pods/record/index/route.js new file mode 100644 index 000000000..0ccef3926 --- /dev/null +++ b/app/pods/record/index/route.js @@ -0,0 +1,8 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + breadCrumb: { + title: 'Record', + linkable: false + } +}); diff --git a/app/pods/record/index/template.hbs b/app/pods/record/index/template.hbs new file mode 100644 index 000000000..c24cd6895 --- /dev/null +++ b/app/pods/record/index/template.hbs @@ -0,0 +1 @@ +{{outlet}} diff --git a/app/styles/_bootstrap_custom.scss b/app/styles/_bootstrap_custom.scss index f7f797596..8fb947545 100644 --- a/app/styles/_bootstrap_custom.scss +++ b/app/styles/_bootstrap_custom.scss @@ -15,6 +15,7 @@ $brand-danger: #d9534f !default; @import 'bootstrap/variables'; $navbar-inverse-bg: lighten($gray-darker, 4); +$breadcrumb-color: $gray; //see https://v4-alpha.getbootstrap.com/content/reboot/#native-font-stack $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; diff --git a/app/styles/_breadcrumb.scss b/app/styles/_breadcrumb.scss index 6cc4c2e9e..706d29648 100644 --- a/app/styles/_breadcrumb.scss +++ b/app/styles/_breadcrumb.scss @@ -1,15 +1,22 @@ .breadcrumb { background-color: lighten($brand-primary, 55); border-radius: 0; + color: $breadcrumb-color; font-size: 12px; margin-bottom: 0; a { + opacity: .8; text-decoration: none; + + &:hover { + opacity: 1; + } } li { @include text-overflow(); + font-weight: 600; max-width: 175px; + li::before { diff --git a/tests/unit/pods/record/index/route-test.js b/tests/unit/pods/record/index/route-test.js new file mode 100644 index 000000000..0de073db4 --- /dev/null +++ b/tests/unit/pods/record/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:record/index', 'Unit | Route | record/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); From 47d41d3efa2e7087a3132ecef5d5b2cabfaf9916 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Sat, 12 Aug 2017 16:10:46 -0800 Subject: [PATCH 205/383] Update associated resource --- .../record/show/edit/associated/resource/index/template.hbs | 2 +- app/pods/record/show/edit/associated/resource/route.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pods/record/show/edit/associated/resource/index/template.hbs b/app/pods/record/show/edit/associated/resource/index/template.hbs index 060714700..ed1a2c207 100644 --- a/app/pods/record/show/edit/associated/resource/index/template.hbs +++ b/app/pods/record/show/edit/associated/resource/index/template.hbs @@ -20,7 +20,7 @@ {{to-elsewhere named="md-slider-content" send=(hash - title="Click row to select a resource record" + title=(concat "Click row to select a resource: " model.associationType) body=(component "control/md-select-table" select=(route-action "insertResource") data=(compute (route-action "sliderData")) diff --git a/app/pods/record/show/edit/associated/resource/route.js b/app/pods/record/show/edit/associated/resource/route.js index ae079d9a2..21b16c5fe 100644 --- a/app/pods/record/show/edit/associated/resource/route.js +++ b/app/pods/record/show/edit/associated/resource/route.js @@ -38,7 +38,7 @@ export default Route.extend({ let resourceId = get(this, 'resourceId'); let model = this.modelFor('record.show.edit'); let objects = model.get('json.metadata.associatedResource'); - let resource = resourceId && isArray(objects) ? objects.get(resourceId) : + let resource = resourceId && isArray(objects) ? objects.objectAt(resourceId) : undefined; //make sure the identifier exists From 9a1bfef5214171879f51bc7a06ede2e9f9dd9e3a Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Sun, 13 Aug 2017 19:32:09 -0800 Subject: [PATCH 206/383] Support spotlight toggle --- app/pods/components/layout/md-card/component.js | 11 ++++++++++- app/pods/components/layout/md-card/template.hbs | 8 +++++--- app/pods/components/md-translate/template.hbs | 8 +++++++- app/services/spotlight.js | 8 ++++++++ 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app/pods/components/layout/md-card/component.js b/app/pods/components/layout/md-card/component.js index f5572bab6..5b833b094 100644 --- a/app/pods/components/layout/md-card/component.js +++ b/app/pods/components/layout/md-card/component.js @@ -70,13 +70,22 @@ export default Component.extend({ */ /** - * If true, the "row" the card body will be initally collapse. + * If true, the "row" the card body will be initally collapsed. * * @property collapsed * @type {Boolean} * @default undefined */ + /** + * If true, the spotlight button will be inserted into the toolbar. + * + * @property spotlightEnabled + * @type {Boolean} + * @default true + */ + spotlightEnabled: true, + /** * If true, the scroll-card class will be applied to the card. * diff --git a/app/pods/components/layout/md-card/template.hbs b/app/pods/components/layout/md-card/template.hbs index c56e6f900..66146eb8d 100644 --- a/app/pods/components/layout/md-card/template.hbs +++ b/app/pods/components/layout/md-card/template.hbs @@ -24,9 +24,11 @@ {{btnText}} {{/if}} - + {{#if spotlightEnabled}} + + {{/if}}

    diff --git a/app/pods/components/md-translate/template.hbs b/app/pods/components/md-translate/template.hbs index 2019859c5..858ea86fd 100644 --- a/app/pods/components/md-translate/template.hbs +++ b/app/pods/components/md-translate/template.hbs @@ -1,6 +1,11 @@
    - {{#layout/md-card title="Options" class="md-translator-options" block=false}} + {{#layout/md-card + title="Options" + class="md-translator-options" + spotlightEnabled=false + block=false + }}
    {{input/md-select label="Choose Format" @@ -51,6 +56,7 @@ scroll=false maximizable=true titleIcon="check" + spotlightEnabled=false }} {{#if isHtml}} - {{else}} - {{input/md-textarea rows=20 class="md-translator-area" placeholder="" value=result}} - {{/if}} - -
    - {{#if isJson}} - {{control/md-json-button class="btn-lg btn-primary" json=result disabled=(if result false true)}} - - - {{/if}} - - -
    - {{/layout/md-card}} - {{/if}} - {{#if messages}} {{#layout/md-card title="Translation Error" @@ -117,5 +83,39 @@ logged. If the problem persists, please contact techincal support.

    {{/layout/md-card}} {{/if}} + + {{#if result}} + {{#layout/md-card + title="Result" + class=(if messages "card-inverse card-outline-danger md-translator-error md-translator-preview" "md-translator-preview") + scroll=false + maximizable=true + titleIcon="check" + spotlightEnabled=false + }} + {{#if isHtml}} + + {{else}} + {{input/md-textarea rows=20 class="md-translator-area" placeholder="" value=result}} + {{/if}} + +
    + {{#if isJson}} + {{control/md-json-button class="btn-lg btn-primary" json=result disabled=(if result false true)}} + + + {{/if}} + + +
    + {{/layout/md-card}} + {{/if}}
    {{yield}} From 3ead6a7b51c34362dee1a5aab36213628d8dbb1e Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 12 Jan 2018 07:57:20 -0800 Subject: [PATCH 359/383] Close slider when changing routes --- .../control/md-json-button/component.js | 10 +++---- .../components/layout/md-slider/component.js | 20 ++++++++------ app/services/slider.js | 26 +++++++++++++++---- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/app/pods/components/control/md-json-button/component.js b/app/pods/components/control/md-json-button/component.js index aeb06736a..1101eb09c 100644 --- a/app/pods/components/control/md-json-button/component.js +++ b/app/pods/components/control/md-json-button/component.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; -const { - inject -} = Ember; +import Component from '@ember/component'; +import { inject } from '@ember/service'; -export default Ember.Component.extend({ - slider: inject.service(), +export default Component.extend({ + slider: inject(), tagName: 'button', classNames: ['btn'], diff --git a/app/pods/components/layout/md-slider/component.js b/app/pods/components/layout/md-slider/component.js index 5b91b1b33..dc5c8fa4d 100644 --- a/app/pods/components/layout/md-slider/component.js +++ b/app/pods/components/layout/md-slider/component.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; - -const { - Component, - computed, - $ -} = Ember; +import Component from '@ember/component'; +import { + computed +} from '@ember/object'; +import $ from 'jquery'; export default Component.extend({ classNames: ['md-slider'], @@ -27,8 +25,14 @@ export default Component.extend({ this.toggleProperty('visible'); if(!this.get('visible')) { + let context = this.get('context'); + this.set('fromName', null); - this.get('onClose').call(this.get('context')); + + if(!context.isDestroying) { + this.get('onClose') + .call(); + } } } } diff --git a/app/services/slider.js b/app/services/slider.js index 70ce1bae1..2ce03c391 100644 --- a/app/services/slider.js +++ b/app/services/slider.js @@ -1,12 +1,28 @@ -import Ember from 'ember'; - -const { - Service -} = Ember; +import Service from '@ember/service'; +import { + inject as service +} from '@ember/service'; +import { + observer +} from '@ember/object'; export default Service.extend({ + init() { + this._super(...arguments); + + this.get('router.currentRouteName'); + }, + + router: service(), + showSlider: false, fromName: 'md-slider-content', + + routeObserver: observer('router.currentRouteName', function () { + this.toggleSlider(false); + this.set('fromName', 'md-slider-content'); + }), + onClose() {}, toggleSlider(state) { From 2782fa24e4de26ff3d2eb3cf25a39bff58290e35 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 12 Jan 2018 07:59:06 -0800 Subject: [PATCH 360/383] Add md-party Rename md-party to md-party-array Add new md-party component --- .../object/md-citation/template.hbs | 2 +- .../object/md-constraint/template.hbs | 2 +- .../object/md-maintenance/template.hbs | 2 +- .../object/md-party-array/component.js | 16 +++ .../object/md-party-array/template.hbs | 36 ++++++ .../components/object/md-party/component.js | 116 ++++++++++++------ .../components/object/md-party/template.hbs | 57 ++++----- .../object/md-process-step/template.hbs | 2 +- .../object/md-party-array/component-test.js | 25 ++++ .../object/md-party/component-test.js | 1 - 10 files changed, 179 insertions(+), 80 deletions(-) create mode 100644 app/pods/components/object/md-party-array/component.js create mode 100644 app/pods/components/object/md-party-array/template.hbs create mode 100644 tests/integration/pods/components/object/md-party-array/component-test.js diff --git a/app/pods/components/object/md-citation/template.hbs b/app/pods/components/object/md-citation/template.hbs index 45ec26058..64d20eb69 100644 --- a/app/pods/components/object/md-citation/template.hbs +++ b/app/pods/components/object/md-citation/template.hbs @@ -60,7 +60,7 @@ {{/layout/md-card}} -{{object/md-party +{{object/md-party-array title="Responsible Party" data-spy="Responsible Parties" class=(if embedded "md-embedded") diff --git a/app/pods/components/object/md-constraint/template.hbs b/app/pods/components/object/md-constraint/template.hbs index 8b6c440b2..aa48d63f7 100644 --- a/app/pods/components/object/md-constraint/template.hbs +++ b/app/pods/components/object/md-constraint/template.hbs @@ -144,7 +144,7 @@ }} {{/layout/md-card}} -{{object/md-party +{{object/md-party-array title="Responsible Party" value=model.responsibleParty profilePath=(concat profilePath ".responsibleParty") diff --git a/app/pods/components/object/md-maintenance/template.hbs b/app/pods/components/object/md-maintenance/template.hbs index b9f7abda8..59e69e0ca 100644 --- a/app/pods/components/object/md-maintenance/template.hbs +++ b/app/pods/components/object/md-maintenance/template.hbs @@ -21,7 +21,7 @@ {{/layout/md-card}} {{#layout/md-card shadow=false profilePath=(concat profilePath ".contact")}} - {{object/md-party + {{object/md-party-array title="Contact" data-spy="Contacts" collapsible=true collapsed=false diff --git a/app/pods/components/object/md-party-array/component.js b/app/pods/components/object/md-party-array/component.js new file mode 100644 index 000000000..c89ebe07e --- /dev/null +++ b/app/pods/components/object/md-party-array/component.js @@ -0,0 +1,16 @@ +import Component from '@ember/component'; +import { + Template +} from '../md-party/component'; + +export default Component.extend({ + attributeBindings: ['data-spy'], + + /** + * See [md-array-table](md-array-table.html#property_templateClass). + * + * @property templateClass + * @type Ember.Object + */ + templateClass: Template +}); diff --git a/app/pods/components/object/md-party-array/template.hbs b/app/pods/components/object/md-party-array/template.hbs new file mode 100644 index 000000000..995445d0b --- /dev/null +++ b/app/pods/components/object/md-party-array/template.hbs @@ -0,0 +1,36 @@ +{{#object/md-array-table + columns="Role,Contacts" + title=title + required=required + plain=plain + value=value + validation=validation + data-spy=false + templateClass=templateClass as |party| + }} + {{#with party.item as |item|}} + + {{input/md-codelist + path="role" + model=item + create=true + tooltip=true + icon=false + disabled=disabled + mdCodeName="role" + showValidations=true + placeholder="Select or enter a role" + }} + + + {{input/md-select-contacts + placeholder="Select one or more contacts" + model=item + path="contacts" + icon=true + tooltip=true + showValidations=true + }} + + {{/with}} +{{/object/md-array-table}} diff --git a/app/pods/components/object/md-party/component.js b/app/pods/components/object/md-party/component.js index 63b8cea48..6b7d45ce0 100644 --- a/app/pods/components/object/md-party/component.js +++ b/app/pods/components/object/md-party/component.js @@ -1,17 +1,22 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import EmberObject from '@ember/object'; +import { + A +} from '@ember/array'; +import { + once +} from '@ember/runloop'; import { - validator, - buildValidations -} from 'ember-cp-validations'; - -const { - Component, computed, - Object: EmObject, - A, + defineProperty, get, set -} = Ember; +} from '@ember/object'; +import { + validator, + buildValidations +} from 'ember-cp-validations'; +import ObjectTemplate from 'mdeditor/mixins/object-template'; const Validations = buildValidations({ 'role': [ @@ -26,35 +31,68 @@ const Validations = buildValidations({ }) }); -export default Component.extend({ - attributeBindings: ['data-spy'], - - /** - * See [md-array-table](md-array-table.html#property_templateClass). - * - * @property templateClass - * @type Ember.Object - */ - templateClass: EmObject.extend(Validations, { - init() { - this._super(...arguments); - this.set('party', A()); - this.set('role', null); +const Template = EmberObject.extend(Validations, { + init() { + this._super(...arguments); + this.set('party', A()); + this.set('role', null); + }, + contacts: computed('party', { + get() { + let party = get(this, 'party'); + return party.mapBy('contactId'); }, - contacts: computed('party', { - get() { - let party = get(this, 'party'); - return party.mapBy('contactId'); - }, - set(key, value) { - let map = value.map((itm) => { - return { - contactId: itm - }; - }); - set(this, 'party', map); - return value; - } - }) + set(key, value) { + let map = value.map((itm) => { + return { + contactId: itm + }; + }); + set(this, 'party', map); + return value; + } }) }); + +const theComp = Component.extend(ObjectTemplate, { + init() { + this._super(...arguments); + + let path = this.get('path'); + let model = this.get('model'); + + defineProperty(this, 'party', computed( + "model."+path, + function () { + if(model && path) { + return get(model, path); + } + return model; + })); + }, + + didReceiveAttrs() { + this._super(...arguments); + + let path = this.get('path'); + let model = this.get('model'); + + if(model && path) { + let obj = get(this, 'model.' + path); + + once(this, function () { + set(model, path, this.applyTemplate(obj)); + }); + } + }, + + attributeBindings: ['data-spy'], + templateClass: Template +}); + +export { + Validations, + Template, + theComp as + default +}; diff --git a/app/pods/components/object/md-party/template.hbs b/app/pods/components/object/md-party/template.hbs index 995445d0b..0a319694b 100644 --- a/app/pods/components/object/md-party/template.hbs +++ b/app/pods/components/object/md-party/template.hbs @@ -1,36 +1,21 @@ -{{#object/md-array-table - columns="Role,Contacts" - title=title - required=required - plain=plain - value=value - validation=validation - data-spy=false - templateClass=templateClass as |party| - }} - {{#with party.item as |item|}} - - {{input/md-codelist - path="role" - model=item - create=true - tooltip=true - icon=false - disabled=disabled - mdCodeName="role" - showValidations=true - placeholder="Select or enter a role" - }} - - - {{input/md-select-contacts - placeholder="Select one or more contacts" - model=item - path="contacts" - icon=true - tooltip=true - showValidations=true - }} - - {{/with}} -{{/object/md-array-table}} +{{input/md-codelist + label="Role" + path="role" + model=party + create=true + tooltip=true + icon=false + disabled=disabled + mdCodeName="role" + showValidations=true + placeholder="Select or enter a role" +}} +{{input/md-select-contacts + label="Contacts" + placeholder="Select one or more contacts" + model=party + path="contacts" + icon=true + tooltip=true + showValidations=true +}} diff --git a/app/pods/components/object/md-process-step/template.hbs b/app/pods/components/object/md-process-step/template.hbs index 54d778102..9608a2f42 100644 --- a/app/pods/components/object/md-process-step/template.hbs +++ b/app/pods/components/object/md-process-step/template.hbs @@ -51,7 +51,7 @@ {{/object/md-array-table}} -{{object/md-party +{{object/md-party-array title="Processors" data-spy="Processors" class=(if embedded "md-embedded") diff --git a/tests/integration/pods/components/object/md-party-array/component-test.js b/tests/integration/pods/components/object/md-party-array/component-test.js new file mode 100644 index 000000000..86309558a --- /dev/null +++ b/tests/integration/pods/components/object/md-party-array/component-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-party-array', 'Integration | Component | object/md party', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-party-array}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-party-array}} + template block text + {{/object/md-party-array}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-party/component-test.js b/tests/integration/pods/components/object/md-party/component-test.js index c5ef7d2ac..d72a21c2a 100644 --- a/tests/integration/pods/components/object/md-party/component-test.js +++ b/tests/integration/pods/components/object/md-party/component-test.js @@ -6,7 +6,6 @@ moduleForComponent('object/md-party', 'Integration | Component | object/md party }); test('it renders', function(assert) { - // Set any properties with this.set('myProperty', 'value'); // Handle any actions with this.on('myAction', function(val) { ... }); From 6044301255508b65c73082af819243325ce40322 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 12 Jan 2018 16:02:46 -0800 Subject: [PATCH 361/383] Add locale-array, update md-party --- .../components/layout/md-slider/component.js | 2 +- .../object/md-locale-array/component.js | 16 ++++++ .../object/md-locale-array/template.hbs | 50 ++++++++++++++++++ .../components/object/md-locale/component.js | 24 ++++++--- .../components/object/md-party/component.js | 51 +++++++++---------- .../components/object/md-party/template.hbs | 4 +- app/styles/_layout.scss | 2 +- .../object/md-locale-array/component-test.js | 24 +++++++++ 8 files changed, 136 insertions(+), 37 deletions(-) create mode 100644 app/pods/components/object/md-locale-array/component.js create mode 100644 app/pods/components/object/md-locale-array/template.hbs create mode 100644 tests/integration/pods/components/object/md-locale-array/component-test.js diff --git a/app/pods/components/layout/md-slider/component.js b/app/pods/components/layout/md-slider/component.js index dc5c8fa4d..9b2996f40 100644 --- a/app/pods/components/layout/md-slider/component.js +++ b/app/pods/components/layout/md-slider/component.js @@ -31,7 +31,7 @@ export default Component.extend({ if(!context.isDestroying) { this.get('onClose') - .call(); + .call(this); } } } diff --git a/app/pods/components/object/md-locale-array/component.js b/app/pods/components/object/md-locale-array/component.js new file mode 100644 index 000000000..7eb258331 --- /dev/null +++ b/app/pods/components/object/md-locale-array/component.js @@ -0,0 +1,16 @@ +import Component from '@ember/component'; +import { + Template +} from '../md-locale/component'; + +export default Component.extend({ + attributeBindings: ['data-spy'], + + /** + * See [md-array-table](md-array-table.html#property_templateClass). + * + * @property templateClass + * @type Ember.Object + */ + templateClass: Template +}); diff --git a/app/pods/components/object/md-locale-array/template.hbs b/app/pods/components/object/md-locale-array/template.hbs new file mode 100644 index 000000000..f761712fe --- /dev/null +++ b/app/pods/components/object/md-locale-array/template.hbs @@ -0,0 +1,50 @@ +{{#object/md-array-table + columns="Language,Character Set,Country" + title=title + required=required + plain=plain + value=value + validation=validation + data-spy=false + templateClass=templateClass as |locale| + }} + {{#with locale.item as |item|}} + + {{input/md-codelist + path="language" + model=item + create=true + tooltip=true + icon=false + disabled=disabled + mdCodeName="language" + showValidations=true + placeholder="Select or enter a language code." + }} + + + {{input/md-codelist + path="characterSet" + model=item + create=false + tooltip=true + icon=false + disabled=disabled + mdCodeName="characterSet" + showValidations=true + placeholder="Select character set." + }} + + + {{input/md-codelist + value=item.country + create=false + tooltip=true + icon=false + disabled=disabled + mdCodeName="countries" + placeholder="Select country code." + }} + + {{/with}} +{{/object/md-array-table}} diff --git a/app/pods/components/object/md-locale/component.js b/app/pods/components/object/md-locale/component.js index d73e0710b..f14a6d06f 100644 --- a/app/pods/components/object/md-locale/component.js +++ b/app/pods/components/object/md-locale/component.js @@ -29,7 +29,13 @@ const Validations = buildValidations({ }) }); -export default Component.extend(Template, { +const TemplateClass = EmObject.extend(Validations, { + init() { + this._super(...arguments); + } +}); + +const theComp = Component.extend(Template, { settings: service(), init() { @@ -42,7 +48,8 @@ export default Component.extend(Template, { //let model = get(model, modelPath); - if(isNone(model) || Object.keys(model).length === 0) { + if(isNone(model) || Object.keys(model) + .length === 0) { model = EmObject.create(this.applyTemplate(model, { language: copy(settings.get('language')), characterSet: copy(settings.get('characterSet')), @@ -66,9 +73,12 @@ export default Component.extend(Template, { * @property templateClass * @type Ember.Object */ - templateClass: EmObject.extend(Validations, { - init() { - this._super(...arguments); - } - }) + templateClass: TemplateClass }); + +export { + Validations, + TemplateClass as Template, + theComp as + default +}; diff --git a/app/pods/components/object/md-party/component.js b/app/pods/components/object/md-party/component.js index 6b7d45ce0..d43da687b 100644 --- a/app/pods/components/object/md-party/component.js +++ b/app/pods/components/object/md-party/component.js @@ -6,17 +6,19 @@ import { import { once } from '@ember/runloop'; +import { + alias +} from '@ember/object/computed'; import { computed, - defineProperty, get, + getWithDefault, set } from '@ember/object'; import { validator, buildValidations } from 'ember-cp-validations'; -import ObjectTemplate from 'mdeditor/mixins/object-template'; const Validations = buildValidations({ 'role': [ @@ -54,36 +56,33 @@ const Template = EmberObject.extend(Validations, { }) }); -const theComp = Component.extend(ObjectTemplate, { - init() { - this._super(...arguments); - - let path = this.get('path'); - let model = this.get('model'); - - defineProperty(this, 'party', computed( - "model."+path, - function () { - if(model && path) { - return get(model, path); - } - return model; - })); - }, +const theComp = Component.extend(Validations, { + contacts: computed('model', { + get() { + let party = get(this, 'model.party'); + return party ? party.mapBy('contactId') : []; + }, + set(key, value) { + let map = value.map((itm) => { + return { + contactId: itm + }; + }); + set(this, 'model.party', map); + return value; + } + }), + role: alias('model.role'), didReceiveAttrs() { this._super(...arguments); - let path = this.get('path'); let model = this.get('model'); - if(model && path) { - let obj = get(this, 'model.' + path); - - once(this, function () { - set(model, path, this.applyTemplate(obj)); - }); - } + once(this, function () { + set(model, 'party', getWithDefault(model, 'party', [])); + set(model, 'role', getWithDefault(model, 'role', null)); + }); }, attributeBindings: ['data-spy'], diff --git a/app/pods/components/object/md-party/template.hbs b/app/pods/components/object/md-party/template.hbs index 0a319694b..8c539de26 100644 --- a/app/pods/components/object/md-party/template.hbs +++ b/app/pods/components/object/md-party/template.hbs @@ -1,7 +1,7 @@ {{input/md-codelist label="Role" path="role" - model=party + model=this create=true tooltip=true icon=false @@ -13,7 +13,7 @@ {{input/md-select-contacts label="Contacts" placeholder="Select one or more contacts" - model=party + model=this path="contacts" icon=true tooltip=true diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index 94c39066d..86f9f5ab2 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -133,7 +133,7 @@ body { margin-top: 1em; } @media(min-width: $screen-sm-min) { - padding: 10px; + padding: 10px 10px 10px 0;; position: fixed; .btn { diff --git a/tests/integration/pods/components/object/md-locale-array/component-test.js b/tests/integration/pods/components/object/md-locale-array/component-test.js new file mode 100644 index 000000000..a357e70c5 --- /dev/null +++ b/tests/integration/pods/components/object/md-locale-array/component-test.js @@ -0,0 +1,24 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-locale-array', 'Integration | Component | object/md locale array', { + integration: true +}); + +test('it renders', function(assert) { + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-locale-array}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-locale-array}} + template block text + {{/object/md-locale-array}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); From 1a01fbb887493f805ed4423b1989245f119e5d2f Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 12 Jan 2018 16:03:27 -0800 Subject: [PATCH 362/383] Add dictionary citation Add dictionary.citation route Add dictionary.identifier route --- .../show/edit/citation/identifier/route.js | 43 +++++++++++++ .../edit/citation/identifier/template.hbs | 21 +++++++ .../show/edit/citation/index/route.js | 13 ++++ .../show/edit/citation/index/template.hbs | 25 ++++++++ .../show/edit/citation/template.hbs | 2 +- .../dictionary/show/edit/index/template.hbs | 61 ++++++++++++++++++- app/pods/dictionary/show/index/route.js | 11 +++- app/pods/dictionary/show/index/template.hbs | 7 +++ .../record/show/edit/main/index/template.hbs | 2 +- .../show/edit/metadata/index/template.hbs | 2 +- app/router.js | 6 +- app/services/profile.js | 15 +++-- app/transitions.js | 7 ++- .../edit/citation/identifier/route-test.js | 11 ++++ .../show/edit/citation/index/route-test.js | 11 ++++ 15 files changed, 225 insertions(+), 12 deletions(-) create mode 100644 app/pods/dictionary/show/edit/citation/identifier/route.js create mode 100644 app/pods/dictionary/show/edit/citation/identifier/template.hbs create mode 100644 app/pods/dictionary/show/edit/citation/index/route.js create mode 100644 app/pods/dictionary/show/edit/citation/index/template.hbs create mode 100644 tests/unit/pods/dictionary/show/edit/citation/identifier/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/citation/index/route-test.js diff --git a/app/pods/dictionary/show/edit/citation/identifier/route.js b/app/pods/dictionary/show/edit/citation/identifier/route.js new file mode 100644 index 000000000..896d9568d --- /dev/null +++ b/app/pods/dictionary/show/edit/citation/identifier/route.js @@ -0,0 +1,43 @@ +import Route from '@ember/routing/route'; +import { isEmpty } from '@ember/utils'; +import { isArray } from '@ember/array'; +import { get } from '@ember/object'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +export default Route.extend(ScrollTo, { + model(params) { + this.set('identifierId', params.identifier_id); + + return this.setupModel(); + }, + + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor('dictionary.show.edit.citation.index')); + this.controllerFor('dictionary.show.edit') + .setProperties({ + onCancel: this.setupModel + }); + }, + + setupModel() { + let identifierId = get(this, 'identifierId'); + let model = this.modelFor('dictionary.show.edit.citation.index'); + let identifiers = model.get('json.dataDictionary.citation.identifier'); + let identifier = identifierId && isArray(identifiers) ? identifiers.get(identifierId) : undefined; + + //make sure the identifier exists + if (isEmpty(identifier)) { + get(this, 'flashMessages') + .warning('No identifier found! Re-directing to citation...'); + this.replaceWith('dictionary.show.edit.citation.index'); + + return; + } + + return identifier; + } +}); diff --git a/app/pods/dictionary/show/edit/citation/identifier/template.hbs b/app/pods/dictionary/show/edit/citation/identifier/template.hbs new file mode 100644 index 000000000..f2ffe9bd5 --- /dev/null +++ b/app/pods/dictionary/show/edit/citation/identifier/template.hbs @@ -0,0 +1,21 @@ +

    + Editing Identifier: {{model.identifier}} + {{control/md-status model=parentModel}} +

    + +
    + {{object/md-identifier + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" + model=model + profilePath="dictionary.citation.identifier" + data-spy="Identifier" + }} + {{outlet}} +
    + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" text="Back to Citation" icon="arrow-left" route="dictionary.show.edit.citation") +}} +{{to-elsewhere named="md-scroll-spy-dict-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/dictionary/show/edit/citation/index/route.js b/app/pods/dictionary/show/edit/citation/index/route.js new file mode 100644 index 000000000..daaf08537 --- /dev/null +++ b/app/pods/dictionary/show/edit/citation/index/route.js @@ -0,0 +1,13 @@ +import Route from '@ember/routing/route'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +export default Route.extend(ScrollTo, { + actions: { + editIdentifier(index) { + this.transitionTo('dictionary.show.edit.citation.identifier', index) + .then(function () { + this.setScrollTo('identifier'); + }.bind(this)); + } + } +}); diff --git a/app/pods/dictionary/show/edit/citation/index/template.hbs b/app/pods/dictionary/show/edit/citation/index/template.hbs new file mode 100644 index 000000000..af3c8996a --- /dev/null +++ b/app/pods/dictionary/show/edit/citation/index/template.hbs @@ -0,0 +1,25 @@ +

    Editing Citation + for {{model.title}} + {{control/md-status model=model}} +

    +{{#with model.json.dataDictionary.citation as |citation|}} +
    + {{object/md-citation + class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" + model=citation + profilePath="dictionary.citation" + editIdentifier=(route-action "editIdentifier") + }} + {{outlet}} +
    +{{/with}} +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" + text="Back to Overview" + icon="home" + route="dictionary.show.index" + ) +}} +{{to-elsewhere named="md-scroll-spy-dict-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/dictionary/show/edit/citation/template.hbs b/app/pods/dictionary/show/edit/citation/template.hbs index e2147cab0..b8324902e 100644 --- a/app/pods/dictionary/show/edit/citation/template.hbs +++ b/app/pods/dictionary/show/edit/citation/template.hbs @@ -1 +1 @@ -{{outlet}} \ No newline at end of file +{{liquid-outlet}} diff --git a/app/pods/dictionary/show/edit/index/template.hbs b/app/pods/dictionary/show/edit/index/template.hbs index bc644b50d..4a4995e33 100644 --- a/app/pods/dictionary/show/edit/index/template.hbs +++ b/app/pods/dictionary/show/edit/index/template.hbs @@ -23,7 +23,6 @@ {{input/md-codelist-multi create=true label="Subject" - required=true tooltip=true icon=true disabled=disabled @@ -39,7 +38,67 @@ }} {{/if}} + {{#layout/md-card + title="Responsible Party" + class="md-embedded" + required=true + collapsible=false + collapsed=false + profilePath="dictionary.main.responsibleParty" + data-spy="Responsible Party" + shadow=false + }} + {{!-- --}} + {{object/md-party model=resource.responsibleParty}} + {{/layout/md-card}} + + {{input/md-markdown-area + value=resource.description + profilePath="dictionary.main.description" + label="Description" + placeholder="Enter text describing the dictionary." + data-spy="Description" + class="md-embedded" + }} + + {{input/md-input + value=resource.dictionaryFormat + placeholder="Describe the language used in the dictionary, e.g. UML." + label="Dictionary Format" + required=true + profilePath="dictionary.main.dictionaryFormat" + }} + + {{input/md-boolean + label="Dictionary Included?" + text="Dictionary is included with the resource" + value=resource.dictionaryIncludedWithResource + profilePath="dictionary.main.included" + }} {{/layout/md-card}} + + {{#object/md-simple-array-table + title="Recommended Use" + required=false + plain=false + profilePath="dictionary.main.included" + value=resource.recommendedUse as |val| + }} + + {{input/md-textarea value=val.item.value + placeholder="Enter a description of how the dictionary should be used."}} + + {{/object/md-simple-array-table}} + + {{object/md-locale-array + title="Locale" + data-spy="Locales" + collapsible=true collapsed=false + required=false + value=resource.locale + profilePath="dictionary.main.locale" + }} +
    {{/with}} diff --git a/app/pods/dictionary/show/index/route.js b/app/pods/dictionary/show/index/route.js index 26d9f3124..c8faa55dd 100644 --- a/app/pods/dictionary/show/index/route.js +++ b/app/pods/dictionary/show/index/route.js @@ -1,4 +1,13 @@ import Ember from 'ember'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; -export default Ember.Route.extend({ +export default Ember.Route.extend(ScrollTo, { + actions: { + editCitation(scrollTo) { + this.transitionTo('dictionary.show.edit.citation') + .then(function () { + this.setScrollTo(scrollTo); + }.bind(this)); + } + } }); diff --git a/app/pods/dictionary/show/index/template.hbs b/app/pods/dictionary/show/index/template.hbs index 86e13e6e8..6bf4037c9 100644 --- a/app/pods/dictionary/show/index/template.hbs +++ b/app/pods/dictionary/show/index/template.hbs @@ -6,6 +6,13 @@ Viewing Dictionary: {{model.title}} {{control/md-status model=model}} + + {{object/md-citation/preview + profilePath="dictionary.main.citation" + citation=model.json.dataDictionary.citation + muted=true + editCitation="editCitation" + }}
    diff --git a/app/pods/record/show/edit/main/index/template.hbs b/app/pods/record/show/edit/main/index/template.hbs index 4386e76a5..268c79de5 100644 --- a/app/pods/record/show/edit/main/index/template.hbs +++ b/app/pods/record/show/edit/main/index/template.hbs @@ -85,7 +85,7 @@ {{/if}} {{#if (is-array resource.pointOfContact)}} - {{object/md-party + {{object/md-party-array title="Point Of Contact" data-spy="Point Of Contact" collapsible=true collapsed=false diff --git a/app/pods/record/show/edit/metadata/index/template.hbs b/app/pods/record/show/edit/metadata/index/template.hbs index 366c80dcd..411acdbea 100644 --- a/app/pods/record/show/edit/metadata/index/template.hbs +++ b/app/pods/record/show/edit/metadata/index/template.hbs @@ -27,7 +27,7 @@ {{/layout/md-card}} {{/layout/md-card}} - {{object/md-party + {{object/md-party-array title="Metadata Contact" data-spy="Metadata Contacts" collapsible=true collapsed=false diff --git a/app/router.js b/app/router.js index 3e2bb6c61..2cc5efb56 100644 --- a/app/router.js +++ b/app/router.js @@ -147,7 +147,11 @@ Router.map(function() { this.route('edit', function() { this.route('domains'); this.route('entities'); - this.route('citation'); + this.route('citation', function() { + this.route('identifier', { + path: 'identifier/:identifier_id' + }); + }); }); }); }); diff --git a/app/services/profile.js b/app/services/profile.js index ec047a9c9..8c765a4f7 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -818,16 +818,21 @@ export default Ember.Service.extend({ dictionary: { secondaryNav: [{ title: 'Main', - target: 'dictionary.show.edit.index' - + target: 'dictionary.show.edit.index', + tip: 'Basic information about the dictionary.' + }, { + title: 'Citation', + target: 'dictionary.show.edit.citation', + tip: 'The citation for the dictionary.' }, { title: 'Domains', - target: 'dictionary.show.edit.domains' + target: 'dictionary.show.edit.domains', + tip: 'Information about defined value lists.' }, { title: 'Entities', - target: 'dictionary.show.edit.entities' - + target: 'dictionary.show.edit.entities', + tip: 'Information about entities(tables) and attributes(columns or fields).' }] } } diff --git a/app/transitions.js b/app/transitions.js index e36fcb0e1..12335a10e 100644 --- a/app/transitions.js +++ b/app/transitions.js @@ -100,7 +100,12 @@ export default function() { this.use('toLeft'), this.reverse('toRight') ); - + this.transition( + this.toRoute('dictionary.show.edit.citation.identifier'), + this.fromRoute('dictionary.show.edit.citation.index'), + this.use('toLeft'), + this.reverse('toRight') + ); //if // this.transition( // this.hasClass('liquid-collapse'), diff --git a/tests/unit/pods/dictionary/show/edit/citation/identifier/route-test.js b/tests/unit/pods/dictionary/show/edit/citation/identifier/route-test.js new file mode 100644 index 000000000..6bc5beafd --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/citation/identifier/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/citation/identifier', 'Unit | Route | dictionary/show/edit/citation/identifier', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/citation/index/route-test.js b/tests/unit/pods/dictionary/show/edit/citation/index/route-test.js new file mode 100644 index 000000000..a5fdc58cc --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/citation/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/citation/index', 'Unit | Route | dictionary/show/edit/citation/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); From eceb365319971b489bf076fa842b42d61adb4ea2 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 12 Jan 2018 16:07:34 -0800 Subject: [PATCH 363/383] Remove unused vars --- app/pods/dictionary/show/edit/route.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/pods/dictionary/show/edit/route.js b/app/pods/dictionary/show/edit/route.js index bd686bc44..678bfa7f6 100644 --- a/app/pods/dictionary/show/edit/route.js +++ b/app/pods/dictionary/show/edit/route.js @@ -3,9 +3,7 @@ import HashPoll from 'mdeditor/mixins/hash-poll'; const { inject, - Route, - get, - copy + Route } = Ember; export default Route.extend(HashPoll, { From f9e278723d120216762aa67b4fa81b4524baba31 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 15 Jan 2018 23:27:27 -0800 Subject: [PATCH 364/383] Defaulting dictionary description to empty string Prevents error form occurring on MDE init --- app/models/dictionary.js | 2 +- app/pods/components/input/md-markdown-area/component.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/dictionary.js b/app/models/dictionary.js index ed261f8bc..2e33d7471 100644 --- a/app/models/dictionary.js +++ b/app/models/dictionary.js @@ -44,7 +44,7 @@ const JsonDefault = Ember.Object.extend({ dateType: 'creation' }] }, - description: null, + description: '', subject: [], responsibleParty: {}, domain: [], diff --git a/app/pods/components/input/md-markdown-area/component.js b/app/pods/components/input/md-markdown-area/component.js index bdb1074ca..b155e2453 100644 --- a/app/pods/components/input/md-markdown-area/component.js +++ b/app/pods/components/input/md-markdown-area/component.js @@ -57,7 +57,7 @@ export default Component.extend({ didReceiveAttrs() { this._super(...arguments); - run.once(() => { + run.once(this, () => { if(isNone(get(this, 'value'))) { set(this, 'value', ''); } From 567cc8c5047a57e4cec8d9d29977f471fe6ff62b Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Mon, 15 Jan 2018 23:38:59 -0800 Subject: [PATCH 365/383] Dictionary.format is not required. --- app/pods/dictionary/show/edit/index/template.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pods/dictionary/show/edit/index/template.hbs b/app/pods/dictionary/show/edit/index/template.hbs index 4a4995e33..6de5ebec3 100644 --- a/app/pods/dictionary/show/edit/index/template.hbs +++ b/app/pods/dictionary/show/edit/index/template.hbs @@ -65,7 +65,7 @@ value=resource.dictionaryFormat placeholder="Describe the language used in the dictionary, e.g. UML." label="Dictionary Format" - required=true + required=false profilePath="dictionary.main.dictionaryFormat" }} From 42032d538fa9b81deb02ef14699b97e9d1f70a8a Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 18 Jan 2018 16:21:02 -0800 Subject: [PATCH 366/383] Apply class template in didReceiveAttrs event Appling the template during `init()` doesn't work, consistently since `init()` isn't fired when switching between the same view in different (by "id") routes. Closes #166 --- .../components/object/md-array-table/component.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/app/pods/components/object/md-array-table/component.js b/app/pods/components/object/md-array-table/component.js index 12ad64d9a..50e651d9b 100644 --- a/app/pods/components/object/md-array-table/component.js +++ b/app/pods/components/object/md-array-table/component.js @@ -27,23 +27,11 @@ export default Component.extend(Template, { * @uses object-template */ - init() { + didReceiveAttrs() { this._super(...arguments); this.applyTemplateArray('value'); - /*const Validation = this.get('validation'); - - if(Validation) { - const owner = getOwner(this); - let Item = EmObject.extend(Validation); - - this.set('value', this.get('value') - .map(i => Item.create( - owner.ownerInjection(), - i)) - ); - }*/ }, attributeBindings: ['data-spy'], From 81dab17eef6815132f831ab4231fe064bdebee3d Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 19 Jan 2018 18:15:01 -0800 Subject: [PATCH 367/383] Add domain routes, update layout styles Added index, edit, citation routes --- .../object/md-object-table/component.js | 52 +++-- .../object/md-object-table/template.hbs | 218 +++++++++--------- .../object/md-objectroute-table/component.js | 2 + .../edit/citation/identifier/template.hbs | 6 +- .../show/edit/citation/index/template.hbs | 18 +- .../show/edit/domain/citation/route.js | 4 + .../show/edit/domain/citation/template.hbs | 1 + .../dictionary/show/edit/domain/edit/route.js | 4 + .../show/edit/domain/edit/template.hbs | 1 + .../show/edit/domain/index/route.js | 25 ++ .../show/edit/domain/index/template.hbs | 19 ++ app/pods/dictionary/show/edit/domain/route.js | 7 + .../dictionary/show/edit/domain/template.hbs | 1 + .../dictionary/show/edit/domains/route.js | 4 - .../dictionary/show/edit/domains/template.hbs | 2 - .../show/edit/entities/template.hbs | 22 ++ .../dictionary/show/edit/index/template.hbs | 176 +++++++------- app/pods/dictionary/show/edit/template.hbs | 6 +- app/pods/error/template.hbs | 2 +- app/pods/not-found/template.hbs | 2 +- .../show/edit/associated/index/template.hbs | 2 +- app/router.js | 5 +- app/services/profile.js | 2 +- .../show/edit/domain/citation/route-test.js | 11 + .../show/edit/domain/edit/route-test.js | 11 + .../show/edit/domain/index/route-test.js | 11 + .../edit/{domains => domain}/route-test.js | 4 +- 27 files changed, 377 insertions(+), 241 deletions(-) create mode 100644 app/pods/dictionary/show/edit/domain/citation/route.js create mode 100644 app/pods/dictionary/show/edit/domain/citation/template.hbs create mode 100644 app/pods/dictionary/show/edit/domain/edit/route.js create mode 100644 app/pods/dictionary/show/edit/domain/edit/template.hbs create mode 100644 app/pods/dictionary/show/edit/domain/index/route.js create mode 100644 app/pods/dictionary/show/edit/domain/index/template.hbs create mode 100644 app/pods/dictionary/show/edit/domain/route.js create mode 100644 app/pods/dictionary/show/edit/domain/template.hbs delete mode 100644 app/pods/dictionary/show/edit/domains/route.js delete mode 100644 app/pods/dictionary/show/edit/domains/template.hbs create mode 100644 tests/unit/pods/dictionary/show/edit/domain/citation/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/domain/edit/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/domain/index/route-test.js rename tests/unit/pods/dictionary/show/edit/{domains => domain}/route-test.js (62%) diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index 341a8b758..1ae3a4ff2 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -6,6 +6,7 @@ const { computed, Component, observer, + get, isEmpty, typeOf, getOwner, @@ -156,7 +157,7 @@ export default Component.extend(InViewportMixin, Template, { * @type {Boolean} * @default true */ - collapsible: true, + collapsible: true, /** * True to truncate the preview table cell text. @@ -193,7 +194,7 @@ export default Component.extend(InViewportMixin, Template, { * @category computed * @requires isCollapsed */ - collapsed: computed('isCollapsed', 'items.[]', function() { + collapsed: computed('isCollapsed', 'items.[]', function () { let isCollapsed = this.get('isCollapsed'); let value = this.get('items'); @@ -206,11 +207,15 @@ export default Component.extend(InViewportMixin, Template, { } }), - panelId: computed('items.@each.val', 'editing', function() { + showAlert: computed('items.length', 'alertIfEmpty', function () { + return get(this, 'items.length') === 0 && get(this, 'alertIfEmpty'); + }), + + panelId: computed('items.@each.val', 'editing', function () { return 'panel-' + this.get('elementId'); }), - btnSize: computed('verticalButtons', function() { + btnSize: computed('verticalButtons', function () { return this.get('verticalButtons') ? 'md' : 'xs'; }), @@ -222,15 +227,15 @@ export default Component.extend(InViewportMixin, Template, { return i; }),*/ - attrArray: computed('attributes', function() { + attrArray: computed('attributes', function () { let attr = this.get('attributes'); return attr ? attr.split(',') : null; }), - attrTitleArray: computed('attrArray', function() { + attrTitleArray: computed('attrArray', function () { return this.get('attrArray') - .map(function(item) { + .map(function (item) { return item.trim() .split('.') .get('lastObject') @@ -250,13 +255,16 @@ export default Component.extend(InViewportMixin, Template, { // behavior: "smooth" // }); - $('html,body').animate({ - scrollTop: $(el).offset().top - offset - }, 'slow'); + $('html,body') + .animate({ + scrollTop: $(el) + .offset() + .top - offset + }, 'slow'); } }, - editingChanged: observer('editing', function() { + editingChanged: observer('editing', function () { // deal with the change //Ember.run.schedule('afterRender', this, function () { let panel = this.$('> .md-object-table > .panel-collapse'); @@ -283,15 +291,17 @@ export default Component.extend(InViewportMixin, Template, { let out = editing ? table[0] : table[1]; let inn = editing ? table[1] : table[0]; - $(out).fadeOut(100, function() { - $(inn).fadeIn(100, function() { - comp.scrollTo(el); + $(out) + .fadeOut(100, function () { + $(inn) + .fadeIn(100, function () { + comp.scrollTo(el); + }); }); - }); table.toggleClass('fadeOut fadeIn'); } else { //add a one-time listener to wait until panel is open - panel.one('shown.bs.collapse', function() { + panel.one('shown.bs.collapse', function () { table.toggleClass('fadeOut fadeIn'); comp.scrollTo(el); }); @@ -300,18 +310,18 @@ export default Component.extend(InViewportMixin, Template, { //}); }), - pillColor: computed('items.[]', function() { + pillColor: computed('items.[]', function () { let count = this.get('items.length') || 0; return(count > 0) ? 'label-info' : 'label-warning'; }), actions: { - deleteItem: function(items, index) { + deleteItem: function (items, index) { items.removeAt(index); }, - addItem: function() { + addItem: function () { const Template = this.get('templateClass'); const owner = getOwner(this); const spotlight = this.get('spotlight'); @@ -324,7 +334,7 @@ export default Component.extend(InViewportMixin, Template, { spotlight.setTarget(this.get('elementId')); }, - editItem: function(items, index) { + editItem: function (items, index) { const spotlight = this.get('spotlight'); this.set('saveItem', items.objectAt(index)); @@ -332,7 +342,7 @@ export default Component.extend(InViewportMixin, Template, { spotlight.setTarget(this.get('elementId')); }, - cancelEdit: function() { + cancelEdit: function () { const spotlight = this.get('spotlight'); this.set('editing', false); diff --git a/app/pods/components/object/md-object-table/template.hbs b/app/pods/components/object/md-object-table/template.hbs index 072e590e2..cd9bbf464 100644 --- a/app/pods/components/object/md-object-table/template.hbs +++ b/app/pods/components/object/md-object-table/template.hbs @@ -1,112 +1,122 @@ -
    +{{#unless showAlert}} +
    -
    -

    - {{#if collapsible}} - - {{else}} - {{header}} - - {{/if}} +
    +

    + {{#if collapsible}} + + {{else}} + {{header}} + + {{/if}} - - -

    -
    + + +

    +
    - -
    + + + {{else}} + + + + + + {{/each}} + + +
    + {{#if editing}} + {{yield saveItem}} + {{/if}} +
    + +
    +
    +
    +
    +{{else}} +
    +

    No {{header}} found. + +

    +
    +{{/unless}} diff --git a/app/pods/components/object/md-objectroute-table/component.js b/app/pods/components/object/md-objectroute-table/component.js index 5c4382170..5509555b1 100644 --- a/app/pods/components/object/md-objectroute-table/component.js +++ b/app/pods/components/object/md-objectroute-table/component.js @@ -15,6 +15,8 @@ export default Table.extend({ * @required */ + alertIfEmpty: true, + /** * Method used to load form for editing item. Should be overidden. * diff --git a/app/pods/dictionary/show/edit/citation/identifier/template.hbs b/app/pods/dictionary/show/edit/citation/identifier/template.hbs index f2ffe9bd5..8fe3f3abc 100644 --- a/app/pods/dictionary/show/edit/citation/identifier/template.hbs +++ b/app/pods/dictionary/show/edit/citation/identifier/template.hbs @@ -1,11 +1,11 @@ -

    +

    Editing Identifier: {{model.identifier}} {{control/md-status model=parentModel}}

    -
    +
    {{object/md-identifier - class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" + class="" model=model profilePath="dictionary.citation.identifier" data-spy="Identifier" diff --git a/app/pods/dictionary/show/edit/citation/index/template.hbs b/app/pods/dictionary/show/edit/citation/index/template.hbs index af3c8996a..c8a192c0e 100644 --- a/app/pods/dictionary/show/edit/citation/index/template.hbs +++ b/app/pods/dictionary/show/edit/citation/index/template.hbs @@ -1,17 +1,15 @@ -

    Editing Citation +

    Editing Citation for {{model.title}} {{control/md-status model=model}}

    {{#with model.json.dataDictionary.citation as |citation|}} -
    - {{object/md-citation - class="col-xxl-11 col-xxxl-10 col-xxl-offset-1" - model=citation - profilePath="dictionary.citation" - editIdentifier=(route-action "editIdentifier") - }} - {{outlet}} -
    + {{object/md-citation + class="" + model=citation + profilePath="dictionary.citation" + editIdentifier=(route-action "editIdentifier") + }} + {{outlet}} {{/with}} {{to-elsewhere named="md-subbar-extra" diff --git a/app/pods/dictionary/show/edit/domain/citation/route.js b/app/pods/dictionary/show/edit/domain/citation/route.js new file mode 100644 index 000000000..6c74252aa --- /dev/null +++ b/app/pods/dictionary/show/edit/domain/citation/route.js @@ -0,0 +1,4 @@ +import Route from '@ember/routing/route'; + +export default Route.extend({ +}); diff --git a/app/pods/dictionary/show/edit/domain/citation/template.hbs b/app/pods/dictionary/show/edit/domain/citation/template.hbs new file mode 100644 index 000000000..e2147cab0 --- /dev/null +++ b/app/pods/dictionary/show/edit/domain/citation/template.hbs @@ -0,0 +1 @@ +{{outlet}} \ No newline at end of file diff --git a/app/pods/dictionary/show/edit/domain/edit/route.js b/app/pods/dictionary/show/edit/domain/edit/route.js new file mode 100644 index 000000000..6c74252aa --- /dev/null +++ b/app/pods/dictionary/show/edit/domain/edit/route.js @@ -0,0 +1,4 @@ +import Route from '@ember/routing/route'; + +export default Route.extend({ +}); diff --git a/app/pods/dictionary/show/edit/domain/edit/template.hbs b/app/pods/dictionary/show/edit/domain/edit/template.hbs new file mode 100644 index 000000000..e2147cab0 --- /dev/null +++ b/app/pods/dictionary/show/edit/domain/edit/template.hbs @@ -0,0 +1 @@ +{{outlet}} \ No newline at end of file diff --git a/app/pods/dictionary/show/edit/domain/index/route.js b/app/pods/dictionary/show/edit/domain/index/route.js new file mode 100644 index 000000000..f9256edb6 --- /dev/null +++ b/app/pods/dictionary/show/edit/domain/index/route.js @@ -0,0 +1,25 @@ +import Route from '@ember/routing/route'; +import { getWithDefault,get,set } from '@ember/object'; + +export default Route.extend({ + afterModel(m) { + this._super(...arguments); + + let model = get(m, 'json.dataDictionary'); + set(model, 'domain', getWithDefault(model, 'domain', [])); + }, + + setupController: function() { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'dictionary.show.edit.index')); + }, + + actions: { + editDomain(id) { + this.transitionTo('dictionary.show.edit.domain.edit', id); + } + } +}); diff --git a/app/pods/dictionary/show/edit/domain/index/template.hbs b/app/pods/dictionary/show/edit/domain/index/template.hbs new file mode 100644 index 000000000..b35b06797 --- /dev/null +++ b/app/pods/dictionary/show/edit/domain/index/template.hbs @@ -0,0 +1,19 @@ +

    + Editing Domains + for {{model.title}} + {{control/md-status model=parentModel}} +

    + +{{object/md-objectroute-table + items=model.json.dataDictionary.domain + header="Domain" + shadow=true + buttonText="Add Domain" + ellipsis=true + attributes="domainId,codeName,description" + editItem=(route-action "editDomain") + verticalButtons=true + profilePath="dictionary.domain" + hideIndex=false + condensed=false +}} diff --git a/app/pods/dictionary/show/edit/domain/route.js b/app/pods/dictionary/show/edit/domain/route.js new file mode 100644 index 000000000..062b3da0b --- /dev/null +++ b/app/pods/dictionary/show/edit/domain/route.js @@ -0,0 +1,7 @@ +import Route from '@ember/routing/route'; + +export default Route.extend({ + breadCrumb: { + title: 'Domains' + } +}); diff --git a/app/pods/dictionary/show/edit/domain/template.hbs b/app/pods/dictionary/show/edit/domain/template.hbs new file mode 100644 index 000000000..e2147cab0 --- /dev/null +++ b/app/pods/dictionary/show/edit/domain/template.hbs @@ -0,0 +1 @@ +{{outlet}} \ No newline at end of file diff --git a/app/pods/dictionary/show/edit/domains/route.js b/app/pods/dictionary/show/edit/domains/route.js deleted file mode 100644 index 26d9f3124..000000000 --- a/app/pods/dictionary/show/edit/domains/route.js +++ /dev/null @@ -1,4 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ -}); diff --git a/app/pods/dictionary/show/edit/domains/template.hbs b/app/pods/dictionary/show/edit/domains/template.hbs deleted file mode 100644 index 2e4c05a76..000000000 --- a/app/pods/dictionary/show/edit/domains/template.hbs +++ /dev/null @@ -1,2 +0,0 @@ -Edit domains -{{outlet}} diff --git a/app/pods/dictionary/show/edit/entities/template.hbs b/app/pods/dictionary/show/edit/entities/template.hbs index c24cd6895..3a496d2d4 100644 --- a/app/pods/dictionary/show/edit/entities/template.hbs +++ b/app/pods/dictionary/show/edit/entities/template.hbs @@ -1 +1,23 @@ {{outlet}} + + +{{#layout/md-card class="construction card-inverse card-warning" shadow=false}} +
    +
    + {{fa-icon "exclamation-triangle" size=2}} +
    +
    + Page Under
    Construction     +
    +
    +{{/layout/md-card}} diff --git a/app/pods/dictionary/show/edit/index/template.hbs b/app/pods/dictionary/show/edit/index/template.hbs index 6de5ebec3..6f8a5dcf4 100644 --- a/app/pods/dictionary/show/edit/index/template.hbs +++ b/app/pods/dictionary/show/edit/index/template.hbs @@ -1,106 +1,104 @@ {{#with model.json.dataDictionary as |resource|}} -
    -
    -

    - Editing {{model.title}} - {{control/md-status model=model}} -

    - {{#layout/md-card title="Basic Information" collapsible=true collapsed=false - profilePath="dictionary.main.basicInformation" data-spy="Basic Information" + +

    + Editing {{model.title}} + {{control/md-status model=model}} +

    + {{#layout/md-card title="Basic Information" collapsible=true collapsed=false + profilePath="dictionary.main.basicInformation" data-spy="Basic Information" + required=true + }} + {{input/md-input + value=model.title + placeholder="Enter the title for the dictionary." + label="Title" required=true + profilePath="dictionary.main.title" + data-spy="Title" + class="md-embedded" }} - {{input/md-input - value=model.title - placeholder="Enter the title for the dictionary." - label="Title" - required=true - profilePath="dictionary.main.title" - data-spy="Title" - class="md-embedded" - }} - - {{#if (is-array resource.subject)}} - {{input/md-codelist-multi - create=true - label="Subject" - tooltip=true - icon=true - disabled=disabled - allowClear=true - mdCodeName="scope" - showValidations=true - model=model - path='json.dataDictionary.subject' - placeholder="Choose type(s) of resource" - profilePath="dictionary.main.subject" - data-spy="Subject" - class="md-embedded" - }} - {{/if}} - {{#layout/md-card - title="Responsible Party" + {{#if (is-array resource.subject)}} + {{input/md-codelist-multi + create=true + label="Subject" + tooltip=true + icon=true + disabled=disabled + allowClear=true + mdCodeName="scope" + showValidations=true + model=model + path='json.dataDictionary.subject' + placeholder="Choose type(s) of resource" + profilePath="dictionary.main.subject" + data-spy="Subject" class="md-embedded" - required=true - collapsible=false - collapsed=false - profilePath="dictionary.main.responsibleParty" - data-spy="Responsible Party" - shadow=false }} - {{!-- --}} - {{object/md-party model=resource.responsibleParty}} - {{/layout/md-card}} + {{/if}} - {{input/md-markdown-area - value=resource.description - profilePath="dictionary.main.description" - label="Description" - placeholder="Enter text describing the dictionary." - data-spy="Description" - class="md-embedded" - }} - - {{input/md-input - value=resource.dictionaryFormat - placeholder="Describe the language used in the dictionary, e.g. UML." - label="Dictionary Format" - required=false - profilePath="dictionary.main.dictionaryFormat" - }} - - {{input/md-boolean - label="Dictionary Included?" - text="Dictionary is included with the resource" - value=resource.dictionaryIncludedWithResource - profilePath="dictionary.main.included" - }} + {{#layout/md-card + title="Responsible Party" + class="md-embedded" + required=true + collapsible=false + collapsed=false + profilePath="dictionary.main.responsibleParty" + data-spy="Responsible Party" + shadow=false + }} + {{!-- --}} + {{object/md-party model=resource.responsibleParty}} {{/layout/md-card}} - {{#object/md-simple-array-table - title="Recommended Use" - required=false - plain=false + {{input/md-markdown-area + value=resource.description + profilePath="dictionary.main.description" + label="Description" + placeholder="Enter text describing the dictionary." + data-spy="Description" + class="md-embedded" + }} + + {{!-- {{input/md-boolean + label="Dictionary Included?" + text="Dictionary is included with the resource" + value=resource.dictionaryIncludedWithResource profilePath="dictionary.main.included" - value=resource.recommendedUse as |val| }} - - {{input/md-textarea value=val.item.value - placeholder="Enter a description of how the dictionary should be used."}} - - {{/object/md-simple-array-table}} - {{object/md-locale-array - title="Locale" - data-spy="Locales" - collapsible=true collapsed=false + {{input/md-input + value=resource.dictionaryFormat + placeholder="Describe the language used in the dictionary, e.g. UML." + label="Dictionary Format" required=false - value=resource.locale - profilePath="dictionary.main.locale" - }} + profilePath="dictionary.main.dictionaryFormat" + }} --}} + {{/layout/md-card}} + + {{#object/md-simple-array-table + title="Recommended Use" + required=false + plain=false + profilePath="dictionary.main.included" + value=resource.recommendedUse as |val| + }} + + {{input/md-textarea value=val.item.value + placeholder="Enter a description of how the dictionary should be used."}} + + {{/object/md-simple-array-table}} + + {{object/md-locale-array + title="Locale" + data-spy="Locales" + collapsible=true collapsed=false + required=false + value=resource.locale + profilePath="dictionary.main.locale" + }} -
    -
    + {{/with}} {{to-elsewhere named="md-scroll-spy-dict-edit" diff --git a/app/pods/dictionary/show/edit/template.hbs b/app/pods/dictionary/show/edit/template.hbs index 1d5741034..c20568aa2 100644 --- a/app/pods/dictionary/show/edit/template.hbs +++ b/app/pods/dictionary/show/edit/template.hbs @@ -1,6 +1,10 @@
    - {{liquid-outlet class="liquid-spy"}} +
    +
    + {{liquid-outlet class="liquid-spy"}} +
    +
    diff --git a/app/pods/error/template.hbs b/app/pods/error/template.hbs index 7d39ee865..fcb679e25 100644 --- a/app/pods/error/template.hbs +++ b/app/pods/error/template.hbs @@ -1,4 +1,4 @@ -
    +

    {{fa-icon "exclamation-triangle"}} Application Error

    The application has encountered an error, or a record that no longer exists. diff --git a/app/pods/not-found/template.hbs b/app/pods/not-found/template.hbs index b9f747c11..3c9b86843 100644 --- a/app/pods/not-found/template.hbs +++ b/app/pods/not-found/template.hbs @@ -1,4 +1,4 @@ -

    +

    {{fa-icon "exclamation-triangle"}} 404 Not Found: {{path}}

    Perhaps you have visited a link that has changed, or a record that no longer exists. diff --git a/app/pods/record/show/edit/associated/index/template.hbs b/app/pods/record/show/edit/associated/index/template.hbs index c5b827ff9..84d16deb8 100644 --- a/app/pods/record/show/edit/associated/index/template.hbs +++ b/app/pods/record/show/edit/associated/index/template.hbs @@ -12,7 +12,7 @@ previewTemplate="object/md-associated/preview" editItem=(route-action "editResource") verticalButtons=true - profilePath="record.metadta.associated" + profilePath="record.metadata.associated" hideIndex=true condensed=true }} diff --git a/app/router.js b/app/router.js index 2cc5efb56..42ff92536 100644 --- a/app/router.js +++ b/app/router.js @@ -145,13 +145,16 @@ Router.map(function() { path: ':dictionary_id' }, function() { this.route('edit', function() { - this.route('domains'); this.route('entities'); this.route('citation', function() { this.route('identifier', { path: 'identifier/:identifier_id' }); }); + this.route('domain', function() { + this.route('citation'); + this.route('edit'); + }); }); }); }); diff --git a/app/services/profile.js b/app/services/profile.js index 8c765a4f7..35470311e 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -826,7 +826,7 @@ export default Ember.Service.extend({ tip: 'The citation for the dictionary.' }, { title: 'Domains', - target: 'dictionary.show.edit.domains', + target: 'dictionary.show.edit.domain', tip: 'Information about defined value lists.' }, { diff --git a/tests/unit/pods/dictionary/show/edit/domain/citation/route-test.js b/tests/unit/pods/dictionary/show/edit/domain/citation/route-test.js new file mode 100644 index 000000000..9faeef7e8 --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/domain/citation/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/domain/citation', 'Unit | Route | dictionary/show/edit/domain/citation', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/domain/edit/route-test.js b/tests/unit/pods/dictionary/show/edit/domain/edit/route-test.js new file mode 100644 index 000000000..0de8e4dca --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/domain/edit/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/domain/edit', 'Unit | Route | dictionary/show/edit/domain/edit', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/domain/index/route-test.js b/tests/unit/pods/dictionary/show/edit/domain/index/route-test.js new file mode 100644 index 000000000..b5bc5d28f --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/domain/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/domain/index', 'Unit | Route | dictionary/show/edit/domain/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/domains/route-test.js b/tests/unit/pods/dictionary/show/edit/domain/route-test.js similarity index 62% rename from tests/unit/pods/dictionary/show/edit/domains/route-test.js rename to tests/unit/pods/dictionary/show/edit/domain/route-test.js index 6b814223c..c0743b0f7 100644 --- a/tests/unit/pods/dictionary/show/edit/domains/route-test.js +++ b/tests/unit/pods/dictionary/show/edit/domain/route-test.js @@ -1,11 +1,11 @@ import { moduleFor, test } from 'ember-qunit'; -moduleFor('route:dictionary/show/edit/domains', 'Unit | Route | dictionary/edit/domains', { +moduleFor('route:dictionary/show/edit/domain', 'Unit | Route | dictionary/show/edit/domain', { // Specify the other units that are required for this test. // needs: ['controller:foo'] }); test('it exists', function(assert) { - var route = this.subject(); + let route = this.subject(); assert.ok(route); }); From 37008325d05d66b619375e8ecf64ab5d32ff6ab3 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 26 Jan 2018 18:33:30 -0800 Subject: [PATCH 368/383] Domains, domains, domains --- app/models/dictionary.js | 5 +- .../components/input/md-textarea/component.js | 2 +- .../components/layout/md-slider/component.js | 4 +- .../object/md-citation/component.js | 17 ++++ .../components/object/md-domain/component.js | 74 +++++++++++++++ .../components/object/md-domain/template.hbs | 72 +++++++++++++++ .../object/md-domainitem/component.js | 90 +++++++++++++++++++ .../object/md-domainitem/preview/component.js | 13 +++ .../object/md-domainitem/preview/template.hbs | 27 ++++++ .../object/md-domainitem/template.hbs | 43 +++++++++ .../object/md-object-table/component.js | 11 +++ .../object/md-object-table/template.hbs | 45 +++++----- .../object/md-objectroute-table/component.js | 31 +++++-- .../show/edit/citation/identifier/route.js | 3 +- .../citation/indentifier}/route.js | 0 .../citation/indentifier}/template.hbs | 0 .../edit/domain/edit/citation/index/route.js | 31 +++++++ .../domain/edit/citation/index/template.hbs | 24 +++++ .../show/edit/domain/edit/citation/route.js | 4 + .../edit/domain/edit/citation/template.hbs | 1 + .../show/edit/domain/edit/index/route.js | 36 ++++++++ .../show/edit/domain/edit/index/template.hbs | 28 ++++++ .../show/edit/domain/edit/item/route.js | 74 +++++++++++++++ .../show/edit/domain/edit/item/template.hbs | 28 ++++++ .../dictionary/show/edit/domain/edit/route.js | 46 ++++++++++ .../show/edit/domain/edit/template.hbs | 2 +- .../show/edit/domain/index/template.hbs | 2 +- .../dictionary/show/edit/domain/template.hbs | 2 +- .../dictionary/show/edit/index/template.hbs | 10 +-- app/pods/dictionary/show/edit/route.js | 59 +++++++++++- app/pods/dictionary/show/route.js | 43 ++------- app/router.js | 12 ++- app/transitions.js | 18 ++++ .../object/md-domain/component-test.js | 24 +++++ .../object/md-domainitem/component-test.js | 24 +++++ .../md-domainitem/preview/component-test.js | 24 +++++ .../edit/citation/indentifier/route-test.js | 11 +++ .../domain/edit/citation/index/route-test.js | 11 +++ .../edit/domain/edit/citation/route-test.js | 11 +++ .../show/edit/domain/edit/index/route-test.js | 11 +++ .../{citation => edit/item}/route-test.js | 2 +- 41 files changed, 890 insertions(+), 85 deletions(-) create mode 100644 app/pods/components/object/md-domain/component.js create mode 100644 app/pods/components/object/md-domain/template.hbs create mode 100644 app/pods/components/object/md-domainitem/component.js create mode 100644 app/pods/components/object/md-domainitem/preview/component.js create mode 100644 app/pods/components/object/md-domainitem/preview/template.hbs create mode 100644 app/pods/components/object/md-domainitem/template.hbs rename app/pods/dictionary/show/edit/domain/{citation => edit/citation/indentifier}/route.js (100%) rename app/pods/dictionary/show/edit/domain/{citation => edit/citation/indentifier}/template.hbs (100%) create mode 100644 app/pods/dictionary/show/edit/domain/edit/citation/index/route.js create mode 100644 app/pods/dictionary/show/edit/domain/edit/citation/index/template.hbs create mode 100644 app/pods/dictionary/show/edit/domain/edit/citation/route.js create mode 100644 app/pods/dictionary/show/edit/domain/edit/citation/template.hbs create mode 100644 app/pods/dictionary/show/edit/domain/edit/index/route.js create mode 100644 app/pods/dictionary/show/edit/domain/edit/index/template.hbs create mode 100644 app/pods/dictionary/show/edit/domain/edit/item/route.js create mode 100644 app/pods/dictionary/show/edit/domain/edit/item/template.hbs create mode 100644 tests/integration/pods/components/object/md-domain/component-test.js create mode 100644 tests/integration/pods/components/object/md-domainitem/component-test.js create mode 100644 tests/integration/pods/components/object/md-domainitem/preview/component-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/domain/edit/citation/indentifier/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/domain/edit/citation/index/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/domain/edit/citation/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/domain/edit/index/route-test.js rename tests/unit/pods/dictionary/show/edit/domain/{citation => edit/item}/route-test.js (67%) diff --git a/app/models/dictionary.js b/app/models/dictionary.js index 2e33d7471..6cae96d26 100644 --- a/app/models/dictionary.js +++ b/app/models/dictionary.js @@ -1,5 +1,6 @@ import Ember from 'ember'; import DS from 'ember-data'; +import { alias } from '@ember/object/computed'; //import uuidV4 from 'npm:uuid/v4'; //import Validator from 'npm:validator'; import Model from 'mdeditor/models/base'; @@ -66,9 +67,7 @@ export default Model.extend(Validations, Copyable, { } }), - title: computed('json.dataDictionary.citation.title', function () { - return this.get('json.dataDictionary.citation.title'); - }), + title: alias('json.dataDictionary.citation.title'), icon: 'book', diff --git a/app/pods/components/input/md-textarea/component.js b/app/pods/components/input/md-textarea/component.js index 8f10c9f3a..58da0f3c7 100644 --- a/app/pods/components/input/md-textarea/component.js +++ b/app/pods/components/input/md-textarea/component.js @@ -16,7 +16,7 @@ export default Ember.Component.extend({ attributeBindings: ['data-spy'], classNames: ['md-textarea'], - classNameBindings: ['label:form-group', 'required'], + classNameBindings: ['label:form-group', 'required','embedded:md-embedded'], /** * Initial value, returned value. diff --git a/app/pods/components/layout/md-slider/component.js b/app/pods/components/layout/md-slider/component.js index 9b2996f40..78ee07b01 100644 --- a/app/pods/components/layout/md-slider/component.js +++ b/app/pods/components/layout/md-slider/component.js @@ -25,11 +25,11 @@ export default Component.extend({ this.toggleProperty('visible'); if(!this.get('visible')) { - let context = this.get('context'); + let context = this.get('context.isDestroying'); this.set('fromName', null); - if(!context.isDestroying) { + if(!context) { this.get('onClose') .call(this); } diff --git a/app/pods/components/object/md-citation/component.js b/app/pods/components/object/md-citation/component.js index 1b833b7b5..475eca54c 100644 --- a/app/pods/components/object/md-citation/component.js +++ b/app/pods/components/object/md-citation/component.js @@ -31,6 +31,23 @@ const formatCitation = function(model) { }; const theComp = Component.extend({ + /** + * mdEditor class for input and edit of mdJSON 'citation' objects. + * + * ```handlebars + * \{{object/md-citation + * model=citation + * profilePath="path" + * simpleIdentifier=false + * embedded=false + * }} + * + * @module mdeditor + * @submodule components-object + * @class md-citation-array + * @constructor + */ + didReceiveAttrs() { this._super(...arguments); diff --git a/app/pods/components/object/md-domain/component.js b/app/pods/components/object/md-domain/component.js new file mode 100644 index 000000000..fb2bcb543 --- /dev/null +++ b/app/pods/components/object/md-domain/component.js @@ -0,0 +1,74 @@ +import Component from '@ember/component'; +import { + set, + getWithDefault, + get +} from '@ember/object'; +import { + alias +} from '@ember/object/computed'; +import { + once +} from '@ember/runloop'; + +import { + validator, + buildValidations +} from 'ember-cp-validations'; + +const Validations = buildValidations({ + 'domainId': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'codeName': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'description': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ] +}); + +export default Component.extend(Validations, { + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(this, function () { + set(model, 'domainItem', getWithDefault(model, 'domainItem', [])); + set(model, 'domainReference', getWithDefault(model, + 'domainReference', {})); + }); + }, + + /** + * The string representing the path in the profile object for the domain. + * + * @property profilePath + * @type {String} + * @default 'false' + * @required + */ + + /** + * The object to use as the data model for the domain. + * + * @property model + * @type {Object} + * @required + */ + + tagName: 'form', + domainId: alias('model.domainId'), + codeName: alias('model.codeName'), + description: alias('model.description') +}); diff --git a/app/pods/components/object/md-domain/template.hbs b/app/pods/components/object/md-domain/template.hbs new file mode 100644 index 000000000..b73054c3e --- /dev/null +++ b/app/pods/components/object/md-domain/template.hbs @@ -0,0 +1,72 @@ + +{{#layout/md-card title="Domain Information" collapsible=true collapsed=false + profilePath=(concat profilePath ".information") data-spy="Domain Information" + required=true +}} + {{input/md-input + model=this + valuePath="domainId" + placeholder="Enter the identifier for the domain." + label="Domain Identifier" + profilePath=(concat profilePath ".identifier") + data-spy="Identifier" + class="md-embedded" + }} + + {{input/md-input + model=this + valuePath="codeName" + placeholder="Enter the name used to refer to the domain in schema definitions." + label="Code Name" + data-spy="Code Name" + profilePath=(concat profilePath ".codeName") + class="md-embedded" + }} + + {{input/md-input + value=model.commonName + placeholder="Enter a short common name for the domain." + label="Common Name" + profilePath=(concat profilePath ".commonName") + data-spy="Common Name" + class="md-embedded" + }} + + {{input/md-textarea + value=model.description + required=true + autoresize=true + placeholder="A brief description of the domain." + label="Description" + data-spy="Description" + embedded=true + profilePath=(concat profilePath ".description") + }} + +{{/layout/md-card}} + +{{#if (is-array model.domainItem)}} + {{object/md-objectroute-table + attributes="Name,Value,Definition" + items=model.domainItem + header="Domain Items" + shadow=true + buttonText="Add Item" + ellipsis=fallse + previewTemplateTable="object/md-domainitem/preview" + editItem=(route-action "editItem") + verticalButtons=false + profilePath=profilePath + hideIndex=false + condensed=false + }} +{{/if}} + +{{object/md-citation/preview + title="Domain Reference" + profilePath=(concat profilePath ".domainReference") + citation=model.domainReference + muted=true + required=false + editCitation="editCitation" +}} diff --git a/app/pods/components/object/md-domainitem/component.js b/app/pods/components/object/md-domainitem/component.js new file mode 100644 index 000000000..dd4ccf544 --- /dev/null +++ b/app/pods/components/object/md-domainitem/component.js @@ -0,0 +1,90 @@ +import Component from '@ember/component'; +import EmberObject from '@ember/object'; +import { + set, + getWithDefault, + get +} from '@ember/object'; +import { + alias +} from '@ember/object/computed'; +import { + once +} from '@ember/runloop'; + +import { + validator, + buildValidations +} from 'ember-cp-validations'; + +const Validations = buildValidations({ + 'name': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'value': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'definition': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ] +}); + + +const TemplateClass = EmberObject.extend(Validations, { + init() { + this._super(...arguments); + + set(this, 'reference', {}); + } +}); + +const theComp = Component.extend(Validations, { + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(this, function () { + set(model, 'reference', getWithDefault(model, + 'reference', {})); + }); + }, + + /** + * The string representing the path in the profile object for the domain. + * + * @property profilePath + * @type {String} + * @default 'false' + * @required + */ + + /** + * The object to use as the data model for the domain. + * + * @property model + * @type {Object} + * @required + */ + + tagName: 'form', + name: alias('model.name'), + value: alias('model.value'), + definition: alias('model.definition') +}); + +export { + Validations, + TemplateClass as Template, + theComp as + default +}; diff --git a/app/pods/components/object/md-domainitem/preview/component.js b/app/pods/components/object/md-domainitem/preview/component.js new file mode 100644 index 000000000..d83de823c --- /dev/null +++ b/app/pods/components/object/md-domainitem/preview/component.js @@ -0,0 +1,13 @@ +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { + Validations +} from '../component'; + +export default Component.extend(Validations, { + tagName:'', + model: alias('item'), + name: alias('model.name'), + value: alias('model.value'), + definition: alias('model.definition') +}); diff --git a/app/pods/components/object/md-domainitem/preview/template.hbs b/app/pods/components/object/md-domainitem/preview/template.hbs new file mode 100644 index 000000000..e1b518c8a --- /dev/null +++ b/app/pods/components/object/md-domainitem/preview/template.hbs @@ -0,0 +1,27 @@ + + {{input/md-input + model=this + valuePath="name" + placeholder="Descriptive name for the domain value." + profilePath=(concat profilePath ".domainItem.name") + showValidations=true + }} + + + {{input/md-input + model=this + valuePath="value" + placeholder="Value of the domain item." + profilePath=(concat profilePath ".domainItem.value") + showValidations=true + }} + + + {{input/md-input + model=this + valuePath="definition" + placeholder="A brief definition for the domain item." + profilePath=(concat profilePath ".domainItem.definition") + showValidations=true + }} + diff --git a/app/pods/components/object/md-domainitem/template.hbs b/app/pods/components/object/md-domainitem/template.hbs new file mode 100644 index 000000000..d7c31fce5 --- /dev/null +++ b/app/pods/components/object/md-domainitem/template.hbs @@ -0,0 +1,43 @@ + {{input/md-input + label="Name" + model=this + valuePath="name" + placeholder="Descriptive name for the domain value." + profilePath=(concat profilePath ".domainItem.name") + showValidations=true + }} + {{input/md-input + label="Value" + model=this + valuePath="value" + placeholder="Value of the domain item." + profilePath=(concat profilePath ".domainItem.value") + showValidations=true + }} + {{input/md-input + label="Definition" + model=this + valuePath="definition" + placeholder="A brief definition for the domain item." + profilePath=(concat profilePath ".domainItem.definition") + showValidations=true + }} + +{{#with model.reference as |citation|}} + {{#layout/md-card + title="Item Reference" + collapsible=true + collapsed=false + profilePath=(concat profilePath '.reference') + data-spy="Item Reference" + shadow=true + }} + Content + {{object/md-citation + model=citation + profilePath=(concat profilePath '.reference') + simpleIdentifier=true + embedded=true + }} + {{/layout/md-card}} +{{/with}} diff --git a/app/pods/components/object/md-object-table/component.js b/app/pods/components/object/md-object-table/component.js index 1ae3a4ff2..acd4c9945 100644 --- a/app/pods/components/object/md-object-table/component.js +++ b/app/pods/components/object/md-object-table/component.js @@ -103,6 +103,17 @@ export default Component.extend(InViewportMixin, Template, { * @default undefined */ + /** + * The path of template to render in the table preview for each row. + * Template content will NOT be wrapped in a `` element. The `property` + * class should be applied to each ``.` + * + * @property previewTemplateTable + * @type {String} + * @optional + * @default undefined + */ + /** * The template class to use for new items. This should be a constructor. * Objects should be created by extending Ember.Object. diff --git a/app/pods/components/object/md-object-table/template.hbs b/app/pods/components/object/md-object-table/template.hbs index cd9bbf464..c1adc3eae 100644 --- a/app/pods/components/object/md-object-table/template.hbs +++ b/app/pods/components/object/md-object-table/template.hbs @@ -27,19 +27,20 @@

    + {{#if showFooter}} +
    + +
    + {{/if}}
    {{else}} From 8aaf40c2c0402038b07f4d1dfd2188b0afb7af0c Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Sat, 3 Feb 2018 05:20:27 -0800 Subject: [PATCH 374/383] Refresh scroll-spy on profile change --- app/pods/components/control/md-scroll-spy/component.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/pods/components/control/md-scroll-spy/component.js b/app/pods/components/control/md-scroll-spy/component.js index ba5adc6ac..75ee72a14 100644 --- a/app/pods/components/control/md-scroll-spy/component.js +++ b/app/pods/components/control/md-scroll-spy/component.js @@ -1,5 +1,5 @@ import Ember from 'ember'; - +import { inject as service } from '@ember/service'; const { Component, computed, @@ -18,6 +18,7 @@ export default Component.extend({ * @constructor */ + profile: service('profile'), classNames: ['md-scroll-spy'], /** @@ -50,11 +51,9 @@ export default Component.extend({ * @property links * @type {Array} * @category computed - * @requires + * @requires refresh,profile.active */ - links: computed('refresh', function () { - //console.info('computed links'); - + links: computed('refresh', 'profile.active', function () { let liquid = ''; if($('.liquid-spy').length) { From 19379a24cfbcee06ba6af3327f591b1e5d464450 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 8 Feb 2018 09:37:32 -0800 Subject: [PATCH 375/383] Implement entity support, update domain --- .../input/md-codelist-multi/component.js | 2 +- .../components/input/md-codelist/component.js | 2 +- .../object/md-attribute/component.js | 104 +++++++++ .../object/md-attribute/preview/component.js | 14 ++ .../object/md-attribute/preview/template.hbs | 34 +++ .../object/md-attribute/template.hbs | 150 ++++++++++++ .../components/object/md-domain/component.js | 2 + .../components/object/md-domain/template.hbs | 1 + .../object/md-domainitem/template.hbs | 3 + .../components/object/md-entity/component.js | 183 +++++++++++++++ .../components/object/md-entity/template.hbs | 216 ++++++++++++++++++ .../show/edit/citation/template.hbs | 6 +- .../domain/edit/citation/identifier/route.js | 2 +- .../edit/citation/identifier/template.hbs | 2 - .../edit/domain/edit/citation/index/route.js | 11 + .../domain/edit/citation/index/template.hbs | 6 +- .../show/edit/domain/edit/citation/route.js | 3 + .../edit/domain/edit/citation/template.hbs | 2 +- .../show/edit/domain/edit/index/route.js | 3 +- .../show/edit/domain/edit/template.hbs | 2 +- .../dictionary/show/edit/domain/template.hbs | 6 +- .../dictionary/show/edit/entities/route.js | 4 - .../show/edit/entities/template.hbs | 23 -- .../edit/entity/edit/attribute/index/route.js | 38 +++ .../entity/edit/attribute/index/template.hbs | 28 +++ .../show/edit/entity/edit/attribute/route.js | 66 ++++++ .../edit/entity/edit/attribute/template.hbs | 1 + .../entity/edit/citation/identifier/route.js | 68 ++++++ .../edit/citation/identifier/template.hbs | 25 ++ .../edit/entity/edit/citation/index/route.js | 17 ++ .../entity/edit/citation/index/template.hbs | 23 ++ .../show/edit/entity/edit/citation/route.js | 59 +++++ .../edit/entity/edit/citation/template.hbs | 1 + .../show/edit/entity/edit/index/route.js | 41 ++++ .../show/edit/entity/edit/index/template.hbs | 29 +++ .../dictionary/show/edit/entity/edit/route.js | 50 ++++ .../show/edit/entity/edit/template.hbs | 1 + .../show/edit/entity/index/route.js | 29 +++ .../show/edit/entity/index/template.hbs | 19 ++ app/pods/dictionary/show/edit/entity/route.js | 4 + .../dictionary/show/edit/entity/template.hbs | 5 + .../dictionary/show/edit/index/template.hbs | 2 +- app/pods/dictionary/show/edit/template.hbs | 11 +- .../record/show/edit/main/index/template.hbs | 2 +- app/router.js | 17 +- app/services/profile.js | 2 +- app/transitions.js | 34 ++- .../object/md-attribute/component-test.js | 24 ++ .../md-attribute/preview/component-test.js | 24 ++ .../object/md-entity/component-test.js | 24 ++ .../entity/edit/attribute/index/route-test.js | 11 + .../edit/entity/edit/attribute/route-test.js | 11 + .../edit/citation/identifier/route-test.js | 11 + .../entity/edit/citation/index/route-test.js | 11 + .../edit/entity/edit/citation/route-test.js | 11 + .../show/edit/entity/edit/index/route-test.js | 11 + .../show/edit/entity/edit/route-test.js | 11 + .../show/edit/entity/index/route-test.js | 11 + .../edit/{entities => entity}/route-test.js | 4 +- 59 files changed, 1464 insertions(+), 53 deletions(-) create mode 100644 app/pods/components/object/md-attribute/component.js create mode 100644 app/pods/components/object/md-attribute/preview/component.js create mode 100644 app/pods/components/object/md-attribute/preview/template.hbs create mode 100644 app/pods/components/object/md-attribute/template.hbs create mode 100644 app/pods/components/object/md-entity/component.js create mode 100644 app/pods/components/object/md-entity/template.hbs delete mode 100644 app/pods/dictionary/show/edit/entities/route.js delete mode 100644 app/pods/dictionary/show/edit/entities/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/edit/attribute/index/route.js create mode 100644 app/pods/dictionary/show/edit/entity/edit/attribute/index/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/edit/attribute/route.js create mode 100644 app/pods/dictionary/show/edit/entity/edit/attribute/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/edit/citation/identifier/route.js create mode 100644 app/pods/dictionary/show/edit/entity/edit/citation/identifier/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/edit/citation/index/route.js create mode 100644 app/pods/dictionary/show/edit/entity/edit/citation/index/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/edit/citation/route.js create mode 100644 app/pods/dictionary/show/edit/entity/edit/citation/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/edit/index/route.js create mode 100644 app/pods/dictionary/show/edit/entity/edit/index/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/edit/route.js create mode 100644 app/pods/dictionary/show/edit/entity/edit/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/index/route.js create mode 100644 app/pods/dictionary/show/edit/entity/index/template.hbs create mode 100644 app/pods/dictionary/show/edit/entity/route.js create mode 100644 app/pods/dictionary/show/edit/entity/template.hbs create mode 100644 tests/integration/pods/components/object/md-attribute/component-test.js create mode 100644 tests/integration/pods/components/object/md-attribute/preview/component-test.js create mode 100644 tests/integration/pods/components/object/md-entity/component-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/entity/edit/attribute/index/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/entity/edit/attribute/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/entity/edit/citation/identifier/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/entity/edit/citation/index/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/entity/edit/citation/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/entity/edit/index/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/entity/edit/route-test.js create mode 100644 tests/unit/pods/dictionary/show/edit/entity/index/route-test.js rename tests/unit/pods/dictionary/show/edit/{entities => entity}/route-test.js (62%) diff --git a/app/pods/components/input/md-codelist-multi/component.js b/app/pods/components/input/md-codelist-multi/component.js index 66fb8cc2c..a5f753067 100644 --- a/app/pods/components/input/md-codelist-multi/component.js +++ b/app/pods/components/input/md-codelist-multi/component.js @@ -109,7 +109,7 @@ export default MdCodelist.extend({ * @type Ember.computed * @return Array */ - codelist: Ember.computed('value', 'filterId', function() { + codelist: Ember.computed('value', 'filterId', 'mapped', function() { let codelist = this.get('mapped'); let value = this.get('value'); let create = this.get('create'); diff --git a/app/pods/components/input/md-codelist/component.js b/app/pods/components/input/md-codelist/component.js index 0d26bd5ef..b9aede3d6 100644 --- a/app/pods/components/input/md-codelist/component.js +++ b/app/pods/components/input/md-codelist/component.js @@ -177,7 +177,7 @@ export default Select.extend({ * @category computed * @requires value */ - codelist: Ember.computed('value', 'filterId', function () { + codelist: Ember.computed('value', 'filterId', 'mapped', function () { let codelist = this.get('mapped'); let value = this.get('value'); let create = this.get('create'); diff --git a/app/pods/components/object/md-attribute/component.js b/app/pods/components/object/md-attribute/component.js new file mode 100644 index 000000000..9d7069ec5 --- /dev/null +++ b/app/pods/components/object/md-attribute/component.js @@ -0,0 +1,104 @@ +import Component from '@ember/component'; +import EmberObject from '@ember/object'; +import { + set, + getWithDefault, + get +} from '@ember/object'; +import { + alias +} from '@ember/object/computed'; +import { + once +} from '@ember/runloop'; + +import { + validator, + buildValidations +} from 'ember-cp-validations'; + +const Validations = buildValidations({ + 'codeName': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'dataType': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'allowNull': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'definition': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ] +}); + + +const TemplateClass = EmberObject.extend(Validations, { + init() { + this._super(...arguments); + + set(this, 'allowNull', false); + set(this, 'attributeReference', {}); + set(this, 'alias',[]); + set(this, 'valueRange',[]); + set(this, 'timePeriod',[]); + } +}); + +const theComp = Component.extend(Validations, { + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(this, function () { + set(model, 'allowNull', getWithDefault(model, 'allowNull', false)); + set(model, 'reference', getWithDefault(model, 'reference', {})); + set(model, 'alias', getWithDefault(model, 'alias', [])); + set(model, 'valueRange', getWithDefault(model, 'valueRange', [])); + set(model, 'timePeriod', getWithDefault(model, 'timePeriod', [])); + }); + }, + + /** + * The string representing the path in the profile object for the domain. + * + * @property profilePath + * @type {String} + * @default 'false' + * @required + */ + + /** + * The object to use as the data model for the domain. + * + * @property model + * @type {Object} + * @required + */ + + tagName: 'form', + codeName: alias('model.codeName'), + dataType: alias('model.dataType'), + definition: alias('model.definition'), + allowNull: alias('model.allowNull') +}); + +export { + Validations, + TemplateClass as Template, + theComp as + default +}; diff --git a/app/pods/components/object/md-attribute/preview/component.js b/app/pods/components/object/md-attribute/preview/component.js new file mode 100644 index 000000000..0c124fa4b --- /dev/null +++ b/app/pods/components/object/md-attribute/preview/component.js @@ -0,0 +1,14 @@ +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { + Validations +} from '../component'; + +export default Component.extend(Validations, { + tagName:'', + model: alias('item'), + name: alias('model.codeName'), + dataType: alias('model.dataType'), + definition: alias('model.definition'), + allowNull: alias('model.allowNull') +}); diff --git a/app/pods/components/object/md-attribute/preview/template.hbs b/app/pods/components/object/md-attribute/preview/template.hbs new file mode 100644 index 000000000..21d22271b --- /dev/null +++ b/app/pods/components/object/md-attribute/preview/template.hbs @@ -0,0 +1,34 @@ + + {{input/md-input + model=this + valuePath="name" + placeholder="Descriptive name for the attribute(column)." + profilePath=(concat profilePath ".attribute.name") + showValidations=true + }} + + + {{input/md-input + model=this + valuePath="dataType" + placeholder="The datatype for the attribute(column)." + profilePath=(concat profilePath ".attribute.dataType") + showValidations=true + }} + + + {{input/md-input + model=this + valuePath="definition" + placeholder="A brief definition of the attribute(column)." + profilePath=(concat profilePath ".attribute.definition") + showValidations=true + }} + + + {{input/md-boolean + required=true + value=model.allowNull + profilePath=(concat profilePath ".attribute.allowNull") + }} + diff --git a/app/pods/components/object/md-attribute/template.hbs b/app/pods/components/object/md-attribute/template.hbs new file mode 100644 index 000000000..c7e715692 --- /dev/null +++ b/app/pods/components/object/md-attribute/template.hbs @@ -0,0 +1,150 @@ +{{#layout/md-card title="Attribute Information" collapsible=true collapsed=false + profilePath=(concat profilePath ".information") data-spy="Attribute Information" + required=true +}} + {{input/md-input + model=this + valuePath="codeName" + placeholder="The code used to identify this attribute, e.g.the column name." + label="Code Name" + data-spy="Code Name" + profilePath=(concat profilePath ".codeName") + class="md-embedded" + }} + + {{input/md-textarea + value=this.definition + required=true + autoresize=true + placeholder="A brief description of the attribute." + label="Definition" + data-spy="Definition" + embedded=true + profilePath=(concat profilePath ".definition") + }} + + {{input/md-input + model=this + valuePath="dataType" + placeholder="The datatype for the attribute(column)." + label="Data Type" + data-spy="Data Type" + profilePath=(concat profilePath ".dataType") + class="md-embedded" + }} + + {{input/md-boolean + label="Allow Null?" + required=true + text="Allow null values" + value=model.allowNull + profilePath=(concat profilePath ".allowNull") + }} + + {{input/md-input + value=model.commonName + placeholder="Enter a short common(alternate) name for the attribute." + label="Common Name" + profilePath=(concat profilePath ".commonName") + data-spy="Common Name" + class="md-embedded" + }} + + {{#object/md-simple-array-table + title="Alias" + required=false + plain=true + profilePath=(concat profilePath ".alias") + data-spy="Alias" + class="md-embedded" + value=model.alias as |val| + }} + + {{input/md-input value=val.item.value + placeholder="Alternate names used to identify this attribute."}} + + {{/object/md-simple-array-table}} + +{{/layout/md-card}} + +{{!-- {{object/md-objectroute-table + attributes="Name,Data Type, Definition" + items=model.attribute + header="Attributes" + shadow=true + buttonText="Add Attribute" + ellipsis=fallse + previewTemplateTable="object/md-attribute/preview" + editItem=(route-action "editAttribute") + verticalButtons=false + profilePath=profilePath + hideIndex=false + condensed=false + editOnAdd=false + scrollToId="md-attribute" + data-spy="Attributes" +}} + +{{#layout/md-card + title="Entity Structure" + collapsible=true + collapsed=false + profilePath=(concat profilePath ".structure") + data-spy="Entity Structure" +}} + + {{input/md-input + value=model.fieldSeparatorCharacter + placeholder="The character which indicates the end of data field contents." + label="Field Separator Character" + profilePath=(concat profilePath ".structure.fieldSeparatorCharacter") + class="md-embedded" + }} + + + {{input/md-input + type="number" + step=1 + model=model + valuePath="numberOfHeaderLines" + placeholder="The number of lines at the beginning of the file." + label="# Header Lines" + profilePath=(concat profilePath ".structure.numberOfHeaderLines") + class="md-embedded" + }} + + {{input/md-input + value=model.quoteCharacter + placeholder="Character used to quote fields in the data representation." + label="Quote Character" + profilePath=(concat profilePath ".structure.quoteCharacter") + class="md-embedded" + }} + +{{/layout/md-card}} --}} + +{{!-- {{object/md-objectroute-table + attributes="Name,Value,Definition" + items=model.entityItem + header="Entity Items" + shadow=true + buttonText="Add Item" + ellipsis=fallse + previewTemplateTable="object/md-entityitem/preview" + editItem=(route-action "editItem") + verticalButtons=false + profilePath=profilePath + hideIndex=false + condensed=false + editOnAdd=false + scrollToId="md-entityitem" +}} + +{{object/md-citation/preview + title="Entity Reference" + profilePath=(concat profilePath ".entityReference") + citation=model.entityReference + muted=true + required=false + editCitation="editCitation" +}} --}} diff --git a/app/pods/components/object/md-domain/component.js b/app/pods/components/object/md-domain/component.js index fb2bcb543..45f851f23 100644 --- a/app/pods/components/object/md-domain/component.js +++ b/app/pods/components/object/md-domain/component.js @@ -15,6 +15,7 @@ import { validator, buildValidations } from 'ember-cp-validations'; +import uuidV4 from "npm:uuid/v4"; const Validations = buildValidations({ 'domainId': [ @@ -44,6 +45,7 @@ export default Component.extend(Validations, { let model = get(this, 'model'); once(this, function () { + set(model, 'domainId', getWithDefault(model, 'domainId', uuidV4())); set(model, 'domainItem', getWithDefault(model, 'domainItem', [])); set(model, 'domainReference', getWithDefault(model, 'domainReference', {})); diff --git a/app/pods/components/object/md-domain/template.hbs b/app/pods/components/object/md-domain/template.hbs index b76ff192e..e5b3b4108 100644 --- a/app/pods/components/object/md-domain/template.hbs +++ b/app/pods/components/object/md-domain/template.hbs @@ -60,6 +60,7 @@ condensed=false editOnAdd=false scrollToId="md-domainitem" + data-spy="Domain Items" }} {{object/md-citation/preview diff --git a/app/pods/components/object/md-domainitem/template.hbs b/app/pods/components/object/md-domainitem/template.hbs index d7c31fce5..d169e2820 100644 --- a/app/pods/components/object/md-domainitem/template.hbs +++ b/app/pods/components/object/md-domainitem/template.hbs @@ -1,5 +1,6 @@ {{input/md-input label="Name" + data-spy="Name" model=this valuePath="name" placeholder="Descriptive name for the domain value." @@ -8,6 +9,7 @@ }} {{input/md-input label="Value" + data-spy="Value" model=this valuePath="value" placeholder="Value of the domain item." @@ -16,6 +18,7 @@ }} {{input/md-input label="Definition" + data-spy="Definition" model=this valuePath="definition" placeholder="A brief definition for the domain item." diff --git a/app/pods/components/object/md-entity/component.js b/app/pods/components/object/md-entity/component.js new file mode 100644 index 000000000..8770713c4 --- /dev/null +++ b/app/pods/components/object/md-entity/component.js @@ -0,0 +1,183 @@ +import Component from '@ember/component'; +import NativeArray from '@ember/array'; +import EmberObject from '@ember/object'; +import { + set, + computed, + getWithDefault, + get +} from '@ember/object'; +import { + alias +} from '@ember/object/computed'; +import { + once +} from '@ember/runloop'; +import { + assert +} from '@ember/debug'; + +import { + validator, + buildValidations +} from 'ember-cp-validations'; +import uuidV4 from "npm:uuid/v4"; + +const Validations = buildValidations({ + 'codeName': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'definition': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ] +}); + +export default Component.extend(Validations, { + init() { + this._super(...arguments); + assert(`You must supply a dictionary for ${this.toString()}.`, get(this, + 'dictionary')); + }, + + didReceiveAttrs() { + this._super(...arguments); + + let model = get(this, 'model'); + + once(this, function () { + set(model, 'entityId', getWithDefault(model, 'entityId', uuidV4())); + set(model, 'alias', getWithDefault(model, 'alias', [])); + set(model, 'primaryKeyAttributeCodeName', getWithDefault(model, + 'primaryKeyAttributeCodeName', [])); + set(model, 'index', getWithDefault(model, 'index', [])); + set(model, 'attribute', getWithDefault(NativeArray.apply(model), + 'attribute', [])); + set(model, 'foreignKey', getWithDefault(model, 'foreignKey', [])); + set(model, 'entityReference', getWithDefault(model, + 'entityReference', [])); + }); + }, + + /** + * The string representing the path in the profile object for the entity. + * + * @property profilePath + * @type {String} + * @default 'false' + * @required + */ + + /** + * The parent dictionary object for this entity used to lookup references. + * + * @property dictionary + * @type {Object} + * @required + */ + + /** + * The object to use as the data model for the entity. + * + * @property model + * @type {Object} + * @required + */ + + tagName: 'form', + + foreignKeyTemplate: EmberObject.extend(buildValidations({ + 'referencedEntityCodeName': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'localAttributeCodeName': [ + validator('presence', { + presence: true, + ignoreBlank: true + }), + validator('array-required', { + track: [] + }) + ], + 'referencedAttributeCodeName': [ + validator('presence', { + presence: true, + ignoreBlank: true + }), + validator('array-required', { + track: [] + }) + ] + }), { + init() { + this._super(...arguments); + this.set('localAttributeCodeName', []); + this.set('referencedAttributeCodeName', []); + } + }), + + //entityId: alias('model.entityId'), + codeName: alias('model.codeName'), + description: alias('model.description'), + entities: alias('dictionary.entity'), + attributes: alias('model.attribute'), + + attributeList: computed('attributes.@each.codeName', 'attributes.[]', + function () { + let attr = get(this, 'model.attribute'); + if(attr) { + return attr.map((attr) => { + return { + codeId: get(attr, 'codeName'), + codeName: get(attr, 'codeName'), + tooltip: get(attr, 'definition') + }; + }); + } + return []; + }), + + entityList: computed('entities.@each.entityId', 'entities.@each.codeName', + function () { + return get(this, 'entities') + .map((attr) => { + if(get(attr, 'entityId')) { + return { + codeId: get(attr, 'entityId'), + codeName: get(attr, 'codeName'), + tooltip: get(attr, 'definition') + }; + } + }); + }), + + actions: { + getEntityAttributes(id) { + let entity = NativeArray.apply(this.get('dictionary.entity')) + .findBy('entityId', id); + + if(entity) { + let a = get(entity, 'attribute') + .map((attr) => { + return { + codeId: get(attr, 'codeName'), + codeName: get(attr, 'codeName'), + tooltip: get(attr, 'definition') + }; + }); + + return a; + } + + return []; + } + } +}); diff --git a/app/pods/components/object/md-entity/template.hbs b/app/pods/components/object/md-entity/template.hbs new file mode 100644 index 000000000..1244d0f69 --- /dev/null +++ b/app/pods/components/object/md-entity/template.hbs @@ -0,0 +1,216 @@ +{{#layout/md-card title="Entity Information" collapsible=true collapsed=false + profilePath=(concat profilePath ".information") data-spy="Entity Information" + required=true +}} + {{input/md-input + value=model.entityId + placeholder="Enter the identifier for the entity." + label="Entity Identifier" + profilePath=(concat profilePath ".identifier") + data-spy="Identifier" + class="md-embedded" + }} + + {{input/md-input + model=this + valuePath="codeName" + placeholder="Enter the name used to refer to the entity in schema definitions or application software." + label="Code Name" + data-spy="Code Name" + profilePath=(concat profilePath ".codeName") + class="md-embedded" + }} + + {{input/md-textarea + value=model.definition + required=true + autoresize=true + placeholder="A brief description of the entity." + label="Definition" + data-spy="Definition" + embedded=true + profilePath=(concat profilePath ".definition") + }} + + {{input/md-input + value=model.commonName + placeholder="Enter a short common name for the entity." + label="Common Name" + profilePath=(concat profilePath ".commonName") + data-spy="Common Name" + class="md-embedded" + }} + + {{#object/md-simple-array-table + title="Alias" + required=false + plain=true + profilePath=(concat profilePath ".alias") + data-spy="Alias" + class="md-embedded" + value=model.alias as |val| + }} + + {{input/md-input value=val.item.value + placeholder="Alternate names used to identify this entity."}} + + {{/object/md-simple-array-table}} + +{{/layout/md-card}} + +{{object/md-objectroute-table + attributes="Name,Data Type, Definition, Allow Null?" + items=model.attribute + header="Attributes" + shadow=true + buttonText="Add Attribute" + ellipsis=fallse + previewTemplateTable="object/md-attribute/preview" + editItem=(route-action "editAttribute") + verticalButtons=false + profilePath=profilePath + hideIndex=false + condensed=false + editOnAdd=false + scrollToId="md-attribute" + data-spy="Attributes" +}} + +{{#layout/md-card + title="Entity Structure" + collapsible=true + collapsed=false + profilePath=(concat profilePath ".structure") + data-spy="Entity Structure" +}} + + {{input/md-input + value=model.fieldSeparatorCharacter + placeholder="The character which indicates the end of data field contents." + label="Field Separator Character" + profilePath=(concat profilePath ".structure.fieldSeparatorCharacter") + class="md-embedded" + }} + + + {{input/md-input + type="number" + step=1 + model=model + valuePath="numberOfHeaderLines" + placeholder="The number of lines at the beginning of the file." + label="# Header Lines" + profilePath=(concat profilePath ".structure.numberOfHeaderLines") + class="md-embedded" + }} + + {{input/md-input + value=model.quoteCharacter + placeholder="Character used to quote fields in the data representation." + label="Quote Character" + profilePath=(concat profilePath ".structure.quoteCharacter") + class="md-embedded" + }} + +{{/layout/md-card}} + +{{#layout/md-card + title="Entity Keys" + collapsible=true + collapsed=false + profilePath=(concat profilePath ".keys") + data-spy="Entity Keys" +}} + + {{input/md-codelist-multi + label="Primary Key Attributes" + value=model.primaryKeyAttributeCodeName + mapped=attributeList + create=true + tooltip=true + placeholder="The codeNames of the attributes that compose the primary key." + profilePath=(concat profilePath "keys.primaryKey") + data-spy="Primary" + class="md-embedded" + }} + + {{#object/md-array-table + columns="Local Attributes,Referenced Entity,Referenced Attributes" + value=model.foreignKey + title="Foreign Key Attributes" + class="md-embedded" + templateClass=foreignKeyTemplate + profilePath=(concat profilePath "keys.foreignKey") + data-spy="Foreign" as |fk| + }} + + {{input/md-codelist-multi + model=fk.item + path="localAttributeCodeName" + mapped=attributeList + create=true + tooltip=true + placeholder="Select the local(child) attributes that compose the foreign key." + profilePath=(concat profilePath ".localAttributes") + showValidations=true + }} + + + {{input/md-codelist + model=fk.item + mapped=entityList + create=true + path="referencedEntityCodeName" + placeholder="Select the referenced (or parent) entity." + showValidations=true + }} + + + {{input/md-codelist-multi + model=fk.item + path="referencedAttributeCodeName" + mapped=(compute (action "getEntityAttributes") fk.item.referencedEntityCodeName) + create=true + tooltip=true + placeholder="Select the referenced(parent) attributes that compose the foreign key." + profilePath=(concat profilePath ".referencedAttributes") + showValidations=true + }} + + {{/object/md-array-table}} + +{{/layout/md-card}} + +{{object/md-citation-array + model=model.entityReference + profilePath=(concat profilePath ".entityReference") + data-spy="Entity Reference" + editItem=(route-action "editCitation") + label="Entity Reference" +}} + +{{!-- {{object/md-objectroute-table + attributes="Name,Value,Definition" + items=model.entityItem + header="Entity Items" + shadow=true + buttonText="Add Item" + ellipsis=fallse + previewTemplateTable="object/md-entityitem/preview" + editItem=(route-action "editItem") + verticalButtons=false + profilePath=profilePath + hideIndex=false + condensed=false + editOnAdd=false + scrollToId="md-entityitem" +}} + +{{object/md-citation/preview + title="Entity Reference" + profilePath=(concat profilePath ".entityReference") + citation=model.entityReference + muted=true + required=false + editCitation="editCitation" +}} --}} diff --git a/app/pods/dictionary/show/edit/citation/template.hbs b/app/pods/dictionary/show/edit/citation/template.hbs index b8324902e..6f0d4872a 100644 --- a/app/pods/dictionary/show/edit/citation/template.hbs +++ b/app/pods/dictionary/show/edit/citation/template.hbs @@ -1 +1,5 @@ -{{liquid-outlet}} +
    +
    + {{liquid-outlet class="liquid-spy"}} +
    +
    diff --git a/app/pods/dictionary/show/edit/domain/edit/citation/identifier/route.js b/app/pods/dictionary/show/edit/domain/edit/citation/identifier/route.js index 653129769..539c6aa9a 100644 --- a/app/pods/dictionary/show/edit/domain/edit/citation/identifier/route.js +++ b/app/pods/dictionary/show/edit/domain/edit/citation/identifier/route.js @@ -20,7 +20,7 @@ export default Route.extend(ScrollTo, { // Call _super for default behavior this._super(...arguments); - this.controller.set('parentModel', this.modelFor('dictionary.show.edit.domain.edit.citation.index')); + this.controller.set('parentModel', this.modelFor('dictionary.show.edit')); this.controllerFor('dictionary.show.edit') .setProperties({ onCancel: this.setupModel, diff --git a/app/pods/dictionary/show/edit/domain/edit/citation/identifier/template.hbs b/app/pods/dictionary/show/edit/domain/edit/citation/identifier/template.hbs index acbff35ba..bd0399b1c 100644 --- a/app/pods/dictionary/show/edit/domain/edit/citation/identifier/template.hbs +++ b/app/pods/dictionary/show/edit/domain/edit/citation/identifier/template.hbs @@ -3,7 +3,6 @@ {{control/md-status model=parentModel}} -{{#if model.identifier}}
    {{object/md-identifier class="" @@ -13,7 +12,6 @@ }} {{outlet}}
    -{{/if}} {{to-elsewhere named="md-subbar-extra" diff --git a/app/pods/dictionary/show/edit/domain/edit/citation/index/route.js b/app/pods/dictionary/show/edit/domain/edit/citation/index/route.js index 53ed5d90f..ea21859fa 100644 --- a/app/pods/dictionary/show/edit/domain/edit/citation/index/route.js +++ b/app/pods/dictionary/show/edit/domain/edit/citation/index/route.js @@ -4,6 +4,10 @@ import { isEmpty } from '@ember/utils'; import { get, set } from '@ember/object'; export default Route.extend(ScrollTo, { + breadCrumb: { + title: 'Reference' + }, + afterModel(model) { let domainId = this.paramsFor('dictionary.show.edit.domain.edit') .domain_id; @@ -15,6 +19,13 @@ export default Route.extend(ScrollTo, { this.set('domainId', domainId); }, + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor('dictionary.show.edit')); + }, + actions: { backToDomain() { this.transitionTo('dictionary.show.edit.domain.edit', diff --git a/app/pods/dictionary/show/edit/domain/edit/citation/index/template.hbs b/app/pods/dictionary/show/edit/domain/edit/citation/index/template.hbs index f6113d727..4f76969f4 100644 --- a/app/pods/dictionary/show/edit/domain/edit/citation/index/template.hbs +++ b/app/pods/dictionary/show/edit/domain/edit/citation/index/template.hbs @@ -1,6 +1,6 @@ -

    Editing Citation - for {{model.codeName}} - {{control/md-status model=model}} +

    Editing Reference + for Domain {{model.codeName}} + {{control/md-status model=parentModel}}

    {{#with model.domainReference as |citation|}} {{object/md-citation diff --git a/app/pods/dictionary/show/edit/domain/edit/citation/route.js b/app/pods/dictionary/show/edit/domain/edit/citation/route.js index 6c74252aa..c99f07f2b 100644 --- a/app/pods/dictionary/show/edit/domain/edit/citation/route.js +++ b/app/pods/dictionary/show/edit/domain/edit/citation/route.js @@ -1,4 +1,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ + breadCrumb: { + title: 'Reference' + } }); diff --git a/app/pods/dictionary/show/edit/domain/edit/citation/template.hbs b/app/pods/dictionary/show/edit/domain/edit/citation/template.hbs index b8324902e..c24cd6895 100644 --- a/app/pods/dictionary/show/edit/domain/edit/citation/template.hbs +++ b/app/pods/dictionary/show/edit/domain/edit/citation/template.hbs @@ -1 +1 @@ -{{liquid-outlet}} +{{outlet}} diff --git a/app/pods/dictionary/show/edit/domain/edit/index/route.js b/app/pods/dictionary/show/edit/domain/edit/index/route.js index bf2c872d7..82d73f63d 100644 --- a/app/pods/dictionary/show/edit/domain/edit/index/route.js +++ b/app/pods/dictionary/show/edit/domain/edit/index/route.js @@ -15,7 +15,8 @@ export default Route.extend(ScrollTo, { this.controllerFor('dictionary.show.edit') .setProperties({ - onCancel: parent.get('setupModel') + onCancel: parent.get('setupModel'), + cancelScope: this }); }, diff --git a/app/pods/dictionary/show/edit/domain/edit/template.hbs b/app/pods/dictionary/show/edit/domain/edit/template.hbs index b8324902e..915dcd11e 100644 --- a/app/pods/dictionary/show/edit/domain/edit/template.hbs +++ b/app/pods/dictionary/show/edit/domain/edit/template.hbs @@ -1 +1 @@ -{{liquid-outlet}} +{{liquid-outlet class="liquid-spy"}} diff --git a/app/pods/dictionary/show/edit/domain/template.hbs b/app/pods/dictionary/show/edit/domain/template.hbs index b8324902e..f45004d5d 100644 --- a/app/pods/dictionary/show/edit/domain/template.hbs +++ b/app/pods/dictionary/show/edit/domain/template.hbs @@ -1 +1,5 @@ -{{liquid-outlet}} +
    +
    + {{liquid-outlet class=""}} +
    +
    diff --git a/app/pods/dictionary/show/edit/entities/route.js b/app/pods/dictionary/show/edit/entities/route.js deleted file mode 100644 index 26d9f3124..000000000 --- a/app/pods/dictionary/show/edit/entities/route.js +++ /dev/null @@ -1,4 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ -}); diff --git a/app/pods/dictionary/show/edit/entities/template.hbs b/app/pods/dictionary/show/edit/entities/template.hbs deleted file mode 100644 index 3a496d2d4..000000000 --- a/app/pods/dictionary/show/edit/entities/template.hbs +++ /dev/null @@ -1,23 +0,0 @@ -{{outlet}} - - -{{#layout/md-card class="construction card-inverse card-warning" shadow=false}} -
    -
    - {{fa-icon "exclamation-triangle" size=2}} -
    -
    - Page Under
    Construction     -
    -
    -{{/layout/md-card}} diff --git a/app/pods/dictionary/show/edit/entity/edit/attribute/index/route.js b/app/pods/dictionary/show/edit/entity/edit/attribute/index/route.js new file mode 100644 index 000000000..9ffcf5352 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/attribute/index/route.js @@ -0,0 +1,38 @@ +import Route from '@ember/routing/route'; +import { + get +} from '@ember/object'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +export default Route.extend(ScrollTo, { + beforeModel(transition) { + this.set('entityId', transition.params[ + 'dictionary.show.edit.entity.edit'].entity_id); + this.set('attributeId', transition.params[ + 'dictionary.show.edit.entity.edit.attribute'].attribute_id); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + let parent = this.controllerFor('dictionary.show.edit.entity.edit.attribute'); + + this.controller.set('parentModel', this.modelFor( + 'dictionary.show.edit')); + this.controller.set('entityId', get(this, 'entityId')); + this.controller.set('attributeId', get(this, 'attributeId')); + this.controllerFor('dictionary.show.edit') + .setProperties({ + onCancel: get(parent, 'setupModel'), + cancelScope: this + }); + }, + + actions: { + backToEntity() { + this.transitionTo('dictionary.show.edit.entity.edit', + this.get('entityId')); + } + } +}); diff --git a/app/pods/dictionary/show/edit/entity/edit/attribute/index/template.hbs b/app/pods/dictionary/show/edit/entity/edit/attribute/index/template.hbs new file mode 100644 index 000000000..040171c01 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/attribute/index/template.hbs @@ -0,0 +1,28 @@ +

    + Editing Attribute {{#if model.codeName}} + {{model.codeName}} + {{else}} + #{{attributeId}} + {{/if}} + for {{parentModel.title}} + {{control/md-status model=parentModel}} +

    + +{{object/md-attribute + class="" + model=model + profilePath="dictionary.entity.attribute" +}} +{{!-- editCitation=(route-action "editCitation") --}} + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" + text="Back to Entity" + icon="arrow-left" + click=(route-action "backToEntity") + ) +}} + +{{to-elsewhere named="md-scroll-spy-dict-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/dictionary/show/edit/entity/edit/attribute/route.js b/app/pods/dictionary/show/edit/entity/edit/attribute/route.js new file mode 100644 index 000000000..286daaec5 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/attribute/route.js @@ -0,0 +1,66 @@ +import Route from '@ember/routing/route'; +import { + //computed, + get +} from '@ember/object'; +import { + isArray +} from '@ember/array'; +import { + isEmpty +} from '@ember/utils'; + +export default Route.extend({ + beforeModel(transition) { + this.set('entityId', transition.params[ + 'dictionary.show.edit.entity.edit'].entity_id); + }, + model(params) { + this.set('attributeId', params.attribute_id); + + return this.setupModel(); + }, + + // breadCrumb: computed('attributeId', function () { + // let model = get(this, 'currentRouteModel').call(this); + // + // return { + // title: 'Attribute: ' + (get(model,'codeName') || get(this, 'attributeId')) + // }; + // }), + + setupController(controller, model) { + this._super(controller, model); + + this.controller.set('setupModel', get(this, 'setupModel')); + + }, + + setupModel() { + let attributeId = get(this, 'attributeId'); + let model = this.modelFor('dictionary.show.edit'); + let objects = model.get('json.dataDictionary.entity.' + get(this, + 'entityId') + '.attribute'); + let resource = attributeId && isArray(objects) ? objects.objectAt( + attributeId) : + undefined; + + //make sure the entity item exists + if(isEmpty(resource)) { + get(this, 'flashMessages') + .warning('No Attribute found! Re-directing to Entity...'); + this.replaceWith('dictionary.show.edit.entity.edit'); + + return; + } + + return resource; + }, + + actions: { + backToEntity() { + this.transitionTo('dictionary.show.edit.entity.edit', + this.get('entityId')); + } + } +}); diff --git a/app/pods/dictionary/show/edit/entity/edit/attribute/template.hbs b/app/pods/dictionary/show/edit/entity/edit/attribute/template.hbs new file mode 100644 index 000000000..e2147cab0 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/attribute/template.hbs @@ -0,0 +1 @@ +{{outlet}} \ No newline at end of file diff --git a/app/pods/dictionary/show/edit/entity/edit/citation/identifier/route.js b/app/pods/dictionary/show/edit/entity/edit/citation/identifier/route.js new file mode 100644 index 000000000..6bd053b07 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/citation/identifier/route.js @@ -0,0 +1,68 @@ +import Route from '@ember/routing/route'; +import { + isEmpty +} from '@ember/utils'; +import { + isArray +} from '@ember/array'; +import { + get +} from '@ember/object'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +export default Route.extend(ScrollTo, { + beforeModel(transition) { + this.set('entityId', transition.params[ + 'dictionary.show.edit.entity.edit'].entity_id); + this.set('citationId', transition.params[ + 'dictionary.show.edit.entity.edit.citation'].citation_id); + }, + model(params) { + this.set('identifierId', params.identifier_id); + + return this.setupModel(); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'dictionary.show.edit')); + this.controllerFor('dictionary.show.edit') + .setProperties({ + onCancel: this.setupModel, + cancelScope: this + }); + }, + + setupModel() { + let identifierId = get(this, 'identifierId'); + //let model = this.modelFor('dictionary.show.edit.citation.index'); + //let identifiers = model.get('json.dataDictionary.citation.identifier'); + let model = this.modelFor('dictionary.show.edit'); + let identifiers = model.get('json.dataDictionary.entity.' + get(this, + 'entityId') + '.entityReference.' + get(this, + 'citationId') + '.identifier'); + let identifier = identifierId && isArray(identifiers) ? identifiers.get( + identifierId) : undefined; + + //make sure the identifier exists + if(isEmpty(identifier)) { + get(this, 'flashMessages') + .warning('No identifier found! Re-directing to citation...'); + this.replaceWith('dictionary.show.edit.entity.edit.citation.index'); + + return; + } + + return identifier; + }, + + actions: { + backToReference() { + this.transitionTo('dictionary.show.edit.entity.edit.citation', + this.get('entityId'), this.get('citationId')); + } + } +}); diff --git a/app/pods/dictionary/show/edit/entity/edit/citation/identifier/template.hbs b/app/pods/dictionary/show/edit/entity/edit/citation/identifier/template.hbs new file mode 100644 index 000000000..2979b9caf --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/citation/identifier/template.hbs @@ -0,0 +1,25 @@ +

    + Editing Identifier + {{control/md-status model=parentModel}} +

    + +
    + {{object/md-identifier + class="" + model=model + profilePath="dictionary.entity.citation.identifier" + data-spy="Identifier" + }} +
    + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" + text="Back to Entity Reference" + icon="arrow-left" + click=(route-action "backToReference") + ) +}} + +{{to-elsewhere named="md-scroll-spy-dict-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/dictionary/show/edit/entity/edit/citation/index/route.js b/app/pods/dictionary/show/edit/entity/edit/citation/index/route.js new file mode 100644 index 000000000..4dd3a370a --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/citation/index/route.js @@ -0,0 +1,17 @@ +import Route from '@ember/routing/route'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +export default Route.extend(ScrollTo, { + actions: { + editIdentifier(index) { + this.transitionTo('dictionary.show.edit.entity.edit.citation.identifier', index) + .then(function () { + this.setScrollTo('entity-identifier'); + }.bind(this)); + } + }, + backToEntity() { + this.transitionTo('dictionary.show.edit.entity.edit', + this.get('entityId')); + } +}); diff --git a/app/pods/dictionary/show/edit/entity/edit/citation/index/template.hbs b/app/pods/dictionary/show/edit/entity/edit/citation/index/template.hbs new file mode 100644 index 000000000..a9d861089 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/citation/index/template.hbs @@ -0,0 +1,23 @@ +

    Editing Reference + for {{model.title}} + {{control/md-status model=model}} +

    +{{#with model as |citation|}} + {{object/md-citation + class="" + model=citation + profilePath="dictionary.entity.entityReference" + editIdentifier=(route-action "editIdentifier") + }} + {{outlet}} +{{/with}} +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" + text="Back to Entity" + icon="arrow-left" + click=(route-action "backToEntity") + ) +}} +{{to-elsewhere named="md-scroll-spy-dict-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/dictionary/show/edit/entity/edit/citation/route.js b/app/pods/dictionary/show/edit/entity/edit/citation/route.js new file mode 100644 index 000000000..27b4e152e --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/citation/route.js @@ -0,0 +1,59 @@ +import Route from '@ember/routing/route'; +import { get } from '@ember/object'; +import { isArray } from '@ember/array'; +import { isEmpty } from '@ember/utils'; + +export default Route.extend({ + breadCrumb: { + title: 'Reference' + }, + + beforeModel(transition) { + this.set('entityId', transition.params[ + 'dictionary.show.edit.entity.edit'].entity_id); + }, + + model(params) { + this.set('citationId', params.citation_id); + + return this.setupModel(); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor('dictionary.show.edit')); + this.controllerFor('dictionary.show.edit') + .setProperties({ + onCancel: this.setupModel, + cancelScope: this + }); + }, + + setupModel() { + let citationId = get(this, 'citationId'); + let model = this.modelFor('dictionary.show.edit'); + let citations = model.get('json.dataDictionary.entity.' + get(this, + 'entityId') + '.entityReference'); + let citation = citationId && isArray(citations) ? citations.get( + citationId) : undefined; + + //make sure the citation exists + if(isEmpty(citation)) { + get(this, 'flashMessages') + .warning('No Entity Reference found! Re-directing...'); + this.replaceWith('dictionary.show.edit.entity.edit'); + + return; + } + + return citation; + }, + actions: { + backToEntity() { + this.transitionTo('dictionary.show.edit.entity.edit', + this.get('entityId')); + } + } +}); diff --git a/app/pods/dictionary/show/edit/entity/edit/citation/template.hbs b/app/pods/dictionary/show/edit/entity/edit/citation/template.hbs new file mode 100644 index 000000000..915dcd11e --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/citation/template.hbs @@ -0,0 +1 @@ +{{liquid-outlet class="liquid-spy"}} diff --git a/app/pods/dictionary/show/edit/entity/edit/index/route.js b/app/pods/dictionary/show/edit/entity/edit/index/route.js new file mode 100644 index 000000000..1b5fcfb2f --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/index/route.js @@ -0,0 +1,41 @@ +import Route from '@ember/routing/route'; +import { + get +} from '@ember/object'; +import ScrollTo from 'mdeditor/mixins/scroll-to'; + +export default Route.extend(ScrollTo, { + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + let parent = this.controllerFor('dictionary.show.edit.entity.edit'); + + this.controller.set('parentModel', this.modelFor( + 'dictionary.show.edit')); + this.controller.set('entityId', get(parent, 'entityId')); + + this.controllerFor('dictionary.show.edit') + .setProperties({ + onCancel: parent.get('setupModel'), + cancelScope: this + }); + }, + + actions: { + editCitation(id) { + this.transitionTo('dictionary.show.edit.entity.edit.citation', id) + .then(function () { + this.setScrollTo('entity-reference'); + }.bind(this)); + }, + editAttribute(id) { + this.transitionTo('dictionary.show.edit.entity.edit.attribute.index', + id) + .then(function () { + this.setScrollTo('md-attribute-' + id); + }.bind(this)); + } + } +}); diff --git a/app/pods/dictionary/show/edit/entity/edit/index/template.hbs b/app/pods/dictionary/show/edit/entity/edit/index/template.hbs new file mode 100644 index 000000000..fbff64230 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/index/template.hbs @@ -0,0 +1,29 @@ +

    + Editing Entity {{#if model.codeName}} + {{model.codeName}} + {{else}} + #{{entityId}} + {{/if}} + for {{parentModel.title}} + {{control/md-status model=parentModel}} +

    + +{{object/md-entity + class="" + model=model + dictionary=parentModel.json.dataDictionary + profilePath="dictionary.entity" + editCitation=(route-action "editCitation") +}} + +{{to-elsewhere + named="md-subbar-extra" + send=(component "control/subbar-link" + text="Back to Entity List" + icon="arrow-left" + route="dictionary.show.edit.entity.index" + ) +}} + +{{to-elsewhere named="md-scroll-spy-dict-edit" + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} diff --git a/app/pods/dictionary/show/edit/entity/edit/route.js b/app/pods/dictionary/show/edit/entity/edit/route.js new file mode 100644 index 000000000..f95932a24 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/route.js @@ -0,0 +1,50 @@ +import Route from '@ember/routing/route'; +import { get, computed } from '@ember/object'; +import { isArray } from '@ember/array'; +import { isEmpty } from '@ember/utils'; + +export default Route.extend({ + model(params) { + this.set('entityId', params.entity_id); + + return this.setupModel(); + }, + + breadCrumb: computed('entityId', function () { + return { + title: get(this, 'entityId') + }; + }), + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('setupModel', get(this, 'setupModel')); + this.controller.set('entityId', get(this, 'entityId')); + this.controllerFor('dictionary.show.edit') + .setProperties({ + onCancel: this.setupModel, + cancelScope: this + }); + }, + + setupModel() { + let entityId = get(this, 'entityId'); + let model = this.modelFor('dictionary.show.edit'); + let objects = model.get('json.dataDictionary.entity'); + let resource = entityId && isArray(objects) ? objects.objectAt(entityId) : + undefined; + + //make sure the entity exists + if(isEmpty(resource)) { + get(this, 'flashMessages') + .warning('No Entity object found! Re-directing to list...'); + this.replaceWith('dictionary.show.edit.entity'); + + return; + } + + return resource; + } +}); diff --git a/app/pods/dictionary/show/edit/entity/edit/template.hbs b/app/pods/dictionary/show/edit/entity/edit/template.hbs new file mode 100644 index 000000000..915dcd11e --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/edit/template.hbs @@ -0,0 +1 @@ +{{liquid-outlet class="liquid-spy"}} diff --git a/app/pods/dictionary/show/edit/entity/index/route.js b/app/pods/dictionary/show/edit/entity/index/route.js new file mode 100644 index 000000000..60dff3588 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/index/route.js @@ -0,0 +1,29 @@ +import Route from '@ember/routing/route'; +import { + getWithDefault, + get, + set +} from '@ember/object'; + +export default Route.extend({ + afterModel(m) { + this._super(...arguments); + + let model = get(m, 'json.dataDictionary'); + set(model, 'entity', getWithDefault(model, 'entity', [])); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'dictionary.show.edit.index')); + }, + + actions: { + editEntity(id) { + this.transitionTo('dictionary.show.edit.entity.edit', id); + } + } +}); diff --git a/app/pods/dictionary/show/edit/entity/index/template.hbs b/app/pods/dictionary/show/edit/entity/index/template.hbs new file mode 100644 index 000000000..1abcd4198 --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/index/template.hbs @@ -0,0 +1,19 @@ +

    + Editing Entities + for {{model.title}} + {{control/md-status model=model}} +

    + +{{object/md-objectroute-table + items=model.json.dataDictionary.entity + header="Entity" + shadow=true + buttonText="Add Entity" + ellipsis=true + attributes="entityId,codeName,definition" + editItem=(route-action "editEntity") + verticalButtons=true + profilePath="dictionary.entity" + hideIndex=false + condensed=false +}} diff --git a/app/pods/dictionary/show/edit/entity/route.js b/app/pods/dictionary/show/edit/entity/route.js new file mode 100644 index 000000000..6c74252aa --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/route.js @@ -0,0 +1,4 @@ +import Route from '@ember/routing/route'; + +export default Route.extend({ +}); diff --git a/app/pods/dictionary/show/edit/entity/template.hbs b/app/pods/dictionary/show/edit/entity/template.hbs new file mode 100644 index 000000000..f45004d5d --- /dev/null +++ b/app/pods/dictionary/show/edit/entity/template.hbs @@ -0,0 +1,5 @@ +
    +
    + {{liquid-outlet class=""}} +
    +
    diff --git a/app/pods/dictionary/show/edit/index/template.hbs b/app/pods/dictionary/show/edit/index/template.hbs index f33c81148..92ecc3f4b 100644 --- a/app/pods/dictionary/show/edit/index/template.hbs +++ b/app/pods/dictionary/show/edit/index/template.hbs @@ -1,5 +1,5 @@ {{#with model.json.dataDictionary as |resource|}} -
    +

    Editing {{model.title}} {{control/md-status model=model}} diff --git a/app/pods/dictionary/show/edit/template.hbs b/app/pods/dictionary/show/edit/template.hbs index c20568aa2..1d32ed7df 100644 --- a/app/pods/dictionary/show/edit/template.hbs +++ b/app/pods/dictionary/show/edit/template.hbs @@ -1,10 +1,11 @@
    -
    -
    - {{liquid-outlet class="liquid-spy"}} -
    -
    + {{outlet}} + {{!--
    +
    --}} + {{!-- {{liquid-outlet class="liquid-spy"}} --}} + {{!--
    +
    --}}
    diff --git a/app/pods/record/show/edit/main/index/template.hbs b/app/pods/record/show/edit/main/index/template.hbs index 268c79de5..abee29e1e 100644 --- a/app/pods/record/show/edit/main/index/template.hbs +++ b/app/pods/record/show/edit/main/index/template.hbs @@ -177,4 +177,4 @@ {{/with}} {{to-elsewhere named="md-scroll-spy-record-edit" - send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo"))}} + send=(component "control/md-scroll-spy" scrollInit=scrollTo setScrollTo=(route-action "setScrollTo") refresh=model.profile)}} diff --git a/app/router.js b/app/router.js index 3a107268b..0dd15e0da 100644 --- a/app/router.js +++ b/app/router.js @@ -145,7 +145,6 @@ Router.map(function () { path: ':dictionary_id' }, function () { this.route('edit', function () { - this.route('entities'); this.route('citation', function () { this.route('identifier', { path: 'identifier/:identifier_id' @@ -165,6 +164,22 @@ Router.map(function () { }); }); }); + this.route('entity', function () { + this.route('edit', { + path: ':entity_id' + }, function () { + this.route('citation', { + path: 'citation/:citation_id' + }, function () { + this.route('identifier', { + path: 'identifier/:identifier_id' + }); + }); + this.route('attribute', { + path: 'attribute/:attribute_id' + }, function () {}); + }); + }); }); }); }); diff --git a/app/services/profile.js b/app/services/profile.js index 35470311e..8ed06c09f 100644 --- a/app/services/profile.js +++ b/app/services/profile.js @@ -831,7 +831,7 @@ export default Ember.Service.extend({ }, { title: 'Entities', - target: 'dictionary.show.edit.entities', + target: 'dictionary.show.edit.entity', tip: 'Information about entities(tables) and attributes(columns or fields).' }] } diff --git a/app/transitions.js b/app/transitions.js index 33a97c005..34321ef27 100644 --- a/app/transitions.js +++ b/app/transitions.js @@ -119,8 +119,8 @@ export default function() { this.reverse('toRight') ); this.transition( - this.toRoute('dictionary.show.edit.domain.edit.citation.index'), - this.fromRoute('dictionary.show.edit.domain.edit'), + this.toRoute('dictionary.show.edit.domain.edit.citation'), + this.fromRoute('dictionary.show.edit.domain.edit.index'), this.use('toLeft'), this.reverse('toRight') ); @@ -130,6 +130,36 @@ export default function() { this.use('toLeft'), this.reverse('toRight') ); + this.transition( + this.toRoute('dictionary.show.edit.entity.edit'), + this.fromRoute('dictionary.show.edit.entity.index'), + this.use('toLeft'), + this.reverse('toRight') + ); + this.transition( + this.toRoute('dictionary.show.edit.entity.edit'), + this.fromRoute('dictionary.show.edit.entity.index'), + this.use('toLeft'), + this.reverse('toRight') + ); + this.transition( + this.toRoute('dictionary.show.edit.entity.edit.citation'), + this.fromRoute('dictionary.show.edit.entity.edit.index'), + this.use('toLeft'), + this.reverse('toRight') + ); + this.transition( + this.toRoute('dictionary.show.edit.entity.edit.citation.identifier'), + this.fromRoute('dictionary.show.edit.entity.edit.citation.index'), + this.use('toLeft'), + this.reverse('toRight') + ); + this.transition( + this.toRoute('dictionary.show.edit.entity.edit.attribute'), + this.fromRoute('dictionary.show.edit.entity.edit.index'), + this.use('toLeft'), + this.reverse('toRight') + ); //if // this.transition( // this.hasClass('liquid-collapse'), diff --git a/tests/integration/pods/components/object/md-attribute/component-test.js b/tests/integration/pods/components/object/md-attribute/component-test.js new file mode 100644 index 000000000..dea3348c7 --- /dev/null +++ b/tests/integration/pods/components/object/md-attribute/component-test.js @@ -0,0 +1,24 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-attribute', 'Integration | Component | object/md attribute', { + integration: true +}); + +test('it renders', function(assert) { + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-attribute}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-attribute}} + template block text + {{/object/md-attribute}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-attribute/preview/component-test.js b/tests/integration/pods/components/object/md-attribute/preview/component-test.js new file mode 100644 index 000000000..f1f3161b6 --- /dev/null +++ b/tests/integration/pods/components/object/md-attribute/preview/component-test.js @@ -0,0 +1,24 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-attribute/preview', 'Integration | Component | object/md attribute/preview', { + integration: true +}); + +test('it renders', function(assert) { + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-attribute/preview}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-attribute/preview}} + template block text + {{/object/md-attribute/preview}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/integration/pods/components/object/md-entity/component-test.js b/tests/integration/pods/components/object/md-entity/component-test.js new file mode 100644 index 000000000..534f271d5 --- /dev/null +++ b/tests/integration/pods/components/object/md-entity/component-test.js @@ -0,0 +1,24 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('object/md-entity', 'Integration | Component | object/md entity', { + integration: true +}); + +test('it renders', function(assert) { + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{object/md-entity}}`); + + assert.equal(this.$().text().trim(), ''); + + // Template block usage: + this.render(hbs` + {{#object/md-entity}} + template block text + {{/object/md-entity}} + `); + + assert.equal(this.$().text().trim(), 'template block text'); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entity/edit/attribute/index/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/edit/attribute/index/route-test.js new file mode 100644 index 000000000..1b0bbaddb --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/entity/edit/attribute/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/entity/edit/attribute/index', 'Unit | Route | dictionary/show/edit/entity/edit/attribute/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entity/edit/attribute/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/edit/attribute/route-test.js new file mode 100644 index 000000000..e8d87d89f --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/entity/edit/attribute/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/entity/edit/attribute', 'Unit | Route | dictionary/show/edit/entity/edit/attribute', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entity/edit/citation/identifier/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/edit/citation/identifier/route-test.js new file mode 100644 index 000000000..3fc4da3d8 --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/entity/edit/citation/identifier/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/entity/edit/citation/identifier', 'Unit | Route | dictionary/show/edit/entity/edit/citation/identifier', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entity/edit/citation/index/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/edit/citation/index/route-test.js new file mode 100644 index 000000000..eb622eb3f --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/entity/edit/citation/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/entity/edit/citation/index', 'Unit | Route | dictionary/show/edit/entity/edit/citation/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entity/edit/citation/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/edit/citation/route-test.js new file mode 100644 index 000000000..96069ed62 --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/entity/edit/citation/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/entity/edit/citation', 'Unit | Route | dictionary/show/edit/entity/edit/citation', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entity/edit/index/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/edit/index/route-test.js new file mode 100644 index 000000000..2f0e47ec4 --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/entity/edit/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/entity/edit/index', 'Unit | Route | dictionary/show/edit/entity/edit/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entity/edit/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/edit/route-test.js new file mode 100644 index 000000000..56d910289 --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/entity/edit/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/entity/edit', 'Unit | Route | dictionary/show/edit/entity/edit', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entity/index/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/index/route-test.js new file mode 100644 index 000000000..c81a52459 --- /dev/null +++ b/tests/unit/pods/dictionary/show/edit/entity/index/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:dictionary/show/edit/entity/index', 'Unit | Route | dictionary/show/edit/entity/index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/pods/dictionary/show/edit/entities/route-test.js b/tests/unit/pods/dictionary/show/edit/entity/route-test.js similarity index 62% rename from tests/unit/pods/dictionary/show/edit/entities/route-test.js rename to tests/unit/pods/dictionary/show/edit/entity/route-test.js index c2c1ca82f..cf6411d05 100644 --- a/tests/unit/pods/dictionary/show/edit/entities/route-test.js +++ b/tests/unit/pods/dictionary/show/edit/entity/route-test.js @@ -1,11 +1,11 @@ import { moduleFor, test } from 'ember-qunit'; -moduleFor('route:dictionary/show/edit/entities', 'Unit | Route | dictionary/edit/entities', { +moduleFor('route:dictionary/show/edit/entity', 'Unit | Route | dictionary/show/edit/entity', { // Specify the other units that are required for this test. // needs: ['controller:foo'] }); test('it exists', function(assert) { - var route = this.subject(); + let route = this.subject(); assert.ok(route); }); From 56f136a6570306774a0714557846684adf430b92 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Thu, 8 Feb 2018 19:32:03 -0800 Subject: [PATCH 376/383] Support for attributes --- .../object/md-attribute/component.js | 47 ++- .../object/md-attribute/preview/component.js | 2 +- .../object/md-attribute/template.hbs | 305 ++++++++++-------- .../components/object/md-entity/component.js | 59 +++- .../components/object/md-entity/template.hbs | 41 +++ .../show/edit/domain/edit/index/route.js | 4 + .../edit/entity/edit/attribute/index/route.js | 6 + .../entity/edit/attribute/index/template.hbs | 1 + .../show/edit/entity/edit/attribute/route.js | 10 + .../show/edit/entity/edit/index/route.js | 4 + .../show/edit/entity/index/route.js | 7 +- 11 files changed, 336 insertions(+), 150 deletions(-) diff --git a/app/pods/components/object/md-attribute/component.js b/app/pods/components/object/md-attribute/component.js index 9d7069ec5..0af3305f5 100644 --- a/app/pods/components/object/md-attribute/component.js +++ b/app/pods/components/object/md-attribute/component.js @@ -3,7 +3,8 @@ import EmberObject from '@ember/object'; import { set, getWithDefault, - get + get, + computed } from '@ember/object'; import { alias @@ -44,16 +45,15 @@ const Validations = buildValidations({ ] }); - const TemplateClass = EmberObject.extend(Validations, { init() { this._super(...arguments); set(this, 'allowNull', false); set(this, 'attributeReference', {}); - set(this, 'alias',[]); - set(this, 'valueRange',[]); - set(this, 'timePeriod',[]); + set(this, 'alias', []); + set(this, 'valueRange', []); + set(this, 'timePeriod', []); } }); @@ -93,7 +93,42 @@ const theComp = Component.extend(Validations, { codeName: alias('model.codeName'), dataType: alias('model.dataType'), definition: alias('model.definition'), - allowNull: alias('model.allowNull') + allowNull: alias('model.allowNull'), + domains: alias('dictionary.domain'), + + domainList: computed('domains.@each.domainId', 'domains.@each.codeName', + function () { + let domains = get(this, 'domains') || []; + + return domains.map((domain) => { + if(get(domain, 'domainId')) { + return { + codeId: get(domain, 'domainId'), + codeName: get(domain, 'codeName'), + tooltip: get(domain, 'description') + }; + } + }); + }), + + rangeTemplate: EmberObject.extend(buildValidations({ + 'minRangeValue': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'maxRangeValue': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ] + }), { + init() { + this._super(...arguments); + } + }), }); export { diff --git a/app/pods/components/object/md-attribute/preview/component.js b/app/pods/components/object/md-attribute/preview/component.js index 0c124fa4b..22f8cb8ec 100644 --- a/app/pods/components/object/md-attribute/preview/component.js +++ b/app/pods/components/object/md-attribute/preview/component.js @@ -5,7 +5,7 @@ import { } from '../component'; export default Component.extend(Validations, { - tagName:'', + tagName: '', model: alias('item'), name: alias('model.codeName'), dataType: alias('model.dataType'), diff --git a/app/pods/components/object/md-attribute/template.hbs b/app/pods/components/object/md-attribute/template.hbs index c7e715692..e5330e7d4 100644 --- a/app/pods/components/object/md-attribute/template.hbs +++ b/app/pods/components/object/md-attribute/template.hbs @@ -2,149 +2,202 @@ profilePath=(concat profilePath ".information") data-spy="Attribute Information" required=true }} - {{input/md-input - model=this - valuePath="codeName" - placeholder="The code used to identify this attribute, e.g.the column name." - label="Code Name" - data-spy="Code Name" - profilePath=(concat profilePath ".codeName") - class="md-embedded" - }} + {{#with (concat profilePath ".information") as |profilePath|}} + {{input/md-input + model=this + valuePath="codeName" + placeholder="The code used to identify this attribute, e.g.the column name." + label="Code Name" + data-spy="Code Name" + profilePath=(concat profilePath ".codeName") + class="md-embedded" + }} - {{input/md-textarea - value=this.definition - required=true - autoresize=true - placeholder="A brief description of the attribute." - label="Definition" - data-spy="Definition" - embedded=true - profilePath=(concat profilePath ".definition") - }} + {{input/md-textarea + value=this.definition + required=true + autoresize=true + placeholder="A brief description of the attribute." + label="Definition" + data-spy="Definition" + embedded=true + profilePath=(concat profilePath ".definition") + }} - {{input/md-input - model=this - valuePath="dataType" - placeholder="The datatype for the attribute(column)." - label="Data Type" - data-spy="Data Type" - profilePath=(concat profilePath ".dataType") - class="md-embedded" - }} + {{input/md-input + model=this + valuePath="dataType" + placeholder="The datatype for the attribute(column)." + label="Data Type" + data-spy="Data Type" + profilePath=(concat profilePath ".dataType") + class="md-embedded" + }} - {{input/md-boolean - label="Allow Null?" - required=true - text="Allow null values" - value=model.allowNull - profilePath=(concat profilePath ".allowNull") - }} + {{input/md-boolean + label="Allow Null?" + required=true + text="Allow null values" + value=model.allowNull + profilePath=(concat profilePath ".allowNull") + }} - {{input/md-input - value=model.commonName - placeholder="Enter a short common(alternate) name for the attribute." - label="Common Name" - profilePath=(concat profilePath ".commonName") - data-spy="Common Name" - class="md-embedded" - }} + {{input/md-input + value=model.commonName + placeholder="Enter a short common(alternate) name for the attribute." + label="Common Name" + profilePath=(concat profilePath ".commonName") + data-spy="Common Name" + class="md-embedded" + }} - {{#object/md-simple-array-table - title="Alias" - required=false - plain=true - profilePath=(concat profilePath ".alias") - data-spy="Alias" - class="md-embedded" - value=model.alias as |val| - }} - - {{input/md-input value=val.item.value - placeholder="Alternate names used to identify this attribute."}} - - {{/object/md-simple-array-table}} + {{input/md-codelist + label="Domain" + value=model.primaryKeyAttributeCodeName + mapped=domainList + create=true + tooltip=true + placeholder="Select or enter the domain for this attribute." + profilePath=(concat profilePath ".domain") + data-spy="Domain" + class="md-embedded" + }} -{{/layout/md-card}} + {{#object/md-simple-array-table + title="Alias" + required=false + plain=true + profilePath=(concat profilePath ".alias") + data-spy="Alias" + class="md-embedded" + value=model.alias as |val| + }} + + {{input/md-input value=val.item.value + placeholder="Alternate names used to identify this attribute."}} + + {{/object/md-simple-array-table}} -{{!-- {{object/md-objectroute-table - attributes="Name,Data Type, Definition" - items=model.attribute - header="Attributes" - shadow=true - buttonText="Add Attribute" - ellipsis=fallse - previewTemplateTable="object/md-attribute/preview" - editItem=(route-action "editAttribute") - verticalButtons=false - profilePath=profilePath - hideIndex=false - condensed=false - editOnAdd=false - scrollToId="md-attribute" - data-spy="Attributes" -}} + {{input/md-boolean + label="Allow Many?" + required=true + text="Allow multiple values?" + value=model.allowMany + profilePath=(concat profilePath ".allowMany") + }} -{{#layout/md-card - title="Entity Structure" - collapsible=true - collapsed=false - profilePath=(concat profilePath ".structure") - data-spy="Entity Structure" -}} + {{input/md-input + value=model.units + placeholder="A unit-of-measure for the attribute, e.g. 'meter', 'atmosphere', 'liter'" + label="Units" + profilePath=(concat profilePath ".units") + }} - {{input/md-input - value=model.fieldSeparatorCharacter - placeholder="The character which indicates the end of data field contents." - label="Field Separator Character" - profilePath=(concat profilePath ".structure.fieldSeparatorCharacter") - class="md-embedded" - }} + {{input/md-input + type="number" + step=".1" + model=model + valuePath="unitsResolution" + placeholder="The smallest unit increment for the attribute value." + label="Units Resolution" + profilePath=(concat profilePath ".unitsResolution") + }} + {{input/md-boolean + label="Case Sensitive?" + required=true + text="Is the attribute content case sensitive?" + value=model.isCaseSensitive + profilePath=(concat profilePath ".caseSensitive") + }} {{input/md-input type="number" - step=1 model=model - valuePath="numberOfHeaderLines" - placeholder="The number of lines at the beginning of the file." - label="# Header Lines" - profilePath=(concat profilePath ".structure.numberOfHeaderLines") - class="md-embedded" + valuePath="fieldWidth" + placeholder="The number of characters allowed in the attribute value." + label="Field Width" + profilePath=(concat profilePath ".fieldWidth") }} - {{input/md-input - value=model.quoteCharacter - placeholder="Character used to quote fields in the data representation." - label="Quote Character" - profilePath=(concat profilePath ".structure.quoteCharacter") - class="md-embedded" - }} + {{input/md-input + value=model.missingValue + placeholder="The code which represents missing data." + label="Missing Value" + profilePath=(concat profilePath ".missingValue") + }} -{{/layout/md-card}} --}} + {{input/md-input + value=model.minValue + placeholder="The minimum value permissible for this attribute." + label="Minimum Value" + profilePath=(concat profilePath ".minValue") + }} -{{!-- {{object/md-objectroute-table - attributes="Name,Value,Definition" - items=model.entityItem - header="Entity Items" - shadow=true - buttonText="Add Item" - ellipsis=fallse - previewTemplateTable="object/md-entityitem/preview" - editItem=(route-action "editItem") - verticalButtons=false - profilePath=profilePath - hideIndex=false - condensed=false - editOnAdd=false - scrollToId="md-entityitem" + {{input/md-input + value=model.maxValue + placeholder="The maximum value permissible for this attribute." + label="Maximum Value" + profilePath=(concat profilePath ".maxValue") + }} + {{/with}} +{{/layout/md-card}} + +{{#object/md-array-table + columns="Min Value, Max Value" + value=model.valueRange + title="Value Range" + plain=false + templateClass=rangeTemplate + profilePath=(concat profilePath ".valueRange") + data-spy="Value Range" as |rg| +}} + + {{input/md-input + model=rg.item + valuePath="minRangeValue" + placeholder="The least value that the attribute can be assigned." + profilePath=(concat profilePath ".minValue") + showValidations=true + }} + + + {{input/md-input + model=rg.item + valuePath="maxRangeValue" + placeholder="The greatest value that the attribute can be assigned." + profilePath=(concat profilePath ".maxValue") + showValidations=true + }} + +{{/object/md-array-table}} + +{{#object/md-object-table + items=model.timePeriod + header="Time Period" + data-spy="Time Period" + buttonText="Add Time Period" + ellipsis=true + profilePath=(concat profilePath ".timePeriod") + attributes="startDateTime,endDateTime" as |tm| }} + {{object/md-timePeriod + model=tm + profilePath=(concat profilePath ".timePeriod") + }} +{{/object/md-object-table}} -{{object/md-citation/preview - title="Entity Reference" - profilePath=(concat profilePath ".entityReference") - citation=model.entityReference - muted=true - required=false - editCitation="editCitation" -}} --}} +{{#layout/md-card + title="Attribute Reference" + profilePath=(concat profilePath ".attributeReference") + shadow=true + collapsible=true + collapsed=true +}} + {{object/md-citation + profilePath=(concat profilePath ".attributeReference") + model=model.attributeReference + editIdentifier=(route-action "editIdentifier") + simpleIdentifier=true + }} +{{/layout/md-card}} diff --git a/app/pods/components/object/md-entity/component.js b/app/pods/components/object/md-entity/component.js index 8770713c4..baa511aff 100644 --- a/app/pods/components/object/md-entity/component.js +++ b/app/pods/components/object/md-entity/component.js @@ -56,8 +56,7 @@ export default Component.extend(Validations, { set(model, 'primaryKeyAttributeCodeName', getWithDefault(model, 'primaryKeyAttributeCodeName', [])); set(model, 'index', getWithDefault(model, 'index', [])); - set(model, 'attribute', getWithDefault(NativeArray.apply(model), - 'attribute', [])); + set(model, 'attribute', getWithDefault(model, 'attribute', [])); set(model, 'foreignKey', getWithDefault(model, 'foreignKey', [])); set(model, 'entityReference', getWithDefault(model, 'entityReference', [])); @@ -124,26 +123,54 @@ export default Component.extend(Validations, { } }), + indexTemplate: EmberObject.extend(buildValidations({ + 'codeName': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'allowDuplicates': [ + validator('presence', { + presence: true, + ignoreBlank: true + }) + ], + 'attributeCodeName': [ + validator('presence', { + presence: true, + ignoreBlank: true + }), + validator('array-required', { + track: [] + }) + ] + }), { + init() { + this._super(...arguments); + this.set('attributeCodeName', []); + } + }), + //entityId: alias('model.entityId'), codeName: alias('model.codeName'), description: alias('model.description'), entities: alias('dictionary.entity'), attributes: alias('model.attribute'), - attributeList: computed('attributes.@each.codeName', 'attributes.[]', - function () { - let attr = get(this, 'model.attribute'); - if(attr) { - return attr.map((attr) => { - return { - codeId: get(attr, 'codeName'), - codeName: get(attr, 'codeName'), - tooltip: get(attr, 'definition') - }; - }); - } - return []; - }), + attributeList: computed('attributes.@each.codeName','attributes.[]', function () { +let attr = get(this, 'model.attribute'); +if(attr){ + return attr.map((attr) => { + return { + codeId: get(attr, 'codeName'), + codeName: get(attr, 'codeName'), + tooltip: get(attr, 'definition') + }; + }); + } + return []; + }), entityList: computed('entities.@each.entityId', 'entities.@each.codeName', function () { diff --git a/app/pods/components/object/md-entity/template.hbs b/app/pods/components/object/md-entity/template.hbs index 1244d0f69..42e1c6d44 100644 --- a/app/pods/components/object/md-entity/template.hbs +++ b/app/pods/components/object/md-entity/template.hbs @@ -139,6 +139,7 @@ value=model.foreignKey title="Foreign Key Attributes" class="md-embedded" + plain=true templateClass=foreignKeyTemplate profilePath=(concat profilePath "keys.foreignKey") data-spy="Foreign" as |fk| @@ -181,6 +182,46 @@ {{/layout/md-card}} +{{#object/md-array-table + columns="Name,Attributes,Duplicates?" + value=model.index + title="Entity Index" + class="md-embedded" + templateClass=indexTemplate + profilePath=(concat profilePath ".index") + data-spy="Entity Indexes" as |itm| +}} + + {{input/md-input + model=itm.item + valuePath="codeName" + placeholder="Name of the index." + showValidations=true + profilePath=(concat profilePath ".index.name") + }} + + + {{input/md-codelist-multi + model=itm.item + path="attributeCodeName" + mapped=attributeList + create=true + tooltip=true + placeholder="Select or enter the attributes that compose the index key." + profilePath=(concat profilePath ".index.attributes") + showValidations=true + }} + + + {{input/md-boolean + required=true + value=itm.item.allowDuplicates + profilePath=(concat profilePath ".index.allowDuplicates") + }} + +{{/object/md-array-table}} + + {{object/md-citation-array model=model.entityReference profilePath=(concat profilePath ".entityReference") diff --git a/app/pods/dictionary/show/edit/domain/edit/index/route.js b/app/pods/dictionary/show/edit/domain/edit/index/route.js index 82d73f63d..67b4ff80d 100644 --- a/app/pods/dictionary/show/edit/domain/edit/index/route.js +++ b/app/pods/dictionary/show/edit/domain/edit/index/route.js @@ -3,6 +3,10 @@ import { get } from '@ember/object'; import ScrollTo from 'mdeditor/mixins/scroll-to'; export default Route.extend(ScrollTo, { + beforeModel(transition) { + this.set('domainId', transition.params[ + 'dictionary.show.edit.domain.edit'].domain_id); + }, setupController: function () { // Call _super for default behavior diff --git a/app/pods/dictionary/show/edit/entity/edit/attribute/index/route.js b/app/pods/dictionary/show/edit/entity/edit/attribute/index/route.js index 9ffcf5352..c5a064758 100644 --- a/app/pods/dictionary/show/edit/entity/edit/attribute/index/route.js +++ b/app/pods/dictionary/show/edit/entity/edit/attribute/index/route.js @@ -33,6 +33,12 @@ export default Route.extend(ScrollTo, { backToEntity() { this.transitionTo('dictionary.show.edit.entity.edit', this.get('entityId')); + }, + editCitation(scrollTo) { + this.transitionTo('dictionary.show.edit.domain.edit.citation') + .then(function () { + this.setScrollTo(scrollTo); + }.bind(this)); } } }); diff --git a/app/pods/dictionary/show/edit/entity/edit/attribute/index/template.hbs b/app/pods/dictionary/show/edit/entity/edit/attribute/index/template.hbs index 040171c01..e9c26047c 100644 --- a/app/pods/dictionary/show/edit/entity/edit/attribute/index/template.hbs +++ b/app/pods/dictionary/show/edit/entity/edit/attribute/index/template.hbs @@ -11,6 +11,7 @@ {{object/md-attribute class="" model=model + dictionary=parentModel.json.dataDictionary profilePath="dictionary.entity.attribute" }} {{!-- editCitation=(route-action "editCitation") --}} diff --git a/app/pods/dictionary/show/edit/entity/edit/attribute/route.js b/app/pods/dictionary/show/edit/entity/edit/attribute/route.js index 286daaec5..43084c1d8 100644 --- a/app/pods/dictionary/show/edit/entity/edit/attribute/route.js +++ b/app/pods/dictionary/show/edit/entity/edit/attribute/route.js @@ -61,6 +61,16 @@ export default Route.extend({ backToEntity() { this.transitionTo('dictionary.show.edit.entity.edit', this.get('entityId')); + }, + editIdentifier(index) { + let model = this.get('currentRouteModel')(); + + this.transitionTo( + 'dictionary.show.edit.entity.edit.attribute.identifier', + get(model, 'attributeReference.identifier.' + index)) + .then(function () { + this.setScrollTo('identifier'); + }.bind(this)); } } }); diff --git a/app/pods/dictionary/show/edit/entity/edit/index/route.js b/app/pods/dictionary/show/edit/entity/edit/index/route.js index 1b5fcfb2f..df8e13f1a 100644 --- a/app/pods/dictionary/show/edit/entity/edit/index/route.js +++ b/app/pods/dictionary/show/edit/entity/edit/index/route.js @@ -5,6 +5,10 @@ import { import ScrollTo from 'mdeditor/mixins/scroll-to'; export default Route.extend(ScrollTo, { + beforeModel(transition) { + this.set('entityId', transition.params[ + 'dictionary.show.edit.entity.edit'].entity_id); + }, setupController: function () { // Call _super for default behavior diff --git a/app/pods/dictionary/show/edit/entity/index/route.js b/app/pods/dictionary/show/edit/entity/index/route.js index 60dff3588..baf55498d 100644 --- a/app/pods/dictionary/show/edit/entity/index/route.js +++ b/app/pods/dictionary/show/edit/entity/index/route.js @@ -4,13 +4,18 @@ import { get, set } from '@ember/object'; +import { once } from '@ember/runloop'; export default Route.extend({ afterModel(m) { this._super(...arguments); let model = get(m, 'json.dataDictionary'); - set(model, 'entity', getWithDefault(model, 'entity', [])); + + once(this, ()=>{ + + set(model, 'entity', getWithDefault(model, 'entity', [])); + }); }, setupController: function () { From 0442dc534d82033ffebd503d92420d8c88802ef0 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Fri, 9 Feb 2018 09:07:05 -0800 Subject: [PATCH 377/383] Update dictionary Set defaults for boolean fields. Remove create option for domain select. --- app/pods/components/object/md-attribute/component.js | 2 +- app/pods/components/object/md-attribute/template.hbs | 2 +- app/pods/components/object/md-entity/component.js | 6 ++++++ app/pods/components/object/md-entity/template.hbs | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/pods/components/object/md-attribute/component.js b/app/pods/components/object/md-attribute/component.js index 0af3305f5..d53a7089c 100644 --- a/app/pods/components/object/md-attribute/component.js +++ b/app/pods/components/object/md-attribute/component.js @@ -49,7 +49,7 @@ const TemplateClass = EmberObject.extend(Validations, { init() { this._super(...arguments); - set(this, 'allowNull', false); + set(this, 'allowNull', true); set(this, 'attributeReference', {}); set(this, 'alias', []); set(this, 'valueRange', []); diff --git a/app/pods/components/object/md-attribute/template.hbs b/app/pods/components/object/md-attribute/template.hbs index e5330e7d4..2b892e979 100644 --- a/app/pods/components/object/md-attribute/template.hbs +++ b/app/pods/components/object/md-attribute/template.hbs @@ -55,7 +55,7 @@ label="Domain" value=model.primaryKeyAttributeCodeName mapped=domainList - create=true + create=false tooltip=true placeholder="Select or enter the domain for this attribute." profilePath=(concat profilePath ".domain") diff --git a/app/pods/components/object/md-entity/component.js b/app/pods/components/object/md-entity/component.js index baa511aff..68454286b 100644 --- a/app/pods/components/object/md-entity/component.js +++ b/app/pods/components/object/md-entity/component.js @@ -17,6 +17,10 @@ import { assert } from '@ember/debug'; +import { + Template as Attribute +} from '../md-attribute/component'; + import { validator, buildValidations @@ -149,9 +153,11 @@ export default Component.extend(Validations, { init() { this._super(...arguments); this.set('attributeCodeName', []); + this.set('allowDuplicates', false); } }), + attributeTemplate: Attribute, //entityId: alias('model.entityId'), codeName: alias('model.codeName'), description: alias('model.description'), diff --git a/app/pods/components/object/md-entity/template.hbs b/app/pods/components/object/md-entity/template.hbs index 42e1c6d44..b99726a2b 100644 --- a/app/pods/components/object/md-entity/template.hbs +++ b/app/pods/components/object/md-entity/template.hbs @@ -74,6 +74,7 @@ editOnAdd=false scrollToId="md-attribute" data-spy="Attributes" + templateClass=attributeTemplate }} {{#layout/md-card From 64d8cbd9852107823410d5559b659002d57e231d Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 14 Feb 2018 19:19:53 -0800 Subject: [PATCH 378/383] Update ember-models-table --- .../control/md-record-table/component.js | 74 +++++++++++++------ .../control/md-select-table/component.js | 2 +- app/pods/records/route.js | 2 - package-lock.json | 9 ++- package.json | 2 +- 5 files changed, 58 insertions(+), 31 deletions(-) diff --git a/app/pods/components/control/md-record-table/component.js b/app/pods/components/control/md-record-table/component.js index 5515feb08..ebac715bf 100644 --- a/app/pods/components/control/md-record-table/component.js +++ b/app/pods/components/control/md-record-table/component.js @@ -1,6 +1,11 @@ import Ember from 'ember'; import Table from 'mdeditor/pods/components/md-models-table/component'; - +import { + warn +} from '@ember/debug'; +import { + isArray +} from '@ember/array'; const { get, computed, @@ -32,15 +37,15 @@ export default Table.extend({ classNames: ['md-record-table'], /** - * Property name used to identify selected records. Should begin with underscore. - * - * @property selectProperty - * @type {String} - * @default "_selected" - * @static - * @readOnly - * @required - */ + * Property name used to identify selected records. Should begin with underscore. + * + * @property selectProperty + * @type {String} + * @default "_selected" + * @static + * @readOnly + * @required + */ selectProperty: '_selected', /** @@ -108,7 +113,8 @@ export default Table.extend({ component: all ? 'control/md-record-table/buttons' : 'control/md-record-table/buttons/show', disableFiltering: !all, - componentForFilterCell: all ? 'control/md-record-table/buttons/filter' : null + componentForFilterCell: all ? + 'control/md-record-table/buttons/filter' : null }; }), @@ -132,11 +138,23 @@ export default Table.extend({ //rowTemplate: 'components/control/md-select-table/row', multipleSelect: true, - preselectedItems: computed(function () { - let prop = this.get('selectProperty'); + selectedItems: computed({ + get() { + let prop = this.get('selectProperty'); + + return this.get('data') + .filterBy(prop) + .toArray(); - return this.get('data') - .filterBy(prop); + }, + set(k, v) { + if(!isArray(v)) { + warn('`selectedItems` must be an array.', false, { + id: '#emt-selectedItems-array' + }); + } + return A(v); + } }), /** @@ -157,26 +175,36 @@ export default Table.extend({ this._super(...arguments); let prop = this.get('selectProperty'); - let sel = get(this, '_selectedItems'); + let sel = get(this, 'selectedItems'); rec.toggleProperty(prop); this.get('select')(rec, idx, sel); }, toggleAllSelection() { - this._super(...arguments); + //this._super(...arguments); + let selectedItems = get(this, 'selectedItems'); + let data = get(this, 'data'); + const allSelectedBefore = get(selectedItems, 'length') === get(data, + 'length'); + get(this, 'selectedItems') + .clear(); + + if(!allSelectedBefore) { + get(this, 'selectedItems') + .pushObjects(data.toArray()); + } + this.userInteractionObserver(); - let selected = get(this, '_selectedItems'); + let selected = get(this, 'selectedItems'); let prop = this.get('selectProperty'); - let data = get(this, 'data'); + //let data = get(this, 'data'); if(get(selected, 'length')) { selected.setEach(prop, true); - return; + } else { + data.setEach(prop, false); } - - data.setEach(prop, false); - this.get('select')(null, null, selected); } } diff --git a/app/pods/components/control/md-select-table/component.js b/app/pods/components/control/md-select-table/component.js index 35e728dd8..ddfb43626 100644 --- a/app/pods/components/control/md-select-table/component.js +++ b/app/pods/components/control/md-select-table/component.js @@ -75,7 +75,7 @@ export default Table.extend({ clickOnRow() { this._super(...arguments); - let sel = get(this, '_selectedItems'); + let sel = get(this, 'selectedItems'); this.get('select')(sel); } diff --git a/app/pods/records/route.js b/app/pods/records/route.js index ae7737693..18570dfa0 100644 --- a/app/pods/records/route.js +++ b/app/pods/records/route.js @@ -1,5 +1,4 @@ import Ember from 'ember'; - const { Route, inject: { @@ -52,5 +51,4 @@ export default Route.extend({ return false; } } - }); diff --git a/package-lock.json b/package-lock.json index 2a58da961..44e377f20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6201,13 +6201,14 @@ } }, "ember-models-table": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/ember-models-table/-/ember-models-table-2.0.0-beta.4.tgz", - "integrity": "sha512-vevkLitqWilFT6LajJRcpXeyHsBw8xJtTUtjRK2/XAVfyxnoI+LBnNu9kCUyjua/ggYlAduK/5eNjf1ZrPQEJw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/ember-models-table/-/ember-models-table-2.3.1.tgz", + "integrity": "sha512-+v002sVDP8EN1KlsBcUV+gJfdn2RmzE2+6F9GO/tKiNmDIcgNah2hAMnmeTIm694O8A9koezUdnm4HE78XNrbA==", "dev": true, "requires": { "ember-cli-babel": "6.8.2", - "ember-cli-htmlbars": "2.0.3" + "ember-cli-htmlbars": "2.0.3", + "ember-composable-helpers": "2.0.3" } }, "ember-moment": { diff --git a/package.json b/package.json index d93bf9fa0..ce4ab770f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mdeditor", - "version": "0.0.0", + "version": "0.1.0", "private": true, "description": "Small description for mdeditor goes here", "license": "GPLv3", From e139457aec021df06b558b063f000dc683628032 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 14 Feb 2018 19:21:06 -0800 Subject: [PATCH 379/383] Remove cancel callback on route change --- app/pods/dictionary/show/edit/route.js | 20 +++++++++++++++++--- app/pods/record/show/edit/route.js | 20 +++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/app/pods/dictionary/show/edit/route.js b/app/pods/dictionary/show/edit/route.js index d88c7962b..06a661b2c 100644 --- a/app/pods/dictionary/show/edit/route.js +++ b/app/pods/dictionary/show/edit/route.js @@ -1,6 +1,11 @@ import Ember from 'ember'; import HashPoll from 'mdeditor/mixins/hash-poll'; -import { once } from '@ember/runloop'; +import { + once +} from '@ember/runloop'; +import { + getOwner +} from '@ember/application'; const { inject, @@ -53,6 +58,9 @@ export default Route.extend(HashPoll, { let message = `Cancelled changes to Dictionary: ${model.get('title')}`; let controller = this.controller; + let same = !controller.cancelScope || getOwner(this) + .lookup('controller:application') + .currentPath === get(controller,'cancelScope.routeName'); if(this.get('settings.data.autoSave')) { let json = model.get('jsonRevert'); @@ -62,7 +70,10 @@ export default Route.extend(HashPoll, { if(controller.onCancel) { once(() => { - controller.onCancel.call(controller.cancelScope || this); + if(same) { + controller.onCancel.call(controller.cancelScope || + this); + } this.refresh(); controller.set('onCancel', null); controller.set('cancelScope', null); @@ -81,7 +92,10 @@ export default Route.extend(HashPoll, { .then(() => { if(controller.onCancel) { once(() => { - controller.onCancel.call(controller.cancelScope || this); + if(same) { + controller.onCancel.call(controller.cancelScope || + this); + } this.refresh(); controller.set('onCancel', null); controller.set('cancelScope', null); diff --git a/app/pods/record/show/edit/route.js b/app/pods/record/show/edit/route.js index ab10a01a0..d23be2d4c 100644 --- a/app/pods/record/show/edit/route.js +++ b/app/pods/record/show/edit/route.js @@ -1,6 +1,11 @@ import Ember from 'ember'; import HashPoll from 'mdeditor/mixins/hash-poll'; -import { once } from '@ember/runloop'; +import { + once +} from '@ember/runloop'; +import { + getOwner +} from '@ember/application'; const { inject, @@ -90,6 +95,9 @@ export default Route.extend(HashPoll, { let model = this.currentRouteModel(); let message = `Cancelled changes to Record: ${model.get('title')}`; let controller = this.controller; + let same = !controller.cancelScope || getOwner(this) + .lookup('controller:application') + .currentPath === get(controller,'cancelScope.routeName'); if(this.get('settings.data.autoSave')) { let json = model.get('jsonRevert'); @@ -99,7 +107,10 @@ export default Route.extend(HashPoll, { if(controller.onCancel) { once(() => { - controller.onCancel.call(controller.cancelScope || this); + if(same) { + controller.onCancel.call(controller.cancelScope || + this); + } this.refresh(); controller.set('onCancel', null); controller.set('cancelScope', null); @@ -118,7 +129,10 @@ export default Route.extend(HashPoll, { .then(() => { if(controller.onCancel) { once(() => { - controller.onCancel.call(controller.cancelScope || this); + if(same) { + controller.onCancel.call(controller.cancelScope || + this); + } this.refresh(); controller.set('onCancel', null); controller.set('cancelScope', null); From 443b3995dbbea2a3a02096d32b377c1fbcaac3d0 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 14 Feb 2018 19:23:54 -0800 Subject: [PATCH 380/383] Support for adding dictionaries to records Create uuids. Inject dictionaries into mdJSON. Closes #94 --- app/models/dictionary.js | 3 + app/pods/components/md-translate/component.js | 2 +- app/pods/dictionary/show/index/template.hbs | 8 +- app/pods/record/show/edit/dictionary/route.js | 98 ++++++++++++++++++- .../record/show/edit/dictionary/template.hbs | 82 +++++++++++----- app/services/mdjson.js | 22 ++++- app/styles/_card_custom.scss | 12 +++ app/styles/_table.scss | 4 + 8 files changed, 200 insertions(+), 31 deletions(-) diff --git a/app/models/dictionary.js b/app/models/dictionary.js index 6cae96d26..1928c2c2f 100644 --- a/app/models/dictionary.js +++ b/app/models/dictionary.js @@ -1,5 +1,6 @@ import Ember from 'ember'; import DS from 'ember-data'; +import uuidV4 from "npm:uuid/v4"; import { alias } from '@ember/object/computed'; //import uuidV4 from 'npm:uuid/v4'; //import Validator from 'npm:validator'; @@ -36,6 +37,7 @@ const JsonDefault = Ember.Object.extend({ init() { this._super(...arguments); this.setProperties({ + dictionaryId: uuidV4(), dataDictionary: { citation: { title: null, @@ -68,6 +70,7 @@ export default Model.extend(Validations, Copyable, { }), title: alias('json.dataDictionary.citation.title'), + dictionaryId: alias('json.dictionaryId'), icon: 'book', diff --git a/app/pods/components/md-translate/component.js b/app/pods/components/md-translate/component.js index 36baf30d7..de0b92b82 100644 --- a/app/pods/components/md-translate/component.js +++ b/app/pods/components/md-translate/component.js @@ -30,7 +30,7 @@ export default Component.extend({ writer: null, writerOptions: [{ - name: 'FGDC CSDGM(beta)', + name: 'FGDC CSDGM', value: 'fgdc', type: 'application/xml', tip: 'Federal Geographic Data Committee Content Standard for Digital Geospatial Metadata' diff --git a/app/pods/dictionary/show/index/template.hbs b/app/pods/dictionary/show/index/template.hbs index 6bf4037c9..b0be5c9ee 100644 --- a/app/pods/dictionary/show/index/template.hbs +++ b/app/pods/dictionary/show/index/template.hbs @@ -5,9 +5,7 @@ Viewing Dictionary: {{model.title}} {{control/md-status model=model}} -

    - - {{object/md-citation/preview + {{object/md-citation/preview profilePath="dictionary.main.citation" citation=model.json.dataDictionary.citation muted=true @@ -23,8 +21,8 @@ {{/control/md-crud-buttons}}
    {{#link-to "dictionaries" class="btn btn-lg btn-primary btn-block" }} - {{fa-icon "list"}} Show List{{/link-to}} + {{fa-icon "list"}} Show List{{/link-to}} {{control/md-scroll-spy}}
    -
    +
    \ No newline at end of file diff --git a/app/pods/record/show/edit/dictionary/route.js b/app/pods/record/show/edit/dictionary/route.js index 7821c6973..029304085 100644 --- a/app/pods/record/show/edit/dictionary/route.js +++ b/app/pods/record/show/edit/dictionary/route.js @@ -1,7 +1,101 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import uuidV4 from "npm:uuid/v4"; +import EmberObject from '@ember/object'; -export default Ember.Route.extend({ +import { + get, + computed,defineProperty, + getWithDefault, + set +} from '@ember/object'; + +export default Route.extend({ breadCrumb: { title: 'Dictionaries' }, + model() { + //return this.store.peekAll('contact'); + let dicts = this.modelFor('application') + .findBy('modelName', 'dictionary'); + let rec = this.modelFor('record.show.edit'); + + set(rec, 'json.mdDictionary', getWithDefault(rec, 'json.mdDictionary', [])); + let selected = rec.get('json.mdDictionary'); + + return dicts.map(dict => { + let json = get(dict, 'json'); + let id = get(json, 'dictionaryId'); + let data = get(json, 'dataDictionary'); + + if(!id) { + set(json, 'dictionaryId', uuidV4()); + dict.save(); + } + + return EmberObject.create({ + id: json.dictionaryId, + title: get(data, 'citation.title'), + description: data.description, + subject: data.subject, + selected: selected.includes(json.dictionaryId) + }); + }); + }, + + setupController: function () { + // Call _super for default behavior + this._super(...arguments); + + this.controller.set('parentModel', this.modelFor( + 'record.show.edit')); + + defineProperty(this.controller, 'selected', computed('model',function() { + return this.model.filterBy('selected'); + })); + + this.controllerFor('record.show.edit') + .setProperties({ + onCancel: this.refresh, + cancelScope: this + }); + }, + + columns: [{ + propertyName: 'title', + title: 'Title' + }, { + propertyName: 'subject', + title: 'Subject' + }], + + _select(obj) { + let rec = this.modelFor('record.show.edit'); + let selected = rec.get('json.mdDictionary'); + + if(obj.selected) { + if(selected.indexOf(obj.id) === -1) { + selected.pushObject(obj.id); + this.controller.notifyPropertyChange('model'); + return; + } + } + selected.removeObject(obj.id); + this.controller.notifyPropertyChange('model'); + + }, + + actions: { + getColumns() { + return this.get('columns'); + }, + + select(obj) { + this._select(obj); + }, + + remove(obj) { + set(obj,'selected', false); + this._select(obj); + } + } }); diff --git a/app/pods/record/show/edit/dictionary/template.hbs b/app/pods/record/show/edit/dictionary/template.hbs index 3a496d2d4..e94e211a6 100644 --- a/app/pods/record/show/edit/dictionary/template.hbs +++ b/app/pods/record/show/edit/dictionary/template.hbs @@ -1,23 +1,61 @@ -{{outlet}} +
    +
    +

    {{fa-icon "book"}} Dictionaries + for {{parentModel.title}} + {{control/md-status model=parentModel}} +

    + {{#if model.length}} + {{#layout/md-card collapsible=true collapsed=false shadow=true + title="Select Dictionaries" + spotlightEnabled=false + }} + {{control/md-record-table + data=model + dataColumns=(compute (route-action "getColumns")) + select=(route-action "select") + actionsColumn=false + selectProperty="selected" + selectedItems=selected + }} + {{/layout/md-card}} - -{{#layout/md-card class="construction card-inverse card-warning" shadow=false}} -
    -
    - {{fa-icon "exclamation-triangle" size=2}} -
    -
    - Page Under
    Construction     -
    -
    -{{/layout/md-card}} + {{#layout/md-card collapsible=true collapsed=false shadow=true + title="Selected Dictionaries" + class="card-inverse hd-success card-outline-success" + spotlightEnabled=false + }} +
      + {{#each selected as |item index|}} +
    • +

      {{item.title}} + {{#control/md-button-confirm class="btn btn btn-danger pull-right" + onConfirm=(route-action "remove" item)}} + Remove + {{/control/md-button-confirm}} +

      + {{!--

      {{get-property item "description"}}

      --}} +
      + {{control/md-definition title="Subject" text=item.subject}} + {{control/md-definition title="Description" text=item.description}} +
      + {{!--
      --}} +
      • + {{else}} +
    • +

      No Dictionaries selected. +

      +
      • + {{/each}} +
    + {{/layout/md-card}} + {{else}} +
    +

    No Dictionaries found. + {{#link-to "dictionary.new" class="btn btn-success btn-lg" }} + {{fa-icon "plus"}} Create a Dictionary + {{/link-to}} +

    +
    + {{/if}} +
    +
    diff --git a/app/services/mdjson.js b/app/services/mdjson.js index ef1745153..bce87aa00 100644 --- a/app/services/mdjson.js +++ b/app/services/mdjson.js @@ -35,7 +35,6 @@ const { } = Ember; const unImplemented = [ - 'dataDictionary', 'metadata.metadataInfo.otherMetadataLocale', 'metadata.resourceInfo.spatialRepresentation', [ 'metadata.resourceInfo.extent', @@ -98,6 +97,26 @@ export default Service.extend({ } }, + injectDictionaries(rec, json) { + let ids = rec.get('json.mdDictionary') || []; + let arr =[]; + + if(ids.length) { + + let dicts = this.get('store').peekAll('dictionary').filterBy('dictionaryId'); + + ids.forEach((id) => { + let record = dicts.findBy('dictionaryId', id); + + if(record) { + arr.pushObject(record.get('json.dataDictionary')); + } + }); + } + + set(json, 'dataDictionary', arr); + }, + formatRecord(rec, asText) { let _contacts = []; let conts = this.get('contacts'); @@ -135,6 +154,7 @@ export default Service.extend({ let clean = cleaner.clean(get(rec, 'json')); this.injectCitations(clean); + this.injectDictionaries(rec, clean); let json = JSON.parse(JSON.stringify(cleaner.clean(clean), _replacer)); let contacts = this.get('store') diff --git a/app/styles/_card_custom.scss b/app/styles/_card_custom.scss index 104903e73..6d6f8baeb 100644 --- a/app/styles/_card_custom.scss +++ b/app/styles/_card_custom.scss @@ -38,6 +38,18 @@ } } + &.hd-success .card-header { + background-color: $brand-success; + + a { + color: $body-bg; + + &:hover { + color: lighten($brand-info, 35); + } + } + } + &.card-inverse .md-card-maximize { color: $body-bg; diff --git a/app/styles/_table.scss b/app/styles/_table.scss index 0d51a1cb4..4ee803cdb 100644 --- a/app/styles/_table.scss +++ b/app/styles/_table.scss @@ -121,6 +121,10 @@ } } + .globalSearch .form-group { + padding-right: 0; + } + > .table { margin-top: 1.25em; From b0fa41be8d3e6ff354e77617f91406d5d6030584 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 14 Feb 2018 19:25:32 -0800 Subject: [PATCH 381/383] Bump version to 0.1.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44e377f20..f993f8cd9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "mdeditor", - "version": "0.0.0", + "version": "0.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ce4ab770f..932c4c3c4 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "ember-load-initializers": "^1.0.0", "ember-local-storage": "^1.3.6", "ember-modal-dialog": "^2.3.0", - "ember-models-table": "2.0.0-beta.4", + "ember-models-table": "2.3.1", "ember-moment": "7.4.1", "ember-multiselect-checkboxes": "^0.10.2", "ember-pollboy": "0.6.3", From c6b04aab5e4e247304096fe49ae872121bf09f49 Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 14 Feb 2018 19:29:09 -0800 Subject: [PATCH 382/383] Refactor get/set calls in leaflet-table --- .../addon/components/leaflet-draw.js | 15 ++++++++------- .../addon/components/lgeojson-layer.js | 10 ++++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/ember-leaflet-table/addon/components/leaflet-draw.js b/lib/ember-leaflet-table/addon/components/leaflet-draw.js index 84609ea44..1e666332e 100644 --- a/lib/ember-leaflet-table/addon/components/leaflet-draw.js +++ b/lib/ember-leaflet-table/addon/components/leaflet-draw.js @@ -1,4 +1,5 @@ import Ember from 'ember'; +import { get, set } from '@ember/object'; import LeafletMap from 'ember-leaflet/components/leaflet-map'; //import uuidV4 from 'npm:uuid/v4'; /* global L */ @@ -92,8 +93,8 @@ export default LeafletMap.extend({ let layers = e.target.drawControl.options.edit.featureGroup.getLayers(); layers.forEach((layer) => { if (layer.hasOwnProperty('editing')) { - if (layer.feature.get('state') !== 'edit') { - layer.feature.set('state', 'edit'); + if (get(layer, 'feature.state') !== 'edit') { + set(layer, 'feature.state', 'edit'); } } }); @@ -109,8 +110,8 @@ export default LeafletMap.extend({ layers.forEach((layer) => { let geo = layer.toGeoJSON(); - layer.feature.set('geometry', geo.geometry); - layer.feature.set('state', ''); + set(layer, 'feature.geometry', geo.geometry); + set(layer, 'feature.state', ''); }); this.closeForm(); @@ -123,8 +124,8 @@ export default LeafletMap.extend({ layers.forEach((layer) => { if (layer.hasOwnProperty('editing')) { - if (layer.feature.get('state') !== 'remove') { - layer.feature.set('state', 'remove'); + if (get(layer,'feature.state') !== 'remove') { + set(layer, 'feature.state', 'remove'); } } }); @@ -134,7 +135,7 @@ export default LeafletMap.extend({ let layers = e.target.drawControl.options.edit.featureGroup.getLayers(); if (layers.length) { layers.forEach((layer) => { - layer.feature.set('state', ''); + set(layer, 'feature.state', ''); }); } else { e.target.drawControl.remove(); diff --git a/lib/ember-leaflet-table/addon/components/lgeojson-layer.js b/lib/ember-leaflet-table/addon/components/lgeojson-layer.js index cd3707c1b..062712b4d 100644 --- a/lib/ember-leaflet-table/addon/components/lgeojson-layer.js +++ b/lib/ember-leaflet-table/addon/components/lgeojson-layer.js @@ -1,4 +1,6 @@ import Ember from 'ember'; +import { get, set } from '@ember/object'; +import { isEmpty } from '@ember/utils'; import Layer from 'ember-leaflet/components/geojson-layer'; import uuidV4 from 'npm:uuid/v4'; /* global L */ @@ -194,15 +196,15 @@ export default Layer.extend({ onMouseover(e) { let feature = e.layer.feature; - if(!feature.get('state')) { - feature.set('state', 'hover'); + if(isEmpty(get(feature,'state'))) { + set(feature,'state', 'hover'); } }, onMouseout(e) { let feature = e.layer.feature; - if(feature.get('state') === 'hover') { - feature.set('state', ''); + if(get(feature,'state') === 'hover') { + set(feature,'state', ''); } }, From 32627a9fa2cf5654b6684395d4811eaa6492459c Mon Sep 17 00:00:00 2001 From: Josh Bradley Date: Wed, 14 Feb 2018 20:11:25 -0800 Subject: [PATCH 383/383] Update info, add Issue button to footer --- .../components/layout/md-footer/template.hbs | 16 ++++++--- app/pods/dashboard/template.hbs | 34 +++---------------- app/styles/_layout.scss | 8 +++++ app/templates/application.hbs | 24 +++++++------ 4 files changed, 38 insertions(+), 44 deletions(-) diff --git a/app/pods/components/layout/md-footer/template.hbs b/app/pods/components/layout/md-footer/template.hbs index cb447dae5..00210daad 100644 --- a/app/pods/components/layout/md-footer/template.hbs +++ b/app/pods/components/layout/md-footer/template.hbs @@ -1,7 +1,13 @@ -
    - AutoSave: +
    + {{fa-icon "github"}} Report Issue + + {{tooltip-on-element text='Report bugs, Request features - GitHub account required.' side="top"}} + + AutoSave: {{if settings.data.autoSave "On" "Off"}} - - {{yield}} -
    +     + {{yield}} +
    diff --git a/app/pods/dashboard/template.hbs b/app/pods/dashboard/template.hbs index 827297a50..e0fbadece 100644 --- a/app/pods/dashboard/template.hbs +++ b/app/pods/dashboard/template.hbs @@ -87,47 +87,23 @@

    The mdEditor is a web application that allows users to author - and edit metadata for projects and datasets. The mdEditor is - currently under active development. The primary goal is to + and edit metadata for projects and datasets. The primary goal is to create an editor that will allow creation and management of archival quality metadata without requiring extensive knowledge of various metadata standards.

    - mdditor Version 1.0 will be - released January 2018. ditor is currently + under active development, and the team is working towards + finalizing the Version 1.0 release. Follow progress or report issues on the Github website. For more information, see the - Github wiki. + href="https://www.mdeditor.org" target="_blank">mdeditor.org.

    - - - {{#layout/md-card class="construction card-inverse card-warning" shadow=false}} -
    -
    - {{fa-icon "exclamation-triangle" size=2}} -
    -
    - Under
    Construction     -
    -
    - {{/layout/md-card}} -
    diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index 86f9f5ab2..2787fb366 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -177,5 +177,13 @@ footer { .text-warning { color: lighten($brand-warning, 10); } + + > span { + margin-left: 1em; + } + } + + .btn-xs { + line-height: 1.25em; } } diff --git a/app/templates/application.hbs b/app/templates/application.hbs index b2fbdbf55..483e00abe 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -54,18 +54,22 @@ {{ember-load-remover}} {{#control/md-modal isShowing=settings.data.showSplash showConfirm=true confirmLabel="OK"}} - -