Skip to content

Show info icons and tooltips consistently for cluster options #8227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KhizerRehan wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −22
Open

Show info icons and tooltips consistently for cluster options #8227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions modules/web/src/app/cluster/details/cluster/edit-cluster/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,11 @@

<div fxLayoutAlign=" center">
<mat-checkbox [formControlName]="Controls.AuditLogging"
kmValueChangedIndicator>Audit Logging</mat-checkbox>
kmValueChangedIndicator>
Audit Logging
<i class="km-icon-info km-pointer"
[matTooltip]="!!datacenter.spec.enforceAuditLogging ? 'Audit Logging is enforced by your admin in the chosen datacenter.' : 'Enable audit logging to record requests received by the Kubernetes API of this cluster.'"></i>
</mat-checkbox>
@if (!!form.get(Controls.AuditLogging).value) {
<mat-button-toggle-group [formControlName]="Controls.AuditPolicyPreset"
group="auditLogging"
Expand All @@ -193,10 +197,6 @@
</mat-button-toggle>
</mat-button-toggle-group>
}
@if (!!datacenter.spec.enforceAuditLogging) {
<i class="km-icon-info km-pointer"
matTooltip="Audit Logging is enforced by your admin in the chosen datacenter."></i>
}
</div>

@if (!!form.get(Controls.AuditLogging).value && !isAuditWebhookBackendHidden) {
Expand Down Expand Up @@ -268,21 +268,17 @@
<mat-checkbox [formControlName]="Controls.MLALogging"
kmValueChangedIndicator>
User Cluster Logging
@if (isEnforced(Controls.MLALogging)) {
<i class="km-icon-info km-pointer"
matTooltip="User Cluster Logging is enforced by your admin."></i>
}
[matTooltip]="isEnforced(Controls.MLALogging) ? 'User Cluster Logging is enforced by your admin.' : 'Enable log collection for this user cluster.'"></i>
</mat-checkbox>
}

@if (isMLAEnabled()) {
<mat-checkbox [formControlName]="Controls.MLAMonitoring"
kmValueChangedIndicator>
User Cluster Monitoring
@if (isEnforced(Controls.MLAMonitoring)) {
<i class="km-icon-info km-pointer"
matTooltip="User Cluster Monitoring is enforced by your admin."></i>
}
[matTooltip]="isEnforced(Controls.MLAMonitoring) ? 'User Cluster Monitoring is enforced by your admin.' : 'Enable metrics collection for this user cluster.'"></i>
</mat-checkbox>
}

Expand Down
18 changes: 7 additions & 11 deletions modules/web/src/app/wizard/step/cluster/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,11 @@ <h4>IPv6</h4>
fxFlex="100"
fxLayoutGap="10px">
<div fxLayoutAlign=" center">
<mat-checkbox [formControlName]="Controls.AuditLogging">Audit Logging</mat-checkbox>
<mat-checkbox [formControlName]="Controls.AuditLogging">
Audit Logging
<i class="km-icon-info km-pointer"
[matTooltip]="isEnforced(Controls.AuditLogging) ? 'Audit Logging is enforced by your admin in the chosen datacenter.' : 'Enable audit logging to record requests received by the Kubernetes API of this cluster.'"></i>
</mat-checkbox>
@if (!!controlValue(Controls.AuditLogging)) {
<mat-button-toggle-group [formControlName]="Controls.AuditPolicyPreset"
group="auditLogging">
Expand All @@ -478,10 +482,6 @@ <h4>IPv6</h4>
</mat-button-toggle>
</mat-button-toggle-group>
}
@if (isEnforced(Controls.AuditLogging)) {
<i class="km-icon-info km-pointer"
matTooltip="Audit Logging is enforced by your admin in the chosen datacenter."></i>
}
</div>
@if (!!controlValue(Controls.AuditLogging) && !isAuditWebhookBackendHidden) {
<div fxLayoutAlign=" center">
Expand Down Expand Up @@ -661,17 +661,13 @@ <h4>IPv6</h4>
@if (isMLAEnabled()) {
<mat-checkbox [formControlName]="Controls.MLALogging">
User Cluster Logging
@if (isEnforced(Controls.MLALogging)) {
<i class="km-icon-info km-pointer"
matTooltip="User Cluster Logging is enforced by your admin."></i>
}
[matTooltip]="isEnforced(Controls.MLALogging) ? 'User Cluster Logging is enforced by your admin.' : 'Enable log collection for this user cluster.'"></i>
</mat-checkbox>
<mat-checkbox [formControlName]="Controls.MLAMonitoring">
User Cluster Monitoring
@if (isEnforced(Controls.MLAMonitoring)) {
<i class="km-icon-info km-pointer"
matTooltip="User Cluster Monitoring is enforced by your admin."></i>
}
[matTooltip]="isEnforced(Controls.MLAMonitoring) ? 'User Cluster Monitoring is enforced by your admin.' : 'Enable metrics collection for this user cluster.'"></i>
</mat-checkbox>
}
@if (isUserSshKeyEnabled) {
Expand Down
7 changes: 7 additions & 0 deletions modules/web/src/assets/css/material/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,13 @@ button {
}
}

// Material puts `.mdc-checkbox--disabled { pointer-events: none; }` on the checkbox host, so a
// disabled checkbox also swallows hover on its projected label content. Info icons there usually
// explain *why* the option is disabled, so their tooltips must stay reachable.
.mat-mdc-checkbox.mat-mdc-checkbox-disabled .mdc-label .km-icon-info {
pointer-events: auto;
}

.mat-button-toggle-group {
&.mat-button-toggle-group-appearance-standard {
border: none;
Expand Down