From ae1b399b621b7a4fd053f39ff1bf1a5ab19a03ab Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Mon, 23 May 2022 15:15:08 +0300 Subject: [PATCH] Simplify code for asking of boolean value from user Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- .../selection-of-update-stability.test.ts.snap | 11 +++++++++++ .../ask-boolean-promise.injectable.ts | 18 +++++++----------- src/main/ask-boolean/ask-boolean.injectable.ts | 2 -- 3 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap diff --git a/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap b/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap new file mode 100644 index 0000000000..dc96c447b0 --- /dev/null +++ b/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap @@ -0,0 +1,11 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`selection of update stability when started renders 1`] = ` + +
+
+
+ +`; diff --git a/src/main/ask-boolean/ask-boolean-promise.injectable.ts b/src/main/ask-boolean/ask-boolean-promise.injectable.ts index c348d74169..827714084f 100644 --- a/src/main/ask-boolean/ask-boolean-promise.injectable.ts +++ b/src/main/ask-boolean/ask-boolean-promise.injectable.ts @@ -11,21 +11,17 @@ const askBooleanPromiseInjectable = getInjectable({ void questionId; let resolve: (value: boolean) => void; - let _promise: Promise; + + const promise = new Promise(_resolve => { + resolve = _resolve; + }); return ({ - get promise() { - return _promise; - }, - - clear: () => { - _promise = new Promise(_resolve => { - resolve = _resolve; - }); - }, + promise, resolve: (value: boolean) => { - resolve(value); }, + resolve(value); + }, }); }, diff --git a/src/main/ask-boolean/ask-boolean.injectable.ts b/src/main/ask-boolean/ask-boolean.injectable.ts index f58346555a..5d39b63a10 100644 --- a/src/main/ask-boolean/ask-boolean.injectable.ts +++ b/src/main/ask-boolean/ask-boolean.injectable.ts @@ -29,8 +29,6 @@ const askBooleanInjectable = getInjectable({ const returnValuePromise = di.inject(askBooleanPromiseInjectable, id); - returnValuePromise.clear(); - await sendToChannel(askBooleanChannel, { id, title, question }); return await returnValuePromise.promise;