AMBARI-5288. Mirroring Manage Clusters: incorrect url after page refresh. (akovalenko)

ambari-web/app/controllers/main/mirroring/edit_dataset_controller.js

@@ -21,6 +21,8 @@ App.MainMirroringEditDataSetController = Ember.Controller.extend({
 
   isEdit: false,
 
+  datasetIdToEdit: null,
+
   // Fields values from Edit DataSet form
   formFields: Ember.Object.create({
     datasetName: null,
@@ -84,7 +86,8 @@ App.MainMirroringEditDataSetController = Ember.Controller.extend({
     this.set('isEdit', false);
   },
 
-  showEditPopup: function () {
+  showEditPopup: function (dataset) {
+    this.set('datasetIdToEdit', dataset.get('id'));
     this.showPopup(Em.I18n.t('mirroring.dataset.editDataset'));
     this.set('isEdit', true);
   },

ambari-web/app/controllers/main/mirroring_controller.js

@@ -195,11 +195,8 @@ App.MainMirroringController = Em.ArrayController.extend({
     this.set('datasetCount', this.get('datasetCount') - 1);
     if (this.get('datasetCount') < 1) {
       App.dataSetMapper.map(this.get('datasetsData'));
-      var sortedDatasets = App.Dataset.find().toArray().sortProperty('name');
       this.set('isDatasetsLoaded', true);
-      var selectedDataset = this.get('selectedDataset');
-      if (!selectedDataset) {
-        this.set('selectedDataset', sortedDatasets[0]);
+      if (App.router.get('currentState.name') === 'index' && App.router.get('currentState.parentState.name') === 'mirroring') {
         App.router.send('gotoShowJobs');
       }
     }
@@ -350,13 +347,6 @@ App.MainMirroringController = Em.ArrayController.extend({
     console.error('Failed to load cluster definition.');
   },
 
-  onDataLoad: function () {
-    // Open default dataset job route if mirroring route is opened
-    if (this.get('isLoaded') && App.router.get('currentState.parentState.name') === 'mirroring') {
-      App.router.send('gotoShowJobs');
-    }
-  }.observes('isLoaded'),
-
   manageClusters: function () {
     var self = this;
     App.ModalPopup.show({

ambari-web/app/views/main/mirroring/edit_dataset_view.js

@@ -73,10 +73,9 @@ App.MainMirroringEditDataSetView = Em.View.extend({
 
   fillForm: function () {
     var isEdit = this.get('controller.isEdit');
-    var selectedDataset = App.router.get('mainMirroringController.selectedDataset');
-    if (this.get('isLoaded') && selectedDataset && isEdit) {
+    if (this.get('isLoaded')  && isEdit) {
       var controller = this.get('controller');
-      var dataset = App.Dataset.find().findProperty('name', selectedDataset.get('id'));
+      var dataset = App.Dataset.find().findProperty('id', controller.get('datasetIdToEdit'));
       var scheduleStartDate = new Date(dataset.get('scheduleStartDate'));
       var scheduleEndDate = new Date(dataset.get('scheduleEndDate'));
       var formFields = controller.get('formFields');