upgraded Ember and integrated Bootstrap 4

Upgraded to Ember JS 2.16.x release. This upgrade uses the new JavaScript modules API syntax.

Integrated Bootstrap 4 Beta 2 via package.json and associated popper.js library. Overridden Bootstrap styles using bootstrap.scss -- this file selectively imports the modules we need.

gui/app/services/ajax.js

@@ -9,15 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { computed } from '@ember/object';
+
+import { inject as service } from '@ember/service';
 import AjaxService from 'ember-ajax/services/ajax';
 import config from '../config/environment';
 
-const {
-	computed,
-	inject: { service }
-} = Ember;
-
 export default AjaxService.extend({
 	session: service(),
 	host: config.apiHost,

gui/app/services/app-meta.js

@@ -9,17 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { htmlSafe } from '@ember/string';
+
+import { resolve } from 'rsvp';
+import Service, { inject as service } from '@ember/service';
 import config from '../config/environment';
 import constants from '../utils/constants';
 
-const {
-	String: { htmlSafe },
-	RSVP: { resolve },
-	inject: { service }
-} = Ember;
-
-export default Ember.Service.extend({
+export default Service.extend({
 	ajax: service(),
 	localStorage: service(),
 	kcAuth: service(),

gui/app/services/base.js

@@ -9,9 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Service from '@ember/service';
 
-export default Ember.Service.extend({
+export default Service.extend({
     interval(func, wait, times) {
         var interv = function(w, t) {
             return function() {

gui/app/services/browser.js

@@ -9,10 +9,10 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Service, { inject as service } from '@ember/service';
 
-export default Ember.Service.extend({
-    sessionService: Ember.inject.service('session'),
+export default Service.extend({
+    sessionService: service('session'),
 
     init() {
         this.setMetaDescription();

gui/app/services/category.js

@@ -9,12 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
-import BaseService from '../services/base';
+import { inject as service } from '@ember/service';
 
-const {
-	inject: { service }
-} = Ember;
+import BaseService from '../services/base';
 
 export default BaseService.extend({
 	sessionService: service('session'),

gui/app/services/document.js

@@ -9,13 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { set } from '@ember/object';
 
-const {
-	inject: { service }
-} = Ember;
+import { A } from '@ember/array';
+import ArrayProxy from '@ember/array/proxy';
+import Service, { inject as service } from '@ember/service';
 
-export default Ember.Service.extend({
+export default Service.extend({
 	sessionService: service('session'),
 	folderService: service('folder'),
 	ajax: service(),
@@ -39,8 +39,8 @@ export default Ember.Service.extend({
 		return this.get('ajax').request(`documents?space=${spaceId}`, {
 			method: "GET"
 		}).then((response) => {
-			let documents = Ember.ArrayProxy.create({
-				content: Ember.A([])
+			let documents = ArrayProxy.create({
+				content: A([])
 			});
 
 			documents = response.map((doc) => {
@@ -92,7 +92,7 @@ export default Ember.Service.extend({
 		var revision = skipRevision ? "?r=true" : "?r=false";
 		let url = `documents/${documentId}/pages/${pageId}${revision}`;
 
-		Ember.set(payload.meta, 'id', parseInt(payload.meta.id));
+		set(payload.meta, 'id', parseInt(payload.meta.id));
 
 		return this.get('ajax').request(url, {
 			method: 'PUT',

gui/app/services/event-bus.js

@@ -9,9 +9,11 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Evented from '@ember/object/evented';
 
-export default Ember.Service.extend(Ember.Evented, {
+import Service from '@ember/service';
+
+export default Service.extend(Evented, {
 	init() {
 		this._super(...arguments);
 		let _this = this;

gui/app/services/folder.js

@@ -9,13 +9,10 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
-import BaseService from '../services/base';
+import RSVP from 'rsvp';
 
-const {
-	RSVP,
-	inject: { service }
-} = Ember;
+import { inject as service } from '@ember/service';
+import BaseService from '../services/base';
 
 export default BaseService.extend({
 	sessionService: service('session'),

gui/app/services/global.js

@@ -9,13 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Service, { inject as service } from '@ember/service';
 
-const {
-	inject: { service }
-} = Ember;
-
-export default Ember.Service.extend({
+export default Service.extend({
 	sessionService: service('session'),
 	ajax: service(),
 	appMeta: service(),

gui/app/services/kc-auth.js

@@ -9,14 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import Service, { inject as service } from '@ember/service';
 import netUtil from '../utils/net';
 
-const {
-	inject: { service }
-} = Ember;
-
-export default Ember.Service.extend({
+export default Service.extend({
 	sessionService: service('session'),
 	ajax: service(),
 	appMeta: service(),
@@ -24,7 +22,7 @@ export default Ember.Service.extend({
     config: {},
 
 	boot() {
-        return new Ember.RSVP.Promise((resolve, reject) => {
+        return new EmberPromise((resolve, reject) => {
             if (is.not.undefined(this.get('keycloak')) && is.not.null(this.get('keycloak')) ) {
                 resolve(this.get('keycloak'));
                 return;
@@ -50,7 +48,7 @@ export default Ember.Service.extend({
     },
 
 	login() {
-        return new Ember.RSVP.Promise((resolve, reject) => {
+        return new EmberPromise((resolve, reject) => {
             this.boot().then((keycloak) => {
                 let url = netUtil.getAppUrl(netUtil.getSubdomain()) + '/auth/keycloak?mode=login';
 
@@ -64,7 +62,7 @@ export default Ember.Service.extend({
     },
 
     logout() {
-        return new Ember.RSVP.Promise((resolve, reject) => {
+        return new EmberPromise((resolve, reject) => {
             this.boot().then((keycloak) => {
                 keycloak.logout(JSON.parse(this.get('appMeta.authConfig'))).success(() => {
                     this.get('keycloak').clearToken();
@@ -78,7 +76,7 @@ export default Ember.Service.extend({
     },
 
 	fetchProfile() {
-        return new Ember.RSVP.Promise((resolve, reject) => {
+        return new EmberPromise((resolve, reject) => {
             this.boot().then((keycloak) => {
                 keycloak.loadUserProfile().success((profile) => {
                     resolve(profile);

gui/app/services/link.js

@@ -9,13 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Service, { inject as service } from '@ember/service';
 
-const {
-	inject: { service }
-} = Ember;
-
-export default Ember.Service.extend({
+export default Service.extend({
 	sessionService: service('session'),
 	ajax: service(),
 	appMeta: service(),

gui/app/services/local-storage.js

@@ -9,9 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Service from '@ember/service';
 
-export default Ember.Service.extend({
+export default Service.extend({
 	storeSessionItem: function (key, data) {
 		localStorage[key] = data;
 	},

gui/app/services/logger.js

@@ -9,9 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Service from '@ember/service';
 
-export default Ember.Service.extend({
+export default Service.extend({
     action: function(entry) {
         console.log(entry); // eslint-disable-line no-console
     },

gui/app/services/organization.js

@@ -9,13 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Service, { inject as service } from '@ember/service';
 
-const {
-	inject: { service }
-} = Ember;
-
-export default Ember.Service.extend({
+export default Service.extend({
 	sessionService: service('session'),
 	ajax: service(),
 	appMeta: service(),

gui/app/services/pinned.js

@@ -9,14 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { A } from '@ember/array';
 
-const {
-	RSVP,
-	inject: { service }
-} = Ember;
+import ArrayProxy from '@ember/array/proxy';
+import RSVP, { Promise as EmberPromise } from 'rsvp';
+import Service, { inject as service } from '@ember/service';
 
-export default Ember.Service.extend({
+export default Service.extend({
 	session: service('session'),
 	ajax: service(),
 	appMeta: service(),
@@ -37,8 +36,8 @@ export default Ember.Service.extend({
 			if (is.not.array(response)) {
 				response = [];
 			}
-			let pins = Ember.ArrayProxy.create({
-				content: Ember.A([])
+			let pins = ArrayProxy.create({
+				content: A([])
 			});
 
 			pins = response.map((pin) => {
@@ -91,8 +90,8 @@ export default Ember.Service.extend({
 				if (is.not.array(response)) {
 					response = [];
 				}
-				let pins = Ember.ArrayProxy.create({
-					content: Ember.A([])
+				let pins = ArrayProxy.create({
+					content: A([])
 				});
 
 				pins = response.map((pin) => {
@@ -111,7 +110,7 @@ export default Ember.Service.extend({
 		let userId = this.get('session.user.id');
 		let pins = this.get('pins');
 
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			if (this.get('initialized') === false) {
 				this.getUserPins().then((pins) => {
 					pins.forEach((pin) => {
@@ -136,7 +135,7 @@ export default Ember.Service.extend({
 		let userId = this.get('session.user.id');
 		let pins = this.get('pins');
 
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			if (!this.get('initialized')) {
 			this.getUserPins().then((pins) => {
 				pins.forEach((pin) => {

gui/app/services/search.js

@@ -9,13 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Service, { inject as service } from '@ember/service';
 
-const {
-	inject: { service }
-} = Ember;
-
-export default Ember.Service.extend({
+export default Service.extend({
 	sessionService: service('session'),
 	ajax: service(),
 

gui/app/services/section.js

@@ -9,12 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
-import BaseService from '../services/base';
+import { inject as service } from '@ember/service';
 
-const {
-	inject: { service }
-} = Ember;
+import BaseService from '../services/base';
 
 export default BaseService.extend({
 	sessionService: service('session'),

gui/app/services/session.js

@@ -9,13 +9,10 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
-import SimpleAuthSession from 'ember-simple-auth/services/session';
+import { inject as service } from '@ember/service';
 
-const {
-	inject: { service },
-	computed
-} = Ember;
+import { computed } from '@ember/object';
+import SimpleAuthSession from 'ember-simple-auth/services/session';
 
 export default SimpleAuthSession.extend({
 	ajax: service(),

gui/app/services/template.js

@@ -9,13 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { A } from '@ember/array';
 
-const {
-	inject: { service }
-} = Ember;
+import ArrayProxy from '@ember/array/proxy';
+import Service, { inject as service } from '@ember/service';
 
-export default Ember.Service.extend({
+export default Service.extend({
 	sessionService: service('session'),
 	ajax: service(),
 	store: service(),
@@ -39,8 +38,8 @@ export default Ember.Service.extend({
 			if (is.not.array(response)) {
 				response = [];
 			}
-			let templates = Ember.ArrayProxy.create({
-				content: Ember.A([])
+			let templates = ArrayProxy.create({
+				content: A([])
 			});
 
 			templates = response.map((template) => {

gui/app/services/tether.js

@@ -9,13 +9,15 @@
 //
 // https://documize.com
 
+import Service from '@ember/service';
+
 import Ember from 'ember';
 
 /**
  * This is a work around problems that tether introduces into testing.
  * TODO: remove this code and refactor in favour of ember-tether
  */
-export default Ember.Service.extend({
+export default Service.extend({
 	createDrop() {
 		if (Ember.testing) {
 			return;

gui/app/services/user.js

@@ -9,15 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { isEmpty } from '@ember/utils';
 
-const {
-	isEmpty,
-	RSVP,
-	inject: { service }
-} = Ember;
+import RSVP from 'rsvp';
+import Service, { inject as service } from '@ember/service';
 
-export default Ember.Service.extend({
+export default Service.extend({
 	sessionService: service('session'),
 	ajax: service(),
 	store: service(),