Skip to content

Commit 9c25d27

Browse files
committed
FIX All Bulk Actions
1 parent abc7bf4 commit 9c25d27

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

src/web/wizard/components/rules/AlertRulesContainer.jsx

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,23 +183,37 @@ const AlertRulesContainer = ({ fieldOrder }) => {
183183

184184
const deleteAlertRules = (alertRulesIds) => {
185185
const promises = alertRulesIds.map(id => AlertRuleActions.delete(id));
186-
Promise.all(promises).then(() => _loadAlertRules());
186+
Promise.all(promises).then(() => {}).finally(() => _loadAlertRules());
187187
}
188188

189-
const disableAlertRules = (alertRulesIds) => {
190-
const tempElements = alertRulesIds.map(name => elements.find(x => x.id === name));
189+
const disableAlertRules = async (alertRulesIds) => {
190+
const tempElements = [];
191+
192+
for(const id of alertRulesIds) {
193+
const loadedRule = await AlertRuleActions.get(id);
194+
tempElements.push(_convertAlertToElement(loadedRule));
195+
}
191196

197+
const promises = [];
192198
for(const elt of tempElements) {
193-
_onPause(elt.title, elt.condition, elt.streamId, elt.secondEventDefinition, elt.streamId2);
199+
promises.push(_onPause(elt.title, elt.condition, elt.streamId, elt.secondEventDefinition, elt.streamId2));
194200
}
201+
Promise.all(promises).then(() => {}).finally(() => _loadAlertRules());
195202
}
196203

197-
const enableAlertRules = (alertRulesIds) => {
198-
const tempElements = alertRulesIds.map(name => elements.find(x => x.id === name));
204+
const enableAlertRules = async (alertRulesIds) => {
205+
const tempElements = [];
199206

207+
for(const id of alertRulesIds) {
208+
const loadedRule = await AlertRuleActions.get(id);
209+
tempElements.push(_convertAlertToElement(loadedRule));
210+
}
211+
212+
const promises = [];
200213
for(const elt of tempElements) {
201-
_onResume(elt.condition, elt.streamId, elt.secondEventDefinition, elt.streamId2);
214+
promises.push(_onResume(elt.condition, elt.streamId, elt.secondEventDefinition, elt.streamId2));
202215
}
216+
Promise.all(promises).then(() => {}).finally(() => _loadAlertRules());
203217
}
204218

205219
const _onResume = (eventDefinitionIdentifier, stream, secondEventDefinitionIdentifier, stream2) => {
@@ -216,7 +230,7 @@ const AlertRulesContainer = ({ fieldOrder }) => {
216230
if (stream2 !== null) {
217231
StreamsStore.resume(stream2, response => response);
218232
}
219-
Promise.all(promises).then(() => {}).finally(() => _loadAlertRules());
233+
return Promise.all(promises);
220234
};
221235

222236
const _onPause = (name, eventDefinitionIdentifier, stream, secondEventDefinitionIdentifier, secondStream) => {
@@ -233,7 +247,7 @@ const AlertRulesContainer = ({ fieldOrder }) => {
233247
if (secondStream !== null) {
234248
StreamsStore.pause(secondStream, response => response);
235249
}
236-
Promise.all(promises).then(() => {}).finally(() => _loadAlertRules());
250+
return Promise.all(promises);
237251
}
238252

239253
const _onCloneSubmit = (name, title, description, shouldCloneNotification) => {

0 commit comments

Comments
 (0)