From 983e33aae1dbf8403a474e7b3472bf4f0e19f3ef Mon Sep 17 00:00:00 2001
From: Qxisylolo
Date: Thu, 19 Sep 2024 15:16:44 +0800
Subject: [PATCH 1/3] fix/fix_UI_of_Assets_modal
Signed-off-by: Qxisylolo
---
.../saved_objects_table.test.tsx.snap | 226 +-----------------
.../objects_table/saved_objects_table.tsx | 150 ++++++------
2 files changed, 80 insertions(+), 296 deletions(-)
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
index 23f8a7b89724..1b6137b056e6 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
@@ -1,230 +1,10 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`SavedObjectsTable delete should show a confirm modal 1`] = `
-
- }
- confirmButtonText={
-
- }
- defaultFocusedButton="confirm"
- onCancel={[Function]}
- onConfirm={[Function]}
- title={
-
- }
->
-
-
-
-
-
-
-
-`;
+exports[`SavedObjectsTable delete should show a confirm modal 1`] = `null`;
-exports[`SavedObjectsTable delete should show error toast when failing to delete saved objects 1`] = `
-
- }
- confirmButtonText={
-
- }
- defaultFocusedButton="confirm"
- onCancel={[Function]}
- onConfirm={[Function]}
- title={
-
- }
->
-
-
-
-
-
-
-
-`;
+exports[`SavedObjectsTable delete should show error toast when failing to delete saved objects 1`] = `null`;
-exports[`SavedObjectsTable delete should show error toast when failing to delete saved objects 2`] = `
-
- }
- confirmButtonText={
-
- }
- defaultFocusedButton="confirm"
- onCancel={[Function]}
- onConfirm={[Function]}
- title={
-
- }
->
-
-
-
-
-
-
-
-`;
+exports[`SavedObjectsTable delete should show error toast when failing to delete saved objects 2`] = `null`;
exports[`SavedObjectsTable duplicate should allow the user to choose on header when duplicating all 1`] = `
- }
- onCancel={onCancel}
- onConfirm={onConfirm}
- buttonColor="danger"
- cancelButtonText={
-
- }
- confirmButtonText={
- isDeleting ? (
+
+
+
- ) : (
-
- )
- }
- defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
- >
-
-
+
+
+
+
+
+
+
+
+
+ (
+
+
+
+ ),
+ },
+ {
+ field: 'meta.title',
+ name: i18n.translate(
+ 'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName',
+ { defaultMessage: 'Title' }
+ ),
+ },
+ {
+ field: 'id',
+ name: i18n.translate(
+ 'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.idColumnName',
+ { defaultMessage: 'ID' }
+ ),
+ },
+ ]}
+ pagination={true}
+ sorting={false}
+ />
+
+
+
+
-
-
- (
-
-
-
- ),
- },
- {
- field: 'id',
- name: i18n.translate(
- 'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.idColumnName',
- { defaultMessage: 'Id' }
- ),
- },
- {
- field: 'meta.title',
- name: i18n.translate(
- 'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName',
- { defaultMessage: 'Title' }
- ),
- },
- ]}
- pagination={true}
- sorting={false}
- />
-
+
+
+
+ {isDeleting ? (
+
+ ) : (
+
+ )}
+
+
+
);
}
From dd520c28f61c52197d9b6b0f97147588dcd5a35b Mon Sep 17 00:00:00 2001
From: Qxisylolo
Date: Thu, 24 Oct 2024 15:54:26 +0800
Subject: [PATCH 2/3] correct tests
Signed-off-by: Qxisylolo
---
.../saved_objects_table.test.tsx.snap | 299 +++++++++++++++++-
.../saved_objects_table.test.tsx | 9 +-
2 files changed, 302 insertions(+), 6 deletions(-)
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
index 1b6137b056e6..0c49e4f7cb9e 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
@@ -1,10 +1,303 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`SavedObjectsTable delete should show a confirm modal 1`] = `null`;
+exports[`SavedObjectsTable delete should show a confirm modal 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`SavedObjectsTable delete should show a confirm modal 2`] = `
+
+
+
+
+
+`;
-exports[`SavedObjectsTable delete should show error toast when failing to delete saved objects 1`] = `null`;
+exports[`SavedObjectsTable delete should show a confirm modal 3`] = `
+
+
+
+
+
+
+
+
+`;
+
+exports[`SavedObjectsTable delete should show a confirm modal 4`] = `null`;
+
+exports[`SavedObjectsTable delete should show error toast when failing to delete saved objects 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
-exports[`SavedObjectsTable delete should show error toast when failing to delete saved objects 2`] = `null`;
+exports[`SavedObjectsTable delete should show error toast when failing to delete saved objects 2`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
exports[`SavedObjectsTable duplicate should allow the user to choose on header when duplicating all 1`] = `
{
await component.instance().onDelete();
component.update();
- expect(component.find('EuiConfirmModal')).toMatchSnapshot();
+ expect(component.find('EuiModal')).toMatchSnapshot();
+ expect(component.find('EuiModalHeader')).toMatchSnapshot();
+ expect(component.find('EuiModalFooter')).toMatchSnapshot();
+ expect(component.find('Delete assets')).toMatchSnapshot();
});
it('should delete selected objects', async () => {
@@ -675,14 +678,14 @@ describe('SavedObjectsTable', () => {
await component.instance().onDelete();
component.update();
expect(component.state('isShowingDeleteConfirmModal')).toBe(true);
- expect(component.find('EuiConfirmModal')).toMatchSnapshot();
+ expect(component.find('EuiModal')).toMatchSnapshot();
await component.instance().delete();
component.update();
expect(notifications.toasts.addDanger).toHaveBeenCalled();
// If user fail to delete the saved objects, the delete modal will continue to display
expect(component.state('isShowingDeleteConfirmModal')).toBe(true);
- expect(component.find('EuiConfirmModal')).toMatchSnapshot();
+ expect(component.find('EuiModal')).toMatchSnapshot();
expect(component.state('isDeleting')).toBe(false);
});
});
From 7c4f5e60f29ded6d6279f6a795c2de78950d4321 Mon Sep 17 00:00:00 2001
From: "opensearch-changeset-bot[bot]"
<154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 07:56:21 +0000
Subject: [PATCH 3/3] Changeset file for PR #8237 created/updated
---
changelogs/fragments/8237.yml | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 changelogs/fragments/8237.yml
diff --git a/changelogs/fragments/8237.yml b/changelogs/fragments/8237.yml
new file mode 100644
index 000000000000..a4466d7b6500
--- /dev/null
+++ b/changelogs/fragments/8237.yml
@@ -0,0 +1,2 @@
+fix:
+- Fix the UI of delete modal in the save objects(assets) page ([#8237](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8237))
\ No newline at end of file