Skip to content

Commit

Permalink
Fix used saved objects types
Browse files Browse the repository at this point in the history
  • Loading branch information
dokmic committed Jan 18, 2023
1 parent 2e4e4b6 commit e8eb772
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@
*/

import { HttpStart } from '@kbn/core/public';
import { SavedObjectError } from '@kbn/core-saved-objects-common';

interface SavedObjectDeleteRequest {
id: string;
type: string;
}
import { SavedObjectError, SavedObjectTypeIdTuple } from '@kbn/core-saved-objects-common';

interface SavedObjectDeleteStatus {
id: string;
Expand All @@ -23,7 +18,7 @@ interface SavedObjectDeleteStatus {

export function bulkDeleteObjects(
http: HttpStart,
objects: SavedObjectDeleteRequest[]
objects: SavedObjectTypeIdTuple[]
): Promise<SavedObjectDeleteStatus[]> {
return http.post<SavedObjectDeleteStatus[]>(
'/internal/kibana/management/saved_objects/_bulk_delete',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export class SavedObjectEdition extends Component<
title: i18n.translate('savedObjectsManagement.deleteConfirm.modalTitle', {
defaultMessage: `Delete '{title}'?`,
values: {
title: object?.attributes?.title || 'saved Kibana object',
title: object?.meta?.title || 'saved Kibana object',
},
}),
buttonColor: 'danger',
Expand All @@ -155,7 +155,6 @@ export class SavedObjectEdition extends Component<
}

const [{ success, error }] = await bulkDeleteObjects(http, [{ id, type }]);

if (!success) {
notifications.toasts.addDanger({
title: i18n.translate(
Expand All @@ -164,7 +163,7 @@ export class SavedObjectEdition extends Component<
defaultMessage: `Failed to delete '{title}' {type} object`,
values: {
type,
title: object!.attributes.title,
title: object?.meta?.title,
},
}
),
Expand All @@ -174,7 +173,7 @@ export class SavedObjectEdition extends Component<
return;
}

notifications.toasts.addSuccess(`Deleted '${object!.attributes.title}' ${type} object`);
notifications.toasts.addSuccess(`Deleted '${object?.meta?.title}' ${type} object`);
this.redirectToListing();
}

Expand Down
1 change: 1 addition & 0 deletions src/plugins/saved_objects_management/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"@kbn/i18n-react",
"@kbn/test-jest-helpers",
"@kbn/core-saved-objects-api-server",
"@kbn/core-saved-objects-common",
"@kbn/monaco",
"@kbn/config-schema",
],
Expand Down

0 comments on commit e8eb772

Please sign in to comment.