github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #5771 from nocodb/fix/filter-groups 

fix: filter groups
pull/5774/head
Raju Udava 2 years ago committed by GitHub
parent
219377d5df 5971a67f0a
commit
e41bb1a53d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 148 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      packages/nocodb-sdk/src/lib/Api.ts
  2. 146
      packages/nocodb/src/schema/swagger.json

72
packages/nocodb-sdk/src/lib/Api.ts
Unescape View File

@ -546,7 +546,39 @@ export interface FilterType {
| 'notchecked' | 'notchecked'
| 'notempty' | 'notempty'
| 'notnull' | 'notnull'
| 'null'; | 'null'
| null
| (
| 'allof'
| 'anyof'
| 'blank'
| 'btw'
| 'checked'
| 'empty'
| 'eq'
| 'ge'
| 'gt'
| 'gte'
| 'in'
| 'is'
| 'isWithin'
| 'isnot'
| 'le'
| 'like'
| 'lt'
| 'lte'
| 'nallof'
| 'nanyof'
| 'nbtw'
| 'neq'
| 'nlike'
| 'not'
| 'notblank'
| 'notchecked'
| 'notempty'
| 'notnull'
| ('null' & null)
);
/** Comparison Sub-Operator */ /** Comparison Sub-Operator */
comparison_sub_op?: comparison_sub_op?:
| 'daysAgo' | 'daysAgo'
@ -589,7 +621,7 @@ export interface FilterType {
| ('yesterday' & null) | ('yesterday' & null)
); );
/** Foreign Key to Column */ /** Foreign Key to Column */
fk_column_id?: IdType; fk_column_id?: StringOrNullType;
/** Foreign Key to Hook */ /** Foreign Key to Hook */
fk_hook_id?: StringOrNullType; fk_hook_id?: StringOrNullType;
/** Foreign Key to Model */ /** Foreign Key to Model */
@ -664,7 +696,39 @@ export interface FilterReqType {
| 'notchecked' | 'notchecked'
| 'notempty' | 'notempty'
| 'notnull' | 'notnull'
| 'null'; | 'null'
| null
| (
| 'allof'
| 'anyof'
| 'blank'
| 'btw'
| 'checked'
| 'empty'
| 'eq'
| 'ge'
| 'gt'
| 'gte'
| 'in'
| 'is'
| 'isWithin'
| 'isnot'
| 'le'
| 'like'
| 'lt'
| 'lte'
| 'nallof'
| 'nanyof'
| 'nbtw'
| 'neq'
| 'nlike'
| 'not'
| 'notblank'
| 'notchecked'
| 'notempty'
| 'notnull'
| ('null' & null)
);
/** Comparison Sub-Operator */ /** Comparison Sub-Operator */
comparison_sub_op?: comparison_sub_op?:
| 'daysAgo' | 'daysAgo'
@ -707,7 +771,7 @@ export interface FilterReqType {
| ('yesterday' & null) | ('yesterday' & null)
); );
/** Foreign Key to Column */ /** Foreign Key to Column */
fk_column_id?: IdType; fk_column_id?: StringOrNullType;
/** Belong to which filter ID */ /** Belong to which filter ID */
fk_parent_id?: StringOrNullType; fk_parent_id?: StringOrNullType;
/** Is this filter grouped? */ /** Is this filter grouped? */

146
packages/nocodb/src/schema/swagger.json
Unescape View File

@ -15197,38 +15197,45 @@
}, },
"comparison_op": { "comparison_op": {
"description": "Comparison Operator", "description": "Comparison Operator",
"enum": [ "anyOf": [
"allof", {
"anyof", "enum": [
"blank", "allof",
"btw", "anyof",
"checked", "blank",
"empty", "btw",
"eq", "checked",
"ge", "empty",
"gt", "eq",
"gte", "ge",
"in", "gt",
"is", "gte",
"isWithin", "in",
"isnot", "is",
"le", "isWithin",
"like", "isnot",
"lt", "le",
"lte", "like",
"nallof", "lt",
"nanyof", "lte",
"nbtw", "nallof",
"neq", "nanyof",
"nlike", "nbtw",
"not", "neq",
"notblank", "nlike",
"notchecked", "not",
"notempty", "notblank",
"notnull", "notchecked",
"null" "notempty",
], "notnull",
"type": "string" "null"
],
"type": "string"
},
{
"type": "null"
}
]
}, },
"comparison_sub_op": { "comparison_sub_op": {
"anyOf": [ "anyOf": [
@ -15262,7 +15269,7 @@
"description": "Comparison Sub-Operator" "description": "Comparison Sub-Operator"
}, },
"fk_column_id": { "fk_column_id": {
"$ref": "#/components/schemas/Id", "$ref": "#/components/schemas/StringOrNull",
"description": "Foreign Key to Column" "description": "Foreign Key to Column"
}, },
"fk_hook_id": { "fk_hook_id": {
@ -15518,38 +15525,45 @@
"properties": { "properties": {
"comparison_op": { "comparison_op": {
"description": "Comparison Operator", "description": "Comparison Operator",
"enum": [ "anyOf": [
"allof", {
"anyof", "enum": [
"blank", "allof",
"btw", "anyof",
"checked", "blank",
"empty", "btw",
"eq", "checked",
"ge", "empty",
"gt", "eq",
"gte", "ge",
"in", "gt",
"is", "gte",
"isWithin", "in",
"isnot", "is",
"le", "isWithin",
"like", "isnot",
"lt", "le",
"lte", "like",
"nallof", "lt",
"nanyof", "lte",
"nbtw", "nallof",
"neq", "nanyof",
"nlike", "nbtw",
"not", "neq",
"notblank", "nlike",
"notchecked", "not",
"notempty", "notblank",
"notnull", "notchecked",
"null" "notempty",
], "notnull",
"type": "string" "null"
],
"type": "string"
},
{
"type": "null"
}
]
}, },
"comparison_sub_op": { "comparison_sub_op": {
"anyOf": [ "anyOf": [
@ -15583,7 +15597,7 @@
"description": "Comparison Sub-Operator" "description": "Comparison Sub-Operator"
}, },
"fk_column_id": { "fk_column_id": {
"$ref": "#/components/schemas/Id", "$ref": "#/components/schemas/StringOrNull",
"description": "Foreign Key to Column" "description": "Foreign Key to Column"
}, },
"fk_parent_id": { "fk_parent_id": {

Write Preview
Loading…
Cancel
Save