refactor(kube): events datatable react migration [EE-6450] (#11583)

Co-authored-by: testa113 <testa113>

app/kubernetes/components/datatables/events-datatable/eventsDatatable.html

@@ -1,150 +0,0 @@
-<div class="datatable">
-  <div class="toolBar">
-    <div class="toolBarTitle flex">
-      <div class="widget-icon space-right">
-        <pr-icon icon="'history'"></pr-icon>
-      </div>
-      {{ $ctrl.titleText }}
-    </div>
-    <div class="searchBar">
-      <pr-icon icon="'search'" class="vertical-center"></pr-icon>
-      <input
-        type="text"
-        data-cy="k8sConfigDetail-eventsTableSearchInput"
-        class="searchInput ml-1"
-        ng-model="$ctrl.state.textFilter"
-        ng-change="$ctrl.onTextFilterChange()"
-        placeholder="Search for an event..."
-        auto-focus
-        ng-model-options="{ debounce: 300 }"
-      />
-    </div>
-    <div class="settings">
-      <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
-        <span uib-dropdown-toggle><pr-icon icon="'more-vertical'"></pr-icon></span>
-        <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
-          <div class="tableMenu">
-            <div class="menuHeader"> Table settings </div>
-            <div class="menuContent">
-              <div>
-                <div class="md-checkbox">
-                  <input
-                    id="setting_auto_refresh"
-                    type="checkbox"
-                    ng-model="$ctrl.settings.repeater.autoRefresh"
-                    ng-change="$ctrl.onSettingsRepeaterChange()"
-                    data-cy="k8sConfigDetail-eventsTableAutoRefreshCheckbox"
-                  />
-                  <label for="setting_auto_refresh">Auto refresh</label>
-                </div>
-                <div ng-if="$ctrl.settings.repeater.autoRefresh">
-                  <label for="settings_refresh_rate"> Refresh rate </label>
-                  <select
-                    id="settings_refresh_rate"
-                    ng-model="$ctrl.settings.repeater.refreshRate"
-                    ng-change="$ctrl.onSettingsRepeaterChange()"
-                    class="small-select"
-                    data-cy="k8sConfigDetail-eventsTableRefreshRateSelect"
-                  >
-                    <option value="10">10s</option>
-                    <option value="30">30s</option>
-                    <option value="60">1min</option>
-                    <option value="120">2min</option>
-                    <option value="300">5min</option>
-                  </select>
-                  <span>
-                    <pr-icon id="refreshRateChange" style="display: none" icon="'check'" mode="'success'"></pr-icon>
-                  </span>
-                </div>
-              </div>
-            </div>
-            <div>
-              <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">Close</a>
-            </div>
-          </div>
-        </div>
-      </span>
-    </div>
-  </div>
-  <div class="table-responsive">
-    <table class="table-hover nowrap-cells table" data-cy="k8sConfigDetail-eventsTable">
-      <thead>
-        <tr>
-          <th>
-            <table-column-header
-              col-title="'Date'"
-              can-sort="true"
-              is-sorted="$ctrl.state.orderBy === 'Date'"
-              is-sorted-desc="$ctrl.state.orderBy === 'Date' && $ctrl.state.reverseOrder"
-              ng-click="$ctrl.changeOrderBy('Date')"
-            ></table-column-header>
-          </th>
-          <th>
-            <table-column-header
-              col-title="'Kind'"
-              can-sort="true"
-              is-sorted="$ctrl.state.orderBy === 'Involved.kind'"
-              is-sorted-desc="$ctrl.state.orderBy === 'Involved.kind' && $ctrl.state.reverseOrder"
-              ng-click="$ctrl.changeOrderBy('Involved.kind')"
-            ></table-column-header>
-          </th>
-          <th>
-            <table-column-header
-              col-title="'Type'"
-              can-sort="true"
-              is-sorted="$ctrl.state.orderBy === 'Type'"
-              is-sorted-desc="$ctrl.state.orderBy === 'Type' && $ctrl.state.reverseOrder"
-              ng-click="$ctrl.changeOrderBy('Type')"
-            ></table-column-header>
-          </th>
-          <th>
-            <table-column-header
-              col-title="'Message'"
-              can-sort="true"
-              is-sorted="$ctrl.state.orderBy === 'Message'"
-              is-sorted-desc="$ctrl.state.orderBy === 'Message' && $ctrl.state.reverseOrder"
-              ng-click="$ctrl.changeOrderBy('Message')"
-            ></table-column-header>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr
-          dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
-          pagination-id="$ctrl.tableKey"
-        >
-          <td>{{ item.Date | getisodate }}</td>
-          <td>{{ item.Involved.kind }}</td>
-          <td
-            ><span class="label label-{{ item.Type | kubernetesEventTypeColor }}">{{ item.Type }}</span></td
-          >
-          <td>{{ item.Message }}</td>
-        </tr>
-        <tr ng-if="$ctrl.loading">
-          <td colspan="4" class="text-muted text-center">Loading...</td>
-        </tr>
-        <tr ng-if="!$ctrl.loading && (!$ctrl.dataset || $ctrl.state.filteredDataSet.length === 0)">
-          <td colspan="4" class="text-muted text-center">No event available.</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-  <div class="footer" ng-if="$ctrl.dataset">
-    <div class="infoBar" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
-    <div class="paginationControls">
-      <form class="form-inline">
-        <span class="limitSelector">
-          <span style="margin-right: 5px"> Items per page </span>
-          <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="k8sConfigDetail-eventsTablePaginationDropdown">
-            <option value="0">All</option>
-            <option value="10">10</option>
-            <option value="25">25</option>
-            <option value="50">50</option>
-            <option value="100">100</option>
-          </select>
-        </span>
-        <dir-pagination-controls max-size="5" pagination-id="$ctrl.tableKey"></dir-pagination-controls>
-      </form>
-    </div>
-  </div>
-</div>

app/kubernetes/components/datatables/events-datatable/eventsDatatable.js

@@ -1,13 +0,0 @@
-angular.module('portainer.kubernetes').component('kubernetesEventsDatatable', {
-  templateUrl: './eventsDatatable.html',
-  controller: 'GenericDatatableController',
-  bindings: {
-    titleText: '@',
-    dataset: '<',
-    tableKey: '@',
-    orderBy: '@',
-    reverseOrder: '<',
-    loading: '<',
-    refreshCallback: '<',
-  },
-});

app/kubernetes/react/components/clusterManagement.ts

@@ -4,6 +4,8 @@ import { r2a } from '@/react-tools/react2angular';
 import { withUIRouter } from '@/react-tools/withUIRouter';
 import { withCurrentUser } from '@/react-tools/withCurrentUser';
 import { NodeApplicationsDatatable } from '@/react/kubernetes/cluster/NodeView/NodeApplicationsDatatable/NodeApplicationsDatatable';
+import { ResourceEventsDatatable } from '@/react/kubernetes/components/EventsDatatable/ResourceEventsDatatable';
+import { withReactQuery } from '@/react-tools/withReactQuery';
 
 export const clusterManagementModule = angular
   .module('portainer.kubernetes.react.components.clusterManagement', [])
@@ -14,4 +16,11 @@ export const clusterManagementModule = angular
       'isLoading',
       'onRefresh',
     ])
+  )
+  .component(
+    'resourceEventsDatatable',
+    r2a(
+      withUIRouter(withReactQuery(withCurrentUser(ResourceEventsDatatable))),
+      ['resourceId', 'storageKey', 'namespace']
+    )
   ).name;

app/kubernetes/views/cluster/node/node.html

@@ -251,16 +251,7 @@
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
-              <kubernetes-events-datatable
-                title-text="Events"
-                dataset="ctrl.events"
-                table-key="kubernetes.node.events"
-                order-by="Date"
-                reverse-order="true"
-                loading="ctrl.state.eventsLoading"
-                refresh-callback="ctrl.getEvents"
-              >
-              </kubernetes-events-datatable>
+              <resource-events-datatable resource-id="ctrl.node.Id" storage-key="'kubernetes.node.events'"></resource-events-datatable>
             </uib-tab>
             <uib-tab index="2" ng-if="ctrl.node.Yaml" select="ctrl.showEditor()" classes="btn-sm">
               <uib-tab-heading class="vertical-center">

app/kubernetes/views/cluster/node/nodeController.js

@@ -320,7 +320,7 @@ class KubernetesNodeController {
     try {
       this.state.eventsLoading = true;
       const events = await this.KubernetesEventService.get();
-      this.events = events.filter((item) => item.Involved.kind === 'Node');
+      this.events = events.filter((item) => item.Involved.uid === this.node.Id);
       this.state.eventWarningCount = KubernetesEventHelper.warningCount(this.events);
     } catch (err) {
       this.Notifications.error('Failure', err, 'Unable to retrieve node events');

app/kubernetes/views/configurations/configmap/edit/configMap.html

@@ -55,17 +55,11 @@
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
-              <kubernetes-events-datatable
-                title-text="Events"
-                title-icon="history"
-                dataset="ctrl.events"
-                table-key="kubernetes.configuration.events"
-                order-by="Date"
-                reverse-order="true"
-                loading="ctrl.state.eventsLoading"
-                refresh-callback="ctrl.getEvents"
-              >
-              </kubernetes-events-datatable>
+              <resource-events-datatable
+                resource-id="ctrl.configuration.Id"
+                storage-key="'kubernetes.configmap.events'"
+                namespace="ctrl.formValues.ResourcePool.Namespace.Name"
+              ></resource-events-datatable>
             </uib-tab>
             <uib-tab index="2" ng-if="ctrl.configuration.Yaml" classes="btn-sm" select="ctrl.showEditor()" data-cy="k8sConfigDetail-yamlTab">
               <uib-tab-heading>

app/kubernetes/views/configurations/secret/edit/secret.html

@@ -62,17 +62,11 @@
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
-              <kubernetes-events-datatable
-                title-text="Events"
-                title-icon="history"
-                dataset="ctrl.events"
-                table-key="kubernetes.configuration.events"
-                order-by="Date"
-                reverse-order="true"
-                loading="ctrl.state.eventsLoading"
-                refresh-callback="ctrl.getEvents"
-              >
-              </kubernetes-events-datatable>
+              <resource-events-datatable
+                resource-id="ctrl.configuration.Id"
+                storage-key="'kubernetes.secret.events'"
+                namespace="ctrl.formValues.ResourcePool.Namespace.Name"
+              ></resource-events-datatable>
             </uib-tab>
             <uib-tab index="2" ng-if="ctrl.configuration.Yaml" classes="btn-sm" select="ctrl.showEditor()" data-cy="k8sConfigDetail-yamlTab">
               <uib-tab-heading>

app/kubernetes/views/resource-pools/edit/resourcePool.html

@@ -286,15 +286,7 @@
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
-              <kubernetes-events-datatable
-                title-text="Events"
-                dataset="ctrl.events"
-                table-key="kubernetes.resourcepool.events"
-                order-by="Date"
-                reverse-order="true"
-                loading="ctrl.state.eventsLoading"
-                refresh-callback="ctrl.getEvents"
-              ></kubernetes-events-datatable>
+              <resource-events-datatable namespace="ctrl.pool.Namespace.Name" storage-key="'kubernetes.resourcepool.events'"> </resource-events-datatable>
             </uib-tab>
             <uib-tab index="2" ng-if="ctrl.pool.Yaml" select="ctrl.showEditor()" classes="btn-sm">
               <uib-tab-heading class="vertical-center"><pr-icon icon="'code'"></pr-icon> YAML </uib-tab-heading>

app/kubernetes/views/volumes/edit/volume.html

@@ -156,17 +156,12 @@
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
-              <kubernetes-events-datatable
-                title-text="Events"
-                title-icon="file-text"
-                dataset="ctrl.events"
-                table-key="kubernetes.volume.events"
-                order-by="Date"
-                reverse-order="true"
-                loading="ctrl.state.eventsLoading"
-                refresh-callback="ctrl.getEvents"
+              <resource-events-datatable
+                namespace="ctrl.volume.ResourcePool.Namespace.Name"
+                storage-key="'kubernetes.volume.events'"
+                resource-id="ctrl.volume.PersistentVolumeClaim.Id"
               >
-              </kubernetes-events-datatable>
+              </resource-events-datatable>
             </uib-tab>
 
             <uib-tab index="2" ng-if="ctrl.volume.PersistentVolumeClaim.Yaml" select="ctrl.showEditor()" classes="btn-sm">