mirror of
https://github.com/dbeaver/cloudbeaver.git
synced 2026-09-24 16:04:36 +08:00
CB-3029 add information about recursive deletion (#1422)
* CB-3029 add information about recursive deletion * CB-3029 change locales * CB-3029 patch basic confirmation dialog instead of creating a new one * CB-3029 change message Co-authored-by: MarinaVorobeva21 <98399603+MarinaVorobeva21@users.noreply.github.com>
This commit is contained in:
+11
-4
@@ -56,13 +56,20 @@ export class NavNodeContextMenuService extends Bootstrap {
|
||||
|
||||
const nodes = ResourceKeyUtils
|
||||
.mapArray(data, nodeId => this.navNodeInfoResource.get(nodeId))
|
||||
.filter<NavNode>(Boolean as any)
|
||||
.map(node => node.name)
|
||||
.join(', ');
|
||||
.filter<NavNode>(Boolean as any);
|
||||
|
||||
const name = nodes.map(node => node.name).join(', ');
|
||||
const folder = nodes.some(node => node.folder);
|
||||
|
||||
let message: string = this.localizationService.translate('app_navigationTree_node_delete_confirmation', undefined, { name });
|
||||
|
||||
if (folder) {
|
||||
message = message + '\n' + this.localizationService.translate('app_navigationTree_node_folder_delete_confirmation');
|
||||
}
|
||||
|
||||
const result = await this.commonDialogService.open(ConfirmationDialogDelete, {
|
||||
title: 'ui_data_delete_confirmation',
|
||||
message: this.localizationService.translate('app_navigationTree_node_delete_confirmation', undefined, { name: nodes }),
|
||||
message,
|
||||
confirmActionText: 'ui_delete',
|
||||
});
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ export default [
|
||||
['app_navigationTree_settings_folders_title', 'Folders'],
|
||||
['app_navigationTree_settings_folders_description', 'Open any node as tree root node'],
|
||||
['app_navigationTree_node_delete_confirmation', 'You\'re going to delete "{arg:name}". Are you sure?'],
|
||||
['app_navigationTree_node_folder_delete_confirmation', 'All content in the selected folder will be deleted.'],
|
||||
['app_navigationTree_node_delete_error', 'Failed to delete "{arg:name}'],
|
||||
['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
|
||||
['app_navigationTree_node_empty', 'Empty'],
|
||||
|
||||
@@ -9,6 +9,7 @@ export default [
|
||||
['app_navigationTree_settings_filter_all_title', 'Show collapsed'],
|
||||
['app_navigationTree_settings_filter_all_description', 'Shows filtered elements in collapsed folders'],
|
||||
['app_navigationTree_node_delete_confirmation', 'You\'re going to delete "{arg:name}". Are you sure?'],
|
||||
['app_navigationTree_node_folder_delete_confirmation', 'All content in the selected folder will be deleted.'],
|
||||
['app_navigationTree_node_delete_error', 'Failed to delete "{arg:name}'],
|
||||
['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
|
||||
['app_navigationTree_settings_state_title', 'Save tree state'],
|
||||
|
||||
@@ -15,6 +15,7 @@ export default [
|
||||
['app_navigationTree_settings_folders_title', 'Папки'],
|
||||
['app_navigationTree_settings_folders_description', 'Позволяет открыть любой узел как начальный'],
|
||||
['app_navigationTree_node_delete_confirmation', 'Вы собираетесь удалить "{arg:name}". Вы уверены?'],
|
||||
['app_navigationTree_node_folder_delete_confirmation', 'Все содержимое выбранной папки будет удалено.'],
|
||||
['app_navigationTree_node_delete_error', 'Ошибка удаления "{arg:name}'],
|
||||
['app_navigationTree_node_rename_error', 'Ошибка переименования ноды'],
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ export default [
|
||||
['app_navigationTree_settings_folders_title', 'Folders'],
|
||||
['app_navigationTree_settings_folders_description', 'Open any node as tree root node'],
|
||||
['app_navigationTree_node_delete_confirmation', 'You\'re going to delete "{arg:name}". Are you sure?'],
|
||||
['app_navigationTree_node_folder_delete_confirmation', 'All content in the selected folder will be deleted.'],
|
||||
['app_navigationTree_node_delete_error', 'Failed to delete "{arg:name}'],
|
||||
['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
|
||||
['app_navigationTree_node_empty', 'Empty'],
|
||||
|
||||
@@ -35,7 +35,6 @@ import { ResourcesProjectsNavNodeService } from './ResourcesProjectsNavNodeServi
|
||||
interface ITargetNode {
|
||||
projectId: string;
|
||||
folderId?: string;
|
||||
|
||||
projectNodeId: string;
|
||||
selectProject: boolean;
|
||||
}
|
||||
@@ -109,6 +108,7 @@ export class ResourceFoldersBootstrap extends Bootstrap {
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
load(): void | Promise<void> { }
|
||||
|
||||
private async moveResourceToFolder(
|
||||
|
||||
Reference in New Issue
Block a user