Update ckeditor

Move e2e tests
Code refactoring

Author: RainLoop

.flowconfig

@@ -13,10 +13,12 @@
 ./dev/
 
 [options]
+strip_root=true
 module.system=haste
 
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
+esproposal.decorators=ignore
 
 experimental.strict_type_args=true
 

.gitignore

@@ -9,9 +9,9 @@
 /rainloop/v/0.0.0/static/*
 /rainloop/v/0.0.0/app/localization/moment/*
 !/rainloop/v/0.0.0/app/localization/moment/.gitempty
-/e2e/configuration.js
-/e2e/output/*
-!/e2e/output/.gitempty
+/tests/e2e/configuration.js
+/tests/e2e/output/*
+!/tests/e2e/output/.gitempty
 /vendors/.*
 /node_modules
 /build/local

build/owncloud/rainloop-app/appinfo/info.xml

@@ -10,7 +10,7 @@
 	<ocsid>165254</ocsid>
 	<dependencies>
         <php min-version="5.4" />
-        <owncloud min-version="6" max-version="9.1" />
+        <owncloud min-version="6" max-version="9.2" />
     </dependencies>
 	<category>productivity</category>
 	<website>http://www.rainloop.net/</website>

dev/App/Abstract.js

@@ -2,7 +2,9 @@
 import window from 'window';
 import $ from '$';
 import _ from '_';
+import ko from 'ko';
 import key from 'key';
+import ssm from 'ssm';
 
 import {
 	$win, $html, $doc,
@@ -22,6 +24,10 @@ import {toggle as toggleCmd} from 'Common/Cmd';
 import * as Events from 'Common/Events';
 import * as Settings from 'Storage/Settings';
 
+import LanguageStore from 'Stores/Language';
+import ThemeStore from 'Stores/Theme';
+import SocialStore from 'Stores/Social';
+
 import {routeOff, setHash} from 'Knoin/Knoin';
 import {AbstractBoot} from 'Knoin/AbstractBoot';
 
@@ -289,10 +295,7 @@ class AbstractApp extends AbstractBoot
 
 		Events.pub('rl.bootstart');
 
-		const
-			mobile = Settings.appSettingsGet('mobile'),
-			ssm = require('ssm'),
-			ko = require('ko');
+		const mobile = Settings.appSettingsGet('mobile');
 
 		ko.components.register('SaveTrigger', require('Component/SaveTrigger'));
 		ko.components.register('Input', require('Component/Input'));
@@ -395,9 +398,9 @@ class AbstractApp extends AbstractBoot
 
 		leftPanelDisabled.valueHasMutated();
 
-		require('Stores/Language').populate();
-		require('Stores/Theme').populate();
-		require('Stores/Social').populate();
+		LanguageStore.populate();
+		ThemeStore.populate();
+		SocialStore.populate();
 	}
 }
 

dev/App/Admin.js

@@ -12,6 +12,7 @@ import {pInt, isNormal, isArray, inArray, isUnd} from 'Common/Utils';
 import * as Settings from 'Storage/Settings';
 
 import AppStore from 'Stores/Admin/App';
+import CapaStore from 'Stores/Admin/Capa';
 import DomainStore from 'Stores/Admin/Domain';
 import PluginStore from 'Stores/Admin/Plugin';
 import LicenseStore from 'Stores/Admin/License';
@@ -217,8 +218,8 @@ class AdminApp extends AbstractApp
 
 		super.bootstart();
 
-		require('Stores/Admin/App').populate();
-		require('Stores/Admin/Capa').populate();
+		AppStore.populate();
+		CapaStore.populate();
 
 		hideLoading();
 

dev/App/User.js

@@ -43,14 +43,16 @@ import * as Events from 'Common/Events';
 import {getNotification, i18n} from 'Common/Translator';
 
 import SocialStore from 'Stores/Social';
+import AppStore from 'Stores/User/App';
 import SettingsStore from 'Stores/User/Settings';
+import NotificationStore from 'Stores/User/Notification';
 import AccountStore from 'Stores/User/Account';
+import ContactStore from 'Stores/User/Contact';
 import IdentityStore from 'Stores/User/Identity';
 import TemplateStore from 'Stores/User/Template';
 import FolderStore from 'Stores/User/Folder';
 import PgpStore from 'Stores/User/Pgp';
 import MessageStore from 'Stores/User/Message';
-import ContactStore from 'Stores/User/Contact';
 import QuotaStore from 'Stores/User/Quota';
 
 import * as Local from 'Storage/Client';
@@ -1258,11 +1260,11 @@ class AppUser extends AbstractApp
 
 		super.bootstart();
 
-		require('Stores/User/App').populate();
-		require('Stores/User/Settings').populate();
-		require('Stores/User/Notification').populate();
-		require('Stores/User/Account').populate();
-		require('Stores/User/Contact').populate();
+		AppStore.populate();
+		SettingsStore.populate();
+		NotificationStore.populate();
+		AccountStore.populate();
+		ContactStore.populate();
 
 		let
 			contactsSyncInterval = pInt(Settings.settingsGet('ContactsSyncInterval'));

dev/Model/Filter.js

@@ -7,6 +7,8 @@ import {pString, inArray, isNonEmptyArray, fakeMd5, delegateRunOnDestroy, window
 import {i18n} from 'Common/Translator';
 import {getFolderFromCacheList} from 'Common/Cache';
 
+import AccountStore from 'Stores/User/Account';
+
 import {FilterConditionModel} from 'Model/FilterCondition';
 import {AbstractModel} from 'Knoin/AbstractModel';
 
@@ -214,7 +216,7 @@ class FilterModel extends AbstractModel
 	}
 
 	setRecipients() {
-		this.actionValueFourth(require('Stores/User/Account').accountsEmails().join(', '));
+		this.actionValueFourth(AccountStore.accountsEmails().join(', '));
 	}
 
 	parse(json) {

dev/Model/Message.js

@@ -16,6 +16,9 @@ import {
 import {$win} from 'Common/Globals';
 import {messageViewLink, messageDownloadLink} from 'Common/Links';
 
+import FolderStore from 'Stores/User/Folder';
+import PgpStore from 'Stores/User/Pgp';
+
 import {emailArrayFromJson, emailArrayToStringClear, emailArrayToString, replyHelper} from 'Helper/Message';
 
 import {AttachmentModel, staticCombinedIconClass} from 'Model/Attachment';
@@ -211,8 +214,8 @@ class MessageModel extends AbstractModel
 
 	computeSenderEmail() {
 		const
-			sentFolder = require('Stores/User/Folder').sentFolder(),
-			draftFolder = require('Stores/User/Folder').draftFolder();
+			sentFolder = FolderStore.sentFolder(),
+			draftFolder = FolderStore.draftFolder();
 
 		this.senderEmailsString(this.folderFullNameRaw === sentFolder || this.folderFullNameRaw === draftFolder ?
 			this.toEmailsString() : this.fromEmailString());
@@ -307,7 +310,7 @@ class MessageModel extends AbstractModel
 
 			this.proxy = !!json.ExternalProxy;
 
-			if (require('Stores/User/Pgp').capaOpenPGP())
+			if (PgpStore.capaOpenPGP())
 			{
 				this.isPgpSigned(!!json.PgpSigned);
 				this.isPgpEncrypted(!!json.PgpEncrypted);

dev/Promises/User/Ajax.js

@@ -61,4 +61,4 @@ class UserAjaxUserPromises extends AbstractAjaxPromises
 	}
 }
 
-module.exports = new UserAjaxUserPromises();
+export default new UserAjaxUserPromises();

dev/Promises/User/Populator.js

@@ -12,6 +12,8 @@ import * as Local from 'Storage/Client';
 import AppStore from 'Stores/User/App';
 import FolderStore from 'Stores/User/Folder';
 
+import Remote from 'Remote/User/Ajax';
+
 import {FolderModel} from 'Model/Folder';
 import {AbstractBasicPromises} from 'Promises/AbstractBasic';
 
@@ -165,7 +167,7 @@ class PromisesUserPopulator extends AbstractBasicPromises
 
 			if (update)
 			{
-				require('Remote/User/Ajax').saveSystemFolders(noop, {
+				Remote.saveSystemFolders(noop, {
 					SentFolder: FolderStore.sentFolder(),
 					DraftFolder: FolderStore.draftFolder(),
 					SpamFolder: FolderStore.spamFolder(),
@@ -180,4 +182,4 @@ class PromisesUserPopulator extends AbstractBasicPromises
 	}
 }
 
-module.exports = new PromisesUserPopulator();
+export default new PromisesUserPopulator();