From: Alfonso Martínez <almartin@redhat.com>
Date: Tue, 11 Feb 2020 14:26:34 +0000 (+0100)
Subject: mgr/dashboard: show correct RGW user 'system' info
X-Git-Tag: v14.2.10~203^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=549a691070a58f9475311c47b71821c27de15603;p=ceph.git

mgr/dashboard: show correct RGW user 'system' info

Fixes: https://tracker.ceph.com/issues/44075
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 3d84dd948d771e761b42e8476eaf7d9df57c2eb3)

 Conflicts:
	src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html

- Conflicts manually solved.
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html
index 304ce2327e9f..b17391934338 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html
@@ -27,7 +27,7 @@
           <tr>
             <td i18n
                 class="bold col-sm-1">System</td>
-            <td class="col-sm-3">{{ user.system | booleanText }}</td>
+            <td class="col-sm-3">{{ user.system === 'true' | booleanText }}</td>
           </tr>
           <tr>
             <td i18n
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts
index d5afbc5285a0..cafbf63d5f0b 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts
@@ -29,4 +29,26 @@ describe('RgwUserDetailsComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should show correct "System" info', () => {
+    component.selection.selected = [
+      { uid: '', email: '', system: 'true', keys: [], swift_keys: [] }
+    ];
+    component.selection.hasSelection = true;
+    component.selection.hasSingleSelection = true;
+    component.ngOnChanges();
+    fixture.detectChanges();
+
+    const detailsTab = fixture.debugElement.nativeElement.querySelectorAll(
+      '.table.table-striped.table-bordered tr td'
+    );
+    expect(detailsTab[6].textContent).toEqual('System');
+    expect(detailsTab[7].textContent).toEqual('Yes');
+
+    component.selection.selected[0].system = 'false';
+    component.ngOnChanges();
+    fixture.detectChanges();
+
+    expect(detailsTab[7].textContent).toEqual('No');
+  });
 });