mgr/dashboard: Add restore events in notification screen

Fixes: https://tracker.ceph.com/issues/72887
Signed-off-by: pujashahu <pshahu@redhat.com>
Signed-off-by: pujaoshahu <pshahu@redhat.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.html
index e53e6da02ad4e51012b3a6b044f80c361f325aa0..32560058723410a8d99a784a6b6c9ba6a23052e5 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.html
@@ -14,6 +14,7 @@
             columnMode="flex"
             selectionType="single"
             identifier="Id"
+            [autoReload]="true"
             (updateSelection)="updateSelection($event)"
             (fetchData)="fetchData()">
   <cd-table-actions class="table-actions"

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.ts
index 239b3f36161f021bceea957c8040ca6acf32f0c5..340f8cb4af7c55584b52f4eeea4daadd309a269a 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-notification-list/rgw-bucket-notification-list.component.ts
@@ -75,7 +75,7 @@ export class RgwBucketNotificationListComponent extends ListWithDetails implemen
       },
       {
         name: $localize`Destination`,
-        prop: 'Destination',
+        prop: 'Topic',
         flexGrow: 1,
         cellTransformation: CellTemplate.copy
       },

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-topic-list/rgw-topic-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-topic-list/rgw-topic-list.component.html
index 8bb037f3f010679c699a0d8d34c0cf14f4286798..56e805ede96f4329110e7ffa6768cdc7c58be0de 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-topic-list/rgw-topic-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-topic-list/rgw-topic-list.component.html
@@ -1,8 +1,13 @@
   <ng-container>
+  <legend>
+  <cd-help-text i18n>
+   A topic specifies where and how event notifications from a bucket are delivered, including the target system (e.g., Kafka or HTTP) and its configuration.
+  </cd-help-text>
+  </legend>
   <cd-table #table
             headerTitle="Notification destination"
             headerDescription="Delivers bucket and object change notifications to external services like Kafka or AMQP."
-            [autoReload]="false"
+            [autoReload]="true"
             [data]="topics$ | async"
             [columns]="columns"
             columnMode="flex"

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-topic-list/rgw-topic-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-topic-list/rgw-topic-list.component.spec.ts
index f7ddf1593ea4783c9d3f3cb5de5d631fa7c943c3..79d6b20fab226d9f11e880be58a6d52cee0e99ff 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-topic-list/rgw-topic-list.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-topic-list/rgw-topic-list.component.spec.ts
@@ -1,4 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+
 import { RgwTopicListComponent } from './rgw-topic-list.component';
 import { SharedModule } from '~/app/shared/shared.module';
 import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper';
@@ -48,7 +49,7 @@ describe('RgwTopicListComponent', () => {
 
   it('should create', () => {
     expect(component).toBeTruthy();
-    expect(rgwTopicServiceListSpy).toHaveBeenCalledTimes(2);
+    expect(rgwTopicServiceListSpy.calls.count()).toBe(1);
   });
 
   it('should test all TableActions combinations', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/models/notification-configuration.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/models/notification-configuration.model.ts
index 428b6b1630180458132a19b6faace4dd4b7811d4..90cf13ff0c2dc208274ca20ab26ad42c4453e9f2 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/models/notification-configuration.model.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/models/notification-configuration.model.ts
@@ -44,6 +44,10 @@ export const events: ComboBoxItem[] = [
     name: 's3:ObjectCreated:CompleteMultipartUpload'
   },
   { content: 's3:ObjectRemoved:*', name: 's3:ObjectRemoved:*' },
+  { content: 's3:ObjectRestore:*', name: 's3:ObjectRestore:*' },
+  { content: 's3:ObjectRestore:Post', name: 's3:ObjectRestore:Post' },
+  { content: 's3:ObjectRestore:Completed', name: 's3:ObjectRestore:Completed' },
+  { content: 's3:ObjectRestore:Delete', name: 's3:ObjectRestore:Delete' },
   { content: 's3:ObjectRemoved:Delete', name: 's3:ObjectRemoved:Delete' },
   { content: 's3:ObjectRemoved:DeleteMarkerCreated', name: 's3:ObjectRemoved:DeleteMarkerCreated' }
 ];