github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/11749/head
Matt Hook 2024-04-30 19:17:22 +12:00 committed by GitHub
parent 549579d935
commit cf91a8352d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html
View File

@ -6,7 +6,7 @@
<div class="widget-icon space-right"> <div class="widget-icon space-right">
<pr-icon icon="'history'"></pr-icon> <pr-icon icon="'history'"></pr-icon>
</div> </div>
Activity Logs Activity logs
</div> </div>
<div class="vertical-center"> <div class="vertical-center">
<datatable-searchbar on-change="($ctrl.onChangeKeyword)" value="$ctrl.keyword"></datatable-searchbar> <datatable-searchbar on-change="($ctrl.onChangeKeyword)" value="$ctrl.keyword"></datatable-searchbar>

4
app/portainer/user-activity/activity-logs-view/activity-logs-view.html
View File

@ -1,8 +1,8 @@
<page-header title="'User Activity'" breadcrumbs="['Activity Logs']" reload="true"> </page-header> <page-header title="'User activity logs'" breadcrumbs="['User activity 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-2" feature="$ctrl.limitedFeature"></be-feature-indicator></div>
<div class="limited-be-content"> <div class="limited-be-content">
<rd-widget> <rd-widget>
<rd-widget-body> <rd-widget-body>

2
app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html
View File

@ -6,7 +6,7 @@
<div class="widget-icon space-right"> <div class="widget-icon space-right">
<pr-icon icon="'history'"></pr-icon> <pr-icon icon="'history'"></pr-icon>
</div> </div>
Authentication Events Authentication events
</div> </div>
<div class="vertical-center"> <div class="vertical-center">
<datatable-searchbar on-change="($ctrl.onChangeKeyword)"></datatable-searchbar> <datatable-searchbar on-change="($ctrl.onChangeKeyword)"></datatable-searchbar>

88
app/portainer/user-activity/auth-logs-view/auth-logs-view.html
View File

@ -1,48 +1,54 @@
<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"> <div class="limited-be-content !p-0 !pt-[15px]">
<rd-widget> <div class="row">
<rd-widget-body> <div class="col-sm-12">
<div class="form-horizontal"> <rd-widget>
<div class="form-group"> <rd-widget-body>
<label for="dateRangeInput" class="col-sm-2 control-label text-left">Date Range</label> <div class="form-horizontal">
<div class="col-sm-6"> <div class="form-group">
<input type="text" class="form-control" disabled /> <label for="dateRangeInput" class="col-sm-2 control-label text-left">Date Range</label>
<div class="col-sm-6">
<input type="text" class="form-control" disabled />
</div>
</div>
</div> </div>
</div> <p class="text-muted small vertical-center">
</div> <pr-icon icon="'info'" class-name="'icon icon-sm icon-primary'"></pr-icon>
<p class="text-muted small vertical-center"> Portainer user authentication logs have a maximum retention of 7 days.
<pr-icon icon="'info'" class-name="'icon icon-sm icon-primary'"></pr-icon> </p>
Portainer user authentication activity logs have a maximum retention of 7 days. <div>
</p> <button type="button" class="btn btn-sm btn-primary" limited-feature-dir="{{::$ctrl.limitedFeature}}" limited-feature-class="limited-be" limited-feature-disabled
<div> ><pr-icon icon="'download'" class-name="'icon icon-sm'"></pr-icon>Export as CSV
<button type="button" class="btn btn-sm btn-primary" limited-feature-dir="{{::$ctrl.limitedFeature}}" limited-feature-class="limited-be" limited-feature-disabled </button>
><pr-icon icon="'download'" class-name="'icon icon-sm'"></pr-icon>Export as CSV </div>
</button> </rd-widget-body>
</div> </rd-widget>
</rd-widget-body> </div>
</rd-widget> </div>
<div class="row mt-5"> <div class="row">
<auth-logs-datatable <div class="col-sm-12">
logs="$ctrl.state.logs" <auth-logs-datatable
keyword="$ctrl.state.keyword" logs="$ctrl.state.logs"
sort="$ctrl.state.sort" keyword="$ctrl.state.keyword"
limit="$ctrl.state.limit" sort="$ctrl.state.sort"
context-filter="$ctrl.state.contextFilter" limit="$ctrl.state.limit"
type-filter="$ctrl.state.typeFilter" context-filter="$ctrl.state.contextFilter"
total-items="$ctrl.state.totalItems" type-filter="$ctrl.state.typeFilter"
current-page="$ctrl.state.currentPage" total-items="$ctrl.state.totalItems"
feature="{{:: $ctrl.limitedFeature}}" current-page="$ctrl.state.currentPage"
on-change-context-filter="($ctrl.onChangeContextFilter)" feature="{{:: $ctrl.limitedFeature}}"
on-change-type-filter="($ctrl.onChangeTypeFilter)" on-change-context-filter="($ctrl.onChangeContextFilter)"
on-change-keyword="($ctrl.onChangeKeyword)" on-change-type-filter="($ctrl.onChangeTypeFilter)"
on-change-sort="($ctrl.onChangeSort)" on-change-keyword="($ctrl.onChangeKeyword)"
on-change-limit="($ctrl.onChangeLimit)" on-change-sort="($ctrl.onChangeSort)"
on-change-page="($ctrl.onChangePage)" on-change-limit="($ctrl.onChangeLimit)"
></auth-logs-datatable> on-change-page="($ctrl.onChangePage)"
></auth-logs-datatable>
</div>
</div> </div>
</div> </div>
</div> </div>

5
yarn.lock
View File

@ -7314,11 +7314,6 @@ axios-cache-interceptor@^1.4.1:
fast-defer "1.1.8" fast-defer "1.1.8"
object-code "1.3.2" object-code "1.3.2"
axios-progress-bar@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/axios-progress-bar/-/axios-progress-bar-1.2.0.tgz#f9ee88dc9af977246be1ef07eedfa4c990c639c5"
integrity sha512-PEgWb/b2SMyHnKJ/cxA46OdCuNeVlo8eqL0HxXPtz+6G/Jtpyo49icPbW+jpO1wUeDEjbqpseMoCyWxESxf5pA==
axios-progress-bar@portainer/progress-bar-4-axios: axios-progress-bar@portainer/progress-bar-4-axios:
version "1.2.0" version "1.2.0"
resolved "https://codeload.github.com/portainer/progress-bar-4-axios/tar.gz/d424cd29f5b629af9ffc5c3d6db8d92d11d82f0f" resolved "https://codeload.github.com/portainer/progress-bar-4-axios/tar.gz/d424cd29f5b629af9ffc5c3d6db8d92d11d82f0f"