From 002c1948f6413d715a5bc342edf002b4f6e58ea2 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 31 May 2023 13:36:52 +0800
Subject: [PATCH 1/2] fix(nocodb): comparison_op & fk_column_id types in
 swagger.json

---
 packages/nocodb/src/schema/swagger.json | 146 +++++++++++++-----------
 1 file changed, 80 insertions(+), 66 deletions(-)

diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index b7d5a6e102..57083b9061 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -15197,38 +15197,45 @@
           },
           "comparison_op": {
             "description": "Comparison Operator",
-            "enum": [
-              "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"
-            ],
-            "type": "string"
+            "anyOf": [
+              {
+                "enum": [
+                  "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"
+                ],
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
           },
           "comparison_sub_op": {
             "anyOf": [
@@ -15262,7 +15269,7 @@
             "description": "Comparison Sub-Operator"
           },
           "fk_column_id": {
-            "$ref": "#/components/schemas/Id",
+            "$ref": "#/components/schemas/StringOrNull",
             "description": "Foreign Key to Column"
           },
           "fk_hook_id": {
@@ -15518,38 +15525,45 @@
         "properties": {
           "comparison_op": {
             "description": "Comparison Operator",
-            "enum": [
-              "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"
-            ],
-            "type": "string"
+            "anyOf": [
+              {
+                "enum": [
+                  "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"
+                ],
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
           },
           "comparison_sub_op": {
             "anyOf": [
@@ -15583,7 +15597,7 @@
             "description": "Comparison Sub-Operator"
           },
           "fk_column_id": {
-            "$ref": "#/components/schemas/Id",
+            "$ref": "#/components/schemas/StringOrNull",
             "description": "Foreign Key to Column"
           },
           "fk_parent_id": {

From 5971a67f0a97189a248301f38218fb29d0fd56ef Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 31 May 2023 13:37:02 +0800
Subject: [PATCH 2/2] chore(sdk): regenerate Api.ts

---
 packages/nocodb-sdk/src/lib/Api.ts | 72 ++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 06493d405c..948638e4ed 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -546,7 +546,39 @@ export interface FilterType {
     | 'notchecked'
     | 'notempty'
     | '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_op?:
     | 'daysAgo'
@@ -589,7 +621,7 @@ export interface FilterType {
         | ('yesterday' & null)
       );
   /** Foreign Key to Column */
-  fk_column_id?: IdType;
+  fk_column_id?: StringOrNullType;
   /** Foreign Key to Hook */
   fk_hook_id?: StringOrNullType;
   /** Foreign Key to Model */
@@ -664,7 +696,39 @@ export interface FilterReqType {
     | 'notchecked'
     | 'notempty'
     | '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_op?:
     | 'daysAgo'
@@ -707,7 +771,7 @@ export interface FilterReqType {
         | ('yesterday' & null)
       );
   /** Foreign Key to Column */
-  fk_column_id?: IdType;
+  fk_column_id?: StringOrNullType;
   /** Belong to which filter ID */
   fk_parent_id?: StringOrNullType;
   /** Is this filter grouped? */