diff --git a/package-lock.json b/package-lock.json
index f772d2d5b..93ecea17e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2634,9 +2634,9 @@
}
},
"electron": {
- "version": "11.2.1",
- "resolved": "https://registry.npmjs.org/electron/-/electron-11.2.1.tgz",
- "integrity": "sha512-Im1y29Bnil+Nzs+FCTq01J1OtLbs+2ZGLLllaqX/9n5GgpdtDmZhS/++JHBsYZ+4+0n7asO+JKQgJD+CqPClzg==",
+ "version": "9.4.1",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-9.4.1.tgz",
+ "integrity": "sha512-r4CxoVG9Ja7tBtkilWMnBsBGup8G8Z+v7icZmwysHa8/OSr0OrLjrcOF/30BAP7yPE5fz/XTxygnltzW4OTZdw==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index 59ce57c20..0a8fe5050 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
},
"devDependencies": {
"cross-env": "7.0.3",
- "electron": "11.2.1",
+ "electron": "9.4.1",
"electron-builder": "22.9.1",
"electron-packager": "15.2.0",
"electron-rebuild": "2.3.4",
diff --git a/src/public/app/widgets/search_actions/abstract_search_action.js b/src/public/app/widgets/search_actions/abstract_search_action.js
index 0fb7f8ef1..49bcb09c4 100644
--- a/src/public/app/widgets/search_actions/abstract_search_action.js
+++ b/src/public/app/widgets/search_actions/abstract_search_action.js
@@ -14,7 +14,7 @@ export default class AbstractSearchAction extends Component {
try {
const $rendered = this.doRender();
- $rendered.attr('data-attribute-id', this.attribute.attributeId);
+ $rendered.find('.action-conf-del').on('click', () => this.deleteAction())
return $rendered;
}
@@ -39,4 +39,12 @@ export default class AbstractSearchAction extends Component {
await ws.waitForMaxKnownEntityChangeId();
}
+
+ async deleteAction() {
+ await server.remove(`notes/${this.attribute.noteId}/attributes/${this.attribute.attributeId}`);
+
+ await ws.waitForMaxKnownEntityChangeId();
+
+ await this.triggerCommand('refreshSearchDefinition');
+ }
}
diff --git a/src/public/app/widgets/search_actions/delete_label.js b/src/public/app/widgets/search_actions/delete_label.js
index 8914c80d0..0af3bca3a 100644
--- a/src/public/app/widgets/search_actions/delete_label.js
+++ b/src/public/app/widgets/search_actions/delete_label.js
@@ -17,7 +17,7 @@ const TPL = `
|
-
+
|
`;
diff --git a/src/public/app/widgets/search_actions/delete_note.js b/src/public/app/widgets/search_actions/delete_note.js
index bc579ec29..b4927d09b 100644
--- a/src/public/app/widgets/search_actions/delete_note.js
+++ b/src/public/app/widgets/search_actions/delete_note.js
@@ -8,7 +8,7 @@ const TPL = `
Delete matched note
-
+
|
`;
diff --git a/src/public/app/widgets/search_actions/delete_relation.js b/src/public/app/widgets/search_actions/delete_relation.js
index 6376dca22..5176633c8 100644
--- a/src/public/app/widgets/search_actions/delete_relation.js
+++ b/src/public/app/widgets/search_actions/delete_relation.js
@@ -17,7 +17,7 @@ const TPL = `
-
+
|
`;
diff --git a/src/public/app/widgets/search_actions/execute_script.js b/src/public/app/widgets/search_actions/execute_script.js
index 7e9391ce2..f340c2334 100644
--- a/src/public/app/widgets/search_actions/execute_script.js
+++ b/src/public/app/widgets/search_actions/execute_script.js
@@ -16,7 +16,7 @@ const TPL = `
-
+
|
`;
diff --git a/src/public/app/widgets/search_actions/rename_label.js b/src/public/app/widgets/search_actions/rename_label.js
index 6e46e2216..bd3c958c5 100644
--- a/src/public/app/widgets/search_actions/rename_label.js
+++ b/src/public/app/widgets/search_actions/rename_label.js
@@ -28,7 +28,7 @@ const TPL = `
-
+
|
`;
diff --git a/src/public/app/widgets/search_actions/rename_relation.js b/src/public/app/widgets/search_actions/rename_relation.js
index 64a436e4a..13795a4b5 100644
--- a/src/public/app/widgets/search_actions/rename_relation.js
+++ b/src/public/app/widgets/search_actions/rename_relation.js
@@ -28,7 +28,7 @@ const TPL = `
-
+
|
`;
diff --git a/src/public/app/widgets/search_actions/set_label_value.js b/src/public/app/widgets/search_actions/set_label_value.js
index 25c761921..63215673e 100644
--- a/src/public/app/widgets/search_actions/set_label_value.js
+++ b/src/public/app/widgets/search_actions/set_label_value.js
@@ -24,7 +24,7 @@ const TPL = `
-
+
|
`;
diff --git a/src/public/app/widgets/search_actions/set_relation_target.js b/src/public/app/widgets/search_actions/set_relation_target.js
index 0d386b09e..cb3d8ef7c 100644
--- a/src/public/app/widgets/search_actions/set_relation_target.js
+++ b/src/public/app/widgets/search_actions/set_relation_target.js
@@ -24,7 +24,7 @@ const TPL = `
-
+
|
`;
diff --git a/src/public/app/widgets/search_definition.js b/src/public/app/widgets/search_definition.js
index 36e821a8f..cc8821f05 100644
--- a/src/public/app/widgets/search_definition.js
+++ b/src/public/app/widgets/search_definition.js
@@ -200,16 +200,6 @@ export default class SearchDefinitionWidget extends TabAwareWidget {
this.refresh();
});
- this.$widget.on('click', '[data-action-conf-del]', async event => {
- const attributeId = $(event.target).closest('[data-attribute-id]').attr('data-attribute-id');
-
- await server.remove(`notes/${this.noteId}/attributes/${attributeId}`);
-
- await ws.waitForMaxKnownEntityChangeId();
-
- this.refresh();
- });
-
this.$searchOptions = this.$widget.find('.search-options');
this.$actionOptions = this.$widget.find('.action-options');