Preparation of merge with master

shared/imports.js

@@ -10,10 +10,15 @@ const ImportType = {
 };
 
 const ImportStatus = {
-    NOT_READY: 0,
-    SCHEDULED: 1,
-    RUNNING: 2,
-    FINISHED: 3
+    PREP_SCHEDULED: 0,
+    PREP_RUNNING: 1,
+    PREP_FINISHED: 2,
+    PREP_FAILED: 3,
+
+    RUN_SCHEDULED: 4,
+    RUN_RUNNING: 5,
+    RUN_FINISHED: 6,
+    RUN_FAILED: 7
 };
 
 const RunStatus = {

shared/lists.js

@@ -23,6 +23,14 @@ const SubscriptionStatus = {
     MAX: 4
 };
 
+const SubscriptionSource = {
+    ADMIN_FORM: -1,
+    SUBSCRIPTION_FORM: -2,
+    API: -3,
+    NOT_IMPORTED_V1: -4,
+    IMPORTED_V1: -5
+};
+
 function getFieldKey(field) {
     return field.column || 'grouped_' + field.id;
 }
@@ -30,5 +38,6 @@ function getFieldKey(field) {
 module.exports = {
     UnsubscriptionMode,
     SubscriptionStatus,
+    SubscriptionSource,
     getFieldKey
 };