refactor(activity-logs): migrate auth logs table to react [EE-4715] (#10890)

app/portainer/react/components/activity-logs.ts

@@ -0,0 +1,24 @@
+import angular from 'angular';
+
+import { r2a } from '@/react-tools/react2angular';
+import { withUIRouter } from '@/react-tools/withUIRouter';
+import { withReactQuery } from '@/react-tools/withReactQuery';
+import { AuthenticationLogsTable } from '@/react/portainer/logs/AuthenticationLogsView/AuthenticationLogsTable';
+
+export const activityLogsModule = angular
+  .module('portainer.app.react.components.activity-logs', [])
+  .component(
+    'authenticationLogsTable',
+    r2a(withUIRouter(withReactQuery(AuthenticationLogsTable)), [
+      'currentPage',
+      'dataset',
+      'keyword',
+      'limit',
+      'totalItems',
+      'sort',
+      'onChangeSort',
+      'onChangePage',
+      'onChangeLimit',
+      'onChangeKeyword',
+    ])
+  ).name;

app/portainer/react/components/index.ts

@@ -48,6 +48,7 @@ import { environmentsModule } from './environments';
 import { registriesModule } from './registries';
 import { accountModule } from './account';
 import { usersModule } from './users';
+import { activityLogsModule } from './activity-logs';
 
 export const ngModule = angular
   .module('portainer.app.react.components', [
@@ -59,6 +60,7 @@ export const ngModule = angular
     settingsModule,
     accountModule,
     usersModule,
+    activityLogsModule,
   ])
   .component(
     'tagSelector',

app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.controller.js

@@ -1,68 +0,0 @@
-import { authenticationMethodTypesMap, authenticationMethodTypesLabels } from '@/portainer/settings/authentication/auth-method-constants';
-import { authenticationActivityTypesMap, authenticationActivityTypesLabels } from '@/portainer/settings/authentication/auth-type-constants';
-
-class ActivityLogsDatatableController {
-  /* @ngInject */
-  constructor($controller, $scope, PaginationService) {
-    this.PaginationService = PaginationService;
-
-    this.tableKey = 'authLogs';
-
-    this.contextFilterLabels = Object.values(authenticationMethodTypesMap).map((value) => ({ value, label: authenticationMethodTypesLabels[value] }));
-    this.typeFilterLabels = Object.values(authenticationActivityTypesMap).map((value) => ({ value, label: authenticationActivityTypesLabels[value] }));
-
-    const $onInit = this.$onInit;
-    angular.extend(this, $controller('GenericDatatableController', { $scope }));
-    this.$onInit = $onInit.bind(this);
-
-    this.changeSort = this.changeSort.bind(this);
-    this.handleChangeLimit = this.handleChangeLimit.bind(this);
-  }
-
-  changeSort(key) {
-    let desc = false;
-    if (key === this.sort.key) {
-      desc = !this.sort.desc;
-    }
-
-    this.onChangeSort({ key, desc });
-  }
-
-  contextType(context) {
-    if (!(context in authenticationMethodTypesLabels)) {
-      return '';
-    }
-    return authenticationMethodTypesLabels[context];
-  }
-
-  activityType(type) {
-    if (!(type in authenticationActivityTypesLabels)) {
-      return '';
-    }
-    return authenticationActivityTypesLabels[type];
-  }
-
-  isAuthSuccess(type) {
-    return type === authenticationActivityTypesMap.AuthSuccess;
-  }
-
-  isAuthFailure(type) {
-    return type === authenticationActivityTypesMap.AuthFailure;
-  }
-
-  handleChangeLimit(limit) {
-    this.PaginationService.setPaginationLimit(this.tableKey, limit);
-    this.onChangeLimit(limit);
-  }
-
-  $onInit() {
-    this.$onInitGeneric();
-
-    const limit = this.PaginationService.getPaginationLimit(this.tableKey);
-    if (limit) {
-      this.handleChangeLimit(+limit);
-    }
-  }
-}
-
-export default ActivityLogsDatatableController;

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

@@ -1,99 +0,0 @@
-<div class="datatable datatable-empty">
-  <rd-widget>
-    <rd-widget-body classes="no-padding">
-      <div class="toolBar vertical-center flex-wrap !gap-x-5 !gap-y-1">
-        <div class="toolBarTitle vertical-center">
-          <div class="widget-icon space-right">
-            <pr-icon icon="'history'"></pr-icon>
-          </div>
-          Authentication Events
-        </div>
-        <div class="vertical-center">
-          <datatable-searchbar on-change="($ctrl.onChangeKeyword)"></datatable-searchbar>
-        </div>
-      </div>
-      <div class="table-responsive">
-        <table class="table-hover nowrap-cells table">
-          <thead>
-            <tr>
-              <th>
-                <div class="vertical-center">
-                  <table-column-header
-                    col-title="'Time'"
-                    can-sort="true"
-                    is-sorted="$ctrl.sort.key === 'Timestamp'"
-                    is-sorted-desc="$ctrl.sort.key === 'Timestamp' && $ctrl.sort.desc"
-                    ng-click="$ctrl.changeSort('Timestamp')"
-                  >
-                  </table-column-header>
-                </div>
-              </th>
-              <th>
-                <div class="vertical-center">
-                  <table-column-header
-                    col-title="'Origin'"
-                    can-sort="true"
-                    is-sorted="$ctrl.sort.key === 'Origin'"
-                    is-sorted-desc="$ctrl.sort.key === 'Origin' && $ctrl.sort.desc"
-                    ng-click="$ctrl.changeSort('Origin')"
-                  >
-                  </table-column-header>
-                </div>
-              </th>
-              <th>
-                <div class="vertical-center">
-                  <table-column-header
-                    col-title="'Context'"
-                    can-sort="true"
-                    is-sorted="$ctrl.sort.key === 'Context'"
-                    is-sorted-desc="$ctrl.sort.key === 'Context' && $ctrl.sort.desc"
-                    ng-click="$ctrl.changeSort('Context')"
-                  >
-                  </table-column-header>
-                  <datatable-filter labels="$ctrl.contextFilterLabels" filter-key="context" state="$ctrl.contextFilter" on-change="($ctrl.onChangeContextFilter)">
-                  </datatable-filter>
-                </div>
-              </th>
-              <th>
-                <div class="vertical-center">
-                  <table-column-header
-                    col-title="'User'"
-                    can-sort="true"
-                    is-sorted="$ctrl.sort.key === 'Username'"
-                    is-sorted-desc="$ctrl.sort.key === 'Username' && $ctrl.sort.desc"
-                    ng-click="$ctrl.changeSort('Username')"
-                  >
-                  </table-column-header>
-                </div>
-              </th>
-              <th>
-                <div class="vertical-center">
-                  <table-column-header col-title="'Result'" can-sort="false"> </table-column-header>
-                  <datatable-filter labels="$ctrl.typeFilterLabels" filter-key="type" state="$ctrl.typeFilter" on-change="($ctrl.onChangeTypeFilter)"> </datatable-filter>
-                </div>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr dir-paginate="item in $ctrl.logs | itemsPerPage: $ctrl.limit" total-items="$ctrl.totalItems" current-page="$ctrl.currentPage">
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr ng-if="!$ctrl.logs">
-              <td class="text-muted text-center" colspan="5">Loading...</td>
-            </tr>
-            <tr ng-if="$ctrl.state.logs.length === 0">
-              <td class="text-muted text-center" colspan="8"> No logs available. </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div class="footer" ng-if="$ctrl.logs">
-        <datatable-pagination limit="$ctrl.limit" on-change-limit="($ctrl.handleChangeLimit)" on-change-page="($ctrl.onChangePage)"></datatable-pagination>
-      </div>
-    </rd-widget-body>
-  </rd-widget>
-</div>

app/portainer/user-activity/auth-logs-view/auth-logs-datatable/index.js

@@ -1,25 +0,0 @@
-import controller from './auth-logs-datatable.controller';
-
-export const authLogsDatatable = {
-  templateUrl: './auth-logs-datatable.html',
-  controller,
-  bindings: {
-    logs: '<',
-    keyword: '<',
-    sort: '<',
-    limit: '<',
-    totalItems: '<',
-    currentPage: '<',
-    contextFilter: '<',
-    typeFilter: '<',
-    feature: '@',
-
-    onChangeContextFilter: '<',
-    onChangeTypeFilter: '<',
-    onChangeKeyword: '<',
-    onChangeSort: '<',
-
-    onChangeLimit: '<',
-    onChangePage: '<',
-  },
-};

app/portainer/user-activity/auth-logs-view/auth-logs-view.html

@@ -26,8 +26,8 @@
         </rd-widget-body>
       </rd-widget>
       <div class="row mt-5">
-        <auth-logs-datatable
-          logs="$ctrl.state.logs"
+        <authentication-logs-table
+          dataset="$ctrl.state.logs"
           keyword="$ctrl.state.keyword"
           sort="$ctrl.state.sort"
           limit="$ctrl.state.limit"
@@ -42,7 +42,7 @@
           on-change-sort="($ctrl.onChangeSort)"
           on-change-limit="($ctrl.onChangeLimit)"
           on-change-page="($ctrl.onChangePage)"
-        ></auth-logs-datatable>
+        ></authentication-logs-table>
       </div>
     </div>
   </div>

app/portainer/user-activity/auth-logs-view/index.js

@@ -1,6 +1,5 @@
 import angular from 'angular';
 
 import { authLogsView } from './auth-logs-view';
-import { authLogsDatatable } from './auth-logs-datatable';
 
-export default angular.module('portainer.app.user-activity.auth-logs-view', []).component('authLogsView', authLogsView).component('authLogsDatatable', authLogsDatatable).name;
+export default angular.module('portainer.app.user-activity.auth-logs-view', []).component('authLogsView', authLogsView).name;