From cbde03bf86eeffb0d5f335f7ecb5d4e8a4249b7d Mon Sep 17 00:00:00 2001 From: Andrii Date: Mon, 26 Aug 2024 23:14:38 +0200 Subject: [PATCH 1/8] Update AccessCodeForm.tsx --- src/lib/ui/AccessCodeForm/AccessCodeForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx index 8c3b400e2..99f7eeb9f 100644 --- a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx +++ b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx @@ -173,7 +173,7 @@ function Content({ : null const hasCodeInputs = - accessCode?.type !== 'time_bound' || accessCode.is_offline_access_code + accessCode?.type !== 'time_bound' && accessCode?.is_offline_access_code return ( <> From ed70f00ae986d9ebfa916d684a6d8677c96d8fc3 Mon Sep 17 00:00:00 2001 From: Andrii Date: Mon, 26 Aug 2024 23:22:00 +0200 Subject: [PATCH 2/8] eslint fix --- src/lib/ui/AccessCodeForm/AccessCodeForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx index 99f7eeb9f..cb0e12d2a 100644 --- a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx +++ b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx @@ -80,7 +80,7 @@ function Content({ } const start = startDate.toISO() - if (start == null) { + if (start == null || start === undefined) { throw new Error(`Invalid start date: ${startDate.invalidReason}`) } From 503245b44ccbc04fde82ef9f9bf449767dc9d14e Mon Sep 17 00:00:00 2001 From: Andrii Date: Mon, 26 Aug 2024 23:28:36 +0200 Subject: [PATCH 3/8] Full fix --- src/lib/ui/AccessCodeForm/AccessCodeForm.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx index cb0e12d2a..d99ff3c89 100644 --- a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx +++ b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx @@ -80,12 +80,12 @@ function Content({ } const start = startDate.toISO() - if (start == null || start === undefined) { + if (start === null || start === undefined) { throw new Error(`Invalid start date: ${startDate.invalidReason}`) } const end = endDate.toISO() - if (end == null) { + if (end === null || end === undefined) { throw new Error(`Invalid end date: ${endDate.invalidReason}`) } From 96791cc71b5b6285263b3d37a4cffb88d455a4f7 Mon Sep 17 00:00:00 2001 From: Andrii Date: Mon, 26 Aug 2024 23:31:57 +0200 Subject: [PATCH 4/8] Update AccessCodeForm.tsx --- src/lib/ui/AccessCodeForm/AccessCodeForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx index d99ff3c89..55572fb95 100644 --- a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx +++ b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx @@ -206,7 +206,7 @@ function Content({ }} /> - {hasCodeInputs && ( + {hasCodeInputs !== null && hasCodeInputs !== undefined && hasCodeInputs && ( <> {t.codeInputLabel} From 5917d9520bbd271f6c9475476e24c9400f7bba59 Mon Sep 17 00:00:00 2001 From: Seam Bot Date: Mon, 26 Aug 2024 21:32:57 +0000 Subject: [PATCH 5/8] ci: Format code --- src/lib/ui/AccessCodeForm/AccessCodeForm.tsx | 146 ++++++++++--------- 1 file changed, 74 insertions(+), 72 deletions(-) diff --git a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx index 55572fb95..c66b0ece4 100644 --- a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx +++ b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx @@ -206,81 +206,83 @@ function Content({ }} /> - {hasCodeInputs !== null && hasCodeInputs !== undefined && hasCodeInputs && ( - <> - - {t.codeInputLabel} - - validateCodeLength(device, value), - }), - }} - /> -
- {codeLengthRequirementMessage != null && ( -
    -
  • {codeLengthRequirementMessage}
  • -
  • {t.codeNumbersOnlyRequirement}
  • -
- )} - -
-
- - {t.timingInputLabel} - - <> - {type === 'time_bound' && ( - { - setDatePickerVisible(true) + {codeLengthRequirementMessage != null && ( +
    +
  • {codeLengthRequirementMessage}
  • +
  • {t.codeNumbersOnlyRequirement}
  • +
+ )} + + +
+ + {t.timingInputLabel} + + <> + {type === 'time_bound' && ( + { + setDatePickerVisible(true) + }} + /> + )} + + + + )} {responseErrors?.unknown != null && (
{responseErrors?.unknown}
)} From 14c81db18a7cc3675524ccc37bbc82070b8fc17d Mon Sep 17 00:00:00 2001 From: Andrii Date: Tue, 27 Aug 2024 00:09:18 +0200 Subject: [PATCH 6/8] Possible solution --- src/lib/ui/AccessCodeForm/AccessCodeForm.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx index c66b0ece4..529630567 100644 --- a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx +++ b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx @@ -172,8 +172,7 @@ function Content({ ? t.codeLengthRequirement(codeLengthRequirement) : null - const hasCodeInputs = - accessCode?.type !== 'time_bound' && accessCode?.is_offline_access_code + const hasCodeInputs = accessCode?.type !== 'time_bound' return ( <> From dc6a06d677fbfaa2ee241fe4d0d984c0440c1241 Mon Sep 17 00:00:00 2001 From: Andrii Date: Tue, 27 Aug 2024 00:19:06 +0200 Subject: [PATCH 7/8] Update AccessCodeForm.tsx --- src/lib/ui/AccessCodeForm/AccessCodeForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx index 529630567..a2a6e3ac6 100644 --- a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx +++ b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx @@ -172,7 +172,7 @@ function Content({ ? t.codeLengthRequirement(codeLengthRequirement) : null - const hasCodeInputs = accessCode?.type !== 'time_bound' + const hasCodeInputs = accessCode?.is_offline_access_code !== true return ( <> From 1414939c1dc124dad1273652fd490af81a7d6cab Mon Sep 17 00:00:00 2001 From: Andrii Date: Tue, 27 Aug 2024 00:22:50 +0200 Subject: [PATCH 8/8] Remove redundant code --- src/lib/ui/AccessCodeForm/AccessCodeForm.tsx | 150 +++++++++---------- 1 file changed, 74 insertions(+), 76 deletions(-) diff --git a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx index a2a6e3ac6..da454cc5c 100644 --- a/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx +++ b/src/lib/ui/AccessCodeForm/AccessCodeForm.tsx @@ -80,12 +80,12 @@ function Content({ } const start = startDate.toISO() - if (start === null || start === undefined) { + if (start === null) { throw new Error(`Invalid start date: ${startDate.invalidReason}`) } const end = endDate.toISO() - if (end === null || end === undefined) { + if (end === null) { throw new Error(`Invalid end date: ${endDate.invalidReason}`) } @@ -205,83 +205,81 @@ function Content({ }} /> - {hasCodeInputs !== null && - hasCodeInputs !== undefined && - hasCodeInputs && ( - <> - - {t.codeInputLabel} - - validateCodeLength(device, value), - }), + {hasCodeInputs && ( + <> + + {t.codeInputLabel} + + validateCodeLength(device, value), + }), + }} + /> +
+ {codeLengthRequirementMessage != null && ( +
    +
  • {codeLengthRequirementMessage}
  • +
  • {t.codeNumbersOnlyRequirement}
  • +
+ )} + +
+
+ + {t.timingInputLabel} + + <> + {type === 'time_bound' && ( + { + setDatePickerVisible(true) }} - disabled={isGeneratingCode} - > - {t.codeGenerateButton} - - - - - {t.timingInputLabel} - - <> - {type === 'time_bound' && ( - { - setDatePickerVisible(true) - }} - /> - )} - - - - )} + /> + )} + +
+ + )} {responseErrors?.unknown != null && (
{responseErrors?.unknown}
)}