瀏覽代碼

Frontend: adds folder name in home dash choose menu (#18346)

* Frontend:adds folder name in choose home dash menu(#18293)

* Frontend:adds folder name in choose home dash menu(#18293)
Elykov Alexandr 6 年之前
父節點
當前提交
54f3e873a4
共有 1 個文件被更改,包括 8 次插入1 次删除
  1. 8 1
      public/app/core/components/SharedPreferences/SharedPreferences.tsx

+ 8 - 1
public/app/core/components/SharedPreferences/SharedPreferences.tsx

@@ -97,6 +97,13 @@ export class SharedPreferences extends PureComponent<Props, State> {
     this.setState({ homeDashboardId: dashboardId });
   };
 
+  getFullDashName = (dashboard: DashboardSearchHit) => {
+    if (typeof dashboard.folderTitle === 'undefined' || dashboard.folderTitle === '') {
+      return dashboard.title;
+    }
+    return dashboard.folderTitle + ' / ' + dashboard.title;
+  };
+
   render() {
     const { theme, timezone, homeDashboardId, dashboards } = this.state;
 
@@ -123,7 +130,7 @@ export class SharedPreferences extends PureComponent<Props, State> {
           <Select
             value={dashboards.find(dashboard => dashboard.id === homeDashboardId)}
             getOptionValue={i => i.id}
-            getOptionLabel={i => i.title}
+            getOptionLabel={this.getFullDashName}
             onChange={(dashboard: DashboardSearchHit) => this.onHomeDashboardChanged(dashboard.id)}
             options={dashboards}
             placeholder="Choose default dashboard"