Datasets:

---

JetBrains-Research

/

commit-chronicle

like 8

Follow

JetBrains Research 63

[ { "change_type": "MODIFY", "old_path": "tests/acceptance/custom-forms-test.js", "new_path": "tests/acceptance/custom-forms-test.js", "diff": "@@ -16,7 +16,7 @@ test('crud operations on custom-forms', function(assert) {\nlet crusts = ['Thin', 'Deep Dish', 'Flatbread'];\nlet desserts = ['Ice Cream', 'Cookies', 'Cake'];\nlet toppings = ['Cheese', 'Pepperoni', 'Mushrooms'];\n- let header = '______________________________';\n+ let header = ['______________________________'];\nfunction addField(fieldType, label, values) {\nclick('button:contains(Add Field)');\n@@ -58,7 +58,7 @@ test('crud operations on custom-forms', function(assert) {\nwaitToAppear('.form-preview');\nandThen(function() {\nassert.equal(find('.form-preview label:contains(Create a Pizza)').length, 1, 'Found Create a Pizza Label');\n- assert.equal(find(`.form-preview label:contains(${header}):has(label)`).length, 1, `Found ${header} Label`);\n+ assert.equal(find(`.form-preview label:contains(${header})`).length, 1, `Found ${header} Label`);\nassert.equal(find('.form-preview label:contains(Pizza Toppings)').length, 1, 'Found Pizza Toppings Label');\ntoppings.forEach((topping) => {\nassert.equal(find(`.form-preview label:contains(${topping}):has(input[type=checkbox])`).length, 1, `Found ${topping} checkbox`);\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -37,6 +37,7 @@ To install the frontend please do the following:\nDepending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install ember-cli.\n4. Install [bower](https://www.npmjs.org/package/bower): `npm install -g bower`.\n5. Clone this repo with `git clone https://github.com/HospitalRun/hospitalrun-frontend`, go to the cloned folder and run `script/bootstrap`.\n+ - **Note:** *If installing packages globally via `npm` requires root access on your machine (see `ember-cli` installation), running `script/bootstrap` will also require root access. The contained `bower install` step will fail when running as root. A fix for this is to edit `script/bootstrap` and add the `--allow-root` option to the command: `bower install --allow-root`.*\n- **Note:** *If you are using Windows with `cygwin` please run the script in the following way to remove trailing `\\r` characters:*\n``` bash\nbash -o igncr script/bootstrap\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -37,12 +37,11 @@ To install the frontend please do the following:\nDepending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install ember-cli.\n4. Install [bower](https://www.npmjs.org/package/bower): `npm install -g bower`.\n5. Clone this repo with `git clone https://github.com/HospitalRun/hospitalrun-frontend`, go to the cloned folder and run `script/bootstrap`.\n- - **Note:** *If installing packages globally via `npm` requires root access on your machine (see `ember-cli` installation), running `script/bootstrap` will also require root access. The contained `bower install` step will fail when running as root. A fix for this is to edit `script/bootstrap` and add the `--allow-root` option to the command: `bower install --allow-root`.*\n- - **Note:** *If you are using Windows with `cygwin` please run the script in the following way to remove trailing `\\r` characters:*\n+ - **Note:** *Windows users must use [Cygwin](http://cygwin.org/). If that is your case, please run the script in the following way to remove trailing `\\r` characters:*\n``` bash\nbash -o igncr script/bootstrap\n```\n- - **Note:** *Depending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install PhantomJS2; also, Windows users must run with [Cygwin](http://cygwin.org/)).*\n+ - **Note:** *If installing packages globally via `npm` requires root access on your machine (see `ember-cli` installation), running `script/bootstrap` will also require root access to install PhantomJS2. The contained `bower install` step will fail when running as root. A fix for this is to edit `script/bootstrap` and add the `--allow-root` option to the command: `bower install --allow-root`.*\n- **Note:** *If you just want to use the project, cloning is the best option. However, if you wish to contribute to the project, you will need to fork the project first, and then clone your `hospitalrun-frontend` fork and make your contributions via a branch on your fork.*\n6. Install and configure [CouchDB](http://couchdb.apache.org/):\n1. Download and install CouchDB from http://couchdb.apache.org/#download.\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/inventory/edit/template.hbs", "new_path": "app/inventory/edit/template.hbs", "diff": "{{/if}}\n</tr>\n{{#each model.locations as |location|}}\n- {{#if location.quantity}}\n+ {{#unless location.archived}}\n<tr>\n<td>{{location.location}}</td>\n<td>{{location.aisleLocation}}</td>\n<td>\n<button class=\"btn btn-primary neutral\" {{action \"showAdjustment\" location}}>{{t 'inventory.labels.adjust'}}</button>\n<button class=\"btn btn-primary btn-extra\" {{action \"showTransfer\" location}}>{{t 'inventory.labels.transfer'}}</button>\n+ {{#unless location.quantity}}\n+ <button class=\"btn btn-default warning\" {{action 'deleteItem' location\n+ bubbles=false }}><span class=\"octicon octicon-x\"></span> {{t 'buttons.delete'}}</button>\n+ {{/unless}}\n</td>\n{{/if}}\n</tr>\n- {{/if}}\n+ {{/unless}}\n{{/each}}\n</table>\n{{#if showTransactions}}\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/mixins/dob-days.js", "new_path": "app/mixins/dob-days.js", "diff": "@@ -37,7 +37,7 @@ export default Ember.Mixin.create({\n}\nif (birthDate.getDate) {\n- days = today.getDate() - birthDate.getDate();\n+ days = today.getUTCDate() - birthDate.getUTCDate();\nif (days < 0) {\ndays += 30;\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "@@ -916,7 +916,7 @@ export default {\n'pt-br': 'Portuguese (Brazilian)',\ntr: 'Turkish',\nur: 'Urdu',\n- hndi: 'Hindi'\n+ hindi: 'Hindi'\n},\nloading: {\nmessages: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/pt-br/translations.js", "new_path": "app/locales/pt-br/translations.js", "diff": "@@ -884,7 +884,7 @@ export default {\n'pt-br': 'Portugues (Brasileiro)',\ntr: 'Turco',\nur: 'Urdu',\n- hndi: 'Hindi'\n+ hindi: 'Hindi'\n},\nloading: {\nmessages: {\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "@@ -916,7 +916,7 @@ export default {\n'pt-br': 'Portuguese (Brazilian)',\ntr: 'Turkish',\nur: 'Urdu',\n- hindi: 'Hindi'\n+ hi: 'Hindi'\n},\nloading: {\nmessages: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/pt-br/translations.js", "new_path": "app/locales/pt-br/translations.js", "diff": "@@ -884,7 +884,7 @@ export default {\n'pt-br': 'Portugues (Brasileiro)',\ntr: 'Turco',\nur: 'Urdu',\n- hindi: 'Hindi'\n+ hi: 'Hindi'\n},\nloading: {\nmessages: {\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/components/language-select.js", "new_path": "app/components/language-select.js", "diff": "@@ -6,12 +6,18 @@ export default Ember.Component.extend({\nlanguageOptions: function() {\nlet i18n = this.get('i18n');\n- return i18n.get('locales').map((item) => {\n+ // Hacking around the fact that i18n\n+ // has no support for t(key, locale).\n+ let currentLocale = i18n.get('locale');\n+ let options = i18n.get('locales').map((item) => {\n+ i18n.set('locale', item);\nreturn {\nid: item,\n- name: i18n.t(`languages.${item}`)\n+ name: i18n.t('languageName')\n};\n});\n+ i18n.set('locale', currentLocale);\n+ return options;\n}.property('currentLanguage'),\nonFinish: null,\n" }, { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "export default {\n+ languageName: 'English',\nadmin: {\naddress: {\naddress1Label: 'Address 1 Label',\n@@ -906,18 +907,6 @@ export default {\nrequestsTitle: 'Lab Requests',\nsectionTitle: 'Labs'\n},\n- languages: {\n- en: 'English',\n- fr: 'French',\n- es: 'Spanish',\n- de: 'German',\n- ru: 'Russian',\n- 'es-co': 'Spanish (Colombian)',\n- 'pt-br': 'Portuguese (Brazilian)',\n- tr: 'Turkish',\n- ur: 'Urdu',\n- hi: 'Hindi'\n- },\nloading: {\nmessages: {\n'0': 'The top butterfly flight speed is 12 miles per hour. Some moths can fly 25 miles per hour!',\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/inventory/route.js", "new_path": "app/inventory/route.js", "diff": "@@ -8,7 +8,7 @@ export default AbstractModuleRoute.extend(FulfillRequest, InventoryId, Inventory\nif (this.currentUserCan(this.get('addCapability'))) {\nreturn [{\nbuttonAction: 'newInventoryBatch',\n- buttonText: '+ inventory received',\n+ buttonText: this.get('i18n').t('navigation.subnav.inventoryReceivedPlus'),\nclass: 'btn btn-primary'\n}];\n}\n" }, { "change_type": "MODIFY", "old_path": "app/locales/de/translations.js", "new_path": "app/locales/de/translations.js", "diff": "@@ -1088,6 +1088,7 @@ export default {\nhistory: '',\nincidentCategories: '',\ninventoryReceived: 'Eingeganges Inventar',\n+ inventoryReceivedPlus: '+ Eingeganges Inventar',\ninvoices: 'Rechnungen',\nitems: 'Einheiten',\nloadDB: '',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "@@ -1125,6 +1125,7 @@ export default {\nhistory: 'History',\nincidentCategories: 'Incident Categories',\ninventoryReceived: 'Inventory Received',\n+ inventoryReceivedPlus: '+ Inventory Received',\ninvoices: 'Invoices',\nitems: 'Items',\nloadDB: 'Load DB',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/es-co/translations.js", "new_path": "app/locales/es-co/translations.js", "diff": "@@ -1087,6 +1087,7 @@ export default {\nhistory: '',\nincidentCategories: '',\ninventoryReceived: 'Inventario recibido',\n+ inventoryReceivedPlus: '+ Inventario recibido',\ninvoices: 'Facturas',\nitems: 'Items',\nloadDB: '',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/es/translations.js", "new_path": "app/locales/es/translations.js", "diff": "@@ -1088,6 +1088,7 @@ export default {\nhistory: 'Historial',\nincidentCategories: 'Categorias de Incidente',\ninventoryReceived: 'Inventario recibido',\n+ inventoryReceivedPlus: '+ Inventario recibido',\ninvoices: 'Facturas',\nitems: 'Items',\nloadDB: 'Cargar Base de datos',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/hi/translations.js", "new_path": "app/locales/hi/translations.js", "diff": "@@ -1123,6 +1123,7 @@ export default {\nhistory: 'History',\nincidentCategories: 'Incident Categories',\ninventoryReceived: 'Inventory Received',\n+ inventoryReceivedPlus: '+ Inventory Received',\ninvoices: 'Invoices',\nitems: 'Items',\nloadDB: 'Load DB',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/ru/translations.js", "new_path": "app/locales/ru/translations.js", "diff": "@@ -1089,6 +1089,7 @@ export default {\nhistory: '',\nincidentCategories: '',\ninventoryReceived: '',\n+ inventoryReceivedPlus: '',\ninvoices: '',\nitems: '',\nloadDB: '',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/tr/translations.js", "new_path": "app/locales/tr/translations.js", "diff": "@@ -1088,6 +1088,7 @@ export default {\nhistory: '',\nincidentCategories: '',\ninventoryReceived: '',\n+ inventoryReceivedPlus: '',\ninvoices: '',\nitems: '',\nloadDB: '',\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/models/appointment.js", "new_path": "app/models/appointment.js", "diff": "@@ -30,18 +30,18 @@ export default AbstractModel.extend({\nreturn `${formattedStart} - ${formattedEnd}`;\n},\n- appointmentDate: function() {\n+ appointmentDate: computed('startDate', function() {\nlet startDate = this.get('startDate');\nreturn startDate;\n- }.property('startDate'),\n+ }),\n- displayStatus: function() {\n+ displayStatus: computed('status',function() {\nlet status = this.get('status');\nif (Ember.isEmpty(status)) {\nstatus = 'Scheduled';\n}\nreturn status;\n- }.property('status'),\n+ }),\nformattedAppointmentDate: function() {\nlet allDay = this.get('allDay');\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/models/billing-line-item.js", "new_path": "app/models/billing-line-item.js", "diff": "@@ -3,6 +3,8 @@ import DS from 'ember-data';\nimport Ember from 'ember';\nimport NumberFormat from 'hospitalrun/mixins/number-format';\n+const { computed } = Ember;\n+\nexport default AbstractModel.extend(NumberFormat, {\n// Attributes\namountOwed: DS.attr('number'),\n@@ -16,7 +18,7 @@ export default AbstractModel.extend(NumberFormat, {\n/* The individual objects that make up this line item. */\ndetails: DS.hasMany('line-item-detail', { async: false }),\n- amountOwedChanged: function() {\n+ amountOwedChanged: computed('discount', 'nationalInsurance', 'privateInsurance', 'total', function() {\nEmber.run.debounce(this, function() {\nlet discount = this._getValidNumber(this.get('discount'));\nlet nationalInsurance = this._getValidNumber(this.get('nationalInsurance'));\n@@ -30,7 +32,7 @@ export default AbstractModel.extend(NumberFormat, {\nthis.set('amountOwed', this._numberFormat(amountOwed, true));\n}\n}, 500);\n- }.observes('discount', 'nationalInsurance', 'privateInsurance', 'total'),\n+ }),\ndetailTotals: Ember.computed.mapBy('details', 'amountOwed'),\ntotal: Ember.computed.sum('detailTotals'),\n" }, { "change_type": "MODIFY", "old_path": "app/models/inv-location.js", "new_path": "app/models/inv-location.js", "diff": "@@ -2,6 +2,9 @@ import AbstractModel from 'hospitalrun/models/abstract';\nimport DS from 'ember-data';\nimport Ember from 'ember';\nimport LocationName from 'hospitalrun/mixins/location-name';\n+\n+const { computed } = Ember;\n+\n/**\n* Model to represent the location(s) of inventory items.\n* File/model name is inv-location because using inv-location will cause location\n@@ -14,14 +17,14 @@ let InventoryLocation = AbstractModel.extend(LocationName, {\naisleLocation: DS.attr('string'),\ni18n: Ember.inject.service(),\n- locationNameWithQuantity: function() {\n+ locationNameWithQuantity: computed('locationName', 'quantity', function() {\nlet quantity = this.get('quantity');\nlet locationName = this.get('locationName');\nreturn `${locationName} (${this.get('i18n').t(\n'inventory.labels.availableQuantity',\n{ quantity }\n)})`;\n- }.property('locationName', 'quantity'),\n+ }),\nvalidations: {\nadjustmentQuantity: {\n" }, { "change_type": "MODIFY", "old_path": "app/models/inv-purchase.js", "new_path": "app/models/inv-purchase.js", "diff": "@@ -4,6 +4,8 @@ import Ember from 'ember';\nimport LocationName from 'hospitalrun/mixins/location-name';\nimport NumberFormat from 'hospitalrun/mixins/number-format';\n+const { computed } = Ember;\n+\nfunction defaultQuantityGroups() {\nreturn [];\n}\n@@ -18,14 +20,6 @@ let InventoryPurchaseItem = AbstractModel.extend(LocationName, NumberFormat, {\npurchaseCost: DS.attr('number'),\nlotNumber: DS.attr('string'),\ndateReceived: DS.attr('date'),\n- costPerUnit: function() {\n- let purchaseCost = this.get('purchaseCost');\n- let quantity = parseInt(this.get('originalQuantity'));\n- if (Ember.isEmpty(purchaseCost) || Ember.isEmpty(quantity) || purchaseCost === 0 || quantity === 0) {\n- return 0;\n- }\n- return this._numberFormat(purchaseCost / quantity, true);\n- }.property('purchaseCost', 'originalQuantity'),\noriginalQuantity: DS.attr('number'),\ncurrentQuantity: DS.attr('number'),\nexpirationDate: DS.attr('date'),\n@@ -39,6 +33,16 @@ let InventoryPurchaseItem = AbstractModel.extend(LocationName, NumberFormat, {\ndistributionUnit: DS.attr('string'),\ninvoiceNo: DS.attr('string'),\nquantityGroups: DS.attr({ defaultValue: defaultQuantityGroups }),\n+\n+ costPerUnit: computed('purchaseCost', 'originalQuantity', function() {\n+ let purchaseCost = this.get('purchaseCost');\n+ let quantity = parseInt(this.get('originalQuantity'));\n+ if (Ember.isEmpty(purchaseCost) || Ember.isEmpty(quantity) || purchaseCost === 0 || quantity === 0) {\n+ return 0;\n+ }\n+ return this._numberFormat(purchaseCost / quantity, true);\n+ }),\n+\nvalidations: {\npurchaseCost: {\nnumericality: true\n" }, { "change_type": "MODIFY", "old_path": "app/models/inv-request.js", "new_path": "app/models/inv-request.js", "diff": "@@ -3,6 +3,9 @@ import AdjustmentTypes from 'hospitalrun/mixins/inventory-adjustment-types';\nimport DS from 'ember-data';\nimport Ember from 'ember';\nimport LocationName from 'hospitalrun/mixins/location-name';\n+\n+const { computed } = Ember;\n+\n/**\n* Model to represent a request for inventory items.\n*/\n@@ -32,13 +35,13 @@ let InventoryRequest = AbstractModel.extend(AdjustmentTypes, LocationName, {\nasync: false\n}),\n- deliveryLocationName: function() {\n+ deliveryLocationName: computed('deliveryAisle', 'deliveryLocation', function() {\nlet aisle = this.get('deliveryAisle');\nlet location = this.get('deliveryLocation');\nreturn this.formatLocationName(location, aisle);\n- }.property('deliveryAisle', 'deliveryLocation'),\n+ }),\n- deliveryDetails: function() {\n+ deliveryDetails: computed('deliveryAisle', 'deliveryLocation', 'patient', function() {\nlet locationName = this.get('deliveryLocationName');\nlet patient = this.get('patient');\nif (Ember.isEmpty(patient)) {\n@@ -46,26 +49,26 @@ let InventoryRequest = AbstractModel.extend(AdjustmentTypes, LocationName, {\n} else {\nreturn patient.get('displayName');\n}\n- }.property('deliveryAisle', 'deliveryLocation', 'patient'),\n+ }),\n- haveReason: function() {\n+ haveReason: computed('reason', function() {\nreturn !Ember.isEmpty(this.get('reason'));\n- }.property('reason'),\n+ }),\n- isAdjustment: function() {\n+ isAdjustment: computed('transactionType', function() {\nlet adjustmentTypes = this.get('adjustmentTypes');\nlet transactionType = this.get('transactionType');\nlet adjustmentType = adjustmentTypes.findBy('type', transactionType);\nreturn !Ember.isEmpty(adjustmentType);\n- }.property('transactionType'),\n+ }),\n- isFulfillment: function() {\n+ isFulfillment: computed('transactionType', function() {\nreturn this.get('transactionType') === 'Fulfillment';\n- }.property('transactionType'),\n+ }),\n- isTransfer: function() {\n+ isTransfer: computed('transactionType', function() {\nreturn this.get('transactionType') === 'Transfer';\n- }.property('transactionType'),\n+ }),\nvalidations: {\ninventoryItemTypeAhead: {\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"pouchdb-adapter-memory\": \"6.3.4\",\n\"pouchdb-list\": \"^1.1.0\",\n\"pouchdb-users\": \"^1.0.3\",\n- \"stylelint\": \"~8.0.0\",\n+ \"stylelint\": \"~8.2.0\",\n\"stylelint-config-concentric\": \"1.0.8\",\n\"stylelint-declaration-use-variable\": \"1.6.0\",\n\"stylelint-scss\": \"1.4.1\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"pouchdb-list\": \"^1.1.0\",\n\"pouchdb-users\": \"^1.0.3\",\n\"stylelint\": \"~8.2.0\",\n- \"stylelint-config-concentric\": \"1.0.8\",\n+ \"stylelint-config-concentric\": \"2.0.0\",\n\"stylelint-declaration-use-variable\": \"1.6.0\",\n\"stylelint-scss\": \"1.4.1\",\n\"tosource-polyfill\": \"^0.3.1\",\n" }, { "change_type": "MODIFY", "old_path": "yarn.lock", "new_path": "yarn.lock", "diff": "@@ -11323,9 +11323,9 @@ [email protected]:\nversion \"1.0.7\"\nresolved \"https://registry.yarnpkg.com/stylelint-config-concentric/-/stylelint-config-concentric-1.0.7.tgz#da5cc8b93c9314168e4cbc926fddd728c18021bd\"\ndependencies:\n- stylelint-config-standard \"^13.0.0 || ^14.0.0 || ^15.0.0\"\n+ stylelint-config-standard \"^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0\"\n-\"stylelint-config-standard@^13.0.0 || ^14.0.0 || ^15.0.0\":\n+\"stylelint-config-standard@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0\":\nversion \"15.0.1\"\nresolved \"https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-15.0.1.tgz#f588e036bca6bb52391ea784198e773a9ca70efe\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"pouchdb-adapter-memory\": \"6.3.4\",\n\"pouchdb-list\": \"^1.1.0\",\n\"pouchdb-users\": \"^1.0.3\",\n- \"stylelint\": \"~8.2.0\",\n- \"stylelint-config-concentric\": \"2.0.0\",\n+ \"stylelint\": \"~8.0.0\",\n+ \"stylelint-config-concentric\": \"1.0.8\",\n\"stylelint-declaration-use-variable\": \"1.6.0\",\n\"stylelint-scss\": \"1.4.1\",\n\"tosource-polyfill\": \"^0.3.1\",\n" }, { "change_type": "MODIFY", "old_path": "yarn.lock", "new_path": "yarn.lock", "diff": "@@ -11323,9 +11323,9 @@ [email protected]:\nversion \"1.0.7\"\nresolved \"https://registry.yarnpkg.com/stylelint-config-concentric/-/stylelint-config-concentric-1.0.7.tgz#da5cc8b93c9314168e4cbc926fddd728c18021bd\"\ndependencies:\n- stylelint-config-standard \"^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0\"\n+ stylelint-config-standard \"^13.0.0 || ^14.0.0 || ^15.0.0\"\n-\"stylelint-config-standard@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0\":\n+\"stylelint-config-standard@^13.0.0 || ^14.0.0 || ^15.0.0\":\nversion \"15.0.1\"\nresolved \"https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-15.0.1.tgz#f588e036bca6bb52391ea784198e773a9ca70efe\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "tests/acceptance/inventory-test.js", "new_path": "tests/acceptance/inventory-test.js", "diff": "@@ -21,7 +21,7 @@ test('visiting /inventory', function(assert) {\nandThen(function() {\nassert.equal(currentURL(), '/inventory');\nfindWithAssert('button:contains(new request)');\n- findWithAssert('button:contains(inventory received)');\n+ findWithAssert('button:contains(+ Inventory Received)');\nfindWithAssert('p:contains(No requests found. )');\nfindWithAssert('a:contains(Create a new request?)');\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "@@ -509,10 +509,10 @@ export default {\nedit: 'Edit',\n'export': 'Export Report',\ngenerateRep: 'Generate Report',\n- newAttachment: '+ New Attachment',\n+ newAttachment: '+ new Attachment',\nnewCategory: '+ new category',\nnewIncident: '+ new incident',\n- newNote: '+ New Note'\n+ newNote: '+ new Note'\n},\nlabels: {\nactions: 'Actions',\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/mixins/dob-days.js", "new_path": "app/mixins/dob-days.js", "diff": "@@ -9,8 +9,12 @@ export default Ember.Mixin.create({\nif (birthDate) {\nif (birthDate.getFullYear === undefined) {\n- birthDate = moment(birthDate, 'l').toDate();\n+ birthDate = moment(birthDate, 'LLL').toDate();\n}\n+\n+ birthDate.setHours(0, 0, 0, 0);\n+ today.setHours(0, 0, 0, 0);\n+\nif (birthDate.getFullYear !== undefined) {\nyears = today.getFullYear() - birthDate.getFullYear();\nif (today.getMonth() < birthDate.getMonth()\n@@ -37,7 +41,7 @@ export default Ember.Mixin.create({\n}\nif (birthDate.getDate) {\n- days = today.getUTCDate() - birthDate.getUTCDate();\n+ days = today.getDate() - birthDate.getDate();\nif (days < 0) {\ndays += 30;\n}\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/mixins/dob-days-test.js", "new_path": "tests/unit/mixins/dob-days-test.js", "diff": "@@ -4,6 +4,7 @@ import Ember from 'ember';\nimport DS from 'ember-data';\nimport tHelper from 'ember-i18n/helper';\nimport localeConfig from 'ember-i18n/config/en';\n+import moment from 'moment';\nmoduleFor('mixin:dob-days', 'Unit | Mixin | dob-days', {\nneeds: [\n@@ -47,26 +48,32 @@ moduleFor('mixin:dob-days', 'Unit | Mixin | dob-days', {\n}\n});\n-test('convertDOBToText', function(assert) {\n+test('convertDOBToText date object', function(assert) {\nlet dobDays = this.subject();\n- assert.strictEqual(dobDays.convertDOBToText(new Date(789109200000)).toString(), '21 years 11 months 12 days');\n+ assert.strictEqual(dobDays.convertDOBToText(moment('January 3rd, 1995', 'LLL').toDate()).toString(), '21 years 11 months 12 days');\n+});\n+\n+test('convertDOBToText date object with time component', function(assert) {\n+ let dobDays = this.subject();\n+\n+ assert.strictEqual(dobDays.convertDOBToText(moment('January 3rd, 1995 6:00 AM', 'LLL').toDate()).toString(), '21 years 11 months 12 days');\n});\ntest('convertDOBToText date string', function(assert) {\nlet dobDays = this.subject();\n- assert.strictEqual(dobDays.convertDOBToText('January 3rd, 1995').toString(), '21 years 8 months 26 days');\n+ assert.strictEqual(dobDays.convertDOBToText('January 3rd, 1995').toString(), '21 years 11 months 12 days');\n});\ntest('convertDOBToText date string short format', function(assert) {\nlet dobDays = this.subject();\n- assert.strictEqual(dobDays.convertDOBToText('January 3rd, 1995', true).toString(), '21y 8m 26d');\n+ assert.strictEqual(dobDays.convertDOBToText('January 3rd, 1995', true).toString(), '21y 11m 12d');\n});\ntest('convertDOBToText date string omit days', function(assert) {\nlet dobDays = this.subject();\n- assert.strictEqual(dobDays.convertDOBToText('January 3rd, 1995', false, true).toString(), '21 years 8 months');\n+ assert.strictEqual(dobDays.convertDOBToText('January 3rd, 1995', false, true).toString(), '21 years 11 months');\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -86,7 +86,7 @@ To run HospitalRun with [Docker](https://www.docker.com/) please do the followin\n### Running with Docker Compose\nTo run HospitalRun with Docker-compose please do the following:\n- Go to [https://docs.docker.com/compose/install](https://docs.docker.com/compose/install/) to install Docker-compose.\n-- Execute 'docker-compose up' to reduce the steps to build and run the application.\n+- Execute `docker-compose up` to reduce the steps to build and run the application.\n### Accessing HospitalRun with Docker Toolbox\nIf you are running with Docker Toolbox you will have to run the following commands to get the IP of the docker machine where hospitalrun-frontend is running with the following:\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "script/initcloud9", "diff": "+#!/bin/sh\n+# Usage: source ./script/initcloud9\n+# Sets up the development environment on a cloud9 workspace\n+\n+printf \"\\nInstalling ember-cli...\\n\"\n+npm install -g ember-cli@latest\n+\n+printf \"Installing bower...\\n\"\n+npm install -g bower\n+\n+printf \"Installing node dependecies...\\n\"\n+npm install\n+npm install -g phantomjs-prebuilt\n+\n+printf \"Installing bower components...\\n\"\n+bower install\n+\n+printf \"Setting up CouchDB for cloud9 workspace...\\n\"\n+sudo su couchdb -c 'touch /var/log/couchdb/couchdb.stdout'\n+sudo su couchdb -c 'touch /var/log/couchdb/couchdb.stderr'\n+sudo chown couchdb: /var/log/couchdb\n+sudo chmod u+w /var/log/couchdb\n+sudo mkdir -p /var/run/couchdb\n+sudo chown couchdb:couchdb /var/run/couchdb\n+sudo sed -i 's_couchdb.stderr_/var/log/couchdb/couchdb.stderr_g' /usr/bin/couchdb\n+sudo sed -i 's_couchdb.stdout_/var/log/couchdb/couchdb.stdout_g' /usr/bin/couchdb\n+sudo sed -i 's_BACKGROUND=false_BACKGROUND=true_g' /usr/bin/couchdb\n+sudo su couchdb -c /usr/bin/couchdb & sleep 8\n+\n+printf \"Configuring CouchDB for Hospital Run...\\n\"\n+./script/initcouch.sh\n+\n+printf \"Create Hospital Run server config file...\\n\"\n+cp server/config-example.js server/config.js\n+\n+printf \"Cloud9 initiation completed. You can either start the server or run the tests.\\n\"\n" } ]

[ { "change_type": "MODIFY", "old_path": ".stylelintrc", "new_path": ".stylelintrc", "diff": "\"selector-max-compound-selectors\": 4,\n\"selector-pseudo-element-colon-notation\": \"double\",\n\"selector-list-comma-newline-after\": \"always-multi-line\",\n- \"selector-no-id\": true,\n+ \"selector-max-id\": 0,\n\"selector-no-qualifying-type\": [ true, {\n\"ignore\": [ \"attribute\" ]\n} ],\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-cli-eslint\": \"3.0.3\",\n\"ember-cli-fake-server\": \"0.3.2\",\n\"ember-cli-htmlbars\": \"^2.0.0\",\n- \"ember-cli-htmlbars-inline-precompile\": \"^0.3.3\",\n+ \"ember-cli-htmlbars-inline-precompile\": \"^1.0.2\",\n\"ember-cli-inject-live-reload\": \"^1.4.1\",\n\"ember-cli-moment-shim\": \"3.5.0\",\n\"ember-cli-qunit\": \"^3.0.1\",\n\"ember-export-application-global\": \"^1.0.5\",\n\"ember-fullcalendar\": \"1.8.0\",\n\"ember-i18n\": \"4.4.0\",\n- \"ember-keyboard\": \"2.2.2\",\n\"ember-inspector\": \"^2.0.4\",\n+ \"ember-keyboard\": \"2.2.2\",\n\"ember-load-initializers\": \"^1.0.0\",\n\"ember-pouch\": \"4.2.4\",\n\"ember-radio-buttons\": \"^4.0.1\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/services/database.js", "new_path": "app/services/database.js", "diff": "@@ -219,8 +219,7 @@ export default Service.extend(OAuthHeaders, PouchFindIndexes, {\nif (permissionResult) {\npermissionResult.then(resolve, reject);\n}\n- })\n- .then((permissionResult) => {\n+ }).then((permissionResult) => {\nif (permissionResult !== 'granted') {\nthrow new Error('We weren\\'t granted permission.');\n}\n@@ -298,7 +297,7 @@ export default Service.extend(OAuthHeaders, PouchFindIndexes, {\n_urlBase64ToUint8Array(base64String) {\nlet padding = '='.repeat((4 - base64String.length % 4) % 4);\nlet base64 = (base64String + padding)\n- .replace(/\\-/g, '+')\n+ .replace(/-/g, '+')\n.replace(/_/g, '/');\nlet rawData = window.atob(base64);\n" }, { "change_type": "MODIFY", "old_path": "app/utils/email-validation.js", "new_path": "app/utils/email-validation.js", "diff": "export default {\n- emailRegex: /^(([^<>()[\\]\\\\.,;:\\s@\\\"]+(\\.[^<>()[\\]\\\\.,;:\\s@\\\"]+)*)|(\\\".+\\\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$/\n+ emailRegex: /^(([^<>()[\\]\\\\.,;:\\s@\"]+(\\.[^<>()[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$/\n};\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-cli-content-security-policy\": \"0.6.0\",\n\"ember-cli-dependency-checker\": \"^2.0.0\",\n\"ember-cli-deprecation-workflow\": \"0.2.4\",\n- \"ember-cli-eslint\": \"4.2.2\",\n+ \"ember-cli-eslint\": \"^4.2.2\",\n\"ember-cli-fake-server\": \"0.3.2\",\n\"ember-cli-htmlbars\": \"^2.0.0\",\n\"ember-cli-htmlbars-inline-precompile\": \"^0.3.3\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"license\": \"GPL-3.0\",\n\"devDependencies\": {\n\"babel-plugin-transform-async-to-generator\": \"^6.24.1\",\n- \"babel-preset-env\": \"^1.3.3\",\n+ \"babel-preset-env\": \"^1.6.1\",\n\"babel-preset-es2015\": \"^6.18.0\",\n\"babel-preset-react\": \"^6.24.1\",\n\"babel-preset-stage-2\": \"^6.18.0\",\n\"broccoli-export-text\": \"0.0.2\",\n\"broccoli-serviceworker\": \"0.1.6\",\n\"csv-parse\": \"^1.2.0\",\n- \"devtron\": \"1.4.0\",\n+ \"devtron\": \"^1.4.0\",\n+ \"electron-forge\": \"^4.1.3\",\n\"electron-prebuilt-compile\": \"1.7.9\",\n+ \"electron-protocol-serve\": \"^1.3.0\",\n\"electron-rebuild\": \"^1.5.7\",\n\"ember-ajax\": \"^3.0.0\",\n\"ember-browserify\": \"^1.1.12\",\n\"ember-concurrency\": \"0.8.4\",\n\"ember-concurrency-test-waiter\": \"0.3.1\",\n\"ember-data\": \"2.10.0\",\n- \"ember-electron\": \"2.1.0\",\n+ \"ember-electron\": \"^2.7.2\",\n\"ember-export-application-global\": \"^1.0.5\",\n\"ember-fullcalendar\": \"1.8.0\",\n\"ember-i18n\": \"4.4.0\",\n- \"ember-keyboard\": \"2.2.2\",\n\"ember-inspector\": \"^2.0.4\",\n+ \"ember-keyboard\": \"2.2.2\",\n\"ember-load-initializers\": \"^1.0.0\",\n\"ember-pouch\": \"4.2.4\",\n\"ember-radio-buttons\": \"^4.0.1\",\n\"worker-pouch\": \"git+https://github.com/jkleinsc/worker-pouch.git\"\n},\n\"dependencies\": {\n- \"electron-compile\": \"^6.3.0\",\n+ \"electron-compile\": \"^6.4.2\",\n\"electron-localshortcut\": \"^1.1.1\",\n- \"electron-protocol-serve\": \"1.3.0\"\n+ \"electron-protocol-serve\": \"1.3.0\",\n+ \"electron-squirrel-startup\": \"^1.0.0\"\n},\n\"ember-addon\": {\n\"paths\": [\n" }, { "change_type": "MODIFY", "old_path": "tests/ember-electron/main.js", "new_path": "tests/ember-electron/main.js", "diff": "-/* jshint node:true */\n+/* eslint-env node */\nconst { app, BrowserWindow, protocol } = require('electron');\n-const { dirname, resolve } = require('path');\n+const { dirname, resolve, basename } = require('path');\n+const fs = require('fs');\nconst url = require('url');\nconst protocolServe = require('electron-protocol-serve');\n+const tmp = require('tmp');\nlet mainWindow = null;\n// The testUrl is a file: url pointing to our index.html, with some query\n// params we need to preserve for testem. So we need to register our ember\n// protocol accordingly.\n-const [, , indexUrl] = process.argv;\n-const {\n- pathname: indexPath,\n+let [, , indexUrl] = process.argv;\n+// Undo workaround for windows (see test-runner.js for explanation)\n+indexUrl = indexUrl.replace(/__amp__/g, '&');\n+let {\n+ pathname: originalIndexPath,\nsearch: indexQuery\n} = url.parse(indexUrl);\n+// When we extract the pathname from an absolute path on windows, it starts\n+// with '/C:/', and the leading slash confuses everything, so we need to strip\n+// it.\n+if (process.platform === 'win32') {\n+ originalIndexPath = originalIndexPath.slice(1);\n+}\n+\n+// Copy index-electron.html to a location not managed by broccoli so that it\n+// doesn't get deleted when a change is detected.\n+originalIndexPath = resolve(originalIndexPath);\n+let emberAppDir = resolve(dirname(originalIndexPath), '..');\n+let tmpDir = tmp.dirSync().name;\n+let indexPath = resolve(tmpDir, basename(originalIndexPath));\n+fs.writeFileSync(indexPath, fs.readFileSync(originalIndexPath, 'utf8').toString());\nconst emberAppLocation = `serve://dist${indexQuery}`;\nprotocol.registerStandardSchemes(['serve'], { secure: true });\n-// The index.html is in the tests/ directory, so we want all other assets to\n-// load from its parent directory\n+// The index-electron.html was copied to the tmp directory, so we want all other\n+// assets to load from the parent directory of the original file (emberAppDir).\nprotocolServe({\n- cwd: resolve(dirname(indexPath), '..'),\n+ cwd: emberAppDir,\napp,\nprotocol,\nindexPath\n@@ -36,11 +54,14 @@ app.on('ready', function onReady() {\nmainWindow = new BrowserWindow({\nwidth: 800,\nheight: 600,\n+ webPreferences: {\nbackgroundThrottling: false\n+ }\n});\ndelete mainWindow.module;\n+ process.env.ELECTRON_PROTOCOL_SERVE_INDEX = originalIndexPath;\nmainWindow.loadURL(emberAppLocation);\nmainWindow.on('closed', function onClosed() {\n" } ]

[ { "change_type": "MODIFY", "old_path": "Dockerfile", "new_path": "Dockerfile", "diff": "-FROM ubuntu:14.04\n+FROM node:6-alpine\n-# install couchdb\n-RUN apt-get update && apt-get install curl sudo git wget -y\n+# install script dependencies\n+RUN apk update && apk add sudo curl git wget\n-# install hospital run\n-RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -\n-RUN apt-get update && apt-get install nodejs -y\n+# setup folders\nRUN mkdir -p /usr/src/app\nWORKDIR /usr/src/app\n-COPY . /usr/src/app\n+# install npm dependencies\n+COPY ./package.json /usr/src/app\nRUN npm install -g ember-cli@latest && npm install -g bower\nRUN npm install\n+# install source code\n+COPY . /usr/src/app\nRUN bower install --allow-root\nCOPY ./server/config-example.js ./server/config.js\n+# define settings\nRUN sed -i -e 's/URL=\"localhost\"/URL=\"couchdb\"/g' ./script/initcouch.sh\nRUN sed -i -e \"s/couchDbServer: 'localhost'/couchDbServer: 'couchdb'/g\" ./server/config.js\nRUN sed -i -e \"s/localhost:5984/couchdb:5984/g\" ./script/server\n" }, { "change_type": "MODIFY", "old_path": "docker-compose.yml", "new_path": "docker-compose.yml", "diff": "-version: '2'\n+version: '2.1'\nservices:\nweb:\nbuild: .\nports:\n- \"4200:4200\"\ndepends_on:\n- - \"couchdb\"\ncouchdb:\n- image: \"couchdb:1.6\"\n+ condition: \"service_healthy\"\n+ couchdb:\n+ image: \"couchdb:1.7.1\"\n+ ports:\n+ - \"5984:5984\"\n+ healthcheck:\n+ test: [\"CMD\", \"curl\", \"-f\", \"http://localhost:5984/\"]\n+ interval: 10s\n+ timeout: 90s\n+ retries: 9\n" } ]

[ { "change_type": "DELETE", "old_path": ".stylelintignore", "new_path": null, "diff": "-/app/styles/basscss/\n" }, { "change_type": "MODIFY", "old_path": ".stylelintrc", "new_path": ".stylelintrc", "diff": "],\n\"rules\":{\n\"sh-waqar/declaration-use-variable\": \"color\",\n- \"scss/at-import-partial-extension-whitelist\": [''],\n+ \"scss/at-import-partial-extension-whitelist\": [\"\"],\n\"scss/at-import-no-partial-leading-underscore\": true,\n\"scss/at-extend-no-missing-placeholder\": true,\n\"declaration-bang-space-after\": \"never\",\n\"number-leading-zero\": \"never\",\n\"number-no-trailing-zeros\": true,\n\"length-zero-no-unit\": true,\n- \"rule-nested-empty-line-before\": [\"always-multi-line\", {\n+ \"rule-empty-line-before\": [\"always-multi-line\", {\n\"ignore\": [\"after-comment\"],\n\"except\": [\"first-nested\"]\n} ],\n\"declaration-property-value-blacklist\": {\n\"/^border/\": [\"none\"]\n}\n- }\n+ },\n+ \"ignoreFiles\": [\n+ \"./app/styles/basscss/**/*.scss\"\n+ ]\n}\n" }, { "change_type": "MODIFY", "old_path": "app/styles/components/_loading_notice.scss", "new_path": "app/styles/components/_loading_notice.scss", "diff": "> div {\ndisplay: inline-block;\n- -webkit-animation: stretchdelay 1.2s infinite ease-in-out;\n- animation: stretchdelay 1.2s infinite ease-in-out;\nmargin-left: 3px;\nborder-radius: 50px;\nbackground-color: $green;\nwidth: 6px;\nheight: 100%;\n+ -webkit-animation: stretchdelay 1.2s infinite ease-in-out;\n+ animation: stretchdelay 1.2s infinite ease-in-out;\n&:first-child { margin-left: 0; }\n}\n" }, { "change_type": "MODIFY", "old_path": "app/styles/components/_typeahead.scss", "new_path": "app/styles/components/_typeahead.scss", "diff": "width: 100%;\nmin-width: 160px;\nmax-height: 110px;\n- overflow-y: scroll;\noverflow-x: none;\n+ overflow-y: scroll;\n.query-results { margin-bottom: 0; }\n}\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"start\": \"./script/server\",\n\"test\": \"./script/test\",\n\"electron-test\": \"ember electron:test\",\n- \"translation-sync\": \"babel-node script/translation/sync.js --presets es2015 && eslint --fix app/locales\"\n+ \"translation-sync\": \"babel-node script/translation/sync.js --presets es2015 && eslint --fix app/locales\",\n+ \"stylelint\": \"stylelint 'app/styles/**/*.scss'\"\n},\n\"repository\": {\n\"type\": \"git\",\n\"pouchdb-list\": \"^1.1.0\",\n\"pouchdb-users\": \"^1.0.3\",\n\"stylelint\": \"~8.3.0\",\n- \"stylelint-config-concentric\": \"1.0.8\",\n+ \"stylelint-config-concentric\": \"^2.0.0\",\n\"stylelint-declaration-use-variable\": \"1.6.0\",\n\"stylelint-scss\": \"1.4.1\",\n\"tosource-polyfill\": \"^0.3.1\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"loader.js\": \"^4.0.11\",\n\"minimatch\": \"^3.0.2\",\n\"nano\": \"6.3.0\",\n- \"pouchdb\": \"6.2.0\",\n+ \"pouchdb\": \"6.3.4\",\n\"pouchdb-adapter-memory\": \"6.3.4\",\n\"pouchdb-list\": \"^1.1.0\",\n\"pouchdb-users\": \"^1.0.3\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "Dockerfile", "new_path": "Dockerfile", "diff": "FROM node:6-alpine\n# install script dependencies\n-RUN apk update && apk add sudo curl git wget\n+RUN apk update && apk add \\\n+ bash \\\n+ curl \\\n+ g++ \\\n+ git \\\n+ make \\\n+ python \\\n+ sudo \\\n+ wget\n+\n+# install global npm dependencies\n+RUN npm install -g ember-cli@latest && npm install -g bower\n+\n+# use changes to package.json to force Docker not to use the cache\n+# when we change our application's nodejs dependencies:\n+COPY package*.json /tmp/\n+RUN cd /tmp && npm install\n+RUN mkdir -p /usr/src/app && cp -a /tmp/node_modules /usr/src/app\n+\n+COPY bower.json /tmp/\n+RUN cd /tmp && bower install --allow-root\n+RUN cp -a /tmp/bower_components /usr/src/app\n# setup folders\n-RUN mkdir -p /usr/src/app\nWORKDIR /usr/src/app\n-# install npm dependencies\n-COPY ./package.json /usr/src/app\n-RUN npm install -g ember-cli@latest && npm install -g bower\n-RUN npm install\n-\n# install source code\nCOPY . /usr/src/app\n-RUN bower install --allow-root\nCOPY ./server/config-example.js ./server/config.js\n# define settings\n" }, { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -80,7 +80,7 @@ To run HospitalRun with [Docker](https://www.docker.com/) please do the followin\n- Clone the repository with the command `git clone https://github.com/HospitalRun/hospitalrun-frontend.git`.\n- Change to the hospitalrun-frontend directory `cd hospitalrun-frontend`.\n- Build the HospitalRun image with `docker build -t hospitalrun-frontend .`.\n-- Execute `docker run -it --name couchdb -d couchdb` to create the couchdb container.\n+- Execute `docker run -it --name couchdb -d couchdb:1.7.1` to create the couchdb container.\n- Execute `docker run -it --name hospitalrun-frontend -p 4200:4200 --link couchdb:couchdb -d hospitalrun-frontend` to create the HospitalRun container.\n### Running with Docker Compose\n" } ]

[ { "change_type": "MODIFY", "old_path": "ember-cli-build.js", "new_path": "ember-cli-build.js", "diff": "@@ -5,7 +5,9 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');\nmodule.exports = function(defaults) {\nvar app = new EmberApp(defaults, {\nbabel: {\n- optional: ['es6.spec.symbols'],\n+ optional: ['es6.spec.symbols']\n+ },\n+ 'ember-cli-babel': {\nincludePolyfill: true\n},\nminifyJS: {\n" } ]

[ { "change_type": "MODIFY", "old_path": "docker-compose.yml", "new_path": "docker-compose.yml", "diff": "@@ -4,9 +4,12 @@ services:\nbuild: .\nports:\n- \"4200:4200\"\n+ - \"7020:7020\"\ndepends_on:\ncouchdb:\ncondition: \"service_healthy\"\n+ volumes:\n+ - ./app:/usr/src/app/app\ncouchdb:\nimage: \"couchdb:1.7.1\"\nports:\n" } ]

[ { "change_type": "MODIFY", "old_path": ".travis.yml", "new_path": ".travis.yml", "diff": "@@ -25,12 +25,12 @@ before_install:\n- npm config set spin false\n- npm install -g bower\n- bower --version\n+ - \"/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24\"\ninstall:\n- npm install\n- bower install\n- export DISPLAY=':99.0'\n- - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &\nscript:\n- npm run $COMMAND\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/templates/components/select-or-typeahead.hbs", "new_path": "app/templates/components/select-or-typeahead.hbs", "diff": "{{else}}\n{{em-select class=(concat 'form-input-group ' className) label=label\nproperty=property content=content\n- optionValuePath=optionValuePath optionLabelPath=optionLabelPath\n+ optionValuePath=optionValuePath\n+ optionLabelPath=optionLabelPath\nselected=selection prompt=prompt\n}}\n{{/if}}\n" }, { "change_type": "MODIFY", "old_path": "tests/README.md", "new_path": "tests/README.md", "diff": "@@ -10,3 +10,14 @@ TODO\n* Hint: Add `&nocontainer=hidden` to testem results viewer to get rid of nasty white div:\nhttp://localhost:7357/8986/tests/index.html?module=NavMenuComponent&nojshint=true&nocontainer=hidden\n+### Troubleshooting\n+* in order to troubleshoot some strange failures use recommendations from [the Ember debugging page](https://guides.emberjs.com/v2.18.0/configuring-ember/debugging/). Particularly, for promises add the following in the `test-helper.js`\n+\n+```javascript\n+import { assert } from '@ember/debug';\n+import RSVP from 'rsvp';\n+\n+RSVP.on('error', function(error) {\n+ assert(error, false);\n+});\n+```\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-cli-test-loader\": \"^2.0.0\",\n\"ember-concurrency\": \"0.8.11\",\n\"ember-concurrency-test-waiter\": \"0.3.1\",\n- \"ember-data\": \"2.17.0\",\n+ \"ember-data\": \"^2.10.0\",\n\"ember-electron\": \"^2.7.2\",\n\"ember-export-application-global\": \"^2.0.0\",\n\"ember-fullcalendar\": \"1.8.0\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-cli-test-loader\": \"^2.0.0\",\n\"ember-concurrency\": \"0.8.11\",\n\"ember-concurrency-test-waiter\": \"0.3.1\",\n- \"ember-data\": \"^2.10.0\",\n+ \"ember-data\": \"2.10.0\",\n\"ember-electron\": \"^2.7.2\",\n\"ember-export-application-global\": \"^2.0.0\",\n\"ember-fullcalendar\": \"1.8.0\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "Makefile", "new_path": "Makefile", "diff": "@@ -11,7 +11,7 @@ clean:\n@echo 'Nothing to do yet!'\n.PHONY: test\n-test: install node_modules/phantomjs\n+test:\n@./script/test\n.PHONY: build\n" }, { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -41,7 +41,7 @@ To install the frontend please do the following:\n``` bash\nbash -o igncr script/bootstrap\n```\n- - **Note:** *If installing packages globally via `npm` requires root access on your machine (see `ember-cli` installation), running `script/bootstrap` will also require root access to install PhantomJS2. The contained `bower install` step will fail when running as root. A fix for this is to edit `script/bootstrap` and add the `--allow-root` option to the command: `bower install --allow-root`.*\n+ - **Note:** *If installing packages globally via `npm` requires root access on your machine (see `ember-cli` installation), the contained `bower install` step will fail when running as root. A fix for this is to edit `script/bootstrap` and add the `--allow-root` option to the command: `bower install --allow-root`.*\n- **Note:** *If you just want to use the project, cloning is the best option. However, if you wish to contribute to the project, you will need to fork the project first, and then clone your `hospitalrun-frontend` fork and make your contributions via a branch on your fork.*\n6. Install and configure [CouchDB](http://couchdb.apache.org/):\n1. Download and install CouchDB from http://couchdb.apache.org/#download.\n" }, { "change_type": "MODIFY", "old_path": "script/initcloud9", "new_path": "script/initcloud9", "diff": "@@ -10,7 +10,6 @@ npm install -g bower\nprintf \"Installing node dependecies...\\n\"\nnpm install\n-npm install -g phantomjs-prebuilt\nprintf \"Installing bower components...\\n\"\nbower install\n" }, { "change_type": "MODIFY", "old_path": "script/setupcloud9", "new_path": "script/setupcloud9", "diff": "@@ -29,7 +29,6 @@ npm install -g ember-cli@latest\nnpm install -g bower\nnpm install\nbower install\n-npm install -g phantomjs-prebuilt\nsudo su couchdb -c /usr/bin/couchdb &\nsleep 5\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"devtron\": \"^1.4.0\",\n\"electron-forge\": \"^4.1.3\",\n\"electron-prebuilt-compile\": \"1.7.9\",\n- \"electron-protocol-serve\": \"^1.3.0\",\n\"electron-rebuild\": \"^1.5.7\",\n\"ember-ajax\": \"^3.0.0\",\n\"ember-browserify\": \"^1.1.12\",\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "app/components/language-dropdown.js", "diff": "+import Ember from 'ember';\n+\n+export default Ember.Component.extend({\n+ i18n: Ember.inject.service(),\n+ languagePreference: Ember.inject.service(),\n+ selectedLanguage: Ember.computed.alias('i18n.locale'),\n+\n+ languageOptions: Ember.computed('i18n.locale', function() {\n+ let i18n = this.get('i18n');\n+ return i18n.get('locales').map((item) => {\n+ return {\n+ id: item,\n+ name: i18n.t(`languages.${item}`)\n+ };\n+ });\n+ }),\n+\n+ onFinish: null,\n+\n+ actions: {\n+ selectLanguage(i18n) {\n+ this.get('languagePreference').setUserI18nPreference(i18n);\n+ this.get('onFinish')();\n+ }\n+ }\n+\n+});\n" }, { "change_type": "MODIFY", "old_path": "app/routes/application.js", "new_path": "app/routes/application.js", "diff": "@@ -12,6 +12,7 @@ let ApplicationRoute = Route.extend(ApplicationRouteMixin, ModalHelper, SetupUse\ndatabase: inject.service(),\nconfig: inject.service(),\nsession: inject.service(),\n+ languagePreference: inject.service(),\nshouldSetupUserRole: true,\nactions: {\n@@ -106,10 +107,7 @@ let ApplicationRoute = Route.extend(ApplicationRouteMixin, ModalHelper, SetupUse\nafterModel() {\nset(this.controllerFor('navigation'), 'allowSearch', false);\n$('#apploading').remove();\n- this.get('config.configDB').get('current_user').then((user) => {\n- let language = user.i18n || 'en';\n- this.set('i18n.locale', language);\n- });\n+ this.get('languagePreference').setSessionI18nPreference();\n},\nrenderModal(template) {\n" }, { "change_type": "MODIFY", "old_path": "app/services/config.js", "new_path": "app/services/config.js", "diff": "@@ -12,6 +12,7 @@ export default Ember.Service.extend({\nconfigDB: null,\ndatabase: inject.service(),\nsession: inject.service(),\n+ languagePreference: inject.service(),\nsessionData: Ember.computed.alias('session.data'),\nstandAlone: false,\nneedsUserSetup: false,\n@@ -177,6 +178,7 @@ export default Ember.Service.extend({\nconfig.get('current_user').then((doc) => {\ndoc.value = userName;\nconfig.put(doc);\n+ this.get('languagePreference').setSessionI18nPreference();\n}).catch(() => {\nconfig.put({\n_id: 'current_user',\n" }, { "change_type": "ADD", "old_path": null, "new_path": "app/services/language-preference.js", "diff": "+import Ember from 'ember';\n+\n+export default Ember.Service.extend({\n+\n+ i18n: Ember.inject.service(),\n+ config: Ember.inject.service(),\n+\n+ setSessionI18nPreference() {\n+ let setSessionI18n = (results) => {\n+ let { preferences, userName } = results;\n+ if (userName && preferences[userName]) {\n+ Ember.run(() => {\n+ this.set('i18n.locale', preferences[userName].i18n);\n+ });\n+ }\n+ };\n+ this._fetchUserPreferencesDB().then(setSessionI18n);\n+ },\n+\n+ setUserI18nPreference(i18n) {\n+ let setUserI18n = (results) => {\n+ let { preferences, userName } = results;\n+ if (preferences[userName] === undefined) {\n+ preferences[userName] = {};\n+ }\n+ preferences[userName].i18n = i18n;\n+ this.get('config.configDB').put(preferences).then(() => {\n+ Ember.run(() => {\n+ this.set('i18n.locale', i18n);\n+ });\n+ }).catch((err) => {\n+ console.log(err);\n+ });\n+ };\n+ this._fetchUserPreferencesDB().then(setUserI18n);\n+ },\n+\n+ _fetchUserPreferencesDB() {\n+ let configDB = this.get('config.configDB');\n+ let userName, preferences;\n+ return configDB.get('current_user').then((user) => {\n+ userName = this._fetchUsername(user);\n+ // TODO: this block and then next `then` block could be combined (?)\n+ }).then(() => {\n+ preferences = configDB.get('preferences');\n+ return Ember.RSVP.hash({ userName, preferences });\n+ }).catch((err) => {\n+ if (err.status === 404) {\n+ preferences = this._initPreferencesDB(userName, 'en');\n+ return Ember.RSVP.hash({ userName, preferences });\n+ } else {\n+ console.log(err);\n+ }\n+ });\n+ },\n+\n+ _fetchUsername(user) {\n+ switch (typeof user.value) {\n+ case 'string':\n+ return user.value;\n+ case 'object':\n+ return user.value.name;\n+ default:\n+ return undefined;\n+ }\n+ },\n+\n+ _initPreferencesDB(username, i18n) {\n+ let doc = {\n+ _id: 'preferences'\n+ };\n+ if (username != undefined) {\n+ doc[username] = {\n+ i18n: i18n || 'en'\n+ };\n+ }\n+ return this.get('config.configDB').put(doc).catch((err) => {\n+ console.log(err);\n+ });\n+ }\n+});\n" }, { "change_type": "RENAME", "old_path": "app/templates/components/language-select.hbs", "new_path": "app/templates/components/language-dropdown.hbs", "diff": "{{select-list\n- className=\"test-select-lang\"\n+ class=\"language-dropdown\"\nprompt=(t 'navigation.actions.selectLanguage')\ncontent=languageOptions\noptionLabelPath='name'\noptionValuePath='id'\n+ value=selectedLanguage\naction=(action 'selectLanguage')\n}}\n" }, { "change_type": "MODIFY", "old_path": "app/templates/sidebar_nav/header.hbs", "new_path": "app/templates/sidebar_nav/header.hbs", "diff": "<nav class=\"settings-nav\">\n{{#if session.isAuthenticated}}\n<a href=\"#\" class=\"logout\" {{ action 'invalidateSession' }}>{{t \"navigation.actions.logout\"}}</a>\n- {{language-select onFinish=(action 'toggleSettings')}}\n+ {{language-dropdown onFinish=(action 'toggleSettings')}}\n{{else}}\n{{#link-to 'login'}}{{t \"navigation.actions.login\"}}{{/link-to}}\n{{/if}}\n" }, { "change_type": "MODIFY", "old_path": "tests/acceptance/appointments-test.js", "new_path": "tests/acceptance/appointments-test.js", "diff": "@@ -295,7 +295,6 @@ test('visiting /appointments/search', function(assert) {\n});\nandThen(function() {\n- // debugger;\nlet desiredDate = moment().endOf('day').add(363, 'days').format('l');\nlet datePicker = '.test-selected-start-date input';\nselectDate(datePicker, desiredDate);\n" }, { "change_type": "ADD", "old_path": null, "new_path": "tests/acceptance/language-dropdown-test.js", "diff": "+// // WIP\n+\n+import Ember from 'ember';\n+import { module, test } from 'qunit';\n+import startApp from 'hospitalrun/tests/helpers/start-app';\n+// import FakeServer, { stubRequest } from 'ember-cli-fake-server';\n+\n+module('Acceptance | language dropdown', {\n+ beforeEach() {\n+ // 'FakeServer.start()' and 'FakeServer.stop()' are only needed if we are stubbing requests to the\n+ // authentication endpoint\n+ // FakeServer.start();\n+ this.application = startApp();\n+ // this.application.inject('service', 'languagePreference', 'service:language-preference');\n+ },\n+\n+ afterEach() {\n+ // FakeServer.stop();\n+ Ember.run(this.application, 'destroy');\n+ }\n+});\n+\n+test('setting a language preference persists after logout', (assert) => {\n+ runWithPouchDump('default', () => {\n+ assert.equal(1, 1);\n+ // login(assert, { name: 'hradmin', password: 'test' });\n+ // login(assert, {name: 'hradmin', password: 'test' });\n+\n+ // andThen(() => {\n+ // assert.equal(currentURL(), '/', 'Path should equal homepage');\n+ // assert.equal(find('.view-current-title').text(), 'Welcome to HospitalRun!', 'Title should initially display as English');\n+ // });\n+ // andThen(() => {\n+ // click('a.settings-trigger');\n+ // waitToAppear('.settings-nav');\n+ // });\n+ // andThen(() => {\n+ // select('.language-dropdown', 'French');\n+ // });\n+ // andThen(() => {\n+ // assert.equal(find('.view-current-title').text(), 'Que voulez-vous faire?', 'Title should have changed to French.');\n+ // });\n+ // andThen(() => {\n+ // click('a.settings-trigger');\n+ // waitToAppear('.settings-nav');\n+ // click('a.logout');\n+ // invalidateSession();\n+ // visit('/login');\n+ // });\n+ // andThen(() => {\n+ // login(assert, { name: 'otherhradmin', password: 'test' });\n+ // });\n+ // andThen(() => {\n+ // visit('/');\n+ // });\n+ // andThen(() => {\n+ // // pauseTest();\n+ // assert.equal(currentURL(), '/', 'Path should equal homepage');\n+ // assert.equal(find('.view-current-title').text(), 'Welcome to HospitalRun!', 'Title for 2nd user should be in English');\n+ // click('a.settings-trigger');\n+ // waitToAppear('.settings-nav');\n+ // click('a.logout');\n+ // invalidateSession();\n+ // visit('/login');\n+ // });\n+ // andThen(() => {\n+ // login(assert, { name: 'hradmin', password: 'test' });\n+ // visit('/');\n+ // });\n+ // andThen(() => {\n+ // assert.equal(currentURL(), '/', 'Path should equal homepage');\n+ // assert.equal(find('.view-current-title').text(), 'Que voulez-vous faire?', 'Title for original user should still be in French.');\n+ // });\n+ });\n+});\n+\n+// test('different users can have different language preferences on the same browser', function(assert) {\n+// });\n+\n+// function login(assert, options) {\n+// let { name, password } = options;\n+\n+// runWithPouchDump('default', function() {\n+// visit('/login');\n+\n+// stubRequest('post', '/auth/login', function(request) {\n+// assert.equal(request.requestBody, `name=${name}&password=${password}`);\n+// request.ok({ 'ok': true, name, 'roles': ['System Administrator', 'admin', 'user'] });\n+// });\n+\n+// andThen(function() {\n+// assert.equal(currentURL(), '/login');\n+// });\n+\n+// fillIn('#identification', name);\n+// fillIn('#password', password);\n+// click('button:contains(Sign in)');\n+// andThen(() => {\n+// waitToAppear('.sidebar-nav-logo');\n+// });\n+// });\n+// }\n" }, { "change_type": "MODIFY", "old_path": "tests/helpers/authenticate-user.js", "new_path": "tests/helpers/authenticate-user.js", "diff": "@@ -8,12 +8,14 @@ const {\nEmber.Test.registerHelper('authenticateUser', function(app, attrs = {}) {\nlet expiresAt = new Date().getTime() + 600000;\n+ // let name = attrs.name || 'hradmin';\n+ // let prefix = attrs.prefix || 'p1';\nauthenticateSession(app, merge({\n- name: 'hradmin',\n+ name: attrs.name || 'hradmin',\nroles: ['System Administrator', 'admin', 'user'],\nexpires_at: expiresAt,\nrole: 'System Administrator',\n- prefix: 'p1'\n+ prefix: attrs.prefix || 'p1'\n}, attrs));\n});\n" }, { "change_type": "ADD", "old_path": null, "new_path": "tests/integration/components/language-dropdown-test.js", "diff": "+import { moduleForComponent, test } from 'ember-qunit';\n+import hbs from 'htmlbars-inline-precompile';\n+import Ember from 'ember';\n+\n+moduleForComponent('language-dropdown', 'Integration | Component | language dropdown', {\n+ integration: true,\n+ beforeEach() {\n+ this.inject.service('i18n', { as: 'i18n' });\n+ }\n+});\n+\n+test('it renders', function(assert) {\n+ assert.expect(3);\n+ this.render(hbs`{{language-dropdown}}`);\n+ assert.equal(this.$('.language-dropdown').length, 1);\n+ assert.equal(this.$().text().trim().includes('Select Language'), true);\n+ assert.equal(this.$().text().trim().includes('German'), true);\n+});\n+\n+test('it reacts to language updates', function(assert) {\n+ assert.expect(4);\n+ let model = Ember.Object.extend({\n+ mockOnFinishCalled: 0\n+ });\n+ this.set('model', model);\n+ this.set('mockOnFinish', () => {\n+ // TODO: explain why you're asserting in this manner\n+ assert.equal(1, 1);\n+ });\n+\n+ let languagePreference = Ember.Service.extend({\n+ setUserI18nPreference(language) {\n+ assert.equal(language, 'de');\n+ }\n+ });\n+\n+ this.register('service:languagePreference', languagePreference);\n+ this.inject.service('languagePreference', { as: 'languagePreference' });\n+\n+ this.render(hbs`{{language-dropdown onFinish=(action mockOnFinish)}}`);\n+\n+ $('option:contains(\"German\")').prop('selected', true).trigger('change');\n+});\n" }, { "change_type": "DELETE", "old_path": "tests/integration/components/language-select-test.js", "new_path": null, "diff": "-import { moduleForComponent, test } from 'ember-qunit';\n-import hbs from 'htmlbars-inline-precompile';\n-\n-moduleForComponent('language-select', 'Integration | Component | language select', {\n- integration: true\n-});\n-\n-test('it renders', function(assert) {\n-\n- // Set any properties with this.set('myProperty', 'value');\n- // Handle any actions with this.on('myAction', function(val) { ... });\n-\n- this.render(hbs`{{language-select}}`);\n-\n- assert.equal(this.$().text().trim().includes('Select Language'), true);\n-});\n" }, { "change_type": "ADD", "old_path": null, "new_path": "tests/unit/services/language-preference-test.js", "diff": "+import Ember from 'ember';\n+import { moduleFor, test } from 'ember-qunit';\n+\n+const config = Ember.Service.extend({\n+ configDB: {\n+ current_user: {\n+ value: 'hradmin'\n+ },\n+ preferences: {\n+ hradmin: {\n+ i18n: 'en'\n+ }\n+ },\n+ put(preferences) {\n+ this.preferences = preferences;\n+ }\n+ }\n+});\n+\n+const i18n = Ember.Service.extend({\n+ locales: ['en', 'fr'],\n+ t() {\n+ return 'Select Language';\n+ },\n+ get() {\n+ return this.locales;\n+ }\n+});\n+\n+moduleFor('service:language-preference', 'Unit | Service | language preference', {\n+ needs: ['service:i18n', 'service:config'],\n+ beforeEach() {\n+ this.register('service:i18n', i18n);\n+ this.inject.service('i18n', { as: 'i18n' });\n+ this.register('service:config', config);\n+ this.inject.service('config', { as: 'config' });\n+ }\n+\n+});\n+\n+test('it exists', function(assert) {\n+ let service = this.subject();\n+ assert.ok(service);\n+});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/authenticators/custom.js", "new_path": "app/authenticators/custom.js", "diff": "@@ -40,9 +40,7 @@ export default BaseAuthenticator.extend(MapOauthParams, OAuthHeaders, {\n},\n_finishAuth(user, oauthConfigs) {\n- let config = this.get('config');\nlet database = this.get('database');\n- config.setCurrentUser(user);\nreturn database.setup().then(() => {\nuser.oauthConfigs = oauthConfigs;\nreturn user;\n" }, { "change_type": "DELETE", "old_path": "app/components/language-dropdown.js", "new_path": null, "diff": "-import Ember from 'ember';\n-\n-export default Ember.Component.extend({\n- i18n: Ember.inject.service(),\n- languagePreference: Ember.inject.service(),\n- selectedLanguage: Ember.computed.alias('i18n.locale'),\n-\n- languageOptions: Ember.computed('i18n.locale', function() {\n- let i18n = this.get('i18n');\n- return i18n.get('locales').map((item) => {\n- return {\n- id: item,\n- name: i18n.t(`languages.${item}`)\n- };\n- });\n- }),\n-\n- onFinish: null,\n-\n- actions: {\n- selectLanguage(i18n) {\n- this.get('languagePreference').setUserI18nPreference(i18n);\n- this.get('onFinish')();\n- }\n- }\n-\n-});\n" }, { "change_type": "MODIFY", "old_path": "app/components/language-select.js", "new_path": "app/components/language-select.js", "diff": "import Ember from 'ember';\nexport default Ember.Component.extend({\n- config: Ember.inject.service(),\ni18n: Ember.inject.service(),\n+ languagePreference: Ember.inject.service(),\n+ selectedLanguage: Ember.computed.alias('i18n.locale'),\n- languageOptions: function() {\n+ languageOptions: Ember.computed('i18n.locale', function() {\nlet i18n = this.get('i18n');\n// Hacking around the fact that i18n\n// has no support for t(key, locale).\n@@ -18,24 +19,14 @@ export default Ember.Component.extend({\n});\ni18n.set('locale', currentLocale);\nreturn options;\n- }.property('currentLanguage'),\n+ }),\n- onFinish: null,\n-\n- _setUserLanguage(language) {\n- let configDB = this.get('config.configDB');\n- configDB.get('current_user').then((user) => {\n- user.i18n = language;\n- configDB.put(user);\n- });\n- },\n+ onFinish: () => {},\nactions: {\n- selectLanguage(selection) {\n- this._setUserLanguage(selection);\n- this.set('i18n.locale', selection);\n+ selectLanguage(i18n) {\n+ this.get('languagePreference').saveUserLanguagePreference(i18n);\nthis.get('onFinish')();\n}\n}\n-\n});\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "app/routes/application.js", "new_path": "app/routes/application.js", "diff": "@@ -3,6 +3,7 @@ import Ember from 'ember';\nimport ModalHelper from 'hospitalrun/mixins/modal-helper';\nimport SetupUserRole from 'hospitalrun/mixins/setup-user-role';\nimport UnauthorizedError from 'hospitalrun/utils/unauthorized-error';\n+import { DEFAULT_LANGUAGE } from 'hospitalrun/services/language-preference';\nconst { get, inject, isEmpty, Route, set } = Ember;\n@@ -107,7 +108,9 @@ let ApplicationRoute = Route.extend(ApplicationRouteMixin, ModalHelper, SetupUse\nafterModel() {\nset(this.controllerFor('navigation'), 'allowSearch', false);\n$('#apploading').remove();\n- this.get('languagePreference').setSessionI18nPreference();\n+\n+ // this enables page reloading support\n+ this.get('languagePreference').loadUserLanguagePreference();\n},\nrenderModal(template) {\n@@ -133,6 +136,12 @@ let ApplicationRoute = Route.extend(ApplicationRouteMixin, ModalHelper, SetupUse\n} else {\nthis._super();\n}\n+\n+ this.get('languagePreference').loadUserLanguagePreference();\n+ },\n+ sessionInvalidated() {\n+ this._super();\n+ this.get('languagePreference').setApplicationLanguage(DEFAULT_LANGUAGE);\n}\n});\nexport default ApplicationRoute;\n" }, { "change_type": "MODIFY", "old_path": "app/services/config.js", "new_path": "app/services/config.js", "diff": "@@ -37,7 +37,7 @@ export default Ember.Service.extend({\nlet loadConfig = this.loadConfig.bind(this);\nlet db = this.createDB();\nthis.set('configDB', db);\n- this.setCurrentUser();\n+\nif (window.ELECTRON) {\nthis.set('standAlone', true);\n}\n@@ -169,22 +169,8 @@ export default Ember.Service.extend({\nreturn configDB.allDocs(options);\n},\n- setCurrentUser(userName) {\n- let config = this.get('configDB');\n+ getCurrentUser() {\nlet sessionData = this.get('sessionData');\n- if (!userName && sessionData.authenticated) {\n- userName = sessionData.authenticated.name;\n- }\n- config.get('current_user').then((doc) => {\n- doc.value = userName;\n- config.put(doc);\n- this.get('languagePreference').setSessionI18nPreference();\n- }).catch(() => {\n- config.put({\n- _id: 'current_user',\n- value: userName\n- });\n- });\n+ return sessionData.authenticated;\n}\n-\n});\n" }, { "change_type": "MODIFY", "old_path": "app/services/language-preference.js", "new_path": "app/services/language-preference.js", "diff": "import Ember from 'ember';\n+import config from '../config/environment';\n-export default Ember.Service.extend({\n+export const DEFAULT_LANGUAGE = config.i18n.defaultLocale || 'en';\n+export default Ember.Service.extend({\ni18n: Ember.inject.service(),\nconfig: Ember.inject.service(),\n- setSessionI18nPreference() {\n- let setSessionI18n = (results) => {\n- let { preferences, userName } = results;\n- if (userName && preferences[userName]) {\n- Ember.run(() => {\n- this.set('i18n.locale', preferences[userName].i18n);\n- });\n- }\n- };\n- this._fetchUserPreferencesDB().then(setSessionI18n);\n+ loadUserLanguagePreference() {\n+ return Ember.RSVP.hash({\n+ user: this.getConfig().getCurrentUser(),\n+ preferences: this.fetchOrCreatePreferences()\n+ }).then(({ user, preferences }) => user && user.name && preferences[user.name] && preferences[user.name].i18n || DEFAULT_LANGUAGE)\n+ .catch(() => DEFAULT_LANGUAGE)\n+ .then(this.setApplicationLanguage.bind(this));\n},\n- setUserI18nPreference(i18n) {\n- let setUserI18n = (results) => {\n- let { preferences, userName } = results;\n- if (preferences[userName] === undefined) {\n- preferences[userName] = {};\n- }\n- preferences[userName].i18n = i18n;\n- this.get('config.configDB').put(preferences).then(() => {\n- Ember.run(() => {\n- this.set('i18n.locale', i18n);\n- });\n- }).catch((err) => {\n- console.log(err);\n- });\n- };\n- this._fetchUserPreferencesDB().then(setUserI18n);\n+ setApplicationLanguage(selectedLanguage) {\n+ return Ember.run(() => this.set('i18n.locale', selectedLanguage));\n},\n- _fetchUserPreferencesDB() {\n- let configDB = this.get('config.configDB');\n- let userName, preferences;\n- return configDB.get('current_user').then((user) => {\n- userName = this._fetchUsername(user);\n- // TODO: this block and then next `then` block could be combined (?)\n- }).then(() => {\n- preferences = configDB.get('preferences');\n- return Ember.RSVP.hash({ userName, preferences });\n- }).catch((err) => {\n- if (err.status === 404) {\n- preferences = this._initPreferencesDB(userName, 'en');\n- return Ember.RSVP.hash({ userName, preferences });\n- } else {\n- console.log(err);\n- }\n- });\n+ saveUserLanguagePreference(selectedLanguage) {\n+ this.setApplicationLanguage(selectedLanguage);\n+ return Ember.RSVP.hash({\n+ user: this.getConfig().getCurrentUser(),\n+ preferences: this.fetchOrCreatePreferences().then(\n+ (preferences) => preferences,\n+ () => ({\n+ _id: 'preferences'\n+ })\n+ )\n+ }).then(({ user, preferences }) => {\n+ preferences[user.name] = preferences[user.name] || {};\n+ preferences[user.name].i18n = selectedLanguage;\n+ return this.getConfig().getConfigDB().put(preferences);\n+ }).catch((err) => Ember.Logger.error(err));\n},\n- _fetchUsername(user) {\n- switch (typeof user.value) {\n- case 'string':\n- return user.value;\n- case 'object':\n- return user.value.name;\n- default:\n- return undefined;\n- }\n+ fetchOrCreatePreferences() {\n+ return this.getConfig().getConfigDB().get('preferences');\n},\n- _initPreferencesDB(username, i18n) {\n- let doc = {\n- _id: 'preferences'\n- };\n- if (username != undefined) {\n- doc[username] = {\n- i18n: i18n || 'en'\n- };\n- }\n- return this.get('config.configDB').put(doc).catch((err) => {\n- console.log(err);\n- });\n+ getConfig() {\n+ return this.get('config');\n}\n});\n" }, { "change_type": "RENAME", "old_path": "app/templates/components/language-dropdown.hbs", "new_path": "app/templates/components/language-select.hbs", "diff": "{{select-list\n- class=\"language-dropdown\"\n+ class='language-select'\nprompt=(t 'navigation.actions.selectLanguage')\ncontent=languageOptions\noptionLabelPath='name'\n" }, { "change_type": "MODIFY", "old_path": "app/templates/sidebar_nav/header.hbs", "new_path": "app/templates/sidebar_nav/header.hbs", "diff": "<nav class=\"settings-nav\">\n{{#if session.isAuthenticated}}\n<a href=\"#\" class=\"logout\" {{ action 'invalidateSession' }}>{{t \"navigation.actions.logout\"}}</a>\n- {{language-dropdown onFinish=(action 'toggleSettings')}}\n+ {{language-select onFinish=(action 'toggleSettings')}}\n{{else}}\n{{#link-to 'login'}}{{t \"navigation.actions.login\"}}{{/link-to}}\n{{/if}}\n" }, { "change_type": "DELETE", "old_path": "tests/acceptance/language-dropdown-test.js", "new_path": null, "diff": "-// // WIP\n-\n-import Ember from 'ember';\n-import { module, test } from 'qunit';\n-import startApp from 'hospitalrun/tests/helpers/start-app';\n-// import FakeServer, { stubRequest } from 'ember-cli-fake-server';\n-\n-module('Acceptance | language dropdown', {\n- beforeEach() {\n- // 'FakeServer.start()' and 'FakeServer.stop()' are only needed if we are stubbing requests to the\n- // authentication endpoint\n- // FakeServer.start();\n- this.application = startApp();\n- // this.application.inject('service', 'languagePreference', 'service:language-preference');\n- },\n-\n- afterEach() {\n- // FakeServer.stop();\n- Ember.run(this.application, 'destroy');\n- }\n-});\n-\n-test('setting a language preference persists after logout', (assert) => {\n- runWithPouchDump('default', () => {\n- assert.equal(1, 1);\n- // login(assert, { name: 'hradmin', password: 'test' });\n- // login(assert, {name: 'hradmin', password: 'test' });\n-\n- // andThen(() => {\n- // assert.equal(currentURL(), '/', 'Path should equal homepage');\n- // assert.equal(find('.view-current-title').text(), 'Welcome to HospitalRun!', 'Title should initially display as English');\n- // });\n- // andThen(() => {\n- // click('a.settings-trigger');\n- // waitToAppear('.settings-nav');\n- // });\n- // andThen(() => {\n- // select('.language-dropdown', 'French');\n- // });\n- // andThen(() => {\n- // assert.equal(find('.view-current-title').text(), 'Que voulez-vous faire?', 'Title should have changed to French.');\n- // });\n- // andThen(() => {\n- // click('a.settings-trigger');\n- // waitToAppear('.settings-nav');\n- // click('a.logout');\n- // invalidateSession();\n- // visit('/login');\n- // });\n- // andThen(() => {\n- // login(assert, { name: 'otherhradmin', password: 'test' });\n- // });\n- // andThen(() => {\n- // visit('/');\n- // });\n- // andThen(() => {\n- // // pauseTest();\n- // assert.equal(currentURL(), '/', 'Path should equal homepage');\n- // assert.equal(find('.view-current-title').text(), 'Welcome to HospitalRun!', 'Title for 2nd user should be in English');\n- // click('a.settings-trigger');\n- // waitToAppear('.settings-nav');\n- // click('a.logout');\n- // invalidateSession();\n- // visit('/login');\n- // });\n- // andThen(() => {\n- // login(assert, { name: 'hradmin', password: 'test' });\n- // visit('/');\n- // });\n- // andThen(() => {\n- // assert.equal(currentURL(), '/', 'Path should equal homepage');\n- // assert.equal(find('.view-current-title').text(), 'Que voulez-vous faire?', 'Title for original user should still be in French.');\n- // });\n- });\n-});\n-\n-// test('different users can have different language preferences on the same browser', function(assert) {\n-// });\n-\n-// function login(assert, options) {\n-// let { name, password } = options;\n-\n-// runWithPouchDump('default', function() {\n-// visit('/login');\n-\n-// stubRequest('post', '/auth/login', function(request) {\n-// assert.equal(request.requestBody, `name=${name}&password=${password}`);\n-// request.ok({ 'ok': true, name, 'roles': ['System Administrator', 'admin', 'user'] });\n-// });\n-\n-// andThen(function() {\n-// assert.equal(currentURL(), '/login');\n-// });\n-\n-// fillIn('#identification', name);\n-// fillIn('#password', password);\n-// click('button:contains(Sign in)');\n-// andThen(() => {\n-// waitToAppear('.sidebar-nav-logo');\n-// });\n-// });\n-// }\n" }, { "change_type": "MODIFY", "old_path": "tests/helpers/authenticate-user.js", "new_path": "tests/helpers/authenticate-user.js", "diff": "@@ -8,14 +8,12 @@ const {\nEmber.Test.registerHelper('authenticateUser', function(app, attrs = {}) {\nlet expiresAt = new Date().getTime() + 600000;\n- // let name = attrs.name || 'hradmin';\n- // let prefix = attrs.prefix || 'p1';\nauthenticateSession(app, merge({\n- name: attrs.name || 'hradmin',\n+ name: 'hradmin',\nroles: ['System Administrator', 'admin', 'user'],\nexpires_at: expiresAt,\nrole: 'System Administrator',\n- prefix: attrs.prefix || 'p1'\n+ prefix: 'p1'\n}, attrs));\n});\n" }, { "change_type": "DELETE", "old_path": "tests/integration/components/language-dropdown-test.js", "new_path": null, "diff": "-import { moduleForComponent, test } from 'ember-qunit';\n-import hbs from 'htmlbars-inline-precompile';\n-import Ember from 'ember';\n-\n-moduleForComponent('language-dropdown', 'Integration | Component | language dropdown', {\n- integration: true,\n- beforeEach() {\n- this.inject.service('i18n', { as: 'i18n' });\n- }\n-});\n-\n-test('it renders', function(assert) {\n- assert.expect(3);\n- this.render(hbs`{{language-dropdown}}`);\n- assert.equal(this.$('.language-dropdown').length, 1);\n- assert.equal(this.$().text().trim().includes('Select Language'), true);\n- assert.equal(this.$().text().trim().includes('German'), true);\n-});\n-\n-test('it reacts to language updates', function(assert) {\n- assert.expect(4);\n- let model = Ember.Object.extend({\n- mockOnFinishCalled: 0\n- });\n- this.set('model', model);\n- this.set('mockOnFinish', () => {\n- // TODO: explain why you're asserting in this manner\n- assert.equal(1, 1);\n- });\n-\n- let languagePreference = Ember.Service.extend({\n- setUserI18nPreference(language) {\n- assert.equal(language, 'de');\n- }\n- });\n-\n- this.register('service:languagePreference', languagePreference);\n- this.inject.service('languagePreference', { as: 'languagePreference' });\n-\n- this.render(hbs`{{language-dropdown onFinish=(action mockOnFinish)}}`);\n-\n- $('option:contains(\"German\")').prop('selected', true).trigger('change');\n-});\n" }, { "change_type": "ADD", "old_path": null, "new_path": "tests/integration/components/language-select-test.js", "diff": "+import { moduleForComponent, test } from 'ember-qunit';\n+import hbs from 'htmlbars-inline-precompile';\n+import Ember from 'ember';\n+import sinon from 'sinon';\n+\n+const languagePreference = {\n+ saveUserLanguagePreference: sinon.stub()\n+};\n+\n+moduleForComponent('language-select', 'Integration | Component | language select', {\n+ integration: true,\n+ beforeEach() {\n+ this.inject.service('i18n');\n+\n+ this.register('service:language-preference', Ember.Service.extend(languagePreference));\n+ this.inject.service('language-preference', { as: 'languagePreference' });\n+ },\n+ afterEach() {\n+ languagePreference.saveUserLanguagePreference.reset();\n+ }\n+});\n+\n+test('it renders', function(assert) {\n+ assert.expect(4);\n+\n+ this.render(hbs`{{language-select}}`);\n+\n+ assert.ok(this.$('.language-select').length);\n+ assert.equal(this.$('option[value=\"\"]', '.language-select').text().trim(), 'Select Language');\n+ assert.equal(this.$('option[value=\"de\"]', '.language-select').text().trim(), 'Deutsche');\n+ assert.ok(this.$('option', '.language-select').length > 2, 'There are not so many languages');\n+});\n+\n+test('it reacts to language updates', function(assert) {\n+ assert.expect(1);\n+\n+ this.render(hbs`{{language-select}}`);\n+ this.$('.language-select').val('de').change();\n+\n+ sinon.assert.calledWith(languagePreference.saveUserLanguagePreference, 'de');\n+});\n+\n+test('it calls finish event', function(assert) {\n+ assert.expect(1);\n+\n+ let finish = sinon.stub();\n+ this.set('externalFinish', finish);\n+\n+ this.render(hbs`{{language-select onFinish=(action externalFinish)}}`);\n+ this.$('.language-select').val('de').change();\n+\n+ sinon.assert.calledOnce(finish);\n+});\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/services/config-test.js", "new_path": "tests/unit/services/config-test.js", "diff": "import { moduleFor, test } from 'ember-qunit';\nmoduleFor('service:config', 'Unit | Service | config', {\n- // Specify the other units that are required for this test.\n- // needs: ['service:foo']\n+ needs: [\n+ 'service:session'\n+ ]\n});\n-// Replace this with your real tests.\n-test('it exists', function(assert) {\n+test('getCurrentUser returns user from the session', function(assert) {\nlet service = this.subject();\n- assert.ok(service);\n+\n+ let user = { name: 'name' };\n+ service.get('session').set('data', {\n+ authenticated: user\n+ });\n+\n+ assert.equal(service.getCurrentUser(), user);\n});\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/services/language-preference-test.js", "new_path": "tests/unit/services/language-preference-test.js", "diff": "import Ember from 'ember';\nimport { moduleFor, test } from 'ember-qunit';\n+import { DEFAULT_LANGUAGE } from 'hospitalrun/services/language-preference';\n+import sinon from 'sinon';\n-const config = Ember.Service.extend({\n- configDB: {\n- current_user: {\n- value: 'hradmin'\n- },\n- preferences: {\n+const preferences = {\n+ _id: 'preferences',\nhradmin: {\n- i18n: 'en'\n- }\n+ i18n: 'es'\n},\n- put(preferences) {\n- this.preferences = preferences;\n+ '[email protected]': {\n+ i18n: 'fr'\n}\n- }\n-});\n+};\n+\n+const configDb = {};\n-const i18n = Ember.Service.extend({\n- locales: ['en', 'fr'],\n- t() {\n- return 'Select Language';\n+const currentUser = sinon.stub();\n+\n+const config = Ember.Service.extend({\n+ getCurrentUser() {\n+ return currentUser();\n},\n- get() {\n- return this.locales;\n+ getConfigDB() {\n+ return configDb;\n}\n});\n-moduleFor('service:language-preference', 'Unit | Service | language preference', {\n- needs: ['service:i18n', 'service:config'],\n+moduleFor('service:language-preference', 'Unit | Service | Language preference', {\n+ needs: ['service:config', 'service:i18n'],\nbeforeEach() {\n- this.register('service:i18n', i18n);\n- this.inject.service('i18n', { as: 'i18n' });\n+ configDb.get = sinon.stub().withArgs('preferences').resolves(preferences);\n+ configDb.put = sinon.stub();\n+\nthis.register('service:config', config);\n- this.inject.service('config', { as: 'config' });\n+ this.inject.service('config');\n+ this.register('service:i18n', Ember.Service.extend({}));\n+ this.inject.service('i18n');\n+ },\n+ afterEach() {\n+ configDb.get.reset();\n+ configDb.put.reset();\n+ currentUser.reset();\n+ }\n+});\n+\n+test('loadUserLanguagePreference should return user language preference', function(assert) {\n+ currentUser.returns({ name: '[email protected]' });\n+\n+ let subject = this.subject();\n+ return subject.loadUserLanguagePreference().then(function(lang) {\n+ assert.equal(lang, 'fr');\n+ assert.equal(subject.get('i18n.locale'), lang, 'i18n service was not updated');\n+ });\n+});\n+\n+test(\"loadUserLanguagePreference should return default language if user's preference is not found\", function(assert) {\n+ currentUser.returns({ name: '[email protected]' });\n+\n+ let subject = this.subject();\n+ return subject.loadUserLanguagePreference().then(function(lang) {\n+ assert.equal(lang, DEFAULT_LANGUAGE);\n+ assert.equal(subject.get('i18n.locale'), lang, 'i18n service was not updated');\n+ });\n+});\n+\n+test('loadUserLanguagePreference should return default language if there are no user', function(assert) {\n+ currentUser.returns(undefined);\n+\n+ let subject = this.subject();\n+ return subject.loadUserLanguagePreference().then(function(lang) {\n+ assert.equal(lang, DEFAULT_LANGUAGE);\n+ assert.equal(subject.get('i18n.locale'), lang, 'i18n service was not updated');\n+ });\n+});\n+\n+test('loadUserLanguagePreference sinon test should return default language if there are no preferences', function(assert) {\n+ configDb.get.withArgs('preferences').rejects('no preferences');\n+\n+ currentUser.returns({ name: 'testuser.ts' });\n+\n+ let subject = this.subject();\n+ return subject.loadUserLanguagePreference().then(function(lang) {\n+ assert.equal(lang, DEFAULT_LANGUAGE);\n+ assert.equal(subject.get('i18n.locale'), lang, 'i18n service was not updated');\n+ });\n+});\n+\n+test('saveUserLanguagePreference should update existing user setting', function(assert) {\n+ currentUser.returns({ name: 'hradmin' });\n+\n+ let expectedPreferences = JSON.parse(JSON.stringify(preferences));\n+ expectedPreferences.hradmin.i18n = 'ru';\n+\n+ let subject = this.subject();\n+ return subject.saveUserLanguagePreference('ru').then(function() {\n+ sinon.assert.calledOnce(configDb.put);\n+ sinon.assert.calledWith(configDb.put, expectedPreferences);\n+ assert.equal(subject.get('i18n.locale'), 'ru', 'i18n service was not updated');\n+ });\n+});\n+\n+test(\"saveUserLanguagePreference should update preferences when user doesn't exist\", function(assert) {\n+ currentUser.returns({ name: '[email protected]' });\n+\n+ let expectedPreferences = Object.assign({}, preferences, {\n+ '[email protected]': {\n+ i18n: 'ru'\n}\n+ });\n+ let subject = this.subject();\n+ return subject.saveUserLanguagePreference('ru').then(function() {\n+ sinon.assert.calledOnce(configDb.put);\n+ sinon.assert.calledWith(configDb.put, expectedPreferences);\n+ assert.equal(subject.get('i18n.locale'), 'ru', 'i18n service was not updated');\n+ });\n+});\n+\n+test(\"saveUserLanguagePreference should create preferences when they doesn't exist\", function(assert) {\n+ currentUser.returns({ name: '[email protected]' });\n+ configDb.get.withArgs('preferences').rejects('no preferences');\n+\n+ let expectedPreferences = {\n+ _id: 'preferences',\n+ '[email protected]': {\n+ i18n: 'ru'\n+ }\n+ };\n+\n+ let subject = this.subject();\n+ return subject.saveUserLanguagePreference('ru').then(function() {\n+ sinon.assert.calledOnce(configDb.put);\n+ sinon.assert.calledWith(configDb.put, expectedPreferences);\n+ assert.equal(subject.get('i18n.locale'), 'ru', 'i18n service was not updated');\n+ });\n});\n-test('it exists', function(assert) {\n- let service = this.subject();\n- assert.ok(service);\n+test('setApplicationLanguage should update i18n', function(assert) {\n+ let subject = this.subject();\n+ subject.setApplicationLanguage('ru');\n+ assert.equal(subject.get('i18n.locale'), 'ru', 'i18n service was not updated');\n});\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "tests/unit/services/language-preference-test.js", "new_path": "tests/unit/services/language-preference-test.js", "diff": "@@ -75,7 +75,7 @@ test('loadUserLanguagePreference should return default language if there are no\n});\ntest('loadUserLanguagePreference sinon test should return default language if there are no preferences', function(assert) {\n- configDb.get.withArgs('preferences').rejects('no preferences');\n+ configDb.get.withArgs('preferences').returns(Ember.RSVP.reject('no preferences'));\ncurrentUser.returns({ name: 'testuser.ts' });\n@@ -119,7 +119,7 @@ test(\"saveUserLanguagePreference should update preferences when user doesn't exi\ntest(\"saveUserLanguagePreference should create preferences when they doesn't exist\", function(assert) {\ncurrentUser.returns({ name: '[email protected]' });\n- configDb.get.withArgs('preferences').rejects('no preferences');\n+ configDb.get.withArgs('preferences').returns(Ember.RSVP.reject('no preferences'));\nlet expectedPreferences = {\n_id: 'preferences',\n" } ]

[ { "change_type": "MODIFY", "old_path": "tests/.eslintrc.js", "new_path": "tests/.eslintrc.js", "diff": "@@ -10,6 +10,7 @@ module.exports = {\nglobals: {\n'$': true,\n+ 'addOfflineUsersForElectron': true,\n'authenticateUser': true,\n'invalidateSession': true,\n'require': true,\n" }, { "change_type": "MODIFY", "old_path": "tests/acceptance/language-select-test.js", "new_path": "tests/acceptance/language-select-test.js", "diff": "@@ -9,8 +9,12 @@ moduleForAcceptance('Acceptance | language dropdown');\ntest('setting a language preference persists after logout', (assert) => {\nrunWithPouchDump('default', () => {\n+ addOfflineUsersForElectron();\n+\n+ andThen(() => {\nauthenticateUser();\nvisit('/');\n+ });\nandThen(() => {\nassert.equal(find('.view-current-title').text(), english.dashboard.title, 'Title is NOT in English after first log in');\n@@ -44,8 +48,12 @@ test('setting a language preference persists after logout', (assert) => {\ntest('different users can have different language preferences on the same browser', (assert) => {\nrunWithPouchDump('default', () => {\n+ addOfflineUsersForElectron();\n+\n+ andThen(() => {\nauthenticateUser();\nvisit('/');\n+ });\nandThen(() => {\nassert.equal(find('.view-current-title').text(), english.dashboard.title, 'Title is NOT in English after first log in');\n" }, { "change_type": "MODIFY", "old_path": "tests/acceptance/users-test.js", "new_path": "tests/acceptance/users-test.js", "diff": "import Ember from 'ember';\nimport FakeServer, { stubRequest } from 'ember-cli-fake-server';\n-import PouchDB from 'pouchdb';\n-import PouchAdapterMemory from 'npm:pouchdb-adapter-memory';\nimport startApp from 'hospitalrun/tests/helpers/start-app';\nimport { PREDEFINED_USER_ROLES } from 'hospitalrun/mixins/user-roles';\nimport { module, test } from 'qunit';\n@@ -52,7 +50,7 @@ const {\nfunction addAllUsers(assert) {\nif (window.ELECTRON) {\n- return _addOfflineUsers();\n+ return addOfflineUsersForElectron();\n}\nstubRequest('get', '/db/_users/_all_docs', function(request) {\nlet expectedQuery = {\n@@ -69,18 +67,6 @@ function addAllUsers(assert) {\nreturn RSVP.resolve();\n}\n-function _addOfflineUsers() {\n- return wait().then(() => {\n- PouchDB.plugin(PouchAdapterMemory);\n- let usersDB = new PouchDB('_users', {\n- adapter: 'memory'\n- });\n- let [, joeUser] = MOCK_USER_DATA; // hradmin already added by run-with-pouch-dump\n- delete joeUser.doc._rev;\n- return usersDB.put(joeUser.doc);\n- });\n-}\n-\nmodule('Acceptance | users', {\nbeforeEach() {\nFakeServer.start();\n" }, { "change_type": "ADD", "old_path": null, "new_path": "tests/helpers/add-offline-users-for-electron.js", "diff": "+import Ember from 'ember';\n+import PouchDB from 'pouchdb';\n+import PouchAdapterMemory from 'npm:pouchdb-adapter-memory';\n+\n+const MOCK_USER_DATA = [{\n+ 'id': 'org.couchdb.user:hradmin',\n+ 'key': 'org.couchdb.user:hradmin',\n+ 'value': { 'rev': '1-242f3d5b5eb8596144f8a6300f9f5a2f' },\n+ 'doc': {\n+ '_id': 'org.couchdb.user:hradmin',\n+ '_rev': '1-242f3d5b5eb8596144f8a6300f9f5a2f',\n+ 'password_scheme': 'pwdscheme',\n+ 'iterations': 10,\n+ 'name': 'hradmin',\n+ 'roles': ['System Administrator', 'admin', 'user'],\n+ 'type': 'user',\n+ 'userPrefix': 'p',\n+ 'derived_key': 'derivedkeyhere',\n+ 'salt': 'saltgoeshere',\n+ 'displayName': 'HospitalRun Administrator',\n+ 'email': '[email protected]'\n+ }\n+}, {\n+ 'id': 'org.couchdb.user:[email protected]',\n+ 'key': 'org.couchdb.user:[email protected]',\n+ 'value': {\n+ 'rev': '1-ef3d54502f2cc8e8f73d8547881f0836'\n+ },\n+ 'doc': {\n+ '_id': 'org.couchdb.user:[email protected]',\n+ '_rev': '1-ef3d54502f2cc8e8f73d8547881f0836',\n+ 'password_scheme': 'pbkdf2',\n+ 'iterations': 10,\n+ 'displayName': 'Joe Bagadonuts',\n+ 'email': '[email protected]',\n+ 'name': '[email protected]',\n+ 'roles': ['Hospital Administrator', 'user'],\n+ 'userPrefix': 'p01',\n+ 'type': 'user',\n+ 'derived_key': 'derivedkeyhere',\n+ 'salt': 'saltgoeshere'\n+ }\n+}];\n+\n+export default Ember.Test.registerAsyncHelper('addOfflineUsersForElectron', function() {\n+ if (window.ELECTRON) {\n+ return wait().then(() => {\n+ PouchDB.plugin(PouchAdapterMemory);\n+ let usersDB = new PouchDB('_users', {\n+ adapter: 'memory'\n+ });\n+ let [, joeUser] = MOCK_USER_DATA; // hradmin already added by run-with-pouch-dump\n+ delete joeUser.doc._rev;\n+ return usersDB.put(joeUser.doc);\n+ });\n+ } else {\n+ return wait();\n+ }\n+});\n" }, { "change_type": "MODIFY", "old_path": "tests/helpers/start-app.js", "new_path": "tests/helpers/start-app.js", "diff": "@@ -4,6 +4,7 @@ import config from '../../config/environment';\nimport './run-with-pouch-dump';\nimport './authenticate-user';\n+import './add-offline-users-for-electron';\nimport './select';\nimport './select-date';\nimport './typeahead-fillin';\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/controllers/index.js", "new_path": "app/controllers/index.js", "diff": "@@ -5,9 +5,9 @@ const {\nalias\n},\ninject,\n- get,\n- set\n+ get\n} = Ember;\n+\nexport default Ember.Controller.extend(UserSession, {\nconfig: inject.service(),\ndatabase: inject.service(),\n@@ -18,7 +18,7 @@ export default Ember.Controller.extend(UserSession, {\nif (get(this, 'standAlone')) {\nget(this, 'database.usersDB').allDocs().then((results) => {\nif (results.total_rows <= 1) {\n- set(this, 'config.needsUserSetup', true);\n+ Ember.run(() => this.set('config.needsUserSetup', true));\n}\n});\n}\n" }, { "change_type": "MODIFY", "old_path": "config/deprecation-workflow.js", "new_path": "config/deprecation-workflow.js", "diff": "@@ -4,7 +4,6 @@ window.deprecationWorkflow.config = {\n{ handler: 'silence', matchId: 'ember-getowner-polyfill.import' },\n{ handler: 'silence', matchId: 'ember-metal.binding' },\n{ handler: 'silence', matchId: 'ember-views.did-init-attrs' },\n- { handler: 'silence', matchId: 'ds.serializer.private-should-serialize-has-many' },\n- { handler: 'silence', matchId: 'ember-inflector.globals' }\n+ { handler: 'silence', matchId: 'ds.serializer.private-should-serialize-has-many' }\n]\n};\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/inventory/batch/template.hbs", "new_path": "app/inventory/batch/template.hbs", "diff": "</div>\n</td>\n<td class=\"col-sm-2\">\n- {{date-picker model=model property=\"expirationDate\" minDate=\"now\" model=invoiceItem }}\n+ {{date-picker property=\"expirationDate\" minDate=\"now\" model=invoiceItem }}\n</td>\n<td class=\"col-sm-1\">\n<button class=\"btn btn-default warning\" {{action \"showRemoveItem\" invoiceItem bubbles=false }}>\n" }, { "change_type": "MODIFY", "old_path": "app/templates/components/date-picker.hbs", "new_path": "app/templates/components/date-picker.hbs", "diff": "-{{date-picker-wrapper model=model originalProperty=property property=(concat \"display_\" property) showTime=showTime label=label}}\n\\ No newline at end of file\n+{{date-picker-wrapper\n+ model=model\n+ originalProperty=property\n+ property=(concat \"display_\" property)\n+ showTime=showTime\n+ label=label\n+ minDate=minDate\n+ maxDate=maxDate\n+}}\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/components/date-picker.js", "new_path": "app/components/date-picker.js", "diff": "import Ember from 'ember';\nexport default Ember.Component.extend({\n+ actions: {\n+ dateSetActionWrapper(newDate) {\n+ if (!Ember.isEmpty(this.get('dateSetAction'))) {\n+ this.sendAction('dateSetAction', newDate);\n+ }\n+ }\n+ }\n});\n" }, { "change_type": "MODIFY", "old_path": "app/templates/components/date-picker.hbs", "new_path": "app/templates/components/date-picker.hbs", "diff": "label=label\nminDate=minDate\nmaxDate=maxDate\n+ dateSetAction=(action 'dateSetActionWrapper')\n}}\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "tests/integration/components/date-picker-test.js", "diff": "+import { moduleForComponent, test } from 'ember-qunit';\n+import hbs from 'htmlbars-inline-precompile';\n+import sinon from 'sinon';\n+import Ember from 'ember';\n+import wait from 'ember-test-helpers/wait';\n+\n+moduleForComponent('date-picker', 'Integration | Component | date picker', {\n+ integration: true\n+});\n+\n+test('it renders', function(assert) {\n+\n+ this.set('model', Ember.Object.create({\n+ test: new Date()\n+ }));\n+\n+ this.render(hbs`{{date-picker model=model property=\"test\"}}`);\n+\n+ assert.equal(this.$().text().trim(), '');\n+});\n+\n+test('it calls the event handler', function(assert) {\n+ assert.expect(1);\n+\n+ let stub = sinon.stub();\n+\n+ this.on('testAction', stub);\n+ this.set('model', Ember.Object.create({\n+ test: new Date()\n+ }));\n+\n+ this.render(hbs`{{date-picker model=model property=\"test\" dateSetAction=\"testAction\"}}`);\n+\n+ return wait().then(() => {\n+ sinon.assert.calledOnce(stub);\n+ });\n+});\n" } ]

[ { "change_type": "MODIFY", "old_path": "script/build.js", "new_path": "script/build.js", "diff": "'use strict';\nconst child = require('child_process');\n+const proc = require('process');\n-console.log('Running ember build.');\n-child.exec('ember build', (error, stdout, stderr) => {\n- if (error) {\n- console.error(`Execution error: ${error}`);\n- return;\n- }\n+let buildProc = child.spawnSync('ember', ['build'], {\n+ shell: true,\n+ stdio: ['inherit', 'inherit', 'inherit']\n});\n+\n+proc.exit(buildProc.status);\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "script/server.js", "new_path": "script/server.js", "diff": "'use strict';\nconst http = require('http');\n-const path = require('path');\nconst process = require('process');\nconst child = require('child_process');\n@@ -34,11 +33,9 @@ testCouchServer(couchurl)\n.then(\n() => {\nconsole.log('Starting ember server');\n- child.exec('ember serve', (error, stdout, stderr) => {\n- if (error) {\n- console.error(`Execution error: ${error}`);\n- return;\n- }\n+ child.spawn('ember', ['serve'], {\n+ shell: true,\n+ stdio: ['inherit', 'inherit', 'inherit']\n});\n}\n)\n" }, { "change_type": "MODIFY", "old_path": "script/test.js", "new_path": "script/test.js", "diff": "'use strict';\nconst child = require('child_process');\n+const process = require('process');\n-child.exec('ember test', (error, stdout, stderr) => {\n- if (error) {\n- console.error(`Ember test execution got error: ${error}`);\n- return;\n- }\n+let testProc = child.spawnSync('ember', ['test'], {\n+ shell: true,\n+ stdio: ['inherit', 'inherit', 'inherit']\n});\n+process.exit(testProc.status);\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": ".gitignore", "new_path": ".gitignore", "diff": "# See http://help.github.com/ignore-files/ for more about ignoring files.\n/.idea\n+/.vscode\n# compiled output\n/dist\n" }, { "change_type": "MODIFY", "old_path": "app/appointments/edit/template.hbs", "new_path": "app/appointments/edit/template.hbs", "diff": "{{#if model.selectPatient}}\n{{patient-typeahead model=model property=\"patientTypeAhead\" label=(t 'models.patient.names.singular') content=patientList selection=selectedPatient class=\"required test-patient-input\"}}\n{{else}}\n- {{patient-summary patient=model.patient returnTo='appointments.edit' returnToContext=model.id disablePatientLink=model.isNew }}\n+ {{patient-summary patient=model.patient returnTo='appointments.edit' returnToContext=model.id disablePatientLink=model.isNew class=\"clickable\"}}\n{{/if}}\n<div class=\"row\">\n{{#if isAdmissionAppointment}}\n" }, { "change_type": "MODIFY", "old_path": "app/appointments/item/template.hbs", "new_path": "app/appointments/item/template.hbs", "diff": "-<tr {{action 'editAppointment' appointment}}>\n+<tr {{action 'editAppointment' appointment}} class=\"{{if canEdit \"clickable\"}}\">\n<td class=\"appointment-date\">\n{{appointment.formattedAppointmentDate}}\n</td>\n" }, { "change_type": "MODIFY", "old_path": "app/imaging/edit/template.hbs", "new_path": "app/imaging/edit/template.hbs", "diff": "{{#if model.selectPatient}}\n{{patient-typeahead model=model property=\"patientTypeAhead\" label=(t 'labels.patient')content=patientList selection=selectedPatient class=\"required patient-input\"}}\n{{else}}\n- {{patient-summary patient=model.patient returnTo='imaging.edit' returnToContext=model.id disablePatientLink=model.isNew }}\n+ {{patient-summary patient=model.patient returnTo='imaging.edit' returnToContext=model.id disablePatientLink=model.isNew class=\"clickable\"}}\n{{/if}}\n{{#if model.isNew}}\n<div class=\"row\">\n" }, { "change_type": "MODIFY", "old_path": "app/invoices/edit/template.hbs", "new_path": "app/invoices/edit/template.hbs", "diff": "{{#edit-panel editPanelProps=editPanelProps}}\n{{#em-form model=model submitButton=false as |form|}}\n{{#unless model.isNew}}\n- {{patient-summary patient=model.patient returnTo='invoices.edit' returnToContext=model.id disablePatientLink=model.isNew }}\n+ {{patient-summary patient=model.patient returnTo='invoices.edit' returnToContext=model.id disablePatientLink=model.isNew class=\"clickable\"}}\n{{/unless}}\n<div class=\"row\">\n{{#unless model.isNew}}\n" }, { "change_type": "MODIFY", "old_path": "app/labs/edit/template.hbs", "new_path": "app/labs/edit/template.hbs", "diff": "{{#if model.selectPatient}}\n{{patient-typeahead model=model property=\"patientTypeAhead\" label=(t 'labels.patient') content=patientList selection=selectedPatient class=\"required test-patient-name\"}}\n{{else}}\n- {{patient-summary patient=model.patient returnTo='labs.edit' returnToContext=model.id disablePatientLink=model.isNew }}\n+ {{patient-summary patient=model.patient returnTo='labs.edit' returnToContext=model.id disablePatientLink=model.isNew class=\"clickable\"}}\n{{/if}}\n{{#if model.isNew}}\n<div class=\"row\">\n" }, { "change_type": "MODIFY", "old_path": "app/medication/edit/template.hbs", "new_path": "app/medication/edit/template.hbs", "diff": "{{#edit-panel editPanelProps=editPanelProps}}\n{{#em-form model=model submitButton=false as |form|}}\n{{#unless model.selectPatient}}\n- {{patient-summary patient=model.patient returnTo='medication.edit' returnToContext=model.id disablePatientLink=model.isNew }}\n+ {{patient-summary patient=model.patient returnTo='medication.edit' returnToContext=model.id disablePatientLink=model.isNew class=\"clickable\"}}\n{{/unless}}\n<div class=\"row\">\n{{#if model.selectPatient}}\n" }, { "change_type": "MODIFY", "old_path": "app/patients/edit/template.hbs", "new_path": "app/patients/edit/template.hbs", "diff": "<th>{{t 'labels.actions'}}</th>\n</tr>\n{{#each model.appointments as |appointment|}}\n- <tr {{action \"editAppointment\" appointment}}>\n+ <tr {{action \"editAppointment\" appointment}} class=\"{{if canAddAppointment \"clickable\"}}\">\n<td>{{appointment.formattedAppointmentDate}}</td>\n<td>{{appointment.provider}}</td>\n<td>{{appointment.location}}</td>\n<th>{{t 'labels.actions'}}</th>\n</tr>\n{{#each model.visits as |visit|}}\n- <tr {{action \"editVisit\" visit}}>\n+ <tr {{action \"editVisit\" visit}} class=\"{{if canAddVisit \"clickable\"}}\">\n<td>{{date-format visit.startDate}}</td>\n<td>{{date-format visit.endDate}}</td>\n<td>{{visit.primaryDiagnoses}}</td>\n" }, { "change_type": "MODIFY", "old_path": "app/patients/imaging/template.hbs", "new_path": "app/patients/imaging/template.hbs", "diff": "<th>{{t 'labels.actions'}}</th>\n</tr>\n{{#each patientImaging as |imaging|}}\n- <tr {{action \"editImaging\" imaging}}>\n+ <tr {{action \"editImaging\" imaging}} class=\"{{if imaging.canEdit (if canAddImaging \"clickable\")}}\">\n<td>{{date-format imaging.requestedDate}}</td>\n<td>{{imaging.imagingType.name}}</td>\n<td>{{imaging.status}}</td>\n" }, { "change_type": "MODIFY", "old_path": "app/patients/labs/template.hbs", "new_path": "app/patients/labs/template.hbs", "diff": "<th>{{t 'labels.actions'}}</th>\n</tr>\n{{#each patientLabs as |lab|}}\n- <tr {{action \"editLab\" lab}}>\n+ <tr {{action \"editLab\" lab}} class= \"{{if lab.canEdit (if canAddLab \"clickable\")}}\">\n<td>{{date-format lab.requestedDate}}</td>\n<td>{{lab.labType.name}}</td>\n<td>{{lab.status}}</td>\n" }, { "change_type": "MODIFY", "old_path": "app/patients/medication/template.hbs", "new_path": "app/patients/medication/template.hbs", "diff": "<th>{{t 'labels.actions'}}</th>\n</tr>\n{{#each patientMedications as |medication|}}\n- <tr {{action \"editMedication\" medication}}>\n+ <tr {{action \"editMedication\" medication}} class=\"{{if medication.canEdit (if canAddMedication \"clickable\")}}\">\n<td>{{date-format medication.prescriptionDate}}</td>\n<td>{{medication.medicationName}}</td>\n<td>{{medication.status}}</td>\n" }, { "change_type": "MODIFY", "old_path": "app/visits/edit/template.hbs", "new_path": "app/visits/edit/template.hbs", "diff": "<div class=\"panel-body\">\n{{#em-form model=model submitButton=false as |form|}}\n{{#if model.patient}}\n- {{patient-summary\n+ {{patient-summary class= \"clickable\"\npatient=model.patient\ndiagnosisContainer=model\nreturnTo='visits.edit'\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"prod\"\n],\n\"scripts\": {\n- \"build\": \"node script/build.js \",\n+ \"build\": \"ember build\",\n\"start\": \"node script/server.js\",\n- \"test\": \"node script/test.js\",\n+ \"test\": \"ember test\",\n\"electron-test\": \"ember electron:test\",\n\"translation-sync\": \"babel-node script/translation/sync.js --presets es2015 && eslint --fix app/locales\",\n\"stylelint\": \"stylelint 'app/styles/**/*.scss'\"\n\"electron-rebuild\": \"^1.5.7\",\n\"ember-ajax\": \"^3.0.0\",\n\"ember-browserify\": \"^1.1.12\",\n- \"ember-cli\": \"^2.18.0\",\n+ \"ember-cli\": \"2.17.1\",\n\"ember-cli-active-link-wrapper\": \"0.3.2\",\n\"ember-cli-app-version\": \"^3.0.0\",\n\"ember-cli-babel\": \"^6.10.0\",\n\"worker-pouch\": \"git+https://github.com/jkleinsc/worker-pouch.git\"\n},\n\"dependencies\": {\n- \"broccoli-funnel\": \"^2.0.1\",\n\"electron-compile\": \"^6.4.2\",\n\"electron-localshortcut\": \"^3.0.4\",\n\"electron-protocol-serve\": \"1.3.0\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "Dockerfile", "new_path": "Dockerfile", "diff": "@@ -34,7 +34,7 @@ COPY ./server/config-example.js ./server/config.js\n# define settings\nRUN sed -i -e 's/URL=\"localhost\"/URL=\"couchdb\"/g' ./script/initcouch.sh\nRUN sed -i -e \"s/couchDbServer: 'localhost'/couchDbServer: 'couchdb'/g\" ./server/config.js\n-RUN sed -i -e \"s/localhost:5984/couchdb:5984/g\" ./script/server\n+RUN sed -i -e \"s/localhost:5984/couchdb:5984/g\" ./script/server.js\nEXPOSE 4200\n" }, { "change_type": "MODIFY", "old_path": "script/initcouch.sh", "new_path": "script/initcouch.sh", "diff": "-#!/bin/bash\n+#!/bin/sh\nURL=\"localhost\"\nPORT=\"5984\"\n" }, { "change_type": "MODIFY", "old_path": "script/initcouch2.sh", "new_path": "script/initcouch2.sh", "diff": "-#!/bin/bash\n+#!/bin/sh\nURL=\"localhost\"\nPORT=\"5984\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/components/date-input.js", "new_path": "app/components/date-input.js", "diff": "@@ -53,6 +53,6 @@ export default EmInput.extend(PikadayComponent, {\nlet displayPropertyName = `display_${dateProperty}`;\nthis.currentDate = Ember.computed.alias(`model.${dateProperty}`);\nthis.addObserver(`model.${dateProperty}`, this, this.currentDateChangedValue);\n- Ember.Binding.from(`model.errors.${dateProperty}`).to(`model.errors.${displayPropertyName}`).connect(this);\n+ Ember.defineProperty(this, `model.errors.${displayPropertyName}`, Ember.computed.alias(`model.errors.${dateProperty}`));\n}\n});\n" }, { "change_type": "MODIFY", "old_path": "app/components/inventory-location-picker.js", "new_path": "app/components/inventory-location-picker.js", "diff": "@@ -45,7 +45,7 @@ export default Ember.Component.extend({\n},\n_setup: function() {\n- Ember.Binding.from('selectedLocations').to('componentSelectedLocations').connect(this);\n+ Ember.defineProperty(this, 'componentSelectedLocations', Ember.computed.alias('selectedLocations'));\n}.on('init'),\n_setupLocationPickers(locationPickers, locationList, setInitialLocation) {\n@@ -83,7 +83,7 @@ export default Ember.Component.extend({\nreturn (previousValue + location.get('quantity'));\n}, 0);\nthis._setupLocationPickers(locationPickers, locationList, true);\n- this.locationChange();\n+ Ember.run.scheduleOnce('afterRender', this, this.locationChange);\nthis.set('doingSetup', false);\nreturn this.get('calculatedLocationPickers');\n}.property('calculatedLocationPickers', 'locationList', 'quantityRequested')\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-source\": \"2.11.0\",\n\"ember-select-list\": \"0.9.5\",\n\"ember-simple-auth\": \"^1.5.1\",\n- \"ember-sinon-qunit\": \"^1.4.0\",\n+ \"ember-sinon-qunit\": \"1.6.0\",\n\"ember-truth-helpers\": \"2.0.0\",\n\"ember-validations\": \"2.0.0-alpha.5\",\n\"eslint-plugin-ember-suave\": \"^1.0.0\",\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/controllers/abstract-delete-controller-test.js", "new_path": "tests/unit/controllers/abstract-delete-controller-test.js", "diff": "@@ -30,7 +30,8 @@ moduleFor('controller:abstract-delete-controller', 'Unit | Controller | abstract\ntest('actions.cancel', function(assert) {\nlet controller = this.subject();\n- let send = this.stub(controller, 'send', this.sendStub(controller));\n+ let sendStubFn = this.sendStub(controller);\n+ let send = this.stub(controller, 'send').callsFake(sendStubFn);\ncontroller.send('cancel');\n@@ -45,8 +46,9 @@ test('actions.delete', function(assert) {\nunloadRecord: () => {}\n})\n});\n- let send = this.stub(controller, 'send', this.sendStub(controller));\n- let save = this.stub(controller.get('model'), 'save', () => {\n+ let sendStubFn = this.sendStub(controller);\n+ let send = this.stub(controller, 'send').callsFake(sendStubFn);\n+ let save = this.stub(controller.get('model'), 'save').callsFake(() => {\nreturn new Ember.RSVP.Promise((resolve) => resolve());\n});\nlet unloadRecord = this.stub(controller.get('model'), 'unloadRecord');\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/controllers/abstract-report-controller-test.js", "new_path": "tests/unit/controllers/abstract-report-controller-test.js", "diff": "@@ -90,7 +90,7 @@ sinonTest('_setReportTitle single date', function(assert) {\nreportType: 'one'\n});\n- this.stub(window, 'moment', () => {\n+ this.stub(window, 'moment').callsFake(() => {\nreturn {\nformat() {\nreturn 'April 3rd, 2015';\n" }, { "change_type": "MODIFY", "old_path": "yarn.lock", "new_path": "yarn.lock", "diff": "@@ -5283,7 +5283,7 @@ ember-simple-auth@^1.5.1:\nember-getowner-polyfill \"^1.1.0 || ^2.0.0\"\nsilent-error \"^1.0.0\"\n-ember-sinon-qunit@^1.4.0:\[email protected]:\nversion \"1.6.0\"\nresolved \"https://registry.yarnpkg.com/ember-sinon-qunit/-/ember-sinon-qunit-1.6.0.tgz#5eb57523226fd2ab397c1e389587b5e66d59c458\"\ndependencies:\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"stylelint-scss\": \"2.3.0\",\n\"tosource-polyfill\": \"^0.3.1\",\n\"uuid\": \"^3.0.0\",\n- \"worker-pouch\": \"git+https://github.com/jkleinsc/worker-pouch.git\"\n+ \"worker-pouch\": \"2.1.0\"\n},\n\"dependencies\": {\n\"electron-compile\": \"^6.4.2\",\n" }, { "change_type": "MODIFY", "old_path": "yarn.lock", "new_path": "yarn.lock", "diff": "@@ -14859,9 +14859,9 @@ wordwrap@~0.0.2:\nversion \"0.0.3\"\nresolved \"https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107\"\n-\"worker-pouch@git+https://github.com/jkleinsc/worker-pouch.git\":\n- version \"2.0.0\"\n- resolved \"git+https://github.com/jkleinsc/worker-pouch.git#25c2d522e815f9ea8f75b0027ba1c7699616911d\"\[email protected]:\n+ version \"2.1.0\"\n+ resolved \"https://registry.yarnpkg.com/worker-pouch/-/worker-pouch-2.1.0.tgz#c9c0a25b125e99087412d6abb4012405d70b34ad\"\ndependencies:\nargsarray \"0.0.1\"\nblob-util \"^1.1.1\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/services/language-preference.js", "new_path": "app/services/language-preference.js", "diff": "import Ember from 'ember';\nimport config from '../config/environment';\n+import { walkConfigs, setRTL } from '../utils/locale-utils';\nexport const DEFAULT_LANGUAGE = config.i18n.defaultLocale || 'en';\n@@ -17,6 +18,11 @@ export default Ember.Service.extend({\n},\nsetApplicationLanguage(selectedLanguage) {\n+\n+ // Whenever the languague changes, apply RTL settings to application\n+ let currentConfig = walkConfigs(selectedLanguage, Ember.getOwner(this)) || {};\n+ setRTL(currentConfig.rtl);\n+\nreturn Ember.run(() => this.set('i18n.locale', selectedLanguage));\n},\n" }, { "change_type": "MODIFY", "old_path": "app/styles/_base.scss", "new_path": "app/styles/_base.scss", "diff": "@@ -4,6 +4,15 @@ body {\n&.ember-application {/* stylelint-disable-line selector-no-qualifying-type */\npadding-left: 275px; // to accomodate for .sidebar-nav\n}\n+\n+ &.rtl {\n+ &.ember-application {/* stylelint-disable-line selector-no-qualifying-type */\n+ padding-left: 0px;\n+ padding-right: 275px;\n+ direction: rtl;\n+ text-align: right;\n+ }\n+ }\n}\n.clickable { cursor: pointer; }\n" }, { "change_type": "MODIFY", "old_path": "app/styles/_variables_mixins.scss", "new_path": "app/styles/_variables_mixins.scss", "diff": "@@ -64,6 +64,11 @@ $inactive-sort-indicator: rgba($navy_drk2,.3);\ncolor: $navy_mid2;\nfont-size: 28px;\nfont-weight: 600;\n+\n+ .rtl & {\n+ float: right;\n+ text-align: right;\n+ }\n}\n// layout\n" }, { "change_type": "MODIFY", "old_path": "app/styles/components/_panel.scss", "new_path": "app/styles/components/_panel.scss", "diff": ".view-action-buttons {\nfloat: right;\n+ .rtl & {\n+ float: left;\n+ }\n+\n.btn {\nmargin: 10px 0 10px 15px;\nborder: 1px solid $green;\n" }, { "change_type": "MODIFY", "old_path": "app/styles/components/_sidebar_nav.scss", "new_path": "app/styles/components/_sidebar_nav.scss", "diff": "}\n}\n+.rtl .sidebar-nav {\n+ right: 0;\n+ left: unset;\n+ text-align: right;\n+}\n+\n.scroll-container {\nposition: absolute;\ntop: 55px;\n" }, { "change_type": "ADD", "old_path": null, "new_path": "app/utils/locale-utils.js", "diff": "+import Ember from 'ember';\n+\n+/**\n+ * Utilities for working with ember-i18n locales\n+ *\n+ * Pulled from ember-i18n internals, which do not expose these functions directly\n+ */\n+\n+/**\n+ * Walk up configuration objects from most specific to least.\n+ */\n+function walkConfigs(id, owner) {\n+ let appConfig = owner._lookupFactory(`locale:${id}/config`);\n+ if (appConfig) {\n+ return appConfig;\n+ }\n+\n+ let addonConfig = owner._lookupFactory(`ember-i18n@config:${id}`);\n+ if (addonConfig) {\n+ return addonConfig;\n+ }\n+\n+ let parentId = parentLocale(id);\n+ if (parentId) {\n+ return walkConfigs(parentId, owner);\n+ }\n+}\n+\n+function parentLocale(id) {\n+ let lastDash = id.lastIndexOf('-');\n+ return lastDash > 0 ? id.substr(0, lastDash) : null;\n+}\n+\n+/**\n+ * Set RTL settings on current application\n+ * @param {boolean} active Is RTL active in current locale or not (default: false)\n+ */\n+function setRTL(active) {\n+ if (active) {\n+ Ember.$('body').addClass('rtl');\n+ } else {\n+ Ember.$('body').removeClass('rtl');\n+ }\n+}\n+\n+export { walkConfigs, setRTL };\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/styles/_base.scss", "new_path": "app/styles/_base.scss", "diff": "@@ -5,15 +5,13 @@ body {\npadding-left: 275px; // to accomodate for .sidebar-nav\n}\n- &.rtl {\n- &.ember-application {/* stylelint-disable-line selector-no-qualifying-type */\n- padding-left: 0px;\n+ &.rtl.ember-application {/* stylelint-disable-line selector-no-qualifying-type */\npadding-right: 275px;\n+ padding-left: 0;\ndirection: rtl;\ntext-align: right;\n}\n}\n-}\n.clickable { cursor: pointer; }\n" } ]

[ { "change_type": "MODIFY", "old_path": "config/deprecation-workflow.js", "new_path": "config/deprecation-workflow.js", "diff": "@@ -2,8 +2,6 @@ window.deprecationWorkflow = window.deprecationWorkflow || {};\nwindow.deprecationWorkflow.config = {\nworkflow: [\n{ handler: 'silence', matchId: 'ember-getowner-polyfill.import' },\n- { handler: 'silence', matchId: 'ember-metal.binding' },\n{ handler: 'silence', matchId: 'ember-views.did-init-attrs' },\n- { handler: 'silence', matchId: 'ds.serializer.private-should-serialize-has-many' }\n]\n};\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "app/components/sidebar-nav/component.js", "diff": "+import Ember from 'ember';\n+import HospitalRunVersion from 'hospitalrun/mixins/hospitalrun-version';\n+import ModalHelper from 'hospitalrun/mixins/modal-helper';\n+import ProgressDialog from 'hospitalrun/mixins/progress-dialog';\n+import UserSession from 'hospitalrun/mixins/user-session';\n+import Navigation from 'hospitalrun/mixins/navigation';\n+\n+export default Ember.Component.extend(\n+ HospitalRunVersion,\n+ ModalHelper,\n+ ProgressDialog,\n+ UserSession,\n+ Navigation,\n+ {\n+ ajax: Ember.inject.service(),\n+ allowSearch: false,\n+ config: Ember.inject.service(),\n+ currentSearchText: null,\n+ progressTitle: 'Searching',\n+ searchRoute: null,\n+ session: Ember.inject.service(),\n+ syncStatus: '',\n+ currentOpenNav: null,\n+ selectedLanguage: null,\n+ router: Ember.inject.service('-routing'),\n+\n+ actions: {\n+ about() {\n+ let version = this.get('version');\n+ this.get('ajax').request('/serverinfo').then((siteInfo) => {\n+ let message = `Version: ${version}`;\n+ if (!Ember.isEmpty(siteInfo)) {\n+ message += ` Site Info: ${siteInfo}`;\n+ }\n+ this.displayAlert(this.get('i18n').t('navigation.about'), message);\n+ });\n+ },\n+\n+ invalidateSession() {\n+ let session = this.get('session');\n+ if (session.get('isAuthenticated')) {\n+ session.invalidate().catch(() => {\n+ let i18n = this.get('i18n');\n+ let message = i18n.t('navigation.messages.logoutFailed');\n+ let title = i18n.t('navigation.titles.logoutFailed');\n+ this.displayAlert(title, message);\n+ });\n+ }\n+ },\n+\n+ search() {\n+ if (this.allowSearch && this.searchRoute) {\n+ let currentRouteName = this.get('currentRouteName');\n+ let currentSearchText = this.get('currentSearchText');\n+ let textToFind = this.get('searchText');\n+ if (currentSearchText !== textToFind || currentRouteName.indexOf('.search') === -1) {\n+ this.set('searchText', '');\n+ this.set('progressMessage', `Searching for ${textToFind}. Please wait...`);\n+ this.showProgressModal();\n+ this.transitionToRoute(`${this.searchRoute}/${textToFind}`);\n+ }\n+ }\n+ },\n+\n+ navAction(nav) {\n+ if (this.currentOpenNav && this.currentOpenNav.route !== nav.route) {\n+ this.currentOpenNav.closeSubnav();\n+ }\n+ this.set('currentOpenNav', nav);\n+ this.get('router').transitionTo(nav.route);\n+ this.set('isShowingSettings', false);\n+ },\n+\n+ toggleSettings() {\n+ this.toggleProperty('isShowingSettings');\n+ },\n+\n+ closeSettings() {\n+ this.set('isShowingSettings', false);\n+ }\n+\n+ }\n+ }\n+);\n+\n" }, { "change_type": "ADD", "old_path": null, "new_path": "app/components/sidebar-nav/template.hbs", "diff": "+<nav class=\"view sidebar-nav hidden-print\" role=\"navigation\">\n+ {{partial \"sidebar_nav/header\"}}\n+ <div class=\"scroll-container\">\n+ {{partial \"sidebar_nav/search\"}}\n+ {{partial \"sidebar_nav/primary_nav\"}}\n+ {{partial \"sidebar_nav/message\"}}\n+ </div>\n+</nav>\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "tests/integration/components/sidebar-nav/component-test.js", "diff": "+import { moduleForComponent, test } from 'ember-qunit';\n+import hbs from 'htmlbars-inline-precompile';\n+\n+moduleForComponent('sidebar-nav', 'Integration | Component | sidebar nav', {\n+ integration: true\n+});\n+\n+test('it renders', function(assert) {\n+\n+ // Set any properties with this.set('myProperty', 'value');\n+ // Handle any actions with this.on('myAction', function(val) { ... });\n+\n+ this.render(hbs`{{sidebar-nav}}`);\n+\n+ assert.equal(this.$().text().trim(), '');\n+\n+ // Template block usage:\n+ this.render(hbs`\n+ {{#sidebar-nav}}\n+ template block text\n+ {{/sidebar-nav}}\n+ `);\n+\n+ assert.equal(this.$().text().trim(), 'template block text');\n+});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/templates/application.hbs", "new_path": "app/templates/application.hbs", "diff": "{{#if session.isAuthenticated}}\n- {{render \"navigation\"}}\n+ {{!--{{render 'navigation'}}--}}\n+ {{sidebar-nav\n+ allowSearch=(readonly allowSearch)\n+ currentSearchText=(readonly currentSearchText)\n+ isShowingSettings=(readonly isShowingSettings)\n+ currentRouteName=(readonly currentRouteName)\n+ }}\n{{/if}}\n{{outlet}}\n{{outlet \"modal\"}}\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/controllers/application.js", "new_path": "app/controllers/application.js", "diff": "@@ -2,8 +2,18 @@ import Ember from 'ember';\nexport default Ember.Controller.extend({\nfilesystem: Ember.inject.service(),\nsession: Ember.inject.service(),\n+\n+ allowSearch: false,\n+ currentSearchText: null,\n+\n_setup: function() {\nlet fileSystem = this.get('filesystem');\nfileSystem.setup();\n- }.on('init')\n+ }.on('init'),\n+\n+ actions:{\n+ closeSettings() {\n+ this.set('isShowingSettings', false);\n+ }\n+ }\n});\n" }, { "change_type": "MODIFY", "old_path": "app/routes/abstract-module-route.js", "new_path": "app/routes/abstract-module-route.js", "diff": "@@ -114,7 +114,7 @@ export default Ember.Route.extend(UserSession, AuthenticatedRouteMixin, {\n},\nsetupController(controller, model) {\n- let navigationController = this.controllerFor('navigation');\n+ let navigationController = this.controllerFor('application');\nif (this.get('allowSearch') === true) {\nnavigationController.set('allowSearch', true);\nnavigationController.set('searchRoute', this.get('searchRoute'));\n" }, { "change_type": "MODIFY", "old_path": "app/routes/abstract-search-route.js", "new_path": "app/routes/abstract-search-route.js", "diff": "@@ -22,7 +22,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {\nmodel(params) {\nreturn new Ember.RSVP.Promise(function(resolve) {\nlet searchText = params.search_text;\n- this.controllerFor('navigation').set('currentSearchText', searchText);\n+ this.controllerFor('application').set('currentSearchText', searchText);\nthis.set('searchText', searchText);\nthis._findByContains(searchText).then(resolve, function(err) {\nresolve(new DS.AdapterPopulatedRecordArray());\n@@ -39,7 +39,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {\ncontroller.set('hasRecords', false);\n}\ncontroller.set('searchText', this.get('searchText'));\n- this.controllerFor('navigation').closeProgressModal();\n+ this.controllerFor('application').closeProgressModal();\nlet parentController = this.controllerFor(this.get('moduleName'));\nlet searchTitle = `Search Results for <i>${Ember.Handlebars.Utils.escapeExpression(this.get('searchText'))}</i>`;\nparentController.set('currentScreenTitle', searchTitle.htmlSafe());\n" }, { "change_type": "MODIFY", "old_path": "app/routes/application.js", "new_path": "app/routes/application.js", "diff": "@@ -106,7 +106,7 @@ let ApplicationRoute = Route.extend(ApplicationRouteMixin, ModalHelper, SetupUse\n},\nafterModel() {\n- set(this.controllerFor('navigation'), 'allowSearch', false);\n+ set(this.controllerFor('application'), 'allowSearch', false);\n$('#apploading').remove();\n// this enables page reloading support\n" }, { "change_type": "MODIFY", "old_path": "app/routes/index.js", "new_path": "app/routes/index.js", "diff": "@@ -25,7 +25,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, Navigation, UserRoles\n},\nafterModel() {\n- this.controllerFor('navigation').set('allowSearch', false);\n+ this.controllerFor('application').set('allowSearch', false);\n},\nactions: {\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/components/nav-menu.js", "new_path": "app/components/nav-menu.js", "diff": "@@ -9,7 +9,6 @@ const {\nexport default Ember.Component.extend(UserSession, {\ncallCloseSettings: 'closeSettings',\n- callNavAction: 'navAction',\nclassNames: ['primary-nav-item'],\nisShowing: false,\nnav: null,\n@@ -42,7 +41,7 @@ export default Ember.Component.extend(UserSession, {\ntoggleContent() {\nthis.toggleProperty('isShowing');\n- this.sendAction('callNavAction', this.nav);\n+ this.sendAction('navAction', this.nav);\n}\n}\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/mixins/modal-helper.js", "new_path": "app/mixins/modal-helper.js", "diff": "@@ -13,7 +13,8 @@ export default Ember.Mixin.create({\nlet modalOptions = Ember.Object.extend({\nupdateButtonText: i18n.t('buttons.ok')\n});\n- this.send('openModal', 'dialog', modalOptions.create({\n+\n+ let modalOptionsCreated = modalOptions.create({\ncancelAction,\nhideCancelButton: true,\nmessage,\n@@ -21,7 +22,13 @@ export default Ember.Mixin.create({\nokContext,\ntitle,\nupdateButtonAction: 'ok'\n- }));\n+ });\n+\n+ if (!this.get('isComponent')) {\n+ this.send('openModal', 'dialog', modalOptionsCreated);\n+ } else {\n+ this.sendAction('openModal', 'dialog', modalOptionsCreated);\n+ }\n},\ndisplayConfirm(title, message, confirmAction, model) {\n" }, { "change_type": "MODIFY", "old_path": "app/templates/application.hbs", "new_path": "app/templates/application.hbs", "diff": "{{#if session.isAuthenticated}}\n- {{!--{{render 'navigation'}}--}}\n{{sidebar-nav\nallowSearch=(readonly allowSearch)\ncurrentSearchText=(readonly currentSearchText)\nisShowingSettings=(readonly isShowingSettings)\ncurrentRouteName=(readonly currentRouteName)\n+ openModal=\"openModal\"\n}}\n{{/if}}\n{{outlet}}\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/components/nav-menu.js", "new_path": "app/components/nav-menu.js", "diff": "@@ -9,6 +9,7 @@ const {\nexport default Ember.Component.extend(UserSession, {\ncallCloseSettings: 'closeSettings',\n+ callNavAction: 'navAction',\nclassNames: ['primary-nav-item'],\nisShowing: false,\nnav: null,\n@@ -41,7 +42,7 @@ export default Ember.Component.extend(UserSession, {\ntoggleContent() {\nthis.toggleProperty('isShowing');\n- this.sendAction('navAction', this.nav);\n+ this.sendAction('callNavAction', this.nav);\n}\n}\n});\n" }, { "change_type": "MODIFY", "old_path": "app/components/sidebar-nav/component.js", "new_path": "app/components/sidebar-nav/component.js", "diff": "@@ -17,7 +17,6 @@ export default Ember.Component.extend(HospitalRunVersion, ModalHelper, ProgressD\nsyncStatus: '',\ncurrentOpenNav: null,\nselectedLanguage: null,\n- router: Ember.inject.service('-routing'),\nactions: {\nabout() {\n@@ -52,7 +51,8 @@ export default Ember.Component.extend(HospitalRunVersion, ModalHelper, ProgressD\nthis.set('searchText', '');\nthis.set('progressMessage', `Searching for ${textToFind}. Please wait...`);\nthis.showProgressModal();\n- this.transitionToRoute(`${this.searchRoute}/${textToFind}`);\n+ // @todo replace with the router service as of https://www.emberjs.com/blog/2017/09/01/ember-2-15-released.html#toc_public-router-service-phase-1\n+ Ember.getOwner(this).lookup('router:main').transitionTo(`${this.searchRoute}/${textToFind}`);\n}\n}\n},\n@@ -62,7 +62,9 @@ export default Ember.Component.extend(HospitalRunVersion, ModalHelper, ProgressD\nthis.currentOpenNav.closeSubnav();\n}\nthis.set('currentOpenNav', nav);\n- this.get('router').transitionTo(nav.route);\n+\n+ // @todo replace with the router service as of https://www.emberjs.com/blog/2017/09/01/ember-2-15-released.html#toc_public-router-service-phase-1\n+ Ember.getOwner(this).lookup('router:main').transitionTo(nav.route);\nthis.set('isShowingSettings', false);\n},\n" }, { "change_type": "MODIFY", "old_path": "app/controllers/application.js", "new_path": "app/controllers/application.js", "diff": "@@ -9,11 +9,5 @@ export default Ember.Controller.extend({\n_setup: function() {\nlet fileSystem = this.get('filesystem');\nfileSystem.setup();\n- }.on('init'),\n-\n- actions: {\n- closeSettings() {\n- this.set('isShowingSettings', false);\n- }\n- }\n+ }.on('init')\n});\n" }, { "change_type": "MODIFY", "old_path": "app/mixins/progress-dialog.js", "new_path": "app/mixins/progress-dialog.js", "diff": "@@ -44,6 +44,11 @@ export default Ember.Mixin.create({\nprogressDialog.set('message', this.get('progressMessage'));\nthis.set('progressDialog', progressDialog);\nthis.set('progressTimer', this.scheduleProgress(this.get('updateProgressBar')));\n+\n+ if (!this.get('isComponent')) {\nthis.send('openModal', 'dialog', progressDialog);\n+ } else {\n+ this.sendAction('openModal', 'dialog', progressDialog);\n+ }\n}\n});\n" }, { "change_type": "MODIFY", "old_path": "app/templates/application.hbs", "new_path": "app/templates/application.hbs", "diff": "currentSearchText=(readonly currentSearchText)\nisShowingSettings=(readonly isShowingSettings)\ncurrentRouteName=(readonly currentRouteName)\n+ searchRoute=(readonly searchRoute)\nopenModal=\"openModal\"\n}}\n{{/if}}\n" } ]

[ { "change_type": "RENAME", "old_path": "app/components/sidebar-nav/component.js", "new_path": "app/components/sidebar-nav.js", "diff": "" }, { "change_type": "RENAME", "old_path": "app/components/sidebar-nav/template.hbs", "new_path": "app/templates/components/sidebar-nav.hbs", "diff": "" }, { "change_type": "ADD", "old_path": null, "new_path": "tests/integration/components/sidebar-nav-test.js", "diff": "+import { moduleForComponent, test } from 'ember-qunit';\n+import hbs from 'htmlbars-inline-precompile';\n+\n+moduleForComponent('sidebar-nav', 'Integration | Component | sidebar nav', {\n+ integration: true\n+});\n+\n+test('it renders about link when settings are shown', function(assert) {\n+ this.render(hbs`{{sidebar-nav}}`);\n+\n+ assert.equal(this.$().text().trim(), '');\n+\n+ // Template block usage:\n+ this.render(hbs`\n+ {{sidebar-nav isShowingSettings=true}}\n+ `);\n+\n+ assert.ok(this.$().text().trim().includes('About HospitalRun'));\n+});\n+\n+test('it does NOT render about link when settings are NOT shown', function(assert) {\n+ this.render(hbs`{{sidebar-nav}}`);\n+\n+ assert.equal(this.$().text().trim(), '');\n+\n+ // Template block usage:\n+ this.render(hbs`\n+ {{sidebar-nav}}\n+ `);\n+\n+ assert.notOk(this.$().text().trim().includes('About HospitalRun'));\n+});\n" }, { "change_type": "DELETE", "old_path": "tests/integration/components/sidebar-nav/component-test.js", "new_path": null, "diff": "-import { moduleForComponent, test } from 'ember-qunit';\n-import hbs from 'htmlbars-inline-precompile';\n-\n-moduleForComponent('sidebar-nav', 'Integration | Component | sidebar nav', {\n- integration: true\n-});\n-\n-test('it renders', function(assert) {\n-\n- // Set any properties with this.set('myProperty', 'value');\n- // Handle any actions with this.on('myAction', function(val) { ... });\n-\n- this.render(hbs`{{sidebar-nav}}`);\n-\n- assert.equal(this.$().text().trim(), '');\n-\n- // Template block usage:\n- this.render(hbs`\n- {{#sidebar-nav}}\n- template block text\n- {{/sidebar-nav}}\n- `);\n-\n- assert.equal(this.$().text().trim(), 'template block text');\n-});\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "tests/acceptance/navigation-test.js", "diff": "+import Ember from 'ember';\n+import { module, test } from 'qunit';\n+import startApp from 'hospitalrun/tests/helpers/start-app';\n+import FakeServer, { stubRequest } from 'ember-cli-fake-server';\n+\n+module('Acceptance | navigation', {\n+ beforeEach() {\n+ FakeServer.start();\n+ this.application = startApp();\n+ },\n+\n+ afterEach() {\n+ FakeServer.stop();\n+ Ember.run(this.application, 'destroy');\n+ }\n+});\n+\n+test('about dialog', function(assert) {\n+ runWithPouchDump('default', function() {\n+ authenticateUser();\n+ visit('/');\n+\n+ stubRequest('get', '/serverinfo', function(request) {\n+ request.ok({ 'ok': true });\n+ });\n+\n+ click('.settings-trigger');\n+ waitToAppear('a:contains(About HospitalRun)');\n+ click('a:contains(About HospitalRun)');\n+\n+ waitToAppear('.modal-dialog');\n+\n+ andThen(() => {\n+ assert.equal(find('.modal-title').text(), 'About HospitalRun', 'About dialog is shown');\n+ });\n+ });\n+});\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"csv-parse\": \"^1.2.0\",\n\"devtron\": \"^1.4.0\",\n\"electron-forge\": \"^5.1.1\",\n- \"electron-prebuilt-compile\": \"1.8.2-beta.3\",\n+ \"electron-prebuilt-compile\": \"1.8.4\",\n\"electron-protocol-serve\": \"^1.3.0\",\n\"electron-rebuild\": \"^1.5.7\",\n\"ember-ajax\": \"^3.0.0\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/locales/de/translations.js", "new_path": "app/locales/de/translations.js", "diff": "export default {\n- languageName: 'Deutsche',\n+ languageName: 'Deutsch',\nadmin: {\naddress: {\naddress1Label: 'Adresse 1 Kennzeichen',\n" }, { "change_type": "MODIFY", "old_path": "tests/integration/components/language-select-test.js", "new_path": "tests/integration/components/language-select-test.js", "diff": "@@ -27,7 +27,7 @@ test('it renders', function(assert) {\nassert.ok(this.$('.language-select').length);\nassert.equal(this.$('option[value=\"\"]', '.language-select').text().trim(), 'Select Language');\n- assert.equal(this.$('option[value=\"de\"]', '.language-select').text().trim(), 'Deutsche');\n+ assert.equal(this.$('option[value=\"de\"]', '.language-select').text().trim(), 'Deutsch');\nassert.ok(this.$('option', '.language-select').length > 2, 'There are not so many languages');\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/mixins/navigation.js", "new_path": "app/mixins/navigation.js", "diff": "@@ -12,7 +12,7 @@ export default Ember.Mixin.create({\n{\ntitle: 'Inventory',\niconClass: 'octicon-package',\n- route: 'inventory.index',\n+ route: 'inventory',\ncapability: 'inventory',\nsubnav: [\n{\n@@ -45,7 +45,7 @@ export default Ember.Mixin.create({\n{\ntitle: 'Patients',\niconClass: 'octicon-organization',\n- route: 'patients.index',\n+ route: 'patients',\ncapability: 'patients',\nsubnav: [\n{\n@@ -84,7 +84,7 @@ export default Ember.Mixin.create({\n{\ntitle: 'Scheduling',\niconClass: 'octicon-calendar',\n- route: 'appointments.index',\n+ route: 'appointments',\ncapability: 'appointments',\nsubnav: [\n{\n@@ -136,7 +136,7 @@ export default Ember.Mixin.create({\n{\ntitle: 'Imaging',\niconClass: 'octicon-device-camera',\n- route: 'imaging.index',\n+ route: 'imaging',\ncapability: 'imaging',\nsubnav: [\n{\n@@ -163,7 +163,7 @@ export default Ember.Mixin.create({\n{\ntitle: 'Medication',\niconClass: 'octicon-file-text',\n- route: 'medication.index',\n+ route: 'medication',\ncapability: 'medication',\nsubnav: [\n{\n@@ -204,7 +204,7 @@ export default Ember.Mixin.create({\n{\ntitle: 'Labs',\niconClass: 'octicon-microscope',\n- route: 'labs.index',\n+ route: 'labs',\ncapability: 'labs',\nsubnav: [\n{\n@@ -231,7 +231,7 @@ export default Ember.Mixin.create({\n{\ntitle: 'Billing',\niconClass: 'octicon-credit-card',\n- route: 'invoices.index',\n+ route: 'invoices',\ncapability: 'invoices',\nsubnav: [\n{\n@@ -297,7 +297,7 @@ export default Ember.Mixin.create({\n{\ntitle: 'Administration',\niconClass: 'octicon-person',\n- route: 'admin.lookup',\n+ route: 'admin',\ncapability: 'admin',\nsubnav: [\n{\n" }, { "change_type": "MODIFY", "old_path": "app/styles/components/_sidebar_nav.scss", "new_path": "app/styles/components/_sidebar_nav.scss", "diff": "color: $sidebar_sublink_text;\nfont-size: 15px;\n- &:hover {\n+ &:hover,\n+ &.active {\nbackground: $navy_mid;\ncolor: $white;\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"stylelint-config-concentric\": \"^2.0.0\",\n\"stylelint-declaration-use-variable\": \"1.6.1\",\n\"stylelint-scss\": \"2.5.0\",\n+ \"tosource-polyfill\": \"^0.3.1\",\n\"uuid\": \"^3.0.0\",\n\"worker-pouch\": \"2.1.0\"\n},\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/services/language-preference-test.js", "new_path": "tests/unit/services/language-preference-test.js", "diff": "@@ -120,7 +120,7 @@ test(\"saveUserLanguagePreference should update preferences when user doesn't exi\ntest(\"saveUserLanguagePreference should create preferences when they doesn't exist\", function(assert) {\ncurrentUser.returns({ name: '[email protected]' });\n- configDb.get.withArgs('preferences').returns(reject('no preferences'));\n+ configDb.get.withArgs('preferences').rejects('no preferences');\nlet expectedPreferences = {\n_id: 'preferences',\n" }, { "change_type": "MODIFY", "old_path": "yarn.lock", "new_path": "yarn.lock", "diff": "@@ -14361,6 +14361,10 @@ toml@^2.3.2:\nversion \"2.3.3\"\nresolved \"https://registry.yarnpkg.com/toml/-/toml-2.3.3.tgz#8d683d729577cb286231dfc7a8affe58d31728fb\"\n+tosource-polyfill@^0.3.1:\n+ version \"0.3.1\"\n+ resolved \"https://registry.yarnpkg.com/tosource-polyfill/-/tosource-polyfill-0.3.1.tgz#af9bb25fc2281861f073c77e25bf222d76f577af\"\n+\[email protected]:\nversion \"0.0.3\"\nresolved \"https://registry.yarnpkg.com/touch/-/touch-0.0.3.tgz#51aef3d449571d4f287a5d87c9c8b49181a0db1d\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "tests/acceptance/navigation-test.js", "new_path": "tests/acceptance/navigation-test.js", "diff": "@@ -35,3 +35,35 @@ test('about dialog', function(assert) {\n});\n});\n});\n+\n+test('search text clears after search', function(assert) {\n+ runWithPouchDump('default', function() {\n+ authenticateUser();\n+ visit('/patients');\n+\n+ andThen(() => {\n+ fillIn('.sidebar-nav-search div input', 'fakeSearchText');\n+ click('.glyphicon-search');\n+ waitToAppear('h1:contains(Search Results)');\n+ });\n+ andThen(() => {\n+ assert.equal(find('.sidebar-nav-search div input').val(), '');\n+ });\n+ });\n+});\n+\n+test('search text clears after selecting new nav item', function(assert) {\n+ runWithPouchDump('default', function() {\n+ authenticateUser();\n+ visit('/patients');\n+\n+ andThen(() => {\n+ fillIn('.sidebar-nav-search div input', 'fakeSearchText');\n+ click('a:contains(Inventory)');\n+ waitToAppear('h1:contains(Requests)');\n+ });\n+ andThen(() => {\n+ assert.equal(find('.sidebar-nav-search div input').val(), '');\n+ });\n+ });\n+});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/components/sidebar-nav.js", "new_path": "app/components/sidebar-nav.js", "diff": "@@ -41,6 +41,7 @@ export default Ember.Component.extend(HospitalRunVersion, ModalHelper, UserSessi\nsearch() {\nthis.sendAction('search', this.get('searchText'));\n+ this.set('searchText', '');\n},\nnavAction(nav) {\n" }, { "change_type": "MODIFY", "old_path": "app/controllers/application.js", "new_path": "app/controllers/application.js", "diff": "@@ -19,7 +19,6 @@ export default Ember.Controller.extend(ProgressDialog, {\nlet currentRouteName = this.get('currentRouteName');\nlet currentSearchText = this.get('currentSearchText');\nif (currentSearchText !== textToFind || currentRouteName.indexOf('.search') === -1) {\n- this.set('searchText', '');\nthis.set('progressMessage', `Searching for ${textToFind}. Please wait...`);\nthis.showProgressModal();\nthis.transitionToRoute(`${this.searchRoute}/${textToFind}`);\n" }, { "change_type": "MODIFY", "old_path": "app/templates/application.hbs", "new_path": "app/templates/application.hbs", "diff": "isShowingSettings=(readonly isShowingSettings)\nopenModal=\"openModal\"\nsearch=\"search\"\n- searchText=searchText\n}}\n{{/if}}\n{{outlet}}\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-load-initializers\": \"^1.0.0\",\n\"ember-pouch\": \"4.3.0\",\n\"ember-radio-buttons\": \"^4.0.1\",\n- \"ember-rapid-forms\": \"^1.2.4\",\n+ \"ember-rapid-forms\": \"^1.2.5\",\n\"ember-resolver\": \"^4.0.0\",\n\"ember-simple-auth\": \"^1.5.1\",\n\"ember-sinon-qunit\": \"3.1.0\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/invoices/edit/template.hbs", "new_path": "app/invoices/edit/template.hbs", "diff": "</div>\n</td>\n<td class=\"col-xs-1\">\n- {{#em-form model=detail submitButton=false as |form|}}\n- {{form.select\n- class='form-input-group'\n- content=expenseAccountList\n- property='expenseAccount'\n- }}\n- {{/em-form}}\n+ <div class=\"form-input-group\">\n+ <select class=\"language-select form-control\" onchange={{action (mut detail.expenseAccount) value=\"target.value\"}}>\n+ {{#each expenseAccountList as |account|}}\n+ <option value={{account.id}} selected={{eq detail.expenseAccount account.id}}>{{account.value}}</option>\n+ {{/each}}\n+ </select>\n+ </div>\n</td>\n<td class=\"col-xs-1 text-right\">\n{{number-format detail.amountOwed}}\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/invoices/edit/controller.js", "new_path": "app/invoices/edit/controller.js", "diff": "import { merge } from '@ember/polyfills';\n-import EmberObject, { set, computed } from '@ember/object';\n+import EmberObject, { set } from '@ember/object';\nimport {\nall,\nallSettled,\n@@ -18,6 +18,7 @@ import uuid from 'npm:uuid';\nexport default AbstractEditController.extend(NumberFormat, PatientSubmodule, PublishStatuses, {\ninvoiceController: controller('invoices'),\n+ expenseAccountList: alias('invoiceController.expenseAccountList.value'),\npatientList: alias('invoiceController.patientList'),\npharmacyCharges: [],\npricingProfiles: map('invoiceController.pricingProfiles', SelectValues.selectObjectMap),\n@@ -25,11 +26,6 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub\nupdateCapability: 'add_invoice',\nwardCharges: [],\n- expenseAccountList: computed('invoiceController.expenseAccountList.value', function() {\n- let listArray = this.get('invoiceController.expenseAccountList.value');\n- return listArray.map((value) => ({ id: value, value }));\n- }),\n-\nadditionalButtons: function() {\nlet buttons = [];\nlet isValid = this.get('model.isValid');\n@@ -61,7 +57,7 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub\n}.property(),\npharmacyExpenseAccount: function() {\n- let expenseAccountList = this.get('invoiceController.expenseAccountList.value');\n+ let expenseAccountList = this.get('expenseAccountList');\nif (!isEmpty(expenseAccountList)) {\nlet account = expenseAccountList.find(function(value) {\nif (value.toLowerCase().indexOf('pharmacy') > -1) {\n" }, { "change_type": "MODIFY", "old_path": "app/invoices/edit/template.hbs", "new_path": "app/invoices/edit/template.hbs", "diff": "<div class=\"form-input-group\">\n<select class=\"language-select form-control\" onchange={{action (mut detail.expenseAccount) value=\"target.value\"}}>\n{{#each expenseAccountList as |account|}}\n- <option value={{account.id}} selected={{eq detail.expenseAccount account.id}}>{{account.value}}</option>\n+ <option value={{account}} selected={{eq detail.expenseAccount account}}>{{account}}</option>\n{{/each}}\n</select>\n</div>\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/incident/attachment/template.hbs", "new_path": "app/incident/attachment/template.hbs", "diff": "{{form.input property=\"title\" label=(t 'incident.labels.title') class=\"attachment-title\"}}\n{{#if model.isNew}}\n{{take-photo\n+ form=form\ndefaultPhotoSource='uploadAFile'\nisImage=model.isImage\nphotoFile=model.photoFile\n" }, { "change_type": "MODIFY", "old_path": "app/inventory/request/template.hbs", "new_path": "app/inventory/request/template.hbs", "diff": "<div class=\"row\">\n{{date-picker model=model property=\"dateCompleted\" label=(t 'labels.dateCompleted') class=\"col-sm-4\"}}\n</div>\n- {{inventory-location-picker label=(t 'inventory.labels.pullFrom') quantityRequested=model.quantity\n+ {{inventory-location-picker form=form label=(t 'inventory.labels.pullFrom') quantityRequested=model.quantity\nlocationList=model.inventoryItem.availableLocations\nselectedLocations=model.inventoryLocations class=\"inventory-location\"\n}}\n" }, { "change_type": "MODIFY", "old_path": "app/invoices/edit/template.hbs", "new_path": "app/invoices/edit/template.hbs", "diff": "</td>\n<td class=\"col-xs-1\">\n<div class=\"form-input-group\">\n- <select class=\"language-select form-control\" onchange={{action (mut detail.expenseAccount) value=\"target.value\"}}>\n+ <select class=\"form-control\" onchange={{action (mut detail.expenseAccount) value=\"target.value\"}}>\n{{#each expenseAccountList as |account|}}\n<option value={{account}} selected={{eq detail.expenseAccount account}}>{{account}}</option>\n{{/each}}\n" }, { "change_type": "MODIFY", "old_path": "app/medication/edit/template.hbs", "new_path": "app/medication/edit/template.hbs", "diff": "{{/unless}}\n{{#if isFulfilling}}\n{{select-or-typeahead form=form model=model property=\"expenseAccount\" label=(t 'labels.billTo') list=expenseAccountList selection=model.expenseAccount }}\n- {{inventory-location-picker label=(t 'labels.pullFrom') quantityRequested=model.quantity\n+ {{inventory-location-picker form=form label=(t 'labels.pullFrom') quantityRequested=model.quantity\nlocationList= model.inventoryItem.availableLocations\nselectedLocations=model.inventoryLocations class=\"inventory-location\"\n}}\n" }, { "change_type": "MODIFY", "old_path": "app/patients/photo/template.hbs", "new_path": "app/patients/photo/template.hbs", "diff": "{{#em-form model=model submitButton=false as |form|}}\n{{form.input property=\"caption\" label=(t 'patients.labels.caption')}}\n{{#if model.isNew}}\n- {{take-photo photoFile=model.photoFile isImage=model.isImage}}\n+ {{take-photo form=form photoFile=model.photoFile isImage=model.isImage}}\n{{else}}\n{{#if model.isImage}}\n<div class=\"thumbnail\">\n" }, { "change_type": "MODIFY", "old_path": "app/templates/components/inventory-location-picker.hbs", "new_path": "app/templates/components/inventory-location-picker.hbs", "diff": "{{#each locationPickers as |locationPicker|}}\n<div class=\"form-group\">\n<label class=\"control-label\">{{locationPicker.label}}</label>\n- {{location-select locationPicker=locationPicker }}\n+ {{location-select form=form locationPicker=locationPicker }}\n</div>\n{{/each}}\n" }, { "change_type": "MODIFY", "old_path": "app/templates/components/location-select.hbs", "new_path": "app/templates/components/location-select.hbs", "diff": "-{{#em-form model=this submitButton=false as |form|}}\n{{form.select\n+ model=this\nproperty='locationPicker.selectedLocation'\ncontent=locationPicker.subLocationList\nclass=\"form-input-group\"\noptionLabelPath=\"selectObject.locationNameWithQuantity\"\naction=locationChange\n}}\n\\ No newline at end of file\n-{{/em-form}}\n" }, { "change_type": "MODIFY", "old_path": "app/templates/components/quantity-calc.hbs", "new_path": "app/templates/components/quantity-calc.hbs", "diff": "{{#each currentQuantityGroups as |quantityGroup| }}\n{{quantity-conv\n+ form=form\nunit=quantityGroup.unit\nfirstQuantity=quantityGroup.firstQuantity\nunitName=quantityGroup.unitName\n" }, { "change_type": "MODIFY", "old_path": "app/templates/components/quantity-conv.hbs", "new_path": "app/templates/components/quantity-conv.hbs", "diff": "<div class=\"row\">\n<div class=\"col-xs-3\">\n<div class=\"form-group required {{quantityClass}} test-inv-quantity\">\n- {{#em-form model=this class=quantityClass submitButton=false as |form|}}\n{{form.input\n+ model=this\nproperty='quantity'\nlabel=(if firstQuantity (t 'labels.quantity'))\n}}\n<span class=\"help-block\">{{quantityHelp}}</span>\n- {{/em-form}}\n</div>\n</div>\n<div class=\"col-xs-3\">\n- {{#em-form model=this class=unitClass submitButton=false as |form|}}\n+ <div class=\"form-group required {{unitClass}}\">\n{{form.select\n+ model=this\nclass='form-input-group test-inv-unit required'\ncontent=unitListHash\nproperty='unit'\nprompt=' '\nlabel=(if firstQuantity (t 'components.quantityConv.unit') '')\n}}\n+ </div>\n<span class=\"help-block\">{{unitHelp}}</span>\n- {{/em-form}}\n</div>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "app/templates/components/take-photo.hbs", "new_path": "app/templates/components/take-photo.hbs", "diff": "{{#if canCaptureVideo}}\n- {{#em-form model=this submitButton=false as |form|}}\n{{form.select\n+ model=this\nclass='form-input-group'\ncontent=photoSources\nid='photo-source'\n}}\n{{#if showCameraSelect}}\n{{form.select\n+ model=this\naction=(action 'cameraChange')\nclass='form-input-group'\ncontent=videoSources\nproperty='selectedCamera'\n}}\n{{/if}}\n- {{/em-form}}\n<div class=\"camera panel panel-success\">\n<div class=\"panel-body\">\n<div class=\"col-sm-4\">\n" }, { "change_type": "MODIFY", "old_path": "app/templates/inv-purchase.hbs", "new_path": "app/templates/inv-purchase.hbs", "diff": "{{form.input property=\"invoiceNo\" label=(t 'inventory.labels.invoiceNumber') class=\"col-sm-4\"}}\n</div>\n{{#if canEditQuantity }}\n- {{quantity-calc calculated=model.originalQuantity targetUnit=model.distributionUnit quantityGroups=model.quantityGroups unitList=unitList}}\n+ {{quantity-calc form=form calculated=model.originalQuantity targetUnit=model.distributionUnit quantityGroups=model.quantityGroups unitList=unitList}}\n{{else}}\n<div class=\"form-group\">\n<label>{{t 'labels.quantity'}}</label>\n" } ]

[ { "change_type": "MODIFY", "old_path": "config/deprecation-workflow.js", "new_path": "config/deprecation-workflow.js", "diff": "window.deprecationWorkflow = window.deprecationWorkflow || {};\nwindow.deprecationWorkflow.config = {\nworkflow: [\n- { handler: 'silence', matchId: 'ember-getowner-polyfill.import' },\n- { handler: 'silence', matchId: 'ember-views.did-init-attrs' }\n+ { handler: 'silence', matchId: 'ember-getowner-polyfill.import' }\n]\n};\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/incident/route.js", "new_path": "app/incident/route.js", "diff": "@@ -10,6 +10,10 @@ export default AbstractModuleRoute.extend({\nname: 'incidentCategoryList',\nfindArgs: ['inc-category']\n}],\n+ allowSearch: false,\n+ currentScreenTitle: t('incidents.titles.incidents'),\n+ editTitle: t('incidents.titles.editIncident'),\n+ newTitle: t('incidents.titles.newIncident'),\nmoduleName: 'incident',\nnewButtonText: t('incident.buttons.newIncident'),\nsectionTitle: t('incident.titles.incidents')\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/incident/route.js", "new_path": "app/incident/route.js", "diff": "@@ -11,7 +11,6 @@ export default AbstractModuleRoute.extend({\nfindArgs: ['inc-category']\n}],\nallowSearch: false,\n- currentScreenTitle: t('incidents.titles.incidents'),\neditTitle: t('incidents.titles.editIncident'),\nnewTitle: t('incidents.titles.newIncident'),\nmoduleName: 'incident',\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/models/billing-line-item.js", "new_path": "app/models/billing-line-item.js", "diff": "@@ -18,7 +18,7 @@ export default AbstractModel.extend(NumberFormat, {\n/* The individual objects that make up this line item. */\ndetails: DS.hasMany('line-item-detail', { async: false }),\n- amountOwedChanged: computed('discount', 'nationalInsurance', 'privateInsurance', 'total', function() {\n+ amountOwedChanged: function() {\ndebounce(this, function() {\nlet discount = this._getValidNumber(this.get('discount'));\nlet nationalInsurance = this._getValidNumber(this.get('nationalInsurance'));\n@@ -32,7 +32,7 @@ export default AbstractModel.extend(NumberFormat, {\nthis.set('amountOwed', this._numberFormat(amountOwed, true));\n}\n}, 500);\n- }),\n+ }.observes('discount', 'nationalInsurance', 'privateInsurance', 'total'),\ndetailTotals: mapBy('details', 'amountOwed'),\ntotal: sum('detailTotals'),\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/invoices/edit/controller.js", "new_path": "app/invoices/edit/controller.js", "diff": "@@ -133,7 +133,7 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub\n},\nshowDeleteItem(itemToDelete, deleteFrom) {\n- this.showDeleteModal(itemToDelete, EmberObject.create({\n+ this.send('showDeleteModal', itemToDelete, EmberObject.create({\nconfirmAction: 'deleteCharge',\ndeleteFrom,\ntitle: 'Delete Charge'\n@@ -141,7 +141,7 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub\n},\nshowDeleteLineItem(item) {\n- this.showDeleteModal(item, EmberObject.create({\n+ this.send('showDeleteModal', item, EmberObject.create({\nconfirmAction: 'deleteLineItem',\ntitle: 'Delete Line Item'\n}));\n" }, { "change_type": "MODIFY", "old_path": "app/models/billing-line-item.js", "new_path": "app/models/billing-line-item.js", "diff": "import { mapBy, sum } from '@ember/object/computed';\nimport { debounce } from '@ember/runloop';\n-import { computed } from '@ember/object';\nimport AbstractModel from 'hospitalrun/models/abstract';\nimport DS from 'ember-data';\nimport NumberFormat from 'hospitalrun/mixins/number-format';\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/invoices/edit/template.hbs", "new_path": "app/invoices/edit/template.hbs", "diff": "{{if item.showDetails 'glyphicon-minus' 'glyphicon-plus'}}\"\n{{action \"toggleDetails\" item bubbles=false }}>\n</span>\n- <strong>{{input class=\"form-control\" value=item.name }}</strong>\n+ <strong>{{input class=\"form-control item-name\" value=item.name }}</strong>\n</div>\n</td>\n- <td class=\"col-xs-1 text-right\">\n+ <td class=\"col-xs-1 text-right item-total\">\n{{number-format item.total}}\n</td>\n<td class=\"col-xs-1\">\n<div class=\"form-group\">\n- {{input class=\"form-control text-right\" value=item.discount }}\n+ {{input class=\"form-control text-right item-discount\" value=item.discount }}\n</div>\n</td>\n<td class=\"col-xs-1\">\n<div class=\"form-group\">\n- {{input class=\"form-control text-right\" value=item.nationalInsurance }}\n+ {{input class=\"form-control text-right item-national-insurance\" value=item.nationalInsurance }}\n</div>\n</td>\n<td class=\"col-xs-1\">\n<div class=\"form-group\">\n- {{input class=\"form-control text-right\" value=item.privateInsurance }}\n+ {{input class=\"form-control text-right item-private-insurance\" value=item.privateInsurance }}\n</div>\n</td>\n- <td class=\"col-xs-1 text-right\">{{number-format item.amountOwed}}</td>\n+ <td class=\"col-xs-1 text-right item-amount-owed\">{{number-format item.amountOwed}}</td>\n<td class=\"col-xs-2\">\n{{#if canAddCharge}}\n<button class=\"btn btn-default warning\" {{action \"showDeleteLineItem\" item bubbles=false }}>\n{{#each item.details as |detail|}}\n<tr>\n<td colspan=\"2\" class=\"col-xs-6 input-group\">\n- {{input class=\"form-control\" value=detail.name }}\n+ {{input class=\"form-control detail-name\" value=detail.name }}\n</td>\n<td class=\"col-xs-1\">\n<div class=\"form-group\">\n- {{input class=\"form-control\" value=detail.quantity }}\n+ {{input class=\"form-control detail-quantity\" value=detail.quantity }}\n</div>\n</td>\n<td class=\"col-xs-1\">\n<div class=\"form-group\">\n- {{input class=\"form-control\" value=detail.price }}\n+ {{input class=\"form-control detail-price\" value=detail.price }}\n</div>\n</td>\n<td class=\"col-xs-1\">\n</select>\n</div>\n</td>\n- <td class=\"col-xs-1 text-right\">\n+ <td class=\"col-xs-1 text-right detail-amount-owed\">\n{{number-format detail.amountOwed}}\n</td>\n<td class=\"col-xs-2\">\n<td>\n<strong>{{t 'labels.total'}} {{categoryGroup.category}}</strong>\n</td>\n- <td class=\"text-right\">{{number-format categoryGroup.total}}</td>\n- <td class=\"text-right\">{{number-format categoryGroup.discount}}</td>\n- <td class=\"text-right\">{{number-format categoryGroup.nationalInsurance}}</td>\n- <td class=\"text-right\">{{number-format categoryGroup.privateInsurance}}</td>\n- <td class=\"text-right\">{{number-format categoryGroup.amountOwed }}</td>\n+ <td class=\"text-right category-group-total\">{{number-format categoryGroup.total}}</td>\n+ <td class=\"text-right category-group-discount\">{{number-format categoryGroup.discount}}</td>\n+ <td class=\"text-right category-group-national-insurance\">{{number-format categoryGroup.nationalInsurance}}</td>\n+ <td class=\"text-right category-group-private-insurance\">{{number-format categoryGroup.privateInsurance}}</td>\n+ <td class=\"text-right category-group-amount-owed\">{{number-format categoryGroup.amountOwed }}</td>\n<td></td>\n</tr>\n{{/each}}\n<td>\n<strong>{{t 'labels.total'}}</strong>\n</td>\n- <td class=\"text-right\">{{number-format model.total}}</td>\n- <td class=\"text-right\">{{number-format model.discount}}</td>\n- <td class=\"text-right\">{{number-format model.nationalInsurance}}</td>\n- <td class=\"text-right\">{{number-format model.privateInsurance}}</td>\n- <td class=\"text-right\">{{number-format model.finalPatientResponsibility}}</td>\n+ <td class=\"text-right total\">{{number-format model.total}}</td>\n+ <td class=\"text-right discount\">{{number-format model.discount}}</td>\n+ <td class=\"text-right national-insurance\">{{number-format model.nationalInsurance}}</td>\n+ <td class=\"text-right private-insurance\">{{number-format model.privateInsurance}}</td>\n+ <td class=\"text-right final-patient-responsibility\">{{number-format model.finalPatientResponsibility}}</td>\n<td></td>\n</tr>\n<tr>\n<strong>{{t 'billing.labels.paymentsDeposits'}}</strong>\n</td>\n<td colspan=\"4\"></td>\n- <td class=\"text-right\">-{{number-format model.paidTotal}}</td>\n+ <td class=\"text-right paid-total\">-{{number-format model.paidTotal}}</td>\n<td></td>\n</tr>\n<tr>\n<strong>{{t 'labels.grandTotal'}}</strong>\n</td>\n<td colspan=\"4\"></td>\n- <td class=\"text-right\">{{number-format model.remainingBalance}}</td>\n+ <td class=\"text-right remaining-balance\">{{number-format model.remainingBalance}}</td>\n<td></td>\n</tr>\n{{#if model.paymentProfile}}\n" }, { "change_type": "MODIFY", "old_path": "tests/acceptance/invoices-test.js", "new_path": "tests/acceptance/invoices-test.js", "diff": "@@ -178,22 +178,162 @@ test('Searching invoices', function(assert) {\nawait authenticateUser();\nawait visit('/invoices');\n- await fillIn('[role=\"search\"] div input', 'Joe');\n+ await fillIn('[role=\"search\"] input', 'Joe');\nawait click('.glyphicon-search');\nassert.equal(currentURL(), '/invoices/search/Joe', 'Searched for Joe');\nassert.dom('.invoice-number').exists({ count: 1 }, 'There is one search item');\n- await fillIn('[role=\"search\"] div input', 'joe');\n+ await fillIn('[role=\"search\"] input', 'joe');\nawait click('.glyphicon-search');\nassert.equal(currentURL(), '/invoices/search/joe', 'Searched for all lower case joe');\nassert.dom('.invoice-number').exists({ count: 1 }, 'There is one search item');\n- await fillIn('[role=\"search\"] div input', 'ItemNotFound');\n+ await fillIn('[role=\"search\"] input', 'ItemNotFound');\nawait click('.glyphicon-search');\nassert.equal(currentURL(), '/invoices/search/ItemNotFound', 'Searched for ItemNotFound');\nassert.dom('.invoice-number').doesNotExist('There is no search result');\n});\n});\n+\n+test('Delete invoice line item detail', function(assert) {\n+ return runWithPouchDump('billing', async function() {\n+ await authenticateUser();\n+ await visit('/invoices/edit/new');\n+ assert.equal(currentURL(), '/invoices/edit/new');\n+\n+ await typeAheadFillIn('.invoice-patient', 'Joe Bagadonuts - TCH 00001');\n+ await waitToAppear('.invoice-visit option:contains((Admission))');\n+ await select('.invoice-visit', '(Admission)');\n+\n+ await click('.glyphicon-plus');\n+ await click('button:contains(Add Charge)');\n+\n+ // delete the first line item detail (second Delete button from top, as the very first is for the line item itself)\n+ await click($('button:contains(Delete):eq(1)')[0]);\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('Delete Charge', 'Delete Charge modal displays');\n+ await click('.modal-footer button:contains(Ok)');\n+ await waitToDisappear('.modal-dialog');\n+\n+ // topmost detail showing should now be the blank one we added at beginning of this test\n+ assert.equal(find('.detail-quantity').val(), '', 'First line item detail no longer appears.');\n+ });\n+});\n+\n+test('Delete invoice line item', function(assert) {\n+ return runWithPouchDump('billing', async function() {\n+ await authenticateUser();\n+ await visit('/invoices/edit/new');\n+ assert.equal(currentURL(), '/invoices/edit/new');\n+\n+ await typeAheadFillIn('.invoice-patient', 'Joe Bagadonuts - TCH 00001');\n+ await waitToAppear('.invoice-visit option:contains((Admission))');\n+ await select('.invoice-visit', '(Admission)');\n+\n+ await click('button:contains(Delete)');\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('Delete Line Item', 'Delete Line Item modal displays');\n+ await click('.modal-footer button:contains(Ok)');\n+ await waitToDisappear('.modal-dialog');\n+ assert.equal(find('.item-name').val(), 'Pharmacy', 'First line item no longer appears.');\n+ });\n+});\n+\n+test('Calculate totals', function(assert) {\n+ return runWithPouchDump('billing', async function() {\n+ await authenticateUser();\n+ await visit('/invoices/edit/new');\n+ assert.equal(currentURL(), '/invoices/edit/new');\n+\n+ await typeAheadFillIn('.invoice-patient', 'Joe Bagadonuts - TCH 00001');\n+ await waitToAppear('.invoice-visit option:contains((Admission))');\n+ await select('.invoice-visit', '(Admission)');\n+\n+ // first item, discounts and details\n+ await fillIn('.item-discount:eq(0)', '1');\n+ await fillIn('.item-national-insurance:eq(0)', '2');\n+ await fillIn('.item-private-insurance:eq(0)', '3');\n+ await click('.glyphicon-plus');\n+ await fillIn('.detail-price:eq(0)', '3');\n+ await click('button:contains(Add Charge)');\n+ await fillIn($('.detail-quantity:eq(1)'), '60');\n+ await fillIn($('.detail-price:eq(1)'), '4');\n+\n+ // second item, discounts and details\n+ await click('.glyphicon-plus');\n+ await fillIn($('.item-discount:eq(1)'), '4');\n+ await fillIn($('.item-national-insurance:eq(1)'), '6');\n+ await fillIn($('.item-private-insurance:eq(1)'), '1');\n+ await fillIn($('.detail-price:eq(2)'), '14');\n+\n+ // add a payment\n+ await click('button:contains(Add Payment)');\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('Add Payment', 'Add Payment modal displays');\n+ await fillIn('.payment-amount input', '100');\n+ await click('.update-payment-btn');\n+ await waitToAppear('.modal-title:contains(Payment Added)');\n+ assert.dom('.modal-title').hasText('Payment Added', 'Payment was saved successfully');\n+ await click('.modal-footer button:contains(Ok)');\n+ await waitToDisappear('.modal-dialog');\n+\n+ // total for first 2 items (2 details per item)\n+ let expected = +$('.detail-amount-owed:eq(0)').text() + +$('.detail-amount-owed:eq(1)').text();\n+ assert.dom($('.item-total:eq(0)')[0]).hasText(expected.toString(), 'First item total is correct');\n+ expected = +$('.detail-amount-owed:eq(2)').text() + +$('.detail-amount-owed:eq(3)').text();\n+ assert.dom($('.item-total:eq(1)')[0]).hasText(expected.toString(), 'Second item total is correct');\n+\n+ // amount owed for first 2 items (2 details per item)\n+ expected = +$('.item-total:eq(0)').text() - (+$('.item-discount:eq(0)').val() + +$('.item-national-insurance:eq(0)').val() + +$('.item-private-insurance:eq(0)').val());\n+ assert.dom($('.item-amount-owed:eq(0)')[0]).hasText(expected.toString(), 'First item amount owed is correct');\n+ expected = +$('.item-total:eq(1)').text() - (+$('.item-discount:eq(1)').val() + +$('.item-national-insurance:eq(1)').val() + +$('.item-private-insurance:eq(1)').val());\n+ assert.dom($('.item-amount-owed:eq(1)')[0]).hasText(expected.toString(), 'Second item amount owed is correct');\n+\n+ // detail amount owed for first 4 details\n+ expected = $('.detail-quantity:eq(0)').val() * $('.detail-price:eq(0)').val();\n+ assert.dom($('.detail-amount-owed:eq(0)')[0]).hasText(expected.toString(), 'First detail amount owed is correct');\n+ expected = $('.detail-quantity:eq(1)').val() * $('.detail-price:eq(1)').val();\n+ assert.dom($('.detail-amount-owed:eq(1)')[0]).hasText(expected.toString(), 'Second detail amount owed is correct');\n+ expected = $('.detail-quantity:eq(2)').val() * $('.detail-price:eq(2)').val();\n+ assert.dom($('.detail-amount-owed:eq(2)')[0]).hasText(expected.toString(), 'Third detail amount owed is correct');\n+ expected = $('.detail-quantity:eq(3)').val() * $('.detail-price:eq(3)').val();\n+ assert.dom($('.detail-amount-owed:eq(3)')[0]).hasText(expected.toString(), 'Fourth detail amount owed is correct');\n+\n+ // category group and invoice total (same thing as this test only uses 1 category)\n+ expected = +$('.item-total:eq(0)').text() + +$('.item-total:eq(1)').text() + +$('.item-total:eq(2)').text() + +$('.item-total:eq(3)').text();\n+ assert.dom('.category-group-total').hasText(expected.toString(), 'Category group total is correct');\n+ expected = +$('.item-total:eq(0)').text() + +$('.item-total:eq(1)').text() + +$('.item-total:eq(2)').text() + +$('.item-total:eq(3)').text();\n+ assert.dom('.total').hasText(expected.toString(), 'Total is correct');\n+\n+ // category group and invoice discount\n+ expected = +$('.item-discount:eq(0)').val() + +$('.item-discount:eq(1)').val();\n+ assert.dom('.category-group-discount').hasText(expected.toString(), 'Category group discount is correct');\n+ expected = +$('.item-discount:eq(0)').val() + +$('.item-discount:eq(1)').val();\n+ assert.dom('.discount').hasText(expected.toString(), 'Discount is correct');\n+\n+ // category group and invoice national insurance\n+ expected = +$('.item-national-insurance:eq(0)').val() + +$('.item-national-insurance:eq(1)').val();\n+ assert.dom('.category-group-national-insurance').hasText(expected.toString(), 'Category group national insurance is correct');\n+ expected = +$('.item-national-insurance:eq(0)').val() + +$('.item-national-insurance:eq(1)').val();\n+ assert.dom('.national-insurance').hasText(expected.toString(), 'National insurance is correct');\n+\n+ // category group and invoice private insurance\n+ expected = +$('.item-private-insurance:eq(0)').val() + +$('.item-private-insurance:eq(1)').val();\n+ assert.dom('.category-group-private-insurance').hasText(expected.toString(), 'Category group private insurance is correct');\n+ expected = +$('.item-private-insurance:eq(0)').val() + +$('.item-private-insurance:eq(1)').val();\n+ assert.dom('.private-insurance').hasText(expected.toString(), 'Private insurance is correct');\n+\n+ // category group and invoice amount owed\n+ expected = +$('.item-amount-owed:eq(0)').text() + +$('.item-amount-owed:eq(1)').text() + +$('.item-amount-owed:eq(2)').text() + +$('.item-amount-owed:eq(3)').text();\n+ assert.dom('.category-group-amount-owed').hasText(expected.toString(), 'Category group amount owed is correct');\n+ expected = +$('.item-amount-owed:eq(0)').text() + +$('.item-amount-owed:eq(1)').text() + +$('.item-amount-owed:eq(2)').text() + +$('.item-amount-owed:eq(3)').text();\n+ assert.dom('.final-patient-responsibility').hasText(expected.toString(), 'Final patient responsibility is correct');\n+\n+ // remaining balance after paid total is taken off\n+ expected = +$('.final-patient-responsibility:eq(0)').text() - Math.abs(+$('.paid-total:eq(0)').text());\n+ assert.dom('.remaining-balance').hasText(expected.toString(), 'Remaining balance is correct');\n+ });\n+});\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/patients/notes/template.hbs", "new_path": "app/patients/notes/template.hbs", "diff": "updateButtonText=updateButtonText }}\n{{#em-form model=model submitButton=false as |form|}}\n{{expand-text label=(t 'labels.note') property=\"content\" rows=3 class=\"test-note-content required form-input-group\" form=form}}\n- {{form.select class=\"required form-input-group\" label=(t 'labels.visit')\n+ {{form.select class=\"required form-input-group test-note-visit\" label=(t 'labels.visit')\nproperty=\"visit\" content=patientVisitsForSelect\noptionValuePath=\"selectObject\" optionLabelPath=\"selectObject.visitDescription\"\nprompt=(t 'patients.notes.pleaseSelectAVisit')\n" }, { "change_type": "MODIFY", "old_path": "app/visits/edit/route.js", "new_path": "app/visits/edit/route.js", "diff": "@@ -72,7 +72,10 @@ export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, PatientVi\n},\nactions: {\n- updateNote() {\n+ updateNote(model) {\n+ if (model.get('visit.id') != this.controller.get('model.id')) {\n+ model.get('visit').save();\n+ }\nthis.controller.send('update', true);\n},\ndeletePatientNote(model) {\n" }, { "change_type": "MODIFY", "old_path": "app/visits/edit/template.hbs", "new_path": "app/visits/edit/template.hbs", "diff": "<div class=\"row\">\n{{#if isAdmissionVisit}}\n- {{date-picker model=model property=\"startDate\" label=(t \"patients.labels.admissionDate\") showTime=true class=\"col-sm-4 required\"}}\n+ {{date-picker model=model property=\"startDate\" label=(t \"patients.labels.admissionDate\") showTime=true class=\"col-sm-4 required test-visit-start\"}}\n{{date-picker model=model property=\"endDate\" label=(t \"patients.labels.dischargeDate\") showTime=true class=\"col-sm-4\"}}\n{{else}}\n{{date-picker model=model property=\"startDate\" label=(t \"visits.labels.checkInTime\") showTime=true class=\"col-sm-4 required checkin-date\"}}\n" }, { "change_type": "MODIFY", "old_path": "tests/acceptance/patient-notes-test.js", "new_path": "tests/acceptance/patient-notes-test.js", "diff": "@@ -3,6 +3,7 @@ import moduleForAcceptance from 'hospitalrun/tests/helpers/module-for-acceptance\nimport runWithPouchDump from 'hospitalrun/tests/helpers/run-with-pouch-dump';\nimport { waitToAppear, waitToDisappear } from 'hospitalrun/tests/helpers/wait-to-appear';\nimport { authenticateUser } from 'hospitalrun/tests/helpers/authenticate-user';\n+import select from 'hospitalrun/tests/helpers/select';\nmoduleForAcceptance('Acceptance | patient notes');\n@@ -63,3 +64,143 @@ test('patient notes crud testing', function(assert) {\nassert.equal(find('#visit-notes table tr td:contains(This is an updated note.)').length, 0, 'Successfully deleted note.');\n});\n});\n+\n+test('move existing note to different visit', function(assert) {\n+ return runWithPouchDump('default', async function() {\n+ await authenticateUser();\n+ await visit('/patients/edit/new');\n+ assert.equal(currentURL(), '/patients/edit/new');\n+ await fillIn('.test-first-name input', 'John');\n+ await fillIn('.test-last-name input', 'Doe');\n+ await click('.panel-footer button:contains(Add)');\n+ await waitToAppear('.message:contains(The patient record for John Doe has been saved)');\n+ assert.dom('.message').hasText('The patient record for John Doe has been saved.');\n+\n+ await waitToAppear('.patient-summary');\n+ assert.dom('.patient-summary').exists();\n+\n+ await click('[data-test-selector=visits-tab]');\n+ assert.dom('#visits').exists();\n+\n+ // add a first visit with type 'Admission'\n+ await click('button:contains(New Visit)');\n+ assert.equal(currentURL(), '/visits/edit/new', 'Now in add visiting information route');\n+ await select('.visit-type', 'Admission');\n+ await fillIn('.test-visit-start input', '5/20/2017');\n+ await click('.panel-footer button:contains(Add)');\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('Visit Saved', 'New visit has been saved');\n+ await click('button:contains(Ok)');\n+ await click('button:contains(Return)');\n+\n+ // add a second visit with type 'Lab'\n+ await click('button:contains(New Visit)');\n+ assert.equal(currentURL(), '/visits/edit/new', 'Now in add visiting information route');\n+ await select('.visit-type', 'Lab');\n+ await fillIn('.checkin-date input', '5/20/2017');\n+ await click('.panel-footer button:contains(Add)');\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('Visit Saved', 'New visit has been saved');\n+ await click('button:contains(Ok)');\n+\n+ // still on the second visit that was added, select the 'notes' tab\n+ await click('[data-test-selector=notes-tab]');\n+\n+ // add a note\n+ await click('button:contains(New Note)');\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('New Note for John Doe', 'Notes modal appeared');\n+ await fillIn('.test-note-content textarea', 'This is a note.');\n+ await click('.modal-footer button:contains(Add)');\n+ await waitToDisappear('.modal-dialog');\n+ await waitToAppear('#visit-notes table tr td:contains(This is a note.)');\n+ assert.equal(find('#visit-notes table tr td:contains(This is a note.)').length, 1, 'Successfully added note.');\n+\n+ // edit note to switch it to the other visit\n+ await click('#visit-notes table tr td button:contains(Edit)');\n+ await waitToAppear('.modal-dialog');\n+ await select('.test-note-visit', '5/20/2017 (Admission)');\n+ await click('.modal-footer button:contains(Update)');\n+ await waitToDisappear('.modal-dialog');\n+ await click('button:contains(Return)');\n+\n+ await waitToAppear('.ph-visit-type');\n+ await click('.ph-visit-type:contains(Admission)');\n+ await click('[data-test-selector=notes-tab]');\n+ await waitToAppear('#visit-notes table');\n+ assert.equal(find('#visit-notes table tr td:contains(This is a note.)').length, 1, 'Note is now attached to the \"Admission\" visit.');\n+ await click('button:contains(Return)');\n+\n+ await waitToAppear('.ph-visit-type');\n+ await click('.ph-visit-type:contains(Lab)');\n+ await click('[data-test-selector=notes-tab]');\n+ await waitToAppear('#visit-notes table');\n+ assert.equal(find('#visit-notes table tr td:contains(This is a note.)').length, 0, 'Note is no longer attached to the \"Lab\" visit.');\n+ });\n+});\n+\n+test('add a note from Edit Patient', function(assert) {\n+ return runWithPouchDump('default', async function() {\n+ await authenticateUser();\n+ await visit('/patients/edit/new');\n+ assert.equal(currentURL(), '/patients/edit/new');\n+ await fillIn('.test-first-name input', 'John');\n+ await fillIn('.test-last-name input', 'Doe');\n+ await click('.panel-footer button:contains(Add)');\n+ await waitToAppear('.message:contains(The patient record for John Doe has been saved)');\n+ assert.dom('.message').hasText('The patient record for John Doe has been saved.');\n+\n+ await waitToAppear('.patient-summary');\n+ assert.dom('.patient-summary').exists();\n+\n+ await click('[data-test-selector=visits-tab]');\n+ assert.dom('#visits').exists();\n+\n+ // add a first visit with type 'Admission'\n+ await click('button:contains(New Visit)');\n+ assert.equal(currentURL(), '/visits/edit/new', 'Now in add visiting information route');\n+ await select('.visit-type', 'Admission');\n+ await fillIn('.test-visit-start input', '5/20/2017');\n+ await click('.panel-footer button:contains(Add)');\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('Visit Saved', 'New visit has been saved');\n+ await click('button:contains(Ok)');\n+ await click('button:contains(Return)');\n+\n+ // add a second visit with type 'Lab'\n+ await click('button:contains(New Visit)');\n+ assert.equal(currentURL(), '/visits/edit/new', 'Now in add visiting information route');\n+ await select('.visit-type', 'Lab');\n+ await fillIn('.checkin-date input', '5/20/2017');\n+ await click('.panel-footer button:contains(Add)');\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('Visit Saved', 'New visit has been saved');\n+ await click('button:contains(Ok)');\n+\n+ // go back to 'Edit Patient'\n+ await click('button:contains(Return)');\n+ assert.dom('.view-current-title').hasText('Edit Patient');\n+\n+ // add a note to the 'Lab' visit\n+ await click('button:contains(New Note)');\n+ await waitToAppear('.modal-dialog');\n+ assert.dom('.modal-title').hasText('New Note for John Doe', 'Notes modal appeared');\n+ await fillIn('.test-note-content textarea', 'This is a note.');\n+ await select('.test-note-visit', '5/20/2017 (Lab)');\n+ await click('.modal-footer button:contains(Add)');\n+ await waitToDisappear('.modal-dialog');\n+\n+ await waitToAppear('.ph-visit-type');\n+ await click('.ph-visit-type:contains(Admission)');\n+ await click('[data-test-selector=notes-tab]');\n+ await waitToAppear('#visit-notes table');\n+ assert.equal(find('#visit-notes table tr td:contains(This is a note.)').length, 0, 'Note is not attached to the \"Admission\" visit.');\n+ await click('button:contains(Return)');\n+\n+ await waitToAppear('.ph-visit-type');\n+ await click('.ph-visit-type:contains(Lab)');\n+ await click('[data-test-selector=notes-tab]');\n+ await waitToAppear('#visit-notes table');\n+ assert.equal(find('#visit-notes table tr td:contains(This is a note.)').length, 1, 'Note is attached to the \"Lab\" visit.');\n+ });\n+});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/patients/notes/controller.js", "new_path": "app/patients/notes/controller.js", "diff": "import { Promise as EmberPromise } from 'rsvp';\nimport { alias } from '@ember/object/computed';\nimport { inject as controller } from '@ember/controller';\n+import { computed } from '@ember/object';\nimport AbstractEditController from 'hospitalrun/controllers/abstract-edit-controller';\nimport IsUpdateDisabled from 'hospitalrun/mixins/is-update-disabled';\nimport moment from 'moment';\n@@ -11,6 +12,7 @@ export default AbstractEditController.extend(IsUpdateDisabled, UserSession, Pati\ncancelAction: 'closeModal',\nupdateAction: 'updateNote',\nmoduleController: controller('patients'),\n+ applicationController: controller('application'),\nphysicianList: alias('moduleController.physicianList'),\nlookupListsToUpdate: [{\nname: 'physicianList',\n@@ -24,6 +26,9 @@ export default AbstractEditController.extend(IsUpdateDisabled, UserSession, Pati\nreturn `${this.get('i18n').t('patients.notes.newNote')} ${moment(this.get('model.date')).format('MM/DD/YYYY')} for ${this.get('model.patient.displayName')}`;\n}\n}.property('model.patient.displayName'),\n+ showSelectVisit: computed('applicationController.currentPath', function() {\n+ return (this.get('applicationController.currentPath') == 'patients.edit');\n+ }),\nupdateCapability: 'add_note',\nbeforeUpdate() {\nthis._setNoteType();\n" }, { "change_type": "MODIFY", "old_path": "app/patients/notes/template.hbs", "new_path": "app/patients/notes/template.hbs", "diff": "updateButtonText=updateButtonText }}\n{{#em-form model=model submitButton=false as |form|}}\n{{expand-text label=(t 'labels.note') property=\"content\" rows=3 class=\"test-note-content required form-input-group\" form=form}}\n+ {{#if showSelectVisit}}\n{{form.select class=\"required form-input-group test-note-visit\" label=(t 'labels.visit')\nproperty=\"visit\" content=patientVisitsForSelect\noptionValuePath=\"selectObject\" optionLabelPath=\"selectObject.visitDescription\"\nprompt=(t 'patients.notes.pleaseSelectAVisit')\nselected=model.visit\n}}\n+ {{/if}}\n{{select-or-typeahead form=form model=model\nproperty=\"attribution\"\nlabel=(t 'patients.notes.onBehalfOfLabel' )\n" }, { "change_type": "MODIFY", "old_path": "app/visits/edit/route.js", "new_path": "app/visits/edit/route.js", "diff": "@@ -72,10 +72,7 @@ export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, PatientVi\n},\nactions: {\n- updateNote(model) {\n- if (model.get('visit.id') != this.controller.get('model.id')) {\n- model.get('visit').save();\n- }\n+ updateNote() {\nthis.controller.send('update', true);\n},\ndeletePatientNote(model) {\n" }, { "change_type": "MODIFY", "old_path": "tests/acceptance/patient-notes-test.js", "new_path": "tests/acceptance/patient-notes-test.js", "diff": "@@ -65,80 +65,6 @@ test('patient notes crud testing', function(assert) {\n});\n});\n-test('move existing note to different visit', function(assert) {\n- return runWithPouchDump('default', async function() {\n- await authenticateUser();\n- await visit('/patients/edit/new');\n- assert.equal(currentURL(), '/patients/edit/new');\n- await fillIn('.test-first-name input', 'John');\n- await fillIn('.test-last-name input', 'Doe');\n- await click('.panel-footer button:contains(Add)');\n- await waitToAppear('.message:contains(The patient record for John Doe has been saved)');\n- assert.dom('.message').hasText('The patient record for John Doe has been saved.');\n-\n- await waitToAppear('.patient-summary');\n- assert.dom('.patient-summary').exists();\n-\n- await click('[data-test-selector=visits-tab]');\n- assert.dom('#visits').exists();\n-\n- // add a first visit with type 'Admission'\n- await click('button:contains(New Visit)');\n- assert.equal(currentURL(), '/visits/edit/new', 'Now in add visiting information route');\n- await select('.visit-type', 'Admission');\n- await fillIn('.test-visit-start input', '5/20/2017');\n- await click('.panel-footer button:contains(Add)');\n- await waitToAppear('.modal-dialog');\n- assert.dom('.modal-title').hasText('Visit Saved', 'New visit has been saved');\n- await click('button:contains(Ok)');\n- await click('button:contains(Return)');\n-\n- // add a second visit with type 'Lab'\n- await click('button:contains(New Visit)');\n- assert.equal(currentURL(), '/visits/edit/new', 'Now in add visiting information route');\n- await select('.visit-type', 'Lab');\n- await fillIn('.checkin-date input', '5/20/2017');\n- await click('.panel-footer button:contains(Add)');\n- await waitToAppear('.modal-dialog');\n- assert.dom('.modal-title').hasText('Visit Saved', 'New visit has been saved');\n- await click('button:contains(Ok)');\n-\n- // still on the second visit that was added, select the 'notes' tab\n- await click('[data-test-selector=notes-tab]');\n-\n- // add a note\n- await click('button:contains(New Note)');\n- await waitToAppear('.modal-dialog');\n- assert.dom('.modal-title').hasText('New Note for John Doe', 'Notes modal appeared');\n- await fillIn('.test-note-content textarea', 'This is a note.');\n- await click('.modal-footer button:contains(Add)');\n- await waitToDisappear('.modal-dialog');\n- await waitToAppear('#visit-notes table tr td:contains(This is a note.)');\n- assert.equal(find('#visit-notes table tr td:contains(This is a note.)').length, 1, 'Successfully added note.');\n-\n- // edit note to switch it to the other visit\n- await click('#visit-notes table tr td button:contains(Edit)');\n- await waitToAppear('.modal-dialog');\n- await select('.test-note-visit', '5/20/2017 (Admission)');\n- await click('.modal-footer button:contains(Update)');\n- await waitToDisappear('.modal-dialog');\n- await click('button:contains(Return)');\n-\n- await waitToAppear('.ph-visit-type');\n- await click('.ph-visit-type:contains(Admission)');\n- await click('[data-test-selector=notes-tab]');\n- await waitToAppear('#visit-notes table');\n- assert.equal(find('#visit-notes table tr td:contains(This is a note.)').length, 1, 'Note is now attached to the \"Admission\" visit.');\n- await click('button:contains(Return)');\n-\n- await waitToAppear('.ph-visit-type');\n- await click('.ph-visit-type:contains(Lab)');\n- await click('[data-test-selector=notes-tab]');\n- await waitToAppear('#visit-notes table');\n- assert.equal(find('#visit-notes table tr td:contains(This is a note.)').length, 0, 'Note is no longer attached to the \"Lab\" visit.');\n- });\n-});\n-\ntest('add a note from Edit Patient', function(assert) {\nreturn runWithPouchDump('default', async function() {\nawait authenticateUser();\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/pricing/route.js", "new_path": "app/pricing/route.js", "diff": "import AbstractModuleRoute from 'hospitalrun/routes/abstract-module-route';\n+import { translationMacro as t } from 'ember-i18n';\n+\nexport default AbstractModuleRoute.extend({\naddCapability: 'add_pricing',\nadditionalModels: [{\n@@ -16,7 +18,7 @@ export default AbstractModuleRoute.extend({\n}],\nallowSearch: true,\nmoduleName: 'pricing',\n- newButtonText: '+ new item',\n+ newButtonText: t('buttons.newItem'),\nsectionTitle: 'Pricing',\nsubActions: [{\ntext: 'All Pricing Items',\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "@@ -1314,10 +1314,19 @@ export default {\n}\n},\npricing: {\n+ sectionTitle: \"Pricing\",\nlabels: {\ndiscountAmount: 'Discount Amount',\ndiscountPercentage: 'Discount Percentage',\nsetFee: 'Set Fee'\n+ },\n+ navigation: {\n+ allPricingItems: 'All Pricing Items',\n+ imagePricing: 'Imaging Pricing',\n+ labPricing: 'Lab Pricing',\n+ pricingProfiles: 'Pricing Profiles',\n+ procedurePricing: 'Procedure Pricing',\n+ wardPricing: 'Ward Pricing'\n}\n},\nprint: { invoice: {\n" }, { "change_type": "MODIFY", "old_path": "app/pricing/route.js", "new_path": "app/pricing/route.js", "diff": "@@ -19,24 +19,26 @@ export default AbstractModuleRoute.extend({\nallowSearch: true,\nmoduleName: 'pricing',\nnewButtonText: t('buttons.newItem'),\n- sectionTitle: 'Pricing',\n- subActions: [{\n- text: 'All Pricing Items',\n+ sectionTitle: t('pricing.sectionTitle'),\n+ subActions: Ember.computed(function() {\n+ return [{\n+ text: this.get('i18n').t('pricing.navigation.allPricingItems'),\nlinkTo: 'pricing.index'\n}, {\n- text: 'Imaging Pricing',\n+ text: this.get('i18n').t('pricing.navigation.imagePricing'),\nlinkTo: 'pricing.imaging'\n}, {\n- text: 'Lab Pricing',\n+ text: this.get('i18n').t('pricing.navigation.labPricing'),\nlinkTo: 'pricing.lab'\n}, {\n- text: 'Procedure Pricing',\n+ text: this.get('i18n').t('pricing.navigation.procedurePricing'),\nlinkTo: 'pricing.procedure'\n}, {\n- text: 'Ward Pricing',\n+ text: this.get('i18n').t('pricing.navigation.wardPricing'),\nlinkTo: 'pricing.ward'\n}, {\n- text: 'Pricing Profiles',\n+ text: this.get('i18n').t('pricing.navigation.pricingProfiles'),\nlinkTo: 'pricing.profiles'\n}]\n+ })\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/invoices/route.js", "new_path": "app/invoices/route.js", "diff": "import AbstractModuleRoute from 'hospitalrun/routes/abstract-module-route';\nimport ModalHelper from 'hospitalrun/mixins/modal-helper';\nimport PatientListRoute from 'hospitalrun/mixins/patient-list-route';\n+import { translationMacro as t } from 'ember-i18n';\nexport default AbstractModuleRoute.extend(ModalHelper, PatientListRoute, {\naddCapability: 'add_invoice',\n- currentScreenTitle: 'Invoices',\n- editTitle: 'Edit Invoice',\n- newTitle: 'New Invoice',\n+ currentScreenTitle: t('navigation.invoices'),\n+ editTitle: t('billing.editInvoice'),\n+ newTitle: t('billing.newInvoice'),\nmoduleName: 'invoices',\n- newButtonText: '+ new invoice',\n- sectionTitle: 'Invoices',\n+ newButtonText: t('billing.buttons.newInvoice'),\n+ sectionTitle: t('billing.invoiceTitle'),\nadditionalButtons: function() {\nif (this.currentUserCan('add_payment')) {\nreturn [{\nclass: 'btn btn-default',\n- buttonText: '+ add deposit',\n+ buttonText: this.get('i18n').t('billing.buttons.addDeposit'),\nbuttonAction: 'showAddDeposit'\n}];\n}\n@@ -57,32 +58,32 @@ export default AbstractModuleRoute.extend(ModalHelper, PatientListRoute, {\n}\n},\n- subActions: function() {\n+ subActions: Ember.computed(function() {\nlet actions = [{\n- text: 'Billed',\n+ text: this.get('i18n').t('billing.navigation.billed'),\nlinkTo: 'invoices.index',\nstatusQuery: 'Billed'\n}];\nif (this.currentUserCan('add_invoice')) {\nactions.push({\n- text: 'Drafts',\n+ text: this.get('i18n').t('billing.navigation.drafts'),\nlinkTo: 'invoices.index',\nstatusQuery: 'Draft'\n});\nactions.push({\n- text: 'All Invoices',\n+ text: this.get('i18n').t('billing.navigation.allInvoices'),\nlinkTo: 'invoices.index',\nstatusQuery: 'All'\n});\n}\nif (this.currentUserCan('list_paid_invoices')) {\nactions.push({\n- text: 'Paid',\n+ text: this.get('i18n').t('billing.navigation.paid'),\nlinkTo: 'invoices.index',\nstatusQuery: 'Paid'\n});\n}\nreturn actions;\n- }.property()\n+ }).property()\n});\n" }, { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "@@ -302,9 +302,14 @@ export default {\nnoPricingItems: 'No pricing items found.',\nnoPricingProfiles: 'No pricing profiles found.'\n},\n+ editInvoice: 'Edit Invoice',\n+ newInvoice: 'New Invoice',\n+ invoiceTitle: 'Invoices',\nbuttons: {\naddOverride: 'Add Override',\n- createInvoice: 'Create an invoice?'\n+ createInvoice: 'Create an invoice?',\n+ newInvoice: '+ new invoice',\n+ addDeposit: '+ add deposit'\n},\nlabels: {\nactualCharges: 'Actual Charges',\n@@ -319,6 +324,12 @@ export default {\npricingProfile: 'Pricing Profile',\nsetFee: 'Set Fee'\n},\n+ navigation: {\n+ billed: 'Billed',\n+ drafts: 'Drafts',\n+ allInvoices: 'All Invoices',\n+ paid: 'Paid'\n+ },\nmessages: {\nflatDiscountMsg: 'There is a flat discount amount applied to the patient financial responsibility of {{currency}}{{discountAmount}}.',\nflatFeeMsg: 'There is a flat fee for patient financial responsibility of {{currency}}{{setFee}}.'\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "@@ -302,15 +302,14 @@ export default {\nnoPricingItems: 'No pricing items found.',\nnoPricingProfiles: 'No pricing profiles found.'\n},\n- editInvoice: 'Edit Invoice',\n- newInvoice: 'New Invoice',\n- invoiceTitle: 'Invoices',\nbuttons: {\n+ addDeposit: '+ add deposit',\naddOverride: 'Add Override',\ncreateInvoice: 'Create an invoice?',\n- newInvoice: '+ new invoice',\n- addDeposit: '+ add deposit'\n+ newInvoice: '+ new invoice'\n},\n+ editInvoice: 'Edit Invoice',\n+ invoiceTitle: 'Invoices',\nlabels: {\nactualCharges: 'Actual Charges',\ndiscountAmount: 'Discount Amount',\n@@ -324,16 +323,17 @@ export default {\npricingProfile: 'Pricing Profile',\nsetFee: 'Set Fee'\n},\n+ messages: {\n+ flatDiscountMsg: 'There is a flat discount amount applied to the patient financial responsibility of {{currency}}{{discountAmount}}.',\n+ flatFeeMsg: 'There is a flat fee for patient financial responsibility of {{currency}}{{setFee}}.'\n+ },\nnavigation: {\n+ allInvoices: 'All Invoices',\nbilled: 'Billed',\ndrafts: 'Drafts',\n- allInvoices: 'All Invoices',\npaid: 'Paid'\n},\n- messages: {\n- flatDiscountMsg: 'There is a flat discount amount applied to the patient financial responsibility of {{currency}}{{discountAmount}}.',\n- flatFeeMsg: 'There is a flat fee for patient financial responsibility of {{currency}}{{setFee}}.'\n- }\n+ newInvoice: 'New Invoice'\n},\nbuttons: {\nadd: 'Add',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/es-co/translations.js", "new_path": "app/locales/es-co/translations.js", "diff": "@@ -303,9 +303,13 @@ export default {\nnoPricingProfiles: ''\n},\nbuttons: {\n+ addDeposit: '',\naddOverride: '',\n- createInvoice: ''\n+ createInvoice: '',\n+ newInvoice: ''\n},\n+ editInvoice: '',\n+ invoiceTitle: '',\nlabels: {\nactualCharges: '',\ndiscountAmount: '',\n@@ -322,7 +326,14 @@ export default {\nmessages: {\nflatDiscountMsg: '',\nflatFeeMsg: ''\n- }\n+ },\n+ navigation: {\n+ allInvoices: '',\n+ billed: '',\n+ drafts: '',\n+ paid: ''\n+ },\n+ newInvoice: ''\n},\nbuttons: {\nadd: 'Adicionar',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/hi/translations.js", "new_path": "app/locales/hi/translations.js", "diff": "@@ -303,9 +303,13 @@ export default {\nnoPricingProfiles: 'No pricing profiles found.'\n},\nbuttons: {\n+ addDeposit: '',\naddOverride: 'Add Override',\n- createInvoice: 'Create an invoice?'\n+ createInvoice: 'Create an invoice?',\n+ newInvoice: ''\n},\n+ editInvoice: '',\n+ invoiceTitle: '',\nlabels: {\nactualCharges: 'Actual Charges',\ndiscountAmount: 'Discount Amount',\n@@ -322,7 +326,14 @@ export default {\nmessages: {\nflatDiscountMsg: 'There is a flat discount amount applied to the patient financial responsibility of {{currency}}{{discountAmount}}.',\nflatFeeMsg: 'There is a flat fee for patient financial responsibility of {{currency}}{{setFee}}.'\n- }\n+ },\n+ navigation: {\n+ allInvoices: '',\n+ billed: '',\n+ drafts: '',\n+ paid: ''\n+ },\n+ newInvoice: ''\n},\nbuttons: {\nadd: 'Add',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/tr/translations.js", "new_path": "app/locales/tr/translations.js", "diff": "@@ -303,9 +303,13 @@ export default {\nnoPricingProfiles: ''\n},\nbuttons: {\n+ addDeposit: '',\naddOverride: '',\n- createInvoice: ''\n+ createInvoice: '',\n+ newInvoice: ''\n},\n+ editInvoice: '',\n+ invoiceTitle: '',\nlabels: {\nactualCharges: '',\ndiscountAmount: '',\n@@ -322,7 +326,14 @@ export default {\nmessages: {\nflatDiscountMsg: '',\nflatFeeMsg: ''\n- }\n+ },\n+ navigation: {\n+ allInvoices: '',\n+ billed: '',\n+ drafts: '',\n+ paid: ''\n+ },\n+ newInvoice: ''\n},\nbuttons: {\nadd: 'Ekle',\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/invoices/route.js", "new_path": "app/invoices/route.js", "diff": "import AbstractModuleRoute from 'hospitalrun/routes/abstract-module-route';\nimport ModalHelper from 'hospitalrun/mixins/modal-helper';\nimport PatientListRoute from 'hospitalrun/mixins/patient-list-route';\n+import Ember from 'ember';\nimport { translationMacro as t } from 'ember-i18n';\nexport default AbstractModuleRoute.extend(ModalHelper, PatientListRoute, {\n" }, { "change_type": "MODIFY", "old_path": "app/pricing/route.js", "new_path": "app/pricing/route.js", "diff": "import AbstractModuleRoute from 'hospitalrun/routes/abstract-module-route';\n+import Ember from 'ember';\nimport { translationMacro as t } from 'ember-i18n';\nexport default AbstractModuleRoute.extend({\n@@ -39,6 +40,6 @@ export default AbstractModuleRoute.extend({\n}, {\ntext: this.get('i18n').t('pricing.navigation.pricingProfiles'),\nlinkTo: 'pricing.profiles'\n- }]\n+ }];\n})\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/invoices/route.js", "new_path": "app/invoices/route.js", "diff": "@@ -6,7 +6,7 @@ import { translationMacro as t } from 'ember-i18n';\nexport default AbstractModuleRoute.extend(ModalHelper, PatientListRoute, {\naddCapability: 'add_invoice',\n- currentScreenTitle: t('navigation.invoices'),\n+ currentScreenTitle: 'Invoices',\neditTitle: t('billing.editInvoice'),\nnewTitle: t('billing.newInvoice'),\nmoduleName: 'invoices',\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/invoices/route.js", "new_path": "app/invoices/route.js", "diff": "@@ -6,7 +6,7 @@ import { translationMacro as t } from 'ember-i18n';\nexport default AbstractModuleRoute.extend(ModalHelper, PatientListRoute, {\naddCapability: 'add_invoice',\n- currentScreenTitle: 'Invoices',\n+ currentScreenTitle: t('billing.currentScreenTitle'),\neditTitle: t('billing.editInvoice'),\nnewTitle: t('billing.newInvoice'),\nmoduleName: 'invoices',\n" }, { "change_type": "MODIFY", "old_path": "app/locales/de/translations.js", "new_path": "app/locales/de/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: 'Rechnung erstellen?',\nnewInvoice: ''\n},\n+ currentScreenTitle: '',\neditInvoice: '',\ninvoiceTitle: '',\nlabels: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/en/translations.js", "new_path": "app/locales/en/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: 'Create an invoice?',\nnewInvoice: '+ new invoice'\n},\n+ currentScreenTitle: 'Invoices',\neditInvoice: 'Edit Invoice',\ninvoiceTitle: 'Invoices',\nlabels: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/es-co/translations.js", "new_path": "app/locales/es-co/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: '',\nnewInvoice: ''\n},\n+ currentScreenTitle: '',\neditInvoice: '',\ninvoiceTitle: '',\nlabels: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/es/translations.js", "new_path": "app/locales/es/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: 'Crear factura',\nnewInvoice: ''\n},\n+ currentScreenTitle: '',\neditInvoice: '',\ninvoiceTitle: '',\nlabels: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/hi/translations.js", "new_path": "app/locales/hi/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: 'Create an invoice?',\nnewInvoice: ''\n},\n+ currentScreenTitle: '',\neditInvoice: '',\ninvoiceTitle: '',\nlabels: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/it/translations.js", "new_path": "app/locales/it/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: 'Creare una fattura?',\nnewInvoice: ''\n},\n+ currentScreenTitle: '',\neditInvoice: '',\ninvoiceTitle: '',\nlabels: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/pt-br/translations.js", "new_path": "app/locales/pt-br/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: 'Criar nova fatura?',\nnewInvoice: ''\n},\n+ currentScreenTitle: '',\neditInvoice: '',\ninvoiceTitle: '',\nlabels: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/ru/translations.js", "new_path": "app/locales/ru/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: '',\nnewInvoice: ''\n},\n+ currentScreenTitle: '',\neditInvoice: '',\ninvoiceTitle: '',\nlabels: {\n" }, { "change_type": "MODIFY", "old_path": "app/locales/tr/translations.js", "new_path": "app/locales/tr/translations.js", "diff": "@@ -308,6 +308,7 @@ export default {\ncreateInvoice: '',\nnewInvoice: ''\n},\n+ currentScreenTitle: '',\neditInvoice: '',\ninvoiceTitle: '',\nlabels: {\n" } ]

[ { "change_type": "MODIFY", "old_path": "config/environment.js", "new_path": "config/environment.js", "diff": "@@ -53,7 +53,8 @@ module.exports = function(environment) {\n}\nENV.i18n = {\n- defaultLocale: 'en'\n+ defaultLocale: 'en',\n+ defaultFallback: true\n};\nENV.manifest = {\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-exam\": \"^1.0.0\",\n\"ember-export-application-global\": \"^2.0.0\",\n\"ember-fullcalendar\": \"1.8.0\",\n- \"ember-i18n\": \"~5.0.0\",\n+ \"ember-i18n\": \"^5.2.1\",\n\"ember-inspector\": \"^3.0.0\",\n\"ember-keyboard\": \"3.0.2\",\n\"ember-load-initializers\": \"^1.0.0\",\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "app/utils/i18n/missing-message.js", "diff": "+import Ember from 'ember';\n+import Locale from 'ember-i18n/utils/locale';\n+import config from '../../config/environment';\n+\n+const DEFAULT_LOCALE = config.i18n.defaultLocale;\n+\n+let missingMessage = function(locale, key, data) {\n+\n+ console.log(locale)\n+\n+ if (locale === DEFAULT_LOCALE || window.env === 'development') {\n+ return `Missing translation: ${key}`;\n+ } else {\n+\n+ Ember.Logger.warn(\"Missing translation: \" + key);\n+\n+ // NOTE This relies on internal APIs and is brittle.\n+ // Emulating the internals of ember-i18n's translate method\n+ const i18n = this;\n+ const count = Ember.get(data, 'count');\n+ const defaults = Ember.makeArray(Ember.get(data, 'default'));\n+ defaults.unshift(key);\n+ const localeObj = new Locale(DEFAULT_LOCALE, Ember.getOwner(i18n));\n+ const template = localeObj.getCompiledTemplate(defaults, count);\n+ return template(data);\n+ }\n+};\n+\n+export default missingMessage;\n" }, { "change_type": "MODIFY", "old_path": "script/translation/sync.js", "new_path": "script/translation/sync.js", "diff": "@@ -87,6 +87,6 @@ function emptySameType(obj) {\n} else if (obj.constructor === Array) {\nreturn [];\n} else {\n- return '';\n+ return undefined;\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/utils/i18n/missing-message.js", "new_path": "app/utils/i18n/missing-message.js", "diff": "@@ -5,23 +5,20 @@ import config from '../../config/environment';\nconst DEFAULT_LOCALE = config.i18n.defaultLocale;\nlet missingMessage = function(locale, key, data) {\n-\n- console.log(locale)\n-\nif (locale === DEFAULT_LOCALE || window.env === 'development') {\nreturn `Missing translation: ${key}`;\n} else {\n- Ember.Logger.warn(\"Missing translation: \" + key);\n+ Ember.Logger.warn(`Missing translation: ${key}`);\n// NOTE This relies on internal APIs and is brittle.\n// Emulating the internals of ember-i18n's translate method\n- const i18n = this;\n- const count = Ember.get(data, 'count');\n- const defaults = Ember.makeArray(Ember.get(data, 'default'));\n+ let i18n = this;\n+ let count = Ember.get(data, 'count');\n+ let defaults = Ember.makeArray(Ember.get(data, 'default'));\ndefaults.unshift(key);\n- const localeObj = new Locale(DEFAULT_LOCALE, Ember.getOwner(i18n));\n- const template = localeObj.getCompiledTemplate(defaults, count);\n+ let localeObj = new Locale(DEFAULT_LOCALE, Ember.getOwner(i18n));\n+ let template = localeObj.getCompiledTemplate(defaults, count);\nreturn template(data);\n}\n};\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/CONTRIBUTING.md", "new_path": ".github/CONTRIBUTING.md", "diff": "@@ -176,12 +176,12 @@ If you know a language other than English and would like to help translate this\n### Run script to populate missing translation terms\n```npm run translation-sync```\n-After this step, you may see some file changes due to mismatches in translations of different languages. This script will take the English translation as the standard and populate the missing translations in other languages with empty string.\n+After this step, you may see some file changes due to mismatches in translations of different languages. This script will take the English translation as the standard and populate the missing translations in other languages with undefined.\n### Edit the translation file of your language\nThe translation files are in `app/locales/<language>/translations.json`\n-Open the translation file of your language then search for the string ```''```. Afterwards you fill in the quotation with the translated terms and save the file.\n+Open the translation file of your language then search for ```undefined```. Replace undefined with the translated term surrounded by single quotes ```'``` and save the file.\n### Submit the pull request\nFollow GitHub's guide to submit a pull request to the project. If you have trouble with this please post in Issues or contact a developer.\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/inventory/edit/template.hbs", "new_path": "app/inventory/edit/template.hbs", "diff": "<tr>\n<td>{{location.location}}</td>\n<td>{{location.aisleLocation}}</td>\n- <td>{{location.quantity}}</td>\n+ <td class=\"test-location-quantity\">{{location.quantity}}</td>\n{{#if canAdjustLocation}}\n<td>\n<button class=\"btn btn-primary neutral\" {{action \"showAdjustment\" location}}>{{t 'inventory.labels.adjust'}}</button>\n" }, { "change_type": "MODIFY", "old_path": "app/templates/inventory-basic.hbs", "new_path": "app/templates/inventory-basic.hbs", "diff": "{{form.input property=\"name\" label=(t 'labels.name') class=\"required col-sm-6 test-inv-name\"}}\n{{inventory/rank-select property=\"rank\" form=form}}\n{{#unless model.isNew}}\n- <div class=\"form-group col-sm-2\">\n+ <div class=\"form-group col-sm-2 test-inv-quantity\">\n<label>{{t 'labels.quantity'}}</label>\n<p class=\"form-control-static\">{{model.quantity}}</p>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "tests/acceptance/inventory-test.js", "new_path": "tests/acceptance/inventory-test.js", "diff": "@@ -49,6 +49,16 @@ test('Adding a new inventory item', (assert) => {\nfindWithAssert('button:contains(Update)');\nfindWithAssert('button:contains(Return)');\n+ await click('button:contains(Add Purchase)');\n+ await waitToAppear('.modal-dialog');\n+ await fillIn('.test-inv-quantity div div input', 18);\n+ await fillIn('.test-inv-cost div input', 2);\n+ await fillIn('.test-vendor div span input:eq(1)', 'fakeVendor');\n+ await click('.modal-footer .btn-primary');\n+ assert.dom('div.alert.alert-danger.alert-dismissible').doesNotExist('Quantity error does not appear');\n+ assert.dom($('.test-location-quantity')[0]).hasText('1018', 'Location quantity is correct after new purchase');\n+ assert.dom('.test-inv-quantity p').hasText('1018', 'Item total quantity is correct after new purchase');\n+\nawait click('button:contains(Return)');\nassert.equal(currentURL(), '/inventory/listing');\nassert.dom('tr').exists({ count: 2 }, 'One item is listed');\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/CONTRIBUTING.md", "new_path": ".github/CONTRIBUTING.md", "diff": "@@ -78,7 +78,7 @@ In addition, these are descriptions of some extra folders and files in use in th\n### Pod directories\n-This project uses a folder structure called [Pods](http://cball.me/organize-your-ember-app-with-pods/) that is better suited for a large scale Ember application.\n+This project uses a folder structure called [Pods](https://www.programwitherik.com/ember-pods/) that is better suited for a large scale Ember application.\nThe basic folder structure for Ember puts controllers, routes and templates in three different directories. The Pods approach organizes the folders in correlation to the application routes and keeps all three files in the same folder for each view.\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "app/.vs/ProjectSettings.json", "diff": "+{\n+ \"CurrentProjectSetting\": null\n+}\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "app/.vs/VSWorkspaceState.json", "diff": "+{\n+ \"ExpandedNodes\": [\n+ \"\"\n+ ],\n+ \"PreviewInSolutionExplorer\": false\n+}\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": "app/.vs/app/v15/.suo", "new_path": "app/.vs/app/v15/.suo", "diff": "Binary files /dev/null and b/app/.vs/app/v15/.suo differ\n" }, { "change_type": "ADD", "old_path": "app/.vs/slnx.sqlite", "new_path": "app/.vs/slnx.sqlite", "diff": "Binary files /dev/null and b/app/.vs/slnx.sqlite differ\n" }, { "change_type": "MODIFY", "old_path": "app/models/appointment.js", "new_path": "app/models/appointment.js", "diff": "@@ -87,7 +87,36 @@ export default AbstractModel.extend({\npresence: true\n},\nstartDate: {\n- presence: true\n+ acceptance: {\n+ accept: true,\n+ if(object) {\n+ if (!object.get('hasDirtyAttributes')) {\n+ return false;\n+ }\n+ let allDay = object.get('allDay');\n+ let startDate = object.get('startDate');\n+ let endDate = object.get('endDate');\n+ if (isEmpty(startDate)) {\n+ // force validation to fail\n+ return true;\n+ } else if (!isEmpty(endDate)) {\n+ // end date is already selected; do further validation\n+ if (allDay) {\n+ if (endDate.getTime() < startDate.getTime()) {\n+ return true;\n+ }\n+ } else {\n+ if (endDate.getTime() <= startDate.getTime()) {\n+ return true;\n+ }\n+ }\n+ }\n+ // patient is properly selected; don't do any further validation\n+ return false;\n+\n+ },\n+ message: 'Please select a start date earlier than the end date'\n+ }\n},\nendDate: {\nacceptance: {\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-sinon-qunit\": \"3.2.0\",\n\"ember-source\": \"2.18.2\",\n\"ember-truth-helpers\": \"2.0.0\",\n- \"ember-validations\": \"HospitalRun/ember-validations#2.0.0\",\n+ \"ember-validations\": \"2.0.0-alpha.5\",\n\"eslint-plugin-ember\": \"^5.1.0\",\n\"eslint-plugin-ember-suave\": \"^1.0.0\",\n\"express\": \"^4.8.5\",\n" } ]

[ { "change_type": "DELETE", "old_path": "app/.vs/ProjectSettings.json", "new_path": null, "diff": "-{\n- \"CurrentProjectSetting\": null\n-}\n\\ No newline at end of file\n" }, { "change_type": "DELETE", "old_path": "app/.vs/VSWorkspaceState.json", "new_path": null, "diff": "-{\n- \"ExpandedNodes\": [\n- \"\"\n- ],\n- \"PreviewInSolutionExplorer\": false\n-}\n\\ No newline at end of file\n" }, { "change_type": "DELETE", "old_path": "app/.vs/app/v15/.suo", "new_path": "app/.vs/app/v15/.suo", "diff": "Binary files a/app/.vs/app/v15/.suo and /dev/null differ\n" }, { "change_type": "DELETE", "old_path": "app/.vs/slnx.sqlite", "new_path": "app/.vs/slnx.sqlite", "diff": "Binary files a/app/.vs/slnx.sqlite and /dev/null differ\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-sinon-qunit\": \"3.2.0\",\n\"ember-source\": \"2.18.2\",\n\"ember-truth-helpers\": \"2.0.0\",\n- \"ember-validations\": \"HospitalRun/ember-validations#2.0.0\",\n+ \"ember-validations\": \"HospitalRun/ember-validations#v2.0.2\",\n\"eslint-plugin-ember\": \"^5.1.0\",\n\"eslint-plugin-ember-suave\": \"^1.0.0\",\n\"express\": \"^4.8.5\",\n" }, { "change_type": "MODIFY", "old_path": "yarn.lock", "new_path": "yarn.lock", "diff": "@@ -301,6 +301,12 @@ [email protected]:\ndependencies:\nensure-posix-path \"^1.0.1\"\[email protected]:\n+ version \"1.2.0\"\n+ resolved \"https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679\"\n+ dependencies:\n+ ensure-posix-path \"^1.0.1\"\n+\namdefine@>=0.0.4:\nversion \"1.0.1\"\nresolved \"https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5\"\n@@ -1093,6 +1099,12 @@ babel-plugin-debug-macros@^0.1.6:\ndependencies:\nsemver \"^5.3.0\"\n+babel-plugin-debug-macros@^0.2.0-beta.6:\n+ version \"0.2.0-beta.6\"\n+ resolved \"https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0-beta.6.tgz#ecdf6e408d5c863ab21740d7ad7f43f027d2f912\"\n+ dependencies:\n+ semver \"^5.3.0\"\n+\nbabel-plugin-ember-modules-api-polyfill@^1.4.2:\nversion \"1.6.0\"\nresolved \"https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-1.6.0.tgz#abd1afa4237b3121cb51222f9bf3283cad8990aa\"\n@@ -1105,6 +1117,12 @@ babel-plugin-ember-modules-api-polyfill@^2.3.0:\ndependencies:\nember-rfc176-data \"^0.3.0\"\n+babel-plugin-ember-modules-api-polyfill@^2.3.2:\n+ version \"2.3.2\"\n+ resolved \"https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.3.2.tgz#56ea34bea963498d070a2b7dc2ce18a92c434093\"\n+ dependencies:\n+ ember-rfc176-data \"^0.3.0\"\n+\nbabel-plugin-eval@^1.0.1:\nversion \"1.0.1\"\nresolved \"https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da\"\n@@ -1446,6 +1464,14 @@ babel-polyfill@^6.16.0:\ncore-js \"^2.4.0\"\nregenerator-runtime \"^0.10.0\"\n+babel-polyfill@^6.26.0:\n+ version \"6.26.0\"\n+ resolved \"https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153\"\n+ dependencies:\n+ babel-runtime \"^6.26.0\"\n+ core-js \"^2.5.0\"\n+ regenerator-runtime \"^0.10.5\"\n+\nbabel-preset-env@^1.2.0:\nversion \"1.3.3\"\nresolved \"https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.3.3.tgz#5913407784e3d98de2aa814a3ef9059722b34e0b\"\n@@ -1515,6 +1541,41 @@ babel-preset-env@^1.3.2, babel-preset-env@^1.5.1:\ninvariant \"^2.2.2\"\nsemver \"^5.3.0\"\n+babel-preset-env@^1.7.0:\n+ version \"1.7.0\"\n+ resolved \"https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a\"\n+ dependencies:\n+ babel-plugin-check-es2015-constants \"^6.22.0\"\n+ babel-plugin-syntax-trailing-function-commas \"^6.22.0\"\n+ babel-plugin-transform-async-to-generator \"^6.22.0\"\n+ babel-plugin-transform-es2015-arrow-functions \"^6.22.0\"\n+ babel-plugin-transform-es2015-block-scoped-functions \"^6.22.0\"\n+ babel-plugin-transform-es2015-block-scoping \"^6.23.0\"\n+ babel-plugin-transform-es2015-classes \"^6.23.0\"\n+ babel-plugin-transform-es2015-computed-properties \"^6.22.0\"\n+ babel-plugin-transform-es2015-destructuring \"^6.23.0\"\n+ babel-plugin-transform-es2015-duplicate-keys \"^6.22.0\"\n+ babel-plugin-transform-es2015-for-of \"^6.23.0\"\n+ babel-plugin-transform-es2015-function-name \"^6.22.0\"\n+ babel-plugin-transform-es2015-literals \"^6.22.0\"\n+ babel-plugin-transform-es2015-modules-amd \"^6.22.0\"\n+ babel-plugin-transform-es2015-modules-commonjs \"^6.23.0\"\n+ babel-plugin-transform-es2015-modules-systemjs \"^6.23.0\"\n+ babel-plugin-transform-es2015-modules-umd \"^6.23.0\"\n+ babel-plugin-transform-es2015-object-super \"^6.22.0\"\n+ babel-plugin-transform-es2015-parameters \"^6.23.0\"\n+ babel-plugin-transform-es2015-shorthand-properties \"^6.22.0\"\n+ babel-plugin-transform-es2015-spread \"^6.22.0\"\n+ babel-plugin-transform-es2015-sticky-regex \"^6.22.0\"\n+ babel-plugin-transform-es2015-template-literals \"^6.22.0\"\n+ babel-plugin-transform-es2015-typeof-symbol \"^6.23.0\"\n+ babel-plugin-transform-es2015-unicode-regex \"^6.22.0\"\n+ babel-plugin-transform-exponentiation-operator \"^6.22.0\"\n+ babel-plugin-transform-regenerator \"^6.22.0\"\n+ browserslist \"^3.2.6\"\n+ invariant \"^2.2.2\"\n+ semver \"^5.3.0\"\n+\nbabel-preset-es2016-node5@^1.1.2:\nversion \"1.1.2\"\nresolved \"https://registry.yarnpkg.com/babel-preset-es2016-node5/-/babel-preset-es2016-node5-1.1.2.tgz#5ec43d2d8bf41d5315804740cc38f0ddeab26986\"\n@@ -2028,6 +2089,21 @@ broccoli-babel-transpiler@^6.1.2:\nrsvp \"^3.5.0\"\nworkerpool \"^2.3.0\"\n+broccoli-babel-transpiler@^6.4.5:\n+ version \"6.5.0\"\n+ resolved \"https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.0.tgz#aa501a227b298a99742fdd0309b1eaad7124bba0\"\n+ dependencies:\n+ babel-core \"^6.26.0\"\n+ broccoli-funnel \"^2.0.1\"\n+ broccoli-merge-trees \"^2.0.0\"\n+ broccoli-persistent-filter \"^1.4.3\"\n+ clone \"^2.0.0\"\n+ hash-for-dep \"^1.2.3\"\n+ heimdalljs-logger \"^0.1.7\"\n+ json-stable-stringify \"^1.0.0\"\n+ rsvp \"^4.8.2\"\n+ workerpool \"^2.3.0\"\n+\nbroccoli-brocfile-loader@^0.18.0:\nversion \"0.18.0\"\nresolved \"https://registry.yarnpkg.com/broccoli-brocfile-loader/-/broccoli-brocfile-loader-0.18.0.tgz#2e86021c805c34ffc8d29a2fb721cf273e819e4b\"\n@@ -2108,7 +2184,7 @@ broccoli-config-replace@^1.1.2:\ndebug \"^2.2.0\"\nfs-extra \"^0.24.0\"\n-broccoli-debug@^0.6.1, broccoli-debug@^0.6.2, broccoli-debug@^0.6.3:\n+broccoli-debug@^0.6.1, broccoli-debug@^0.6.2, broccoli-debug@^0.6.3, broccoli-debug@^0.6.4:\nversion \"0.6.4\"\nresolved \"https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.4.tgz#986eb3d2005e00e3bb91f9d0a10ab137210cd150\"\ndependencies:\n@@ -2665,6 +2741,13 @@ browserslist@^3.2.0:\ncaniuse-lite \"^1.0.30000819\"\nelectron-to-chromium \"^1.3.40\"\n+browserslist@^3.2.6:\n+ version \"3.2.8\"\n+ resolved \"https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6\"\n+ dependencies:\n+ caniuse-lite \"^1.0.30000844\"\n+ electron-to-chromium \"^1.3.47\"\n+\nbrowserslist@^4.0.2:\nversion \"4.0.2\"\nresolved \"https://registry.yarnpkg.com/browserslist/-/browserslist-4.0.2.tgz#294388f5844bb3ab15ef7394ca17f49bf7a4e6f1\"\n@@ -2863,6 +2946,10 @@ caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000817, caniuse-lite@^1.0.300008\nversion \"1.0.30000820\"\nresolved \"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000820.tgz#6e36ee75187a2c83d26d6504a1af47cc580324d2\"\n+caniuse-lite@^1.0.30000844:\n+ version \"1.0.30000878\"\n+ resolved \"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000878.tgz#c644c39588dd42d3498e952234c372e5a40a4123\"\n+\ncaniuse-lite@^1.0.30000876:\nversion \"1.0.30000877\"\nresolved \"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000877.tgz#f189673b86ecc06436520e3e391de6a13ca923b4\"\n@@ -4762,6 +4849,10 @@ electron-to-chromium@^1.3.40:\nversion \"1.3.40\"\nresolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf\"\n+electron-to-chromium@^1.3.47:\n+ version \"1.3.59\"\n+ resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.59.tgz#6377db04d8d3991d6286c72ed5c3fde6f4aaf112\"\n+\nelectron-to-chromium@^1.3.57:\nversion \"1.3.58\"\nresolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188\"\n@@ -4919,6 +5010,24 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6\nember-cli-version-checker \"^2.1.0\"\nsemver \"^5.4.1\"\n+ember-cli-babel@^6.16.0:\n+ version \"6.16.0\"\n+ resolved \"https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.16.0.tgz#623b4a2764ece72b65f1572fc8aeb5714a450228\"\n+ dependencies:\n+ amd-name-resolver \"1.2.0\"\n+ babel-plugin-debug-macros \"^0.2.0-beta.6\"\n+ babel-plugin-ember-modules-api-polyfill \"^2.3.2\"\n+ babel-plugin-transform-es2015-modules-amd \"^6.24.0\"\n+ babel-polyfill \"^6.26.0\"\n+ babel-preset-env \"^1.7.0\"\n+ broccoli-babel-transpiler \"^6.4.5\"\n+ broccoli-debug \"^0.6.4\"\n+ broccoli-funnel \"^2.0.0\"\n+ broccoli-source \"^1.1.0\"\n+ clone \"^2.0.0\"\n+ ember-cli-version-checker \"^2.1.2\"\n+ semver \"^5.5.0\"\n+\nember-cli-broccoli-sane-watcher@^2.0.4:\nversion \"2.1.1\"\nresolved \"https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-2.1.1.tgz#1687adada9022de26053fba833dc7dd10f03dd08\"\n@@ -5237,6 +5346,13 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0:\nresolve \"^1.3.3\"\nsemver \"^5.3.0\"\n+ember-cli-version-checker@^2.1.2:\n+ version \"2.1.2\"\n+ resolved \"https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz#305ce102390c66e4e0f1432dea9dc5c7c19fed98\"\n+ dependencies:\n+ resolve \"^1.3.3\"\n+ semver \"^5.3.0\"\n+\[email protected]:\nversion \"2.17.1\"\nresolved \"https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.17.1.tgz#915a140732cd28d6c3d5b2e890731864ea55ad5b\"\n@@ -5706,11 +5822,11 @@ ember-try@^0.2.15:\nrsvp \"^3.0.17\"\nsemver \"^5.1.0\"\n-ember-validations@HospitalRun/ember-validations#2.0.0:\n- version \"2.0.0-alpha.5\"\n- resolved \"https://codeload.github.com/HospitalRun/ember-validations/tar.gz/3993180f71ee4e8ef606ecf7f8ab2029e6d8ab45\"\n+ember-validations@HospitalRun/ember-validations#v2.0.2:\n+ version \"2.0.2\"\n+ resolved \"https://codeload.github.com/HospitalRun/ember-validations/tar.gz/405c9fc40f080b17d56cde6b8f207f4053bc6da3\"\ndependencies:\n- ember-cli-babel \"^5.1.6\"\n+ ember-cli-babel \"^6.16.0\"\nencodeurl@~1.0.1:\nversion \"1.0.1\"\n@@ -12623,6 +12739,10 @@ regenerator-runtime@^0.10.0:\nversion \"0.10.3\"\nresolved \"https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e\"\n+regenerator-runtime@^0.10.5:\n+ version \"0.10.5\"\n+ resolved \"https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658\"\n+\nregenerator-runtime@^0.11.0:\nversion \"0.11.1\"\nresolved \"https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9\"\n@@ -13189,6 +13309,10 @@ rsvp@^4.0.1, rsvp@^4.6.1, rsvp@^4.7.0:\nversion \"4.8.2\"\nresolved \"https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.2.tgz#9d5647108735784eb13418cdddb56f75b919d722\"\n+rsvp@^4.8.2:\n+ version \"4.8.3\"\n+ resolved \"https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.3.tgz#25d4b9fdd0f95e216eb5884d9b3767d3fbfbe2cd\"\n+\nrsvp@~3.0.6:\nversion \"3.0.21\"\nresolved \"https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/router.js", "new_path": "app/router.js", "diff": "import EmberRouter from '@ember/routing/router';\nimport config from './config/environment';\n+import { get } from '@ember/object';\n+import { inject as service } from '@ember/service';\n+import { scheduleOnce } from '@ember/runloop';\nconst Router = EmberRouter.extend({\n+ metrics: service(),\n+\nlocation: config.locationType,\n- rootURL: config.rootURL\n+ rootURL: config.rootURL,\n+\n+ didTransition() {\n+ this._super(...arguments);\n+ this._trackPage();\n+ },\n+\n+ _trackPage() {\n+ scheduleOnce('afterRender', this, () => {\n+ let page = this.get('url');\n+ let title = this.getWithDefault('currentRouteName', 'unknown');\n+\n+ get(this, 'metrics').trackPage({ page, title });\n+ });\n+ }\n});\nRouter.map(function() {\n" }, { "change_type": "MODIFY", "old_path": "config/environment.js", "new_path": "config/environment.js", "diff": "@@ -6,6 +6,23 @@ module.exports = function(environment) {\nenvironment,\nrootURL: process.env.EMBER_CLI_ELECTRON ? null : '/',\nlocationType: 'hash', // Using hash location type because it is more friendly for offline.\n+ metricsAdapters: [\n+ {\n+ name: 'GoogleAnalytics',\n+ environments: ['development', 'production'],\n+ config: {\n+ id: 'UA-114278773-1',\n+ // Use `analytics_debug.js` in development\n+ debug: environment === 'development',\n+ // Use verbose tracing of GA events\n+ trace: environment === 'development',\n+ // Ensure development env hits aren't sent to GA\n+ sendHitTask: environment !== 'development',\n+ // Specify Google Analytics plugins\n+ require: []\n+ }\n+ }\n+ ],\nEmberENV: {\nFEATURES: {\n// Here you can enable experimental features on an ember canary build\n@@ -24,11 +41,11 @@ module.exports = function(environment) {\n};\nENV.contentSecurityPolicy = {\n- 'connect-src': \"'self'\",\n+ 'connect-src': \"'self' www.google-analytics.com\",\n'default-src': \"'self'\",\n'frame-src': \"'self'\",\n'img-src': \"'self' filesystem: data: blob:\",\n- 'script-src': \"'self' 'unsafe-inline' 'unsafe-eval'\",\n+ 'script-src': \"'self' 'unsafe-inline' 'unsafe-eval' www.google-analytics.com\",\n'style-src': \"'self' 'unsafe-inline'\"\n};\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"ember-inspector\": \"^3.0.0\",\n\"ember-keyboard\": \"3.0.2\",\n\"ember-load-initializers\": \"^1.0.0\",\n+ \"ember-metrics\": \"^0.12.1\",\n\"ember-pouch\": \"4.3.0\",\n\"ember-radio-buttons\": \"^4.0.1\",\n\"ember-rapid-forms\": \"^1.2.5\",\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/controllers/abstract-delete-controller-test.js", "new_path": "tests/unit/controllers/abstract-delete-controller-test.js", "diff": "@@ -6,6 +6,9 @@ import DS from 'ember-data';\nmoduleFor('controller:abstract-delete-controller', 'Unit | Controller | abstract-delete-controller', {\nunit: true,\n+ needs: [\n+ 'service:metrics'\n+ ],\ntestModel(attrs) {\nreturn run(() => {\nthis.register('model:test', DS.Model);\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/controllers/abstract-edit-controller-test.js", "new_path": "tests/unit/controllers/abstract-edit-controller-test.js", "diff": "@@ -10,6 +10,7 @@ moduleFor('controller:abstract-edit-controller', 'Unit | Controller | abstract-e\n'service:i18n',\n'service:session',\n'service:lookupLists',\n+ 'service:metrics',\n'locale:en/translations',\n'locale:en/config',\n'util:i18n/missing-message',\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/controllers/abstract-paged-controller-test.js", "new_path": "tests/unit/controllers/abstract-paged-controller-test.js", "diff": "@@ -8,6 +8,9 @@ moduleFor('controller:abstract-paged-controller', 'Unit | Controller | abstract-\n'service:session'\n],\nunit: true,\n+ needs: [\n+ 'service:metrics'\n+ ],\ntestModel(attrs) {\nreturn run(() => {\nthis.register('model:test', DS.Model);\n" }, { "change_type": "MODIFY", "old_path": "tests/unit/controllers/abstract-report-controller-test.js", "new_path": "tests/unit/controllers/abstract-report-controller-test.js", "diff": "@@ -9,6 +9,7 @@ import { moduleFor, test } from 'ember-qunit';\nmoduleFor('controller:abstract-report-controller', 'Unit | Controller | abstract-report-controller', {\nneeds: [\n'service:i18n',\n+ 'service:metrics',\n'locale:en/translations',\n'locale:en/config',\n'util:i18n/missing-message',\n" } ]

[ { "change_type": "MODIFY", "old_path": ".eslintrc.js", "new_path": ".eslintrc.js", "diff": "@@ -20,6 +20,7 @@ module.exports = {\n'Bloodhound': true,\n'dymo': true,\n'Filer': true,\n+ 'goog': true,\n'logDebug': true,\n'Pikaday': true,\n'PouchDB': true,\n" }, { "change_type": "ADD", "old_path": null, "new_path": "app/serviceworkers/google-analytics.js", "diff": "+goog.offlineGoogleAnalytics.initialize();\n" }, { "change_type": "MODIFY", "old_path": "config/environment.js", "new_path": "config/environment.js", "diff": "@@ -11,7 +11,7 @@ module.exports = function(environment) {\nname: 'GoogleAnalytics',\nenvironments: ['development', 'production'],\nconfig: {\n- id: 'UA-114278773-1',\n+ id: 'UA-TODO-HOSPITAL-RUN',\n// Use `analytics_debug.js` in development\ndebug: environment === 'development',\n// Use verbose tracing of GA events\n@@ -44,7 +44,7 @@ module.exports = function(environment) {\n'connect-src': \"'self' www.google-analytics.com\",\n'default-src': \"'self'\",\n'frame-src': \"'self'\",\n- 'img-src': \"'self' filesystem: data: blob:\",\n+ 'img-src': \"'self' filesystem: data: blob: www.google-analytics.com\",\n'script-src': \"'self' 'unsafe-inline' 'unsafe-eval' www.google-analytics.com\",\n'style-src': \"'self' 'unsafe-inline'\"\n};\n@@ -91,7 +91,8 @@ module.exports = function(environment) {\ndebug: true,\nexcludePaths: ['manifest.appcache'],\nswIncludeFiles: [\n- 'vendor/pouchdb-for-sw.js'\n+ 'vendor/pouchdb-for-sw.js',\n+ require.resolve('sw-offline-google-analytics')\n]\n};\nif (environment === 'production') {\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"electron-compile\": \"^6.4.2\",\n\"electron-localshortcut\": \"^3.0.4\",\n\"electron-protocol-serve\": \"^1.3.0\",\n- \"electron-squirrel-startup\": \"^1.0.0\"\n+ \"electron-squirrel-startup\": \"^1.0.0\",\n+ \"sw-offline-google-analytics\": \"0.0.25\"\n},\n\"ember-addon\": {\n\"paths\": [\n" } ]

[ { "change_type": "MODIFY", "old_path": "app/router.js", "new_path": "app/router.js", "diff": "@@ -4,6 +4,9 @@ import { get } from '@ember/object';\nimport { inject as service } from '@ember/service';\nimport { scheduleOnce } from '@ember/runloop';\n+const REGEX_UUID_URL_PART = /\\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/g;\n+const REGEX_SEARCH_URL_PART = /(\\/search)\\/.+/;\n+\nconst Router = EmberRouter.extend({\nmetrics: service(),\n@@ -17,7 +20,7 @@ const Router = EmberRouter.extend({\n_trackPage() {\nscheduleOnce('afterRender', this, () => {\n- let page = this.get('url');\n+ let page = this.get('url').replace(REGEX_UUID_URL_PART, '').replace(REGEX_SEARCH_URL_PART, '$1');\nlet title = this.getWithDefault('currentRouteName', 'unknown');\nget(this, 'metrics').trackPage({ page, title });\n" } ]

[ { "change_type": "MODIFY", "old_path": "config/environment.js", "new_path": "config/environment.js", "diff": "@@ -11,7 +11,7 @@ module.exports = function(environment) {\nname: 'GoogleAnalytics',\nenvironments: ['development', 'production'],\nconfig: {\n- id: 'UA-TODO-HOSPITAL-RUN',\n+ id: 'UA-98265531-2',\n// Use `analytics_debug.js` in development\ndebug: environment === 'development',\n// Use verbose tracing of GA events\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -115,6 +115,17 @@ Is your server (still) running? Is CouchDB running? If not, that's probably the\nTry a browser refresh `cmd + r`.\n+**ERR! stack python2: command not found**\n+\n+`npm install` requires Python 2 to build some dependencies.\n+Make sure `python2` is accessible from the current working directory.\n+\n+If you're using [pyenv](https://github.com/pyenv/pyenv), you can run the following to override the Python version used in the current working directory:\n+```\n+$ pyenv install 2.7.15\n+$ pyenv local 2.7.15\n+```\n+\n## Loading sample data\nIf you would like to load sample data, you can do so by navigating to **Load DB** under the Administration menu. You should see the following screen:\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "},\n\"config\": {\n\"forge\": \"./ember-electron/electron-forge-config.js\"\n+ },\n+ \"greenkeeper\": {\n+ \"ignore\": [\n+ \"ember-data\",\n+ \"ember-source\",\n+ \"ember-cli\"\n+ ]\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "yarn.lock", "new_path": "yarn.lock", "diff": "@@ -134,7 +134,7 @@ [email protected]:\nversion \"1.0.9\"\nresolved \"https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135\"\n-abbrev@^1.0.7, abbrev@^1.1.1:\n+abbrev@^1.0.7:\nversion \"1.1.1\"\nresolved \"https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8\"\n@@ -227,12 +227,6 @@ [email protected], after@~0.8.1:\nversion \"0.8.2\"\nresolved \"https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f\"\n-agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0:\n- version \"4.2.1\"\n- resolved \"https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9\"\n- dependencies:\n- es6-promisify \"^5.0.0\"\n-\najv-keywords@^2.1.0:\nversion \"2.1.1\"\nresolved \"https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762\"\n@@ -319,10 +313,6 @@ ansi-escapes@^3.0.0:\nversion \"3.0.0\"\nresolved \"https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92\"\n-ansi-escapes@^3.1.0:\n- version \"3.1.0\"\n- resolved \"https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30\"\n-\nansi-regex@^0.2.0, ansi-regex@^0.2.1:\nversion \"0.2.1\"\nresolved \"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9\"\n@@ -649,10 +639,6 @@ [email protected]:\nversion \"0.9.6\"\nresolved \"https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9\"\[email protected]:\n- version \"0.11.5\"\n- resolved \"https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.5.tgz#9890825d660c03c28339f315e9fa0a360e31ec28\"\n-\nastw@^2.0.0:\nversion \"2.2.0\"\nresolved \"https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917\"\n@@ -2903,7 +2889,7 @@ camelcase@^1.0.2, camelcase@^1.2.1:\nversion \"1.2.1\"\nresolved \"https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39\"\n-camelcase@^2.0.0, camelcase@^2.0.1:\n+camelcase@^2.0.0:\nversion \"2.1.1\"\nresolved \"https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f\"\n@@ -3218,7 +3204,7 @@ cliui@^2.1.0:\nright-align \"^0.1.1\"\nwordwrap \"0.0.2\"\n-cliui@^3.0.3, cliui@^3.2.0:\n+cliui@^3.2.0:\nversion \"3.2.0\"\nresolved \"https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d\"\ndependencies:\n@@ -3565,17 +3551,6 @@ configstore@^3.0.0:\nwrite-file-atomic \"^2.0.0\"\nxdg-basedir \"^3.0.0\"\n-configstore@^3.1.2:\n- version \"3.1.2\"\n- resolved \"https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f\"\n- dependencies:\n- dot-prop \"^4.1.0\"\n- graceful-fs \"^4.1.2\"\n- make-dir \"^1.0.0\"\n- unique-string \"^1.0.0\"\n- write-file-atomic \"^2.0.0\"\n- xdg-basedir \"^3.0.0\"\n-\nconsole-browserify@^1.1.0:\nversion \"1.1.0\"\nresolved \"https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10\"\n@@ -4009,10 +3984,6 @@ dashdash@^1.12.0:\ndependencies:\nassert-plus \"^1.0.0\"\n-data-uri-to-buffer@1:\n- version \"1.2.0\"\n- resolved \"https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835\"\n-\ndate-now@^0.1.4:\nversion \"0.1.4\"\nresolved \"https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b\"\n@@ -4027,12 +3998,6 @@ debug@*, [email protected], debug@^3.0.0, debug@^3.0.1, debug@^3.1.0:\ndependencies:\nms \"2.0.0\"\n-debug@2, [email protected], debug@^2.1.2, debug@^2.4.0, debug@^2.5.1, debug@^2.6.3, debug@^2.6.8:\n- version \"2.6.9\"\n- resolved \"https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f\"\n- dependencies:\n- ms \"2.0.0\"\n-\[email protected], debug@~2.2.0:\nversion \"2.2.0\"\nresolved \"https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da\"\n@@ -4063,6 +4028,12 @@ [email protected]:\ndependencies:\nms \"0.7.3\"\[email protected], debug@^2.1.2, debug@^2.4.0, debug@^2.5.1, debug@^2.6.3, debug@^2.6.8:\n+ version \"2.6.9\"\n+ resolved \"https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f\"\n+ dependencies:\n+ ms \"2.0.0\"\n+\ndecamelize-keys@^1.0.0:\nversion \"1.1.0\"\nresolved \"https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9\"\n@@ -4166,14 +4137,6 @@ defs@~1.1.0:\ntryor \"~0.1.2\"\nyargs \"~3.27.0\"\n-degenerator@^1.0.4:\n- version \"1.0.4\"\n- resolved \"https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095\"\n- dependencies:\n- ast-types \"0.x.x\"\n- escodegen \"1.x.x\"\n- esprima \"3.x.x\"\n-\ndel@^2.0.2:\nversion \"2.2.2\"\nresolved \"https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8\"\n@@ -4917,10 +4880,6 @@ email-validator@^1.1.1:\nversion \"1.1.1\"\nresolved \"https://registry.yarnpkg.com/email-validator/-/email-validator-1.1.1.tgz#b07f3be7bac1dc099bc43e75f6ae399f552d5a80\"\n-email-validator@^2.0.3:\n- version \"2.0.4\"\n- resolved \"https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed\"\n-\nember-ajax@^3.0.0:\nversion \"3.0.0\"\nresolved \"https://registry.yarnpkg.com/ember-ajax/-/ember-ajax-3.0.0.tgz#8f21e9da0c1d433cf879aa855fce464d517e9ab5\"\n@@ -5799,11 +5758,11 @@ ember-template-lint@^0.5.10:\nhtmlbars \"0.14.24\"\nlodash \"^4.11.1\"\[email protected]:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-2.0.0.tgz#f3e2eef667859197f1328bb4f83b0b35b661c1ac\"\[email protected]:\n+ version \"2.1.0\"\n+ resolved \"https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-2.1.0.tgz#d4dab4eee7945aa2388126485977baeb33ca0798\"\ndependencies:\n- ember-cli-babel \"^6.8.2\"\n+ ember-cli-babel \"^6.6.0\"\nember-try-config@^2.2.0:\nversion \"2.2.0\"\n@@ -6097,17 +6056,6 @@ [email protected]:\noptionalDependencies:\nsource-map \"~0.2.0\"\[email protected]:\n- version \"1.11.0\"\n- resolved \"https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589\"\n- dependencies:\n- esprima \"^3.1.3\"\n- estraverse \"^4.2.0\"\n- esutils \"^2.0.2\"\n- optionator \"^0.8.1\"\n- optionalDependencies:\n- source-map \"~0.6.1\"\n-\nescodegen@^1.6.1:\nversion \"1.9.1\"\nresolved \"https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2\"\n@@ -6215,7 +6163,7 @@ [email protected], esprima@^2.6.0, esprima@^2.7.1:\nversion \"2.7.3\"\nresolved \"https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581\"\[email protected], esprima@^3.1.1, esprima@^3.1.3, esprima@~3.1.0:\n+esprima@^3.1.1, esprima@^3.1.3, esprima@~3.1.0:\nversion \"3.1.3\"\nresolved \"https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633\"\n@@ -6524,10 +6472,6 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:\nassign-symbols \"^1.0.0\"\nis-extendable \"^1.0.1\"\n-extend@3, extend@~3.0.2:\n- version \"3.0.2\"\n- resolved \"https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa\"\n-\nextend@^3.0.0, extend@~3.0.0:\nversion \"3.0.0\"\nresolved \"https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4\"\n@@ -6536,6 +6480,10 @@ extend@~3.0.1:\nversion \"3.0.1\"\nresolved \"https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444\"\n+extend@~3.0.2:\n+ version \"3.0.2\"\n+ resolved \"https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa\"\n+\nexternal-editor@^1.1.0:\nversion \"1.1.1\"\nresolved \"https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b\"\n@@ -6686,10 +6634,6 @@ file-entry-cache@^2.0.0:\nflat-cache \"^1.2.1\"\nobject-assign \"^4.0.1\"\n-file-uri-to-path@1:\n- version \"1.0.0\"\n- resolved \"https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd\"\n-\nfile-url@^2.0.2:\nversion \"2.0.2\"\nresolved \"https://registry.yarnpkg.com/file-url/-/file-url-2.0.2.tgz#e951784d79095127d3713029ab063f40818ca2ae\"\n@@ -7076,13 +7020,6 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:\nmkdirp \">=0.5 0\"\nrimraf \"2\"\n-ftp@~0.3.10:\n- version \"0.3.10\"\n- resolved \"https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d\"\n- dependencies:\n- readable-stream \"1.1.x\"\n- xregexp \"2.0.0\"\n-\nfullcalendar-scheduler@^1.8.0:\nversion \"1.9.3\"\nresolved \"https://registry.yarnpkg.com/fullcalendar-scheduler/-/fullcalendar-scheduler-1.9.3.tgz#53c44f561cd1f6da4f10061f7663be04191aae61\"\n@@ -7211,17 +7148,6 @@ get-stream@^3.0.0:\nversion \"3.0.0\"\nresolved \"https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14\"\n-get-uri@^2.0.0:\n- version \"2.0.2\"\n- resolved \"https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578\"\n- dependencies:\n- data-uri-to-buffer \"1\"\n- debug \"2\"\n- extend \"3\"\n- file-uri-to-path \"1\"\n- ftp \"~0.3.10\"\n- readable-stream \"2\"\n-\nget-value@^2.0.3, get-value@^2.0.6:\nversion \"2.0.6\"\nresolved \"https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28\"\n@@ -7857,15 +7783,14 @@ homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:\ndependencies:\nparse-passwd \"^1.0.0\"\[email protected]:\n- version \"1.0.1\"\n- resolved \"https://registry.yarnpkg.com/hospitalrun-dblisteners/-/hospitalrun-dblisteners-1.0.1.tgz#9003207a1cbe8ae68d4e8c8e8c6f0fd6ff8fb2a8\"\[email protected]:\n+ version \"1.0.4\"\n+ resolved \"https://registry.yarnpkg.com/hospitalrun-dblisteners/-/hospitalrun-dblisteners-1.0.4.tgz#5e00fccd97d86ab2287b0744d1cd71e791685bfc\"\ndependencies:\nfollow \"^1.0.0\"\nglob \"^7.0.0\"\nmkdirp \"^0.5.1\"\nnano \"^7.0.0\"\n- snyk \"^1.88.2\"\nuuid \"^3.0.1\"\nweb-push \"^3.2.2\"\n@@ -7940,15 +7865,6 @@ [email protected], http-errors@~1.6.2:\nsetprototypeof \"1.0.3\"\nstatuses \">= 1.3.1 < 2\"\[email protected]:\n- version \"1.6.3\"\n- resolved \"https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d\"\n- dependencies:\n- depd \"~1.1.2\"\n- inherits \"2.0.3\"\n- setprototypeof \"1.1.0\"\n- statuses \">= 1.4.0 < 2\"\n-\nhttp-errors@~1.6.1:\nversion \"1.6.1\"\nresolved \"https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257\"\n@@ -7958,13 +7874,6 @@ http-errors@~1.6.1:\nsetprototypeof \"1.0.3\"\nstatuses \">= 1.3.1 < 2\"\n-http-proxy-agent@^2.1.0:\n- version \"2.1.0\"\n- resolved \"https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405\"\n- dependencies:\n- agent-base \"4\"\n- debug \"3.1.0\"\n-\nhttp-proxy@^1.13.1, http-proxy@^1.9.0:\nversion \"1.16.2\"\nresolved \"https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742\"\n@@ -7998,13 +7907,6 @@ https-browserify@~0.0.0:\nversion \"0.0.1\"\nresolved \"https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82\"\n-https-proxy-agent@^2.2.1:\n- version \"2.2.1\"\n- resolved \"https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0\"\n- dependencies:\n- agent-base \"^4.1.0\"\n- debug \"^3.1.0\"\n-\nhumanize-plus@^1.8.1:\nversion \"1.8.2\"\nresolved \"https://registry.yarnpkg.com/humanize-plus/-/humanize-plus-1.8.2.tgz#a65b34459ad6367adbb3707a82a3c9f916167030\"\n@@ -8021,12 +7923,6 @@ [email protected], iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@^0.4.5:\nversion \"0.4.19\"\nresolved \"https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b\"\[email protected]:\n- version \"0.4.23\"\n- resolved \"https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63\"\n- dependencies:\n- safer-buffer \">= 2.1.2 < 3\"\n-\niconv-lite@~0.4.13:\nversion \"0.4.15\"\nresolved \"https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb\"\n@@ -8124,7 +8020,7 @@ [email protected]:\nversion \"2.0.1\"\nresolved \"https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1\"\[email protected], ini@^1.3.0:\[email protected]:\nversion \"1.3.5\"\nresolved \"https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927\"\n@@ -8204,7 +8100,7 @@ inquirer@^2:\nstrip-ansi \"^3.0.0\"\nthrough \"^2.3.6\"\n-inquirer@^3.0.0, inquirer@^3.0.6, inquirer@^3.2.3:\n+inquirer@^3.0.6, inquirer@^3.2.3:\nversion \"3.3.0\"\nresolved \"https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9\"\ndependencies:\n@@ -8264,10 +8160,6 @@ invert-kv@^1.0.0:\nversion \"1.0.0\"\nresolved \"https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6\"\n-ip@^1.1.4, ip@^1.1.5:\n- version \"1.1.5\"\n- resolved \"https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a\"\n-\[email protected]:\nversion \"1.3.0\"\nresolved \"https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec\"\n@@ -9390,7 +9282,7 @@ lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:\nversion \"4.2.0\"\nresolved \"https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7\"\n-lodash.assignin@^4.1.0, lodash.assignin@^4.2.0:\n+lodash.assignin@^4.1.0:\nversion \"4.2.0\"\nresolved \"https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2\"\n@@ -9437,10 +9329,6 @@ lodash.flatten@^3.0.2:\nlodash._baseflatten \"^3.0.0\"\nlodash._isiterateecall \"^3.0.0\"\n-lodash.flatten@^4.4.0:\n- version \"4.4.0\"\n- resolved \"https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f\"\n-\nlodash.get@^4.0.0, lodash.get@^4.4.2:\nversion \"4.4.2\"\nresolved \"https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99\"\n@@ -9509,10 +9397,6 @@ lodash.restparam@^3.0.0:\nversion \"3.6.1\"\nresolved \"https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805\"\n-lodash.set@^4.3.2:\n- version \"4.3.2\"\n- resolved \"https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23\"\n-\nlodash.template@^3.3.2:\nversion \"3.6.2\"\nresolved \"https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f\"\n@@ -9559,10 +9443,6 @@ [email protected]:\nversion \"3.8.0\"\nresolved \"https://registry.yarnpkg.com/lodash/-/lodash-3.8.0.tgz#376eb98bdcd9382a9365c33c4cb8250de1325b91\"\[email protected], lodash@^4.17.10, lodash@^4.17.5:\n- version \"4.17.10\"\n- resolved \"https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7\"\n-\nlodash@^3.10.0, lodash@^3.10.1, lodash@^3.9.3:\nversion \"3.10.1\"\nresolved \"https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6\"\n@@ -9575,6 +9455,10 @@ lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1:\nversion \"4.17.4\"\nresolved \"https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae\"\n+lodash@^4.17.10:\n+ version \"4.17.10\"\n+ resolved \"https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7\"\n+\nlodash@~2.4.1:\nversion \"2.4.2\"\nresolved \"https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e\"\n@@ -9640,13 +9524,6 @@ lru-cache@^4.0.1:\npseudomap \"^1.0.1\"\nyallist \"^2.0.0\"\n-lru-cache@^4.1.2:\n- version \"4.1.3\"\n- resolved \"https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c\"\n- dependencies:\n- pseudomap \"^1.0.2\"\n- yallist \"^2.1.2\"\n-\[email protected]:\nversion \"2.2.0\"\nresolved \"https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.0.tgz#b65ba5fcb349a29924c8e333f7c6a5562f2e4842\"\n@@ -9665,10 +9542,6 @@ macos-alias@~0.2.5:\ndependencies:\nnan \"^2.4.0\"\n-macos-release@^1.0.0:\n- version \"1.1.0\"\n- resolved \"https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb\"\n-\nmake-array@^0.1.2:\nversion \"0.1.2\"\nresolved \"https://registry.yarnpkg.com/make-array/-/make-array-0.1.2.tgz#335e36ebb0c5a43154d21213a1ecaeae2a1bb3ef\"\n@@ -10302,15 +10175,6 @@ natural-compare@^1.4.0:\nversion \"1.4.0\"\nresolved \"https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7\"\n-nconf@^0.10.0:\n- version \"0.10.0\"\n- resolved \"https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2\"\n- dependencies:\n- async \"^1.4.0\"\n- ini \"^1.3.0\"\n- secure-keys \"^1.0.0\"\n- yargs \"^3.19.0\"\n-\nnconf@^0.7.2:\nversion \"0.7.2\"\nresolved \"https://registry.yarnpkg.com/nconf/-/nconf-0.7.2.tgz#a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00\"\n@@ -10337,10 +10201,6 @@ nested-error-stacks@^1.0.0, nested-error-stacks@^1.0.1:\ndependencies:\ninherits \"~2.0.1\"\n-netmask@^1.0.6:\n- version \"1.0.6\"\n- resolved \"https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35\"\n-\nnext-tick@1:\nversion \"1.0.0\"\nresolved \"https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c\"\n@@ -10772,7 +10632,7 @@ open@^0.0.5:\nversion \"0.0.5\"\nresolved \"https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc\"\n-opn@^5.0.0, opn@^5.2.0:\n+opn@^5.0.0:\nversion \"5.3.0\"\nresolved \"https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c\"\ndependencies:\n@@ -10864,13 +10724,6 @@ os-name@^1.0.3:\nosx-release \"^1.0.0\"\nwin-release \"^1.0.0\"\n-os-name@^2.0.1:\n- version \"2.0.1\"\n- resolved \"https://registry.yarnpkg.com/os-name/-/os-name-2.0.1.tgz#b9a386361c17ae3a21736ef0599405c9a8c5dc5e\"\n- dependencies:\n- macos-release \"^1.0.0\"\n- win-release \"^1.0.0\"\n-\nos-shim@^0.1.2:\nversion \"0.1.3\"\nresolved \"https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917\"\n@@ -10921,29 +10774,6 @@ p-locate@^2.0.0:\ndependencies:\np-limit \"^1.1.0\"\n-pac-proxy-agent@^2.0.1:\n- version \"2.0.2\"\n- resolved \"https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz#90d9f6730ab0f4d2607dcdcd4d3d641aa26c3896\"\n- dependencies:\n- agent-base \"^4.2.0\"\n- debug \"^3.1.0\"\n- get-uri \"^2.0.0\"\n- http-proxy-agent \"^2.1.0\"\n- https-proxy-agent \"^2.2.1\"\n- pac-resolver \"^3.0.0\"\n- raw-body \"^2.2.0\"\n- socks-proxy-agent \"^3.0.0\"\n-\n-pac-resolver@^3.0.0:\n- version \"3.0.0\"\n- resolved \"https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26\"\n- dependencies:\n- co \"^4.6.0\"\n- degenerator \"^1.0.4\"\n- ip \"^1.1.5\"\n- netmask \"^1.0.6\"\n- thunkify \"^2.1.2\"\n-\npackage-json@^1.0.0:\nversion \"1.2.0\"\nresolved \"https://registry.yarnpkg.com/package-json/-/package-json-1.2.0.tgz#c8ecac094227cdf76a316874ed05e27cc939a0e0\"\n@@ -11217,13 +11047,6 @@ path-type@^3.0.0:\ndependencies:\npify \"^3.0.0\"\[email protected]:\n- version \"0.12.7\"\n- resolved \"https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f\"\n- dependencies:\n- process \"^0.11.1\"\n- util \"^0.10.3\"\n-\[email protected]:\nversion \"0.0.1\"\nresolved \"https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d\"\n@@ -11268,10 +11091,6 @@ pinkie@^2.0.0:\nversion \"2.0.4\"\nresolved \"https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870\"\n-pkginfo@^0.4.1:\n- version \"0.4.1\"\n- resolved \"https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff\"\n-\nplist@^2.0.0, plist@^2.1.0:\nversion \"2.1.0\"\nresolved \"https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025\"\n@@ -12225,7 +12044,7 @@ process-relative-require@^1.0.0:\ndependencies:\nnode-modules-path \"^1.0.0\"\n-process@^0.11.1, process@~0.11.0:\n+process@~0.11.0:\nversion \"0.11.10\"\nresolved \"https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182\"\n@@ -12295,19 +12114,6 @@ proxy-addr@~2.0.3:\nforwarded \"~0.1.2\"\nipaddr.js \"1.6.0\"\n-proxy-agent@^2.0.0:\n- version \"2.3.1\"\n- resolved \"https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.3.1.tgz#3d49d863d46cf5f37ca8394848346ea02373eac6\"\n- dependencies:\n- agent-base \"^4.2.0\"\n- debug \"^3.1.0\"\n- http-proxy-agent \"^2.1.0\"\n- https-proxy-agent \"^2.2.1\"\n- lru-cache \"^4.1.2\"\n- pac-proxy-agent \"^2.0.1\"\n- proxy-from-env \"^1.0.0\"\n- socks-proxy-agent \"^3.0.0\"\n-\nproxy-from-env@^1.0.0:\nversion \"1.0.0\"\nresolved \"https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee\"\n@@ -12477,15 +12283,6 @@ [email protected]:\niconv-lite \"0.4.19\"\nunpipe \"1.0.0\"\n-raw-body@^2.2.0:\n- version \"2.3.3\"\n- resolved \"https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3\"\n- dependencies:\n- bytes \"3.0.0\"\n- http-errors \"1.6.3\"\n- iconv-lite \"0.4.23\"\n- unpipe \"1.0.0\"\n-\nraw-body@~1.1.0:\nversion \"1.1.7\"\nresolved \"https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425\"\n@@ -12595,30 +12392,18 @@ [email protected]:\nisarray \"0.0.1\"\nstring_decoder \"~0.10.x\"\[email protected], readable-stream@^1.0.27-1, readable-stream@^1.0.33, readable-stream@^1.1.8, readable-stream@~1.1.9:\n- version \"1.1.14\"\n- resolved \"https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9\"\n+\"readable-stream@>=1.0.33-1 <1.1.0-0\", readable-stream@~1.0.24, readable-stream@~1.0.26:\n+ version \"1.0.34\"\n+ resolved \"https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c\"\ndependencies:\ncore-util-is \"~1.0.0\"\ninherits \"~2.0.1\"\nisarray \"0.0.1\"\nstring_decoder \"~0.10.x\"\n-readable-stream@2:\n- version \"2.3.6\"\n- resolved \"https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf\"\n- dependencies:\n- core-util-is \"~1.0.0\"\n- inherits \"~2.0.3\"\n- isarray \"~1.0.0\"\n- process-nextick-args \"~2.0.0\"\n- safe-buffer \"~5.1.1\"\n- string_decoder \"~1.1.1\"\n- util-deprecate \"~1.0.1\"\n-\n-\"readable-stream@>=1.0.33-1 <1.1.0-0\", readable-stream@~1.0.24, readable-stream@~1.0.26:\n- version \"1.0.34\"\n- resolved \"https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c\"\n+readable-stream@^1.0.27-1, readable-stream@^1.0.33, readable-stream@^1.1.8, readable-stream@~1.1.9:\n+ version \"1.1.14\"\n+ resolved \"https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9\"\ndependencies:\ncore-util-is \"~1.0.0\"\ninherits \"~2.0.1\"\n@@ -12700,7 +12485,7 @@ recast@^0.11.17, recast@^0.11.3:\nprivate \"~0.1.5\"\nsource-map \"~0.5.0\"\n-recursive-readdir@^2.2.1, recursive-readdir@^2.2.2:\n+recursive-readdir@^2.2.1:\nversion \"2.2.2\"\nresolved \"https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f\"\ndependencies:\n@@ -13087,7 +12872,7 @@ [email protected], request@~2.83.0:\ntunnel-agent \"^0.6.0\"\nuuid \"^3.1.0\"\n-request@^2.85.0, request@^2.87.0:\n+request@^2.85.0:\nversion \"2.88.0\"\nresolved \"https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef\"\ndependencies:\n@@ -13399,10 +13184,6 @@ safefs@^4.0.0:\neditions \"^1.1.1\"\ngraceful-fs \"^4.1.4\"\n-\"safer-buffer@>= 2.1.2 < 3\":\n- version \"2.1.2\"\n- resolved \"https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a\"\n-\[email protected]:\nversion \"1.3.0\"\nresolved \"https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50\"\n@@ -13491,10 +13272,6 @@ scss-tokenizer@^0.2.3:\njs-base64 \"^2.1.8\"\nsource-map \"^0.4.2\"\n-secure-keys@^1.0.0:\n- version \"1.0.0\"\n- resolved \"https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca\"\n-\nsecure-random@^1.1.1:\nversion \"1.1.1\"\nresolved \"https://registry.yarnpkg.com/secure-random/-/secure-random-1.1.1.tgz#0880f2d8c5185f4bcb4684058c836b4ddb07145a\"\n@@ -13757,10 +13534,6 @@ slide@^1.1.5:\nversion \"1.1.6\"\nresolved \"https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707\"\n-smart-buffer@^1.0.13:\n- version \"1.1.15\"\n- resolved \"https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16\"\n-\nsnake-case@^2.1.0:\nversion \"2.1.0\"\nresolved \"https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f\"\n@@ -13814,24 +13587,6 @@ [email protected]:\nnconf \"^0.7.2\"\npath-is-absolute \"^1.0.0\"\[email protected]:\n- version \"2.2.0\"\n- resolved \"https://registry.yarnpkg.com/snyk-config/-/snyk-config-2.2.0.tgz#d400ce50e293ce5c3ade4cf46a53bea8205771e6\"\n- dependencies:\n- debug \"^3.1.0\"\n- lodash \"^4.17.5\"\n- nconf \"^0.10.0\"\n-\[email protected]:\n- version \"1.10.3\"\n- resolved \"https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.10.3.tgz#2ac2f05ab821e122a5e1851240d3c021bbb8223f\"\n- dependencies:\n- debug \"^3.1.0\"\n- fs-extra \"^5.0.0\"\n- pkginfo \"^0.4.1\"\n- request \"^2.87.0\"\n- temp-dir \"^1.0.0\"\n-\[email protected]:\nversion \"1.4.5\"\nresolved \"https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.4.5.tgz#bf462656caade0603970b68e756f4b389c3aeaaa\"\n@@ -13839,26 +13594,12 @@ [email protected]:\ngraphlib \"^2.1.1\"\ntoml \"^2.3.2\"\[email protected]:\n- version \"1.5.2\"\n- resolved \"https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.5.2.tgz#c45273a2a05ca621553b3a0c60511757f8d24e1b\"\n- dependencies:\n- graphlib \"^2.1.1\"\n- tmp \"0.0.33\"\n- toml \"^2.3.2\"\n-\[email protected]:\nversion \"1.2.0\"\nresolved \"https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz#ef5aea5d132905cbf0315c72d9d96b24aa4a75dd\"\ndependencies:\nclone-deep \"^0.3.0\"\[email protected]:\n- version \"1.3.0\"\n- resolved \"https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz#7a589155825ec613e24cc2bcf0d738438fb06216\"\n- dependencies:\n- clone-deep \"^0.3.0\"\n-\[email protected], snyk-module@^1.6.0, snyk-module@^1.8.1:\nversion \"1.8.1\"\nresolved \"https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.8.1.tgz#31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca\"\n@@ -13866,29 +13607,10 @@ [email protected], snyk-module@^1.6.0, snyk-module@^1.8.1:\ndebug \"^2.2.0\"\nhosted-git-info \"^2.1.4\"\[email protected], snyk-module@^1.8.2:\n- version \"1.8.2\"\n- resolved \"https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.8.2.tgz#bd3c11b46a90b8ccb0a04a18b387b1d0e5b10291\"\n- dependencies:\n- debug \"^3.1.0\"\n- hosted-git-info \"^2.1.4\"\n-\[email protected]:\nversion \"1.1.1\"\nresolved \"https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.1.tgz#15c13131a368dde487763de93557ad5fb9572ffe\"\[email protected]:\n- version \"1.2.0\"\n- resolved \"https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz#e23c60e35457ce5a26fd4252ddf120dbd7e9ef2a\"\n-\[email protected]:\n- version \"1.2.2\"\n- resolved \"https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.2.2.tgz#d3f17710e6f0fecaffca71db7c7f8966180590cb\"\n- dependencies:\n- lodash \"4.17.10\"\n- path \"0.12.7\"\n- source-map-support \"^0.5.7\"\n-\[email protected]:\nversion \"1.3.9\"\nresolved \"https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.9.tgz#bcdc503eafe9f3eeb4024b756ded4d0c3b265d12\"\n@@ -13898,43 +13620,12 @@ [email protected]:\nxml2js \"^0.4.17\"\nzip \"^1.2.0\"\[email protected]:\n- version \"1.6.4\"\n- resolved \"https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.4.tgz#83cb3e699667ea808803d4020aa0e053e6f3bab4\"\n- dependencies:\n- debug \"^3.1.0\"\n- lodash \"^4.17.10\"\n- xml2js \"^0.4.17\"\n- zip \"^1.2.0\"\n-\[email protected]:\nversion \"1.3.2\"\nresolved \"https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.3.2.tgz#51c19171dee0cd35158a7aa835fe02a97dc84ab8\"\ndependencies:\ndebug \"^3.1.0\"\[email protected]:\n- version \"1.5.1\"\n- resolved \"https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.5.1.tgz#3785ee45f5e003919abc476a109ad4f34fabe631\"\n- dependencies:\n- debug \"^3.1.0\"\n- lodash \"^4.17.5\"\n- path \"0.12.7\"\n-\[email protected]:\n- version \"1.12.0\"\n- resolved \"https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.12.0.tgz#5167cbc4a28b2046b82234f866e49ee4fea1f52a\"\n- dependencies:\n- debug \"^3.1.0\"\n- email-validator \"^2.0.3\"\n- js-yaml \"^3.5.3\"\n- lodash.clonedeep \"^4.3.1\"\n- semver \"^5.5.0\"\n- snyk-module \"^1.8.2\"\n- snyk-resolve \"^1.0.1\"\n- snyk-try-require \"^1.1.1\"\n- then-fs \"^2.0.0\"\n-\nsnyk-policy@^1.10.2:\nversion \"1.10.2\"\nresolved \"https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.10.2.tgz#2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc\"\n@@ -13954,12 +13645,6 @@ [email protected]:\nversion \"1.5.7\"\nresolved \"https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.5.7.tgz#fe45da46b59becec6e41f34023948246778ebc3e\"\[email protected]:\n- version \"1.8.1\"\n- resolved \"https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.8.1.tgz#622427a30c0570726c9a8c9499e0079184d10874\"\n- dependencies:\n- tmp \"0.0.33\"\n-\[email protected]:\nversion \"1.7.0\"\nresolved \"https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz#13743a058437dff890baaf437c333c966a743cb6\"\n@@ -13979,25 +13664,6 @@ [email protected]:\nsnyk-try-require \"^1.1.1\"\nthen-fs \"^2.0.0\"\[email protected]:\n- version \"3.1.0\"\n- resolved \"https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz#722a9757794b5e0fb4036874459afa39847b62ec\"\n- dependencies:\n- ansicolors \"^0.3.2\"\n- debug \"^3.1.0\"\n- lodash.assign \"^4.2.0\"\n- lodash.assignin \"^4.2.0\"\n- lodash.flatten \"^4.4.0\"\n- lodash.get \"^4.4.2\"\n- lodash.set \"^4.3.2\"\n- lru-cache \"^4.0.0\"\n- semver \"^5.1.0\"\n- snyk-module \"^1.6.0\"\n- snyk-resolve \"^1.0.0\"\n- snyk-tree \"^1.0.0\"\n- snyk-try-require \"^1.1.1\"\n- then-fs \"^2.0.0\"\n-\[email protected], snyk-resolve@^1.0.0:\nversion \"1.0.0\"\nresolved \"https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.0.tgz#bbe9196d37f57c39251e6be75ccdd5b2097e99a2\"\n@@ -14005,40 +13671,18 @@ [email protected], snyk-resolve@^1.0.0:\ndebug \"^2.2.0\"\nthen-fs \"^2.0.0\"\[email protected], snyk-resolve@^1.0.1:\n- version \"1.0.1\"\n- resolved \"https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab\"\n- dependencies:\n- debug \"^3.1.0\"\n- then-fs \"^2.0.0\"\n-\[email protected]:\nversion \"1.2.5\"\nresolved \"https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.5.tgz#e86a3b4e727d206f7e41154b0dd2019b16102360\"\ndependencies:\ndebug \"^2.2.0\"\[email protected]:\n- version \"1.3.1\"\n- resolved \"https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.1.tgz#15b4a212672dfba33f26aec953229db1a962f29e\"\n- dependencies:\n- debug \"^3.1.0\"\n-\nsnyk-tree@^1.0.0:\nversion \"1.0.0\"\nresolved \"https://registry.yarnpkg.com/snyk-tree/-/snyk-tree-1.0.0.tgz#0fb73176dbf32e782f19100294160448f9111cc8\"\ndependencies:\narchy \"^1.0.0\"\[email protected]:\n- version \"1.3.1\"\n- resolved \"https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212\"\n- dependencies:\n- debug \"^3.1.0\"\n- lodash.clonedeep \"^4.3.0\"\n- lru-cache \"^4.0.0\"\n- then-fs \"^2.0.0\"\n-\nsnyk-try-require@^1.1.1, snyk-try-require@^1.2.0:\nversion \"1.2.0\"\nresolved \"https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.2.0.tgz#30fc2b11c07064591ee35780c826be91312f2144\"\n@@ -14088,46 +13732,6 @@ snyk@^1.13.2:\nurl \"^0.11.0\"\nuuid \"^3.0.1\"\n-snyk@^1.88.2:\n- version \"1.91.0\"\n- resolved \"https://registry.yarnpkg.com/snyk/-/snyk-1.91.0.tgz#36dc5aa357c6ac17b945f3cacd490e842f7107bb\"\n- dependencies:\n- abbrev \"^1.1.1\"\n- ansi-escapes \"^3.1.0\"\n- chalk \"^2.4.1\"\n- configstore \"^3.1.2\"\n- debug \"^3.1.0\"\n- hasbin \"^1.2.3\"\n- inquirer \"^3.0.0\"\n- lodash \"^4.17.5\"\n- needle \"^2.0.1\"\n- opn \"^5.2.0\"\n- os-name \"^2.0.1\"\n- proxy-agent \"^2.0.0\"\n- proxy-from-env \"^1.0.0\"\n- recursive-readdir \"^2.2.2\"\n- semver \"^5.5.0\"\n- snyk-config \"2.2.0\"\n- snyk-docker-plugin \"1.10.3\"\n- snyk-go-plugin \"1.5.2\"\n- snyk-gradle-plugin \"1.3.0\"\n- snyk-module \"1.8.2\"\n- snyk-mvn-plugin \"1.2.0\"\n- snyk-nodejs-lockfile-parser \"1.2.2\"\n- snyk-nuget-plugin \"1.6.4\"\n- snyk-php-plugin \"1.5.1\"\n- snyk-policy \"1.12.0\"\n- snyk-python-plugin \"1.8.1\"\n- snyk-resolve \"1.0.1\"\n- snyk-resolve-deps \"3.1.0\"\n- snyk-sbt-plugin \"1.3.1\"\n- snyk-tree \"^1.0.0\"\n- snyk-try-require \"1.3.1\"\n- tempfile \"^2.0.0\"\n- then-fs \"^2.0.0\"\n- undefsafe \"^2.0.0\"\n- uuid \"^3.2.1\"\n-\[email protected]:\nversion \"0.5.0\"\nresolved \"https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b\"\n@@ -14200,20 +13804,6 @@ socket.io@^1.4.8:\nsocket.io-client \"1.7.4\"\nsocket.io-parser \"2.3.1\"\n-socks-proxy-agent@^3.0.0:\n- version \"3.0.1\"\n- resolved \"https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz#2eae7cf8e2a82d34565761539a7f9718c5617659\"\n- dependencies:\n- agent-base \"^4.1.0\"\n- socks \"^1.1.10\"\n-\n-socks@^1.1.10:\n- version \"1.1.10\"\n- resolved \"https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a\"\n- dependencies:\n- ip \"^1.1.4\"\n- smart-buffer \"^1.0.13\"\n-\nsorcery@^0.10.0:\nversion \"0.10.0\"\nresolved \"https://registry.yarnpkg.com/sorcery/-/sorcery-0.10.0.tgz#8ae90ad7d7cb05fc59f1ab0c637845d5c15a52b7\"\n@@ -14267,13 +13857,6 @@ source-map-support@^0.4.2:\ndependencies:\nsource-map \"^0.5.6\"\n-source-map-support@^0.5.7:\n- version \"0.5.8\"\n- resolved \"https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.8.tgz#04f5581713a8a65612d0175fbf3a01f80a162613\"\n- dependencies:\n- buffer-from \"^1.0.0\"\n- source-map \"^0.6.0\"\n-\nsource-map-url@^0.3.0:\nversion \"0.3.0\"\nresolved \"https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9\"\n@@ -14308,7 +13891,7 @@ source-map@^0.5.3, source-map@^0.5.7, source-map@~0.5.3:\nversion \"0.5.7\"\nresolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc\"\n-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:\n+source-map@^0.6.1, source-map@~0.6.1:\nversion \"0.6.1\"\nresolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263\"\n@@ -14427,10 +14010,6 @@ static-extend@^0.1.1:\nversion \"1.3.1\"\nresolved \"https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e\"\n-\"statuses@>= 1.4.0 < 2\":\n- version \"1.5.0\"\n- resolved \"https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c\"\n-\nstatuses@~1.4.0:\nversion \"1.4.0\"\nresolved \"https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087\"\n@@ -14536,12 +14115,6 @@ string_decoder@~1.0.3:\ndependencies:\nsafe-buffer \"~5.1.0\"\n-string_decoder@~1.1.1:\n- version \"1.1.1\"\n- resolved \"https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8\"\n- dependencies:\n- safe-buffer \"~5.1.0\"\n-\nstringifile@^0.1.1:\nversion \"0.1.1\"\nresolved \"https://registry.yarnpkg.com/stringifile/-/stringifile-0.1.1.tgz#85bc66cdcfeacb5938bc07b425c142a16287455e\"\n@@ -15020,10 +14593,6 @@ tar@^2.0.0, tar@^2.2.1:\nfstream \"^1.0.2\"\ninherits \"2\"\n-temp-dir@^1.0.0:\n- version \"1.0.0\"\n- resolved \"https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d\"\n-\[email protected], temp@^0.8.3:\nversion \"0.8.3\"\nresolved \"https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59\"\n@@ -15038,13 +14607,6 @@ tempfile@^1.1.1:\nos-tmpdir \"^1.0.0\"\nuuid \"^2.0.1\"\n-tempfile@^2.0.0:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265\"\n- dependencies:\n- temp-dir \"^1.0.0\"\n- uuid \"^3.0.1\"\n-\ntestem@^1.15.0, testem@^1.18.0:\nversion \"1.18.4\"\nresolved \"https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41\"\n@@ -15135,10 +14697,6 @@ through2@~0.6.3:\nversion \"2.3.8\"\nresolved \"https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5\"\n-thunkify@^2.1.2:\n- version \"2.1.2\"\n- resolved \"https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d\"\n-\ntimed-out@^2.0.0:\nversion \"2.0.0\"\nresolved \"https://registry.yarnpkg.com/timed-out/-/timed-out-2.0.0.tgz#f38b0ae81d3747d628001f41dafc652ace671c0a\"\n@@ -15587,12 +15145,6 @@ [email protected]:\nversion \"0.0.3\"\nresolved \"https://registry.yarnpkg.com/undefsafe/-/undefsafe-0.0.3.tgz#ecca3a03e56b9af17385baac812ac83b994a962f\"\n-undefsafe@^2.0.0:\n- version \"2.0.2\"\n- resolved \"https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76\"\n- dependencies:\n- debug \"^2.2.0\"\n-\nunderscore.string@~3.3.4:\nversion \"3.3.4\"\nresolved \"https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.4.tgz#2c2a3f9f83e64762fdc45e6ceac65142864213db\"\n@@ -15827,12 +15379,6 @@ [email protected], util@~0.10.1:\ndependencies:\ninherits \"2.0.1\"\n-util@^0.10.3:\n- version \"0.10.4\"\n- resolved \"https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901\"\n- dependencies:\n- inherits \"2.0.3\"\n-\[email protected]:\nversion \"1.0.0\"\nresolved \"https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8\"\n@@ -15857,7 +15403,7 @@ uuid@^3.0.0:\nversion \"3.0.1\"\nresolved \"https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1\"\n-uuid@^3.2.1, uuid@^3.3.2:\n+uuid@^3.3.2:\nversion \"3.3.2\"\nresolved \"https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131\"\n@@ -16080,7 +15626,7 @@ [email protected]:\nversion \"0.1.0\"\nresolved \"https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d\"\n-window-size@^0.1.1, window-size@^0.1.2, window-size@^0.1.4:\n+window-size@^0.1.1, window-size@^0.1.2:\nversion \"0.1.4\"\nresolved \"https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876\"\n@@ -16269,10 +15815,6 @@ xmlhttprequest@>=1.8.0:\nversion \"1.8.0\"\nresolved \"https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc\"\[email protected]:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943\"\n-\n\"xtend@>=4.0.0 <4.1.0-0\", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:\nversion \"4.0.1\"\nresolved \"https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af\"\n@@ -16387,18 +15929,6 @@ yargs@^11.0.0:\ny18n \"^3.2.1\"\nyargs-parser \"^9.0.2\"\n-yargs@^3.19.0:\n- version \"3.32.0\"\n- resolved \"https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995\"\n- dependencies:\n- camelcase \"^2.0.1\"\n- cliui \"^3.0.3\"\n- decamelize \"^1.1.1\"\n- os-locale \"^1.4.0\"\n- string-width \"^1.0.1\"\n- window-size \"^0.1.4\"\n- y18n \"^3.2.0\"\n-\nyargs@^4.3.2, yargs@^4.8.1:\nversion \"4.8.1\"\nresolved \"https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0\"\n" } ]