Skip to content

Commit 0520e7c

Browse files
committed
Merge remote-tracking branch 'origin/release/v11.1.5' into release/v11.1.5
2 parents 4e79aa9 + 05c82fe commit 0520e7c

2 files changed

Lines changed: 2 additions & 41 deletions

File tree

frontend/src/app/app-management/identity-provider/shared/components/provider-form/provider-form.component.html

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -291,45 +291,6 @@ <h6 class="card-title font-weight-bold">
291291
</div>
292292
</div>
293293

294-
<!-- Required Roles for Authentication -->
295-
<div class="form-section">
296-
<h5 class="section-title">
297-
<i class="icon-lock"></i>
298-
Required Roles for Authentication
299-
</h5>
300-
301-
<div class="alert alert-info alert-styled-left">
302-
<span class="font-weight-semibold">
303-
<i class="icon-info22"></i>
304-
User Access Requirements
305-
</span>
306-
<p class="mt-2 mb-0">
307-
Users must have at least one of these roles in your Identity Provider to access this panel:
308-
</p>
309-
</div>
310-
311-
<div class="row">
312-
<div class="col-md-12">
313-
<div class="required-roles-container">
314-
<div class="role-badge-item">
315-
<i class="icon-shield text-primary mr-2"></i>
316-
<span class="font-weight-500">ROLE_USER</span>
317-
<small class="text-muted ml-2">Basic access to the panel</small>
318-
</div>
319-
<div class="role-badge-item mt-2">
320-
<i class="icon-star text-warning mr-2"></i>
321-
<span class="font-weight-500">ROLE_ADMIN</span>
322-
<small class="text-muted ml-2">Full administrative access</small>
323-
</div>
324-
</div>
325-
<small class="form-text text-muted d-block mt-3">
326-
<i class="icon-alert mr-1"></i>
327-
Ensure your Identity Provider includes these roles in the SAML assertion for users to authenticate successfully.
328-
</small>
329-
</div>
330-
</div>
331-
</div>
332-
333294
<!-- Status -->
334295
<div class="form-section">
335296
<h5 class="section-title">

frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="px-3 w-100 m-0 d-flex">
22
<div style="border-left: 1px #dee2e6 solid" class="d-flex flex-grow-1 p-2 bg-white gap-2">
3-
<div *ngIf="!isSqlMode" class="d-flex align-items-center gap-2">
3+
<div *ngIf="!isSqlMode" class="d-flex flex-grow-1 align-items-center gap-2">
44
<div class="d-flex align-items-center justify-content-start">
55
<app-index-pattern-select
66
(indexPatternChange)="changeFields($event)"
@@ -20,7 +20,7 @@
2020
</button>
2121
</div>
2222
</div>
23-
<div class="log-analyzer-actions d-flex flex-grow-1 justify-content-end gap-2">
23+
<div [ngClass]="{'flex-grow-1': isSqlMode}" class="log-analyzer-actions d-flex justify-content-end gap-2">
2424
<button
2525
class="btn utm-button utm-button-primary"
2626
(click)="toggleSqlMode()"

0 commit comments

Comments
 (0)