V2Wizard: Improve validators

Follow up to #1548 This cleans up implementation for the AWS account ID ad GCP e-mail validators.
osbuild · Jan 15, 2024 · 55686cc · 55686cc
1 parent 3ed2192
commit 55686cc
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/Components/CreateImageWizardV2/validators.ts b/src/Components/CreateImageWizardV2/validators.ts
@@ -1,21 +1,15 @@
 export const isAwsAccountIdValid = (awsAccountId: string | undefined) => {
-  if (
+  return (
     awsAccountId !== undefined &&
     /^\d+$/.test(awsAccountId) &&
     awsAccountId.length === 12
-  ) {
-    return true;
-  }
-  return false;
+  );
 };
 
 export const isGcpEmailValid = (gcpShareWithAccount: string | undefined) => {
-  if (
+  return (
     gcpShareWithAccount !== undefined &&
     /^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,12}$/.test(gcpShareWithAccount) &&
     gcpShareWithAccount.length <= 253
-  ) {
-    return true;
-  }
-  return false;
+  );
 };