RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41721 from aaryanporwal/telemetry-ident-fix

Browse Source 
mgr/dashboard: telemetry activate: show ident fields when checked

Reviewed-by: aaryanporwal <NOT@FOUND>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
This commit is contained in:
Ernesto Puerta 2021-06-25 18:48:34 +02:00 committed by GitHub
commit 26df5df247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.html
View File

@ -126,12 +126,14 @@
<input type="checkbox"
class="custom-control-input"
id="channel_ident"
formControlName="channel_ident">
formControlName="channel_ident"
(click)="toggleIdent()">
<label class="custom-control-label"
for="channel_ident"></label>
</div>
</div>
</div>
<ng-container *ngIf="showContactInfo">
<legend>
<ng-container i18n>Contact Information</ng-container>
<cd-helper i18n>Submitting any contact information is completely optional and disabled by default.</cd-helper>
@ -161,6 +163,7 @@
i18n-placeholder>
</div>
</div>
</ng-container>
<legend i18n>Advanced Settings</legend>
<div class="form-group row">
<label class="cd-col-form-label"

23
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.spec.ts
View File

@ -80,6 +80,29 @@ describe('TelemetryComponent', () => {
expect(component).toBeTruthy();
});
it('should show/hide ident fields on checking/unchecking', () => {
const getContactField = () =>
fixture.debugElement.nativeElement.querySelector('input[id=contact]');
const getDescriptionField = () =>
fixture.debugElement.nativeElement.querySelector('input[id=description]');
// Initially hidden.
expect(getContactField()).toBeFalsy();
expect(getDescriptionField()).toBeFalsy();
// Show fields.
component.toggleIdent();
fixture.detectChanges();
expect(getContactField()).toBeTruthy();
expect(getDescriptionField()).toBeTruthy();
// Hide fields.
component.toggleIdent();
fixture.detectChanges();
expect(getContactField()).toBeFalsy();
expect(getDescriptionField()).toBeFalsy();
});
it('should set module enability to true correctly', () => {
expect(component.moduleEnabled).toBeTruthy();
});

5
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts
View File

@ -42,6 +42,7 @@ export class TelemetryComponent extends CdForm implements OnInit {
sendToUrl = '';
sendToDeviceUrl = '';
step = 1;
showContactInfo = false;
constructor(
public actionLabels: ActionLabelsI18n,
@ -137,6 +138,10 @@ export class TelemetryComponent extends CdForm implements OnInit {
);
}
toggleIdent() {
this.showContactInfo = !this.showContactInfo;
}
updateConfig() {
const config = {};
_.forEach(Object.values(this.options), (option) => {