Skip to content

Beautiful Open-Source Form Builder

Add rich text comparators to open_filters.json and update ColumnCondition.vue (#1006)

Chirag Chhatraladfa6be77c7b0
diff --git a/api/resources/data/open_filters.json b/api/resources/data/open_filters.json
index 9864c6a13..387bf04a1 100644
--- a/api/resources/data/open_filters.json
+++ b/api/resources/data/open_filters.json
@@ -343,6 +343,92 @@
}
}
},
+ "rich_text": {
+ "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
+ ]
+ }
+ },
+ "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"
+ },
+ "matches_regex": {
+ "expected_type": "string",
+ "format": {
+ "type": "regex"
+ }
+ },
+ "does_not_match_regex": {
+ "expected_type": "string",
+ "format": {
+ "type": "regex"
+ }
+ },
+ "exists_in_submissions": {
+ "expected_type": "boolean",
+ "format": {
+ "type": "enum",
+ "values": [true]
+ },
+ "custom_validation_only": true
+ },
+ "does_not_exist_in_submissions": {
+ "expected_type": "boolean",
+ "format": {
+ "type": "enum",
+ "values": [true]
+ },
+ "custom_validation_only": true
+ }
+ }
+ },
"matrix": {
"comparators": {
"equals": {
diff --git a/client/components/open/forms/components/form-logic-components/ColumnCondition.vue b/client/components/open/forms/components/form-logic-components/ColumnCondition.vue
index 76c86b36f..fecd93c2b 100644
--- a/client/components/open/forms/components/form-logic-components/ColumnCondition.vue
+++ b/client/components/open/forms/components/form-logic-components/ColumnCondition.vue
@@ -60,6 +60,7 @@ export default {
hasInput: false,
inputComponent: {
text: "TextInput",
+ rich_text: "TextInput",
number: "TextInput",
rating: "TextInput",
scale: "TextInput",
diff --git a/client/data/open_filters.json b/client/data/open_filters.json
index 9864c6a13..387bf04a1 100644
--- a/client/data/open_filters.json
+++ b/client/data/open_filters.json
@@ -343,6 +343,92 @@
}
}
},
+ "rich_text": {
+ "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
+ ]
+ }
+ },
+ "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"
+ },
+ "matches_regex": {
+ "expected_type": "string",
+ "format": {
+ "type": "regex"
+ }
+ },
+ "does_not_match_regex": {
+ "expected_type": "string",
+ "format": {
+ "type": "regex"
+ }
+ },
+ "exists_in_submissions": {
+ "expected_type": "boolean",
+ "format": {
+ "type": "enum",
+ "values": [true]
+ },
+ "custom_validation_only": true
+ },
+ "does_not_exist_in_submissions": {
+ "expected_type": "boolean",
+ "format": {
+ "type": "enum",
+ "values": [true]
+ },
+ "custom_validation_only": true
+ }
+ }
+ },
"matrix": {
"comparators": {
"equals": {