From 984164d37a8beb79be3c6e3531f66e8d63ac851e Mon Sep 17 00:00:00 2001
From: Tatjana Dehler <tdehler@suse.com>
Date: Wed, 28 Nov 2018 12:31:16 +0100
Subject: [PATCH] mgr/dashboard: show config option description via cd-helper

Fixes: https://tracker.ceph.com/issues/37406
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
---
 .../osd-recv-speed-modal.component.html                     | 1 +
 .../osd-recv-speed-modal/osd-recv-speed-modal.component.ts  | 6 ++++++
 src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf   | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
index 7a7dc9bd04e..42934d711ea 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
@@ -51,6 +51,7 @@
              osdRecvSpeedForm.showError(attr.name, formDir)}">
           <label class="control-label col-sm-6"
                  [for]="attr.name">{{ attr.text }}
+            <cd-helper *ngIf="attr.desc">{{ attr.desc }}</cd-helper>
             <span class="required" *ngIf="osdRecvSpeedForm.getValue('customizePriority')"></span>
           </label>
           <div class="col-sm-6">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts
index 948bea22b9c..f6823557e9a 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts
@@ -57,6 +57,12 @@ export class OsdRecvSpeedModalComponent implements OnInit {
         attr.name,
         new FormControl(null, { validators: [Validators.required] })
       );
+
+      this.configService.get(attr.name).subscribe((data: any) => {
+        if (data.desc !== '') {
+          attr['desc'] = data.desc;
+        }
+      });
     });
   }
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf
index 7ffbb43fdae..0a91e5844b4 100644
--- a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf
+++ b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf
@@ -865,7 +865,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.html</context>
@@ -913,7 +913,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">74</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.html</context>
@@ -941,7 +941,7 @@
         <source>This field is required!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">66</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html</context>
-- 
2.39.5