From fa8cd0e3a3eb8a146d9191e79a1ce46af92e5ae4 Mon Sep 17 00:00:00 2001 From: Danil Shaymurzin Date: Wed, 24 Jan 2024 22:16:18 +0500 Subject: [PATCH 1/4] fix(server_manager): use typeof function instead of directly comparison --- .../web_app/ui_components/outline-server-settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server_manager/web_app/ui_components/outline-server-settings.ts b/src/server_manager/web_app/ui_components/outline-server-settings.ts index 3cd7c05ed..41637e2df 100644 --- a/src/server_manager/web_app/ui_components/outline-server-settings.ts +++ b/src/server_manager/web_app/ui_components/outline-server-settings.ts @@ -441,7 +441,7 @@ Polymer({ _defaultDataLimitEnabledChanged(e: CustomEvent) { const wasDataLimitEnabled = this.isDefaultDataLimitEnabled; const isDataLimitEnabled = e.detail.value === 'enabled'; - if (isDataLimitEnabled === undefined || wasDataLimitEnabled === undefined) { + if (typeof isDataLimitEnabled === undefined || typeof wasDataLimitEnabled === undefined) { return; } else if (isDataLimitEnabled === wasDataLimitEnabled) { return; From 43d49fc683ae8485be644baea9e7313e60fb2ec9 Mon Sep 17 00:00:00 2001 From: Danil Shaymurzin Date: Thu, 25 Jan 2024 14:19:00 +0500 Subject: [PATCH 2/4] fix: clearly type checking --- .../web_app/ui_components/outline-server-settings.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server_manager/web_app/ui_components/outline-server-settings.ts b/src/server_manager/web_app/ui_components/outline-server-settings.ts index 41637e2df..086f46b93 100644 --- a/src/server_manager/web_app/ui_components/outline-server-settings.ts +++ b/src/server_manager/web_app/ui_components/outline-server-settings.ts @@ -439,11 +439,11 @@ Polymer({ }, _defaultDataLimitEnabledChanged(e: CustomEvent) { - const wasDataLimitEnabled = this.isDefaultDataLimitEnabled; - const isDataLimitEnabled = e.detail.value === 'enabled'; - if (typeof isDataLimitEnabled === undefined || typeof wasDataLimitEnabled === undefined) { + if (e.detail?.value === undefined) { return; - } else if (isDataLimitEnabled === wasDataLimitEnabled) { + } + const isDataLimitEnabled = e.detail.value === 'enabled'; + if (isDataLimitEnabled === this.isDefaultDataLimitEnabled) { return; } this.isDefaultDataLimitEnabled = isDataLimitEnabled; From 9681592b6a40a29fdffb91fdab9a7ba7b7b165d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danil=20Shaymurzin=20=E2=9A=A1=EF=B8=8F?= Date: Thu, 1 Feb 2024 12:02:27 +0500 Subject: [PATCH 3/4] Update src/server_manager/web_app/ui_components/outline-server-settings.ts Co-authored-by: Vinicius Fortuna --- .../web_app/ui_components/outline-server-settings.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server_manager/web_app/ui_components/outline-server-settings.ts b/src/server_manager/web_app/ui_components/outline-server-settings.ts index 086f46b93..02e79143d 100644 --- a/src/server_manager/web_app/ui_components/outline-server-settings.ts +++ b/src/server_manager/web_app/ui_components/outline-server-settings.ts @@ -442,11 +442,11 @@ Polymer({ if (e.detail?.value === undefined) { return; } - const isDataLimitEnabled = e.detail.value === 'enabled'; - if (isDataLimitEnabled === this.isDefaultDataLimitEnabled) { + const enableDataLimit = e.detail.value === 'enabled'; + if (this.isDefaultDataLimitEnabled === enableDataLimit) { return; } - this.isDefaultDataLimitEnabled = isDataLimitEnabled; + this.isDefaultDataLimitEnabled = enableDataLimit; if (isDataLimitEnabled) { this._requestSetDefaultDataLimit(); } else { From a58453da5faf56d4cecdad3de4d97a11bbcc7435 Mon Sep 17 00:00:00 2001 From: Danil Shaymurzin Date: Thu, 1 Feb 2024 20:30:58 +0500 Subject: [PATCH 4/4] fix(server_manager): cannot find isDataLimitEnabled --- .../web_app/ui_components/outline-server-settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server_manager/web_app/ui_components/outline-server-settings.ts b/src/server_manager/web_app/ui_components/outline-server-settings.ts index 02e79143d..154281f28 100644 --- a/src/server_manager/web_app/ui_components/outline-server-settings.ts +++ b/src/server_manager/web_app/ui_components/outline-server-settings.ts @@ -447,7 +447,7 @@ Polymer({ return; } this.isDefaultDataLimitEnabled = enableDataLimit; - if (isDataLimitEnabled) { + if (enableDataLimit) { this._requestSetDefaultDataLimit(); } else { this.fire('RemoveDefaultDataLimitRequested');