Merge pull request #4079 from mslourens/delete_renamed_column

use deleteColName when deleting a column
This commit is contained in:
Martin McKeaveney 2022-01-18 10:39:13 +01:00 committed by GitHub
commit b5d2396859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions

View File

@ -127,6 +127,7 @@
}
function deleteColumn() {
field.name = deleteColName
if (field.name === $tables.selected.primaryDisplay) {
notifications.error("You cannot delete the display column")
} else {
@ -470,16 +471,16 @@
onOk={deleteColumn}
onCancel={hideDeleteDialog}
title="Confirm Deletion"
disabled={deleteColName !== field.name}
disabled={deleteColName !== originalName}
>
<p>
Are you sure you wish to delete the column <b>{field.name}?</b>
Are you sure you wish to delete the column <b>{originalName}?</b>
Your data will be deleted and this action cannot be undone - enter the column
name to confirm.
</p>
<Input
dataCy="delete-column-confirm"
bind:value={deleteColName}
placeholder={field.name}
placeholder={originalName}
/>
</ConfirmDialog>