fix: Allow empty string for metadata condition value (#250)

ctrlplanedev · Dec 3, 2024 · 0683c14 · 0683c14
1 parent add1441
commit 0683c14
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/...p/[workspaceSlug]/(app)/(targets)/target-metadata-groups/[groupId]/CombincationsTable.tsx b/...p/[workspaceSlug]/(app)/(targets)/target-metadata-groups/[groupId]/CombincationsTable.tsx
@@ -45,8 +45,9 @@ export const CombinationsTable: React.FC<{
                       ([key, value]) => ({
                         type: "metadata",
                         key,
-                        value,
-                        operator: "equals",
+                        ...(value != null
+                          ? { value, operator: "equals" }
+                          : { operator: "null" }),
                       }),
                     ),
                   }),

diff --git a/packages/validators/src/conditions/metadata-condition.ts b/packages/validators/src/conditions/metadata-condition.ts
@@ -12,7 +12,7 @@ export type NullCondition = z.infer<typeof nullCondition>;
 export const equalsCondition = z.object({
   type: z.literal("metadata"),
   key: z.string().min(1),
-  value: z.string().min(1),
+  value: z.string(),
   operator: z.literal("equals").optional(),
 });
 
@@ -21,7 +21,7 @@ export type EqualCondition = z.infer<typeof equalsCondition>;
 export const regexCondition = z.object({
   type: z.literal("metadata"),
   key: z.string().min(1),
-  value: z.string().min(1),
+  value: z.string(),
   operator: z.literal("regex"),
 });
 
@@ -30,7 +30,7 @@ export type RegexCondition = z.infer<typeof regexCondition>;
 export const likeCondition = z.object({
   type: z.literal("metadata"),
   key: z.string().min(1),
-  value: z.string().min(1),
+  value: z.string(),
   operator: z.literal("like"),
 });
 

diff --git a/packages/validators/src/jobs/conditions/job-condition.ts b/packages/validators/src/jobs/conditions/job-condition.ts
@@ -125,7 +125,7 @@ export const isValidJobCondition = (condition: JobCondition): boolean => {
   if (isMetadataCondition(condition)) {
     if (condition.operator === MetadataOperator.Null)
       return condition.value == null && condition.key.length > 0;
-    return condition.value.length > 0 && condition.key.length > 0;
+    return condition.key.length > 0;
   }
   return condition.value.length > 0;
 };
diff --git a/packages/validators/src/releases/conditions/release-condition.ts b/packages/validators/src/releases/conditions/release-condition.ts
@@ -102,7 +102,7 @@ export const isValidReleaseCondition = (
   if (isMetadataCondition(condition)) {
     if (condition.operator === ReleaseOperator.Null)
       return condition.value == null && condition.key.length > 0;
-    return condition.value.length > 0 && condition.key.length > 0;
+    return condition.key.length > 0;
   }
   return false;
 };
diff --git a/packages/validators/src/resources/conditions/resource-condition.ts b/packages/validators/src/resources/conditions/resource-condition.ts
@@ -125,7 +125,7 @@ export const isValidTargetCondition = (
   if (isMetadataCondition(condition)) {
     if (condition.operator === ResourceOperator.Null)
       return condition.value == null && condition.key.length > 0;
-    return condition.value.length > 0 && condition.key.length > 0;
+    return condition.key.length > 0;
   }
   return condition.value.length > 0;
 };