Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-22 14:59:41 +02:00
Code Issues Releases Activity

fix(kube): fix text in activity and authentication logs teasers [EE-6742] (#11683)

Browse source 
Co-authored-by: testa113 <testa113>
This commit is contained in:
Matt Hook 2024-05-02 14:23:56 +12:00 • committed by GitHub
parent 51605c6442
commit a45ec9a7b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 53 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/portainer/user-activity/auth-logs-view/auth-logs-view.controller.js
View file

@ -85,7 +85,7 @@ export default class AuthLogsViewController {
return this.$async(async () => { return this.$async(async () => {
this.state.logs = null; this.state.logs = null;
try { try {
const { logs, totalCount } = { logs: [{}, {}, {}, {}, {}], totalCount: 5 }; const { logs, totalCount } = { logs: [], totalCount: 0 };
this.state.logs = decorateLogs(logs); this.state.logs = decorateLogs(logs);
this.state.totalItems = totalCount; this.state.totalItems = totalCount;
} catch (err) { } catch (err) {

15
app/portainer/user-activity/auth-logs-view/auth-logs-view.html
View file

@ -1,9 +1,12 @@
<page-header title="'User Activity'" breadcrumbs="['User authentication activity']" reload="true"> </page-header> <page-header title="'User authentication logs'" breadcrumbs="['User authentication logs']" reload="true"> </page-header>
<div class="be-indicator-container limited-be mx-4"> <div class="be-indicator-container limited-be mx-4">
<div> <div>
<div class="limited-be-link vertical-center"><be-feature-indicator feature="$ctrl.limitedFeature"></be-feature-indicator></div> <div class="limited-be-link vertical-center"><be-feature-indicator class="m-4" feature="$ctrl.limitedFeature"></be-feature-indicator></div>
<div class="limited-be-content"> <!-- 15px matches the padding for col-sm-12 for the widget and table -->
<div class="limited-be-content !p-0 !pt-[15px]">
<div class="row">
<div class="col-sm-12">
<rd-widget> <rd-widget>
<rd-widget-body> <rd-widget-body>
<div class="form-horizontal"> <div class="form-horizontal">
@ -16,7 +19,7 @@
</div> </div>
<p class="text-muted small vertical-center"> <p class="text-muted small vertical-center">
<pr-icon icon="'info'" class-name="'icon icon-sm icon-primary'"></pr-icon> <pr-icon icon="'info'" class-name="'icon icon-sm icon-primary'"></pr-icon>
Portainer user authentication activity logs have a maximum retention of 7 days. Portainer user authentication logs have a maximum retention of 7 days.
</p> </p>
<div> <div>
<button type="button" class="btn btn-sm btn-primary" limited-feature-dir="{{::$ctrl.limitedFeature}}" limited-feature-class="limited-be" limited-feature-disabled <button type="button" class="btn btn-sm btn-primary" limited-feature-dir="{{::$ctrl.limitedFeature}}" limited-feature-class="limited-be" limited-feature-disabled
@ -25,7 +28,8 @@
</div> </div>
</rd-widget-body> </rd-widget-body>
</rd-widget> </rd-widget>
<div class="row mt-5"> </div>
</div>
<authentication-logs-table <authentication-logs-table
dataset="$ctrl.state.logs" dataset="$ctrl.state.logs"
keyword="$ctrl.state.keyword" keyword="$ctrl.state.keyword"
@ -45,5 +49,4 @@
></authentication-logs-table> ></authentication-logs-table>
</div> </div>
</div> </div>
</div>
</div> </div>

2
app/react/portainer/logs/ActivityLogsView/ActivityLogsTable.tsx
View file

@ -75,7 +75,7 @@ export function ActivityLogsTable({
}) { }) {
return ( return (
<ExpandableDatatable<ActivityLog> <ExpandableDatatable<ActivityLog>
title="Activity Logs" title="Activity logs"
titleIcon={History} titleIcon={History}
columns={columns} columns={columns}
dataset={dataset || []} dataset={dataset || []}

8
app/react/portainer/logs/ActivityLogsView/ActivityLogsView.tsx
View file

@ -38,10 +38,14 @@ export function ActivityLogsView() {
return ( return (
<> <>
<PageHeader title="User Activity" breadcrumbs="Activity Logs" reload /> <PageHeader
title="User activity logs"
breadcrumbs="User activity logs"
reload
/>
<div className="mx-4"> <div className="mx-4">
<BEOverlay featureId={FeatureId.ACTIVITY_AUDIT}> <BEOverlay className="m-2" featureId={FeatureId.ACTIVITY_AUDIT}>
<FilterBar <FilterBar
value={range} value={range}
onChange={setRange} onChange={setRange}

2
app/react/portainer/logs/AuthenticationLogsView/AuthenticationLogsTable.tsx
View file

@ -30,7 +30,7 @@ export function AuthenticationLogsTable({
}) { }) {
return ( return (
<Datatable<AuthLog> <Datatable<AuthLog>
title="Authentication Events" title="Authentication events"
titleIcon={History} titleIcon={History}
columns={columns} columns={columns}
dataset={dataset || []} dataset={dataset || []}