diff --git a/api/resources/data/open_filters.json b/api/resources/data/open_filters.json index 5899a6f2..c1bf7077 100644 --- a/api/resources/data/open_filters.json +++ b/api/resources/data/open_filters.json @@ -54,6 +54,18 @@ }, "content_length_less_than_or_equal_to": { "expected_type": "number" + }, + "matches_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } + }, + "does_not_match_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } } } }, @@ -112,6 +124,18 @@ }, "content_length_less_than_or_equal_to": { "expected_type": "number" + }, + "matches_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } + }, + "does_not_match_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } } } }, @@ -170,6 +194,18 @@ }, "content_length_less_than_or_equal_to": { "expected_type": "number" + }, + "matches_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } + }, + "does_not_match_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } } } }, @@ -621,6 +657,18 @@ ] } }, + "matches_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } + }, + "does_not_match_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } + }, "past_week": { "expected_type": "object", "format": { @@ -686,5 +734,75 @@ } } } + }, + "barcode": { + "comparators": { + "equals": { + "expected_type": "string" + }, + "does_not_equal": { + "expected_type": "string" + }, + "contains": { + "expected_type": "string" + }, + "does_not_contain": { + "expected_type": "string" + }, + "starts_with": { + "expected_type": "string" + }, + "ends_with": { + "expected_type": "string" + }, + "is_empty": { + "expected_type": "boolean", + "format": { + "type": "enum", + "values": [ + true + ] + } + }, + "is_not_empty": { + "expected_type": "boolean", + "format": { + "type": "enum", + "values": [ + true + ] + } + }, + "matches_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } + }, + "does_not_match_regex": { + "expected_type": "string", + "format": { + "type": "regex" + } + }, + "content_length_equals": { + "expected_type": "number" + }, + "content_length_does_not_equal": { + "expected_type": "number" + }, + "content_length_greater_than": { + "expected_type": "number" + }, + "content_length_greater_than_or_equal_to": { + "expected_type": "number" + }, + "content_length_less_than": { + "expected_type": "number" + }, + "content_length_less_than_or_equal_to": { + "expected_type": "number" + } + } } } diff --git a/client/components/forms/components/CameraUpload.vue b/client/components/forms/components/CameraUpload.vue index 349143b2..8c6fe569 100644 --- a/client/components/forms/components/CameraUpload.vue +++ b/client/components/forms/components/CameraUpload.vue @@ -1,5 +1,8 @@