refatoring: minor changes to PR #13149

public/app/core/components/search/search.ts

@@ -130,9 +130,8 @@ export class SearchCtrl {
     }
 
     const max = flattenedResult.length;
-    let newIndex = this.selectedIndex + direction;
-    const something = (newIndex %= max);
-    this.selectedIndex = something < 0 ? newIndex + max : newIndex;
+    const newIndex = (this.selectedIndex + direction) % max;
+    this.selectedIndex = newIndex < 0 ? newIndex + max : newIndex;
     const selectedItem = flattenedResult[this.selectedIndex];
 
     if (selectedItem.dashboardIndex === undefined && this.results[selectedItem.folderIndex].id === 0) {

public/app/features/dashboard/dashboard_import_ctrl.ts

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import config from 'app/core/config';
+import locationUtil from 'app/core/utils/location_util';
 
 export class DashboardImportCtrl {
   navModel: any;
@@ -179,7 +180,8 @@ export class DashboardImportCtrl {
         folderId: this.folderId,
       })
       .then(res => {
-        this.$location.url(res.importedUrl);
+        const dashUrl = locationUtil.stripBaseFromUrl(res.importedUrl);
+        this.$location.url(dashUrl);
       });
   }
 

public/app/features/dashboard/upload.ts

@@ -37,12 +37,14 @@ function uploadDashboardDirective(timer, alertSrv, $location) {
         };
 
         let i = 0;
-        let f = files[i];
-        for (i; f; i++) {
+        let file = files[i];
+
+        while (file) {
           const reader = new FileReader();
           reader.onload = readerOnload();
-          reader.readAsText(f);
-          f = files[i];
+          reader.readAsText(file);
+          i += 1;
+          file = files[i];
         }
       }
 

public/sass/components/_search.scss

@@ -192,6 +192,10 @@
   &:hover,
   &.selected {
     background: $list-item-hover-bg;
+
+    .search-item__body-title {
+      color: $text-color-strong;
+    }
   }
 }