Merge pull request Countly#443 from Cookiezaurs/master

ar2rsawseen · web-flow · commit 2187dd7920d4 · 2018-03-01T16:56:55.000+02:00
[plugins][data-migration]Export tables.redirect checkbox.test timeout
diff --git a/plugins/data_migration/api/data_migration_helper.js b/plugins/data_migration/api/data_migration_helper.js
@@ -426,15 +426,22 @@ module.exports = function(my_db){
                     scripts.push('mongodump ' + dbstr + ' --collection max_online_counts -q \'{ _id: ObjectId(\"' + appid + '\") }\' --out '+ my_folder);
                     scripts.push('mongodump ' + dbstr + ' --collection events -q \'{ _id: ObjectId(\"' + appid + '\") }\' --out ' + my_folder);
                     scripts.push('mongodump ' + dbstr + ' --collection funnels -q \'{ app_id: \"' + appid + '\" }\' --out ' + my_folder);
-      
+                    
+                    //internal events
+                    for (var j=0; j<plugins.internalEvents.length; j++)
+                    { 
+                        var eventCollName = "events" + crypto.createHash('sha1').update(plugins.internalEvents[j] + appid).digest('hex');
+                        scripts.push('mongodump ' + dbstr + ' --collection ' + eventCollName + ' --out ' + data.my_folder);
+                    }
+                    
                     if(plugins.isPluginEnabled('drill'))
                     {
                         //export drill
-                        var drill_events = ["session","view","action","push_action","push_open","push_sent","crash"]
+                        var drill_events = plugins.internalDrillEvents;
                             
                         for (var j=0; j<drill_events.length; j++)
                         { 
-                            eventCollName = "drill_events" + crypto.createHash('sha1').update("[CLY]_"+drill_events[j] + appid).digest('hex');
+                            eventCollName = "drill_events" + crypto.createHash('sha1').update(drill_events[j] + appid).digest('hex');
                             scripts.push('mongodump ' + dbstr_drill + ' --collection ' + eventCollName + ' --out ' + my_folder);
                         }
                         
diff --git a/plugins/data_migration/frontend/public/javascripts/countly.views.js b/plugins/data_migration/frontend/public/javascripts/countly.views.js
@@ -285,9 +285,16 @@ window.DataMigrationView = countlyView.extend({
             $(this).addClass("selected");  
             
             if($(this).attr('data-from')=='export-transfer')
+            {
                 $('#target-server-data').css('display','block');
+                $('#migration_redirect_traffic').css('display','block');
+            }
             else
-                $('#target-server-data').css('display','none'); 
+            {
+                $('#target-server-data').css('display','none');
+                $('#migration_redirect_traffic').css('display','none');
+                $('#migration_redirect_traffic').find("input").removeAttr('checked');
+            }
             $("#export-widget-drawer").trigger("data-updated");
         }); 
         
@@ -678,6 +685,7 @@ window.DataMigrationView = countlyView.extend({
         
         $('#migration_additional_files').find("input").removeAttr('checked');
         $('#migration_redirect_traffic').find("input").removeAttr('checked');
+        $('#migration_redirect_traffic').css('display','block');
         $('#target-server-data').css('display','block');
         $('#data-export-type-selector').find(".check[data-from=export-transfer]").addClass("selected");
         $('#data-export-type-selector').find(".check[data-from=export-download]").removeClass("selected");
diff --git a/plugins/data_migration/tests/index.js b/plugins/data_migration/tests/index.js
@@ -272,7 +272,8 @@ describe("Create simple export", function(){
         after(function( done ){
             //checking statuss and seeing if it moves to end
             counter=0;
-            setTimeout(function(){validate_result(done,60,"finished","failed");},1000);
+            this.timeout(0);
+            setTimeout(function(){validate_result(done,100,"finished","failed");},1000);
         });
         
     });
@@ -371,7 +372,8 @@ describe("Create simple export", function(){
          after(function( done ){
             //checking statuss and seeing if it moves to end
             counter=0;
-            setTimeout(function(){validate_result(done,60,"finished","failed");},1000);
+            this.timeout(0);
+            setTimeout(function(){validate_result(done,100,"finished","failed");},1000);
         });
     });
     
