From a1b0634d86e6a824f7229920e4b03ac1506f329f Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Thu, 2 May 2024 14:23:47 +1200
Subject: [PATCH] fix(kube): fix text in activity and authentication logs
 teasers [EE-6742] (#11746)

Co-authored-by: testa113 <testa113>
---
 .../activity-logs-datatable.html              |  2 +-
 .../activity-logs-view.html                   |  4 +-
 .../auth-logs-datatable.html                  |  2 +-
 .../auth-logs-view/auth-logs-view.html        | 88 ++++++++++---------
 yarn.lock                                     |  5 --
 5 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html b/app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html
index 970090f69..7516a144c 100644
--- a/app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html
+++ b/app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html
@@ -6,7 +6,7 @@
           <div class="widget-icon space-right">
             <pr-icon icon="'history'"></pr-icon>
           </div>
-          Activity Logs
+          Activity logs
         </div>
         <div class="vertical-center">
           <datatable-searchbar on-change="($ctrl.onChangeKeyword)" value="$ctrl.keyword"></datatable-searchbar>
diff --git a/app/portainer/user-activity/activity-logs-view/activity-logs-view.html b/app/portainer/user-activity/activity-logs-view/activity-logs-view.html
index d0e5801f5..6fa46014a 100644
--- a/app/portainer/user-activity/activity-logs-view/activity-logs-view.html
+++ b/app/portainer/user-activity/activity-logs-view/activity-logs-view.html
@@ -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>
-    <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">
       <rd-widget>
         <rd-widget-body>
diff --git a/app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html b/app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html
index a72179f6d..d6e0f4c3c 100644
--- a/app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html
+++ b/app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html
@@ -6,7 +6,7 @@
           <div class="widget-icon space-right">
             <pr-icon icon="'history'"></pr-icon>
           </div>
-          Authentication Events
+          Authentication events
         </div>
         <div class="vertical-center">
           <datatable-searchbar on-change="($ctrl.onChangeKeyword)"></datatable-searchbar>
diff --git a/app/portainer/user-activity/auth-logs-view/auth-logs-view.html b/app/portainer/user-activity/auth-logs-view/auth-logs-view.html
index 622d1bff3..6d8081b4c 100644
--- a/app/portainer/user-activity/auth-logs-view/auth-logs-view.html
+++ b/app/portainer/user-activity/auth-logs-view/auth-logs-view.html
@@ -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>
-    <div class="limited-be-link vertical-center"><be-feature-indicator feature="$ctrl.limitedFeature"></be-feature-indicator></div>
-    <div class="limited-be-content">
-      <rd-widget>
-        <rd-widget-body>
-          <div class="form-horizontal">
-            <div class="form-group">
-              <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 class="limited-be-link vertical-center"><be-feature-indicator class="m-4" feature="$ctrl.limitedFeature"></be-feature-indicator></div>
+    <div class="limited-be-content !p-0 !pt-[15px]">
+      <div class="row">
+        <div class="col-sm-12">
+          <rd-widget>
+            <rd-widget-body>
+              <div class="form-horizontal">
+                <div class="form-group">
+                  <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">
-            <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.
-          </p>
-          <div>
-            <button type="button" class="btn btn-sm btn-primary" limited-feature-dir="{{::$ctrl.limitedFeature}}" limited-feature-class="limited-be" limited-feature-disabled
-              ><pr-icon icon="'download'" class-name="'icon icon-sm'"></pr-icon>Export as CSV
-            </button>
-          </div>
-        </rd-widget-body>
-      </rd-widget>
-      <div class="row mt-5">
-        <auth-logs-datatable
-          logs="$ctrl.state.logs"
-          keyword="$ctrl.state.keyword"
-          sort="$ctrl.state.sort"
-          limit="$ctrl.state.limit"
-          context-filter="$ctrl.state.contextFilter"
-          type-filter="$ctrl.state.typeFilter"
-          total-items="$ctrl.state.totalItems"
-          current-page="$ctrl.state.currentPage"
-          feature="{{:: $ctrl.limitedFeature}}"
-          on-change-context-filter="($ctrl.onChangeContextFilter)"
-          on-change-type-filter="($ctrl.onChangeTypeFilter)"
-          on-change-keyword="($ctrl.onChangeKeyword)"
-          on-change-sort="($ctrl.onChangeSort)"
-          on-change-limit="($ctrl.onChangeLimit)"
-          on-change-page="($ctrl.onChangePage)"
-        ></auth-logs-datatable>
+              <p class="text-muted small vertical-center">
+                <pr-icon icon="'info'" class-name="'icon icon-sm icon-primary'"></pr-icon>
+                Portainer user authentication logs have a maximum retention of 7 days.
+              </p>
+              <div>
+                <button type="button" class="btn btn-sm btn-primary" limited-feature-dir="{{::$ctrl.limitedFeature}}" limited-feature-class="limited-be" limited-feature-disabled
+                  ><pr-icon icon="'download'" class-name="'icon icon-sm'"></pr-icon>Export as CSV
+                </button>
+              </div>
+            </rd-widget-body>
+          </rd-widget>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm-12">
+          <auth-logs-datatable
+            logs="$ctrl.state.logs"
+            keyword="$ctrl.state.keyword"
+            sort="$ctrl.state.sort"
+            limit="$ctrl.state.limit"
+            context-filter="$ctrl.state.contextFilter"
+            type-filter="$ctrl.state.typeFilter"
+            total-items="$ctrl.state.totalItems"
+            current-page="$ctrl.state.currentPage"
+            feature="{{:: $ctrl.limitedFeature}}"
+            on-change-context-filter="($ctrl.onChangeContextFilter)"
+            on-change-type-filter="($ctrl.onChangeTypeFilter)"
+            on-change-keyword="($ctrl.onChangeKeyword)"
+            on-change-sort="($ctrl.onChangeSort)"
+            on-change-limit="($ctrl.onChangeLimit)"
+            on-change-page="($ctrl.onChangePage)"
+          ></auth-logs-datatable>
+        </div>
       </div>
     </div>
   </div>
diff --git a/yarn.lock b/yarn.lock
index 126e00f7b..9f812ce2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7314,11 +7314,6 @@ axios-cache-interceptor@^1.4.1:
     fast-defer "1.1.8"
     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:
   version "1.2.0"
   resolved "https://codeload.github.com/portainer/progress-bar-4-axios/tar.gz/d424cd29f5b629af9ffc5c3d6db8d92d11d82f0f"