Bugfix] Data migration and redirect_url

*Added missing warining if traffic is redirected
*Updated app settings to allow removing redirect_urlesli

Author: Cookiezaurs

frontend/express/public/core/app-management/javascripts/countly.views.js

@@ -390,6 +390,10 @@
             },
             saveApp: function(doc) {
                 doc.app_id = this.selectedApp;
+                if (doc.redirect_url) {
+                    doc.redirect_url = doc.redirect_url.replace(" ", "");
+                }
+
                 delete doc._id;
                 var self = this;
                 $.ajax({
@@ -575,7 +579,7 @@
                     return differences;
                 }
                 else {
-                    ["name", "category", "type", "key", "country", "timezone", "salt", "_id"].forEach(function(currentKey) {
+                    ["name", "category", "type", "key", "country", "timezone", "salt", "_id", "redirect_url"].forEach(function(currentKey) {
                         if (editedObject[currentKey] !== selectedApp[currentKey]) {
                             differences.push(currentKey);
                         }

frontend/express/public/core/app-management/templates/app-management.html

@@ -144,6 +144,19 @@ <h2 class="bu-mb-4"> {{apps[selectedApp] ? apps[selectedApp].name : i18n('common
                                                     v-model="formScope.editedObject.key">
                                                 </el-input>
                                             </cly-inline-form-field>
+                                        </div>
+										<div v-if="!newApp && apps[selectedApp] && apps[selectedApp].redirect_url">
+                                            <cly-inline-form-field v-if="edited" :label="i18n('management-applications.redirect_url')" :help="i18n('management-applications.redirect_url.help')">
+                                                {{formScope.editedObject.redirect_url}}
+											</cly-inline-form-field>
+											<cly-inline-form-field v-else rules="" :label="i18n('management-applications.redirect_url')" prop="redirect_url" :help="i18n('management-applications.redirect_url.help')">
+												<el-switch 
+													:active-value="apps[selectedApp].redirect_url"
+													inactive-value=" "
+													:active-text = "apps[selectedApp].redirect_url"
+													v-model="formScope.editedObject.redirect_url">
+												</el-switch>
+                                            </cly-inline-form-field> 
                                         </div>
                                     </cly-form-step>
                                     <div v-if="newApp" class="bu-has-text-right" @mouseenter="formScope.validate()">

plugins/data_migration/frontend/public/javascripts/countly.views.js

@@ -1,4 +1,4 @@
-/*global countlyVue, CV, countlyCommon, CountlyHelpers, countlyGlobal, countlyDataMigration, app */
+/*global countlyVue, CV, countlyCommon, CountlyHelpers, countlyGlobal, countlyDataMigration, app,jQuery */
 (function() {
     var FEATURE_NAME = 'data_migration';
 
@@ -398,5 +398,25 @@
         this.renderWhenReady(DataMigrationMainView);
     });
 
+
+    //switching apps. show message if redirect url is set
+    app.addAppSwitchCallback(function(appId) {
+        if (appId && countlyGlobal.apps[appId] && countlyGlobal.apps[appId].redirect_url && countlyGlobal.apps[appId].redirect_url !== "") {
+            var mm = "<h4 class='bu-pt-3 bu-pb-1'>" + jQuery.i18n.map["data-migration.app-redirected"].replace('{app_name}', countlyGlobal.apps[appId].name) + "</h4><p bu-pt-1>" + jQuery.i18n.map["data-migration.app-redirected-explanation"] + " <b>" + countlyGlobal.apps[appId].redirect_url + "</b><p><a href='#/manage/apps' style='color:rgb(1, 102, 214);'>" + jQuery.i18n.map["data-migration.app-redirected-remove"] + "</a>";
+            var msg = {
+                title: jQuery.i18n.map["data-migration.app-redirected"].replace('{app_name}', countlyGlobal.apps[appId].name),
+                message: mm,
+                info: jQuery.i18n.map["data-migration.app-redirected-remove"],
+                sticky: true,
+                clearAll: true,
+                type: "warning",
+                onClick: function() {
+                    app.navigate("#/manage/apps", true);
+                }
+            };
+            CountlyHelpers.notify(msg);
+        }
+    });
+
     app.addMenu("management", {code: "data-migration", permission: FEATURE_NAME, url: "#/manage/data-migration", text: "data-migration.page-title", icon: '<div class="logo-icon fa fa-arrows-alt-h"></div>', priority: 70});
 })();