fix: Remove reference to regex condition

apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/version/condition/DeploymentVersionConditionBadge.tsx

@@ -36,7 +36,6 @@ const operatorVerbs = {
       is <span className="text-orange-500">null</span>
     </span>
   ),
-  [DeploymentVersionOperator.Regex]: "matches",
   [DeploymentVersionOperator.Like]: "contains",
   [DateOperator.After]: "after",
   [DateOperator.Before]: "before",

apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/ColumnConditionRender.tsx

@@ -45,15 +45,12 @@ export const ColumnConditionRender: React.FC<ColumnConditionRenderProps> = ({
               Starts with
             </SelectItem>
             <SelectItem value={ColumnOperator.EndsWith}>Ends with</SelectItem>
-            <SelectItem value={ColumnOperator.Regex}>Regex</SelectItem>
           </SelectContent>
         </Select>
       </div>
       <div className="col-span-7">
         <Input
-          placeholder={
-            operator === ColumnOperator.Regex ? "^[a-zA-Z]+$" : "Value"
-          }
+          placeholder="Value"
           value={value}
           onChange={(e) => setValue(e.target.value)}
           className="w-full cursor-pointer rounded-l-none"

apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/MetadataConditionRender.tsx

@@ -95,7 +95,6 @@ export const MetadataConditionRender: React.FC<
             onValueChange={(
               v:
                 | MetadataOperator.Equals
-                | MetadataOperator.Regex
                 | MetadataOperator.Null
                 | MetadataOperator.StartsWith
                 | MetadataOperator.EndsWith
@@ -110,7 +109,6 @@ export const MetadataConditionRender: React.FC<
             </SelectTrigger>
             <SelectContent className="text-muted-foreground">
               <SelectItem value={MetadataOperator.Equals}>Equals</SelectItem>
-              <SelectItem value={MetadataOperator.Regex}>Regex</SelectItem>
               <SelectItem value={MetadataOperator.StartsWith}>
                 Starts with
               </SelectItem>
@@ -128,11 +126,7 @@ export const MetadataConditionRender: React.FC<
         {condition.operator !== MetadataOperator.Null ? (
           <div className="col-span-4">
             <Input
-              placeholder={
-                condition.operator === MetadataOperator.Regex
-                  ? "^[a-zA-Z]+$"
-                  : "Value"
-              }
+              placeholder="Value"
               value={condition.value}
               onChange={(e) => setValue(e.target.value)}
               className="rounded-l-none rounded-r-sm hover:bg-neutral-800/50"

apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionBadge.tsx

@@ -52,7 +52,6 @@ const operatorVerbs = {
       is <span className="text-orange-500">null</span>
     </span>
   ),
-  [MetadataOperator.Regex]: "matches",
   [DateOperator.After]: "after",
   [DateOperator.Before]: "before",
   [DateOperator.AfterOrOn]: "after or on",

apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionBadge.tsx

@@ -46,7 +46,6 @@ const operatorVerbs = {
       is <span className="text-orange-500">null</span>
     </span>
   ),
-  [ResourceOperator.Regex]: "matches",
   [ResourceOperator.Like]: "contains",
   [ColumnOperator.StartsWith]: "starts with",
   [ColumnOperator.EndsWith]: "ends with",

packages/db/src/schema/deployment-version.ts

@@ -179,21 +179,6 @@ const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
         .limit(1),
     );
 
-  if (cond.operator === MetadataOperator.Regex)
-    return exists(
-      tx
-        .select({ value: sql<number>`1` })
-        .from(deploymentVersionMetadata)
-        .where(
-          and(
-            eq(deploymentVersionMetadata.versionId, deploymentVersion.id),
-            eq(deploymentVersionMetadata.key, cond.key),
-            sql`${deploymentVersionMetadata.value} ~ ${cond.value}`,
-          ),
-        )
-        .limit(1),
-    );
-
   if (cond.operator === MetadataOperator.StartsWith)
     return exists(
       tx
@@ -272,9 +257,7 @@ const buildVersionCondition = (cond: VersionCondition): SQL => {
     return ilike(deploymentVersion.tag, `${cond.value}%`);
   if (cond.operator === ColumnOperator.EndsWith)
     return ilike(deploymentVersion.tag, `%${cond.value}`);
-  if (cond.operator === ColumnOperator.Contains)
-    return ilike(deploymentVersion.tag, `%${cond.value}%`);
-  return sql`${deploymentVersion.tag} ~ ${cond.value}`;
+  return ilike(deploymentVersion.tag, `%${cond.value}%`);
 };
 
 const buildCondition = (tx: Tx, cond: DeploymentVersionCondition): SQL => {

packages/db/src/schema/job.ts

@@ -172,21 +172,6 @@ const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
         .limit(1),
     );
 
-  if (cond.operator === MetadataOperator.Regex)
-    return exists(
-      tx
-        .select({ value: sql<number>`1` })
-        .from(jobMetadata)
-        .where(
-          and(
-            eq(jobMetadata.jobId, job.id),
-            eq(jobMetadata.key, cond.key),
-            sql`${jobMetadata.value} ~ ${cond.value}`,
-          ),
-        )
-        .limit(1),
-    );
-
   if (cond.operator === MetadataOperator.StartsWith)
     return exists(
       tx
@@ -263,9 +248,7 @@ const buildVersionCondition = (cond: VersionCondition): SQL => {
     return ilike(deploymentVersion.tag, `${cond.value}%`);
   if (cond.operator === ColumnOperator.EndsWith)
     return ilike(deploymentVersion.tag, `%${cond.value}`);
-  if (cond.operator === ColumnOperator.Contains)
-    return ilike(deploymentVersion.tag, `%${cond.value}%`);
-  return sql`${deploymentVersion.tag} ~ ${cond.value}`;
+  return ilike(deploymentVersion.tag, `%${cond.value}%`);
 };
 
 const buildCondition = (tx: Tx, cond: JobCondition): SQL => {

packages/db/src/schema/resource.ts

@@ -184,21 +184,6 @@ const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
         .limit(1),
     );
 
-  if (cond.operator === MetadataOperator.Regex)
-    return exists(
-      tx
-        .select({ value: sql<number>`1` })
-        .from(resourceMetadata)
-        .where(
-          and(
-            eq(resourceMetadata.resourceId, resource.id),
-            eq(resourceMetadata.key, cond.key),
-            sql`${resourceMetadata.value} ~ ${cond.value}`,
-          ),
-        )
-        .limit(1),
-    );
-
   if (cond.operator === MetadataOperator.StartsWith)
     return exists(
       tx
@@ -269,9 +254,7 @@ const buildIdentifierCondition = (tx: Tx, cond: IdentifierCondition): SQL => {
     return ilike(resource.identifier, `${cond.value}%`);
   if (cond.operator === ColumnOperator.EndsWith)
     return ilike(resource.identifier, `%${cond.value}`);
-  if (cond.operator === ColumnOperator.Contains)
-    return ilike(resource.identifier, `%${cond.value}%`);
-  return sql`${resource.identifier} ~ ${cond.value}`;
+  return ilike(resource.identifier, `%${cond.value}%`);
 };
 
 const buildNameCondition = (tx: Tx, cond: NameCondition): SQL => {
@@ -281,9 +264,7 @@ const buildNameCondition = (tx: Tx, cond: NameCondition): SQL => {
     return ilike(resource.name, `${cond.value}%`);
   if (cond.operator === ColumnOperator.EndsWith)
     return ilike(resource.name, `%${cond.value}`);
-  if (cond.operator === ColumnOperator.Contains)
-    return ilike(resource.name, `%${cond.value}%`);
-  return sql`${resource.name} ~ ${cond.value}`;
+  return ilike(resource.name, `%${cond.value}%`);
 };
 
 const buildCreatedAtCondition = (tx: Tx, cond: CreatedAtCondition): SQL => {

packages/validators/src/conditions/index.ts

@@ -5,7 +5,6 @@ export * from "./date-condition.js";
 
 export enum ColumnOperator {
   Equals = "equals",
-  Regex = "regex",
   StartsWith = "starts-with",
   EndsWith = "ends-with",
   Contains = "contains",

packages/validators/src/conditions/metadata-condition.ts

@@ -18,15 +18,6 @@ export const equalsCondition = z.object({
 
 export type EqualCondition = z.infer<typeof equalsCondition>;
 
-export const regexCondition = z.object({
-  type: z.literal("metadata"),
-  key: z.string().min(1),
-  value: z.string(),
-  operator: z.literal("regex"),
-});
-
-export type RegexCondition = z.infer<typeof regexCondition>;
-
 export const startsWithCondition = z.object({
   type: z.literal("metadata"),
   key: z.string().min(1),
@@ -58,7 +49,6 @@ export const metadataCondition = z.union([
   startsWithCondition,
   endsWithCondition,
   containsCondition,
-  regexCondition,
   equalsCondition,
   nullCondition,
 ]);
@@ -67,7 +57,6 @@ export type MetadataCondition = z.infer<typeof metadataCondition>;
 
 export enum MetadataOperator {
   Equals = "equals",
-  Regex = "regex",
   Null = "null",
   StartsWith = "starts-with",
   EndsWith = "ends-with",
@@ -76,7 +65,6 @@ export enum MetadataOperator {
 
 export type MetadataOperatorType =
   | MetadataOperator.Equals
-  | MetadataOperator.Regex
   | MetadataOperator.Null
   | MetadataOperator.StartsWith
   | MetadataOperator.EndsWith

packages/validators/src/releases/conditions/release-condition.ts

@@ -26,7 +26,6 @@ export const deploymentVersionCondition = z.union([
 export enum DeploymentVersionOperator {
   Equals = "equals",
   Like = "like",
-  Regex = "regex",
   Null = "null",
   And = "and",
   Or = "or",

packages/validators/src/resources/conditions/resource-condition.ts

@@ -46,7 +46,6 @@ export const resourceCondition = z.union([
 export enum ResourceOperator {
   Equals = "equals",
   Like = "like",
-  Regex = "regex",
   Null = "null",
   And = "and",
   Or = "or",