Browse Source

fix: replace oneOf with anyOf - update all the places

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/5174/head
Pranav C 2 years ago
parent
commit
dbcc489c0d
  1. 32
      packages/nocodb-sdk/src/lib/Api.ts
  2. 8
      scripts/sdk/swagger.json

32
packages/nocodb-sdk/src/lib/Api.ts

@ -276,7 +276,13 @@ export interface ColumnType {
| RollupType
| LookupType
| SelectOptionsType
| object;
| object
| (LinkToAnotherRecordType &
FormulaType &
RollupType &
LookupType &
SelectOptionsType &
object);
}
export interface ColumnListType {
@ -808,11 +814,16 @@ export interface FormulaColumnReqType {
}
export type ColumnReqType = (
| NormalColumnRequestType
| LinkToAnotherColumnReqType
| RollupColumnReqType
| FormulaColumnReqType
| LookupColumnReqType
| NormalColumnRequestType
| (LinkToAnotherColumnReqType &
RollupColumnReqType &
FormulaColumnReqType &
LookupColumnReqType &
NormalColumnRequestType)
) & {
column_name?: string;
title?: string;
@ -4262,11 +4273,11 @@ export class Api<
relatedMetas?: any,
client?: string,
base_id?: string,
columns?: ((GridColumnType | FormColumnType | GalleryColumnType) & ColumnType),
columns?: ((GridColumnType | FormColumnType | GalleryColumnType | (GridColumnType & FormColumnType & GalleryColumnType)) & ColumnType),
model?: TableType,
} & {
view?: (FormType | GridType | GalleryType),
view?: (FormType | GridType | GalleryType | (FormType & GridType & GalleryType)),
})` OK
*/
@ -4276,11 +4287,20 @@ export class Api<
relatedMetas?: any;
client?: string;
base_id?: string;
columns?: (GridColumnType | FormColumnType | GalleryColumnType) &
columns?: (
| GridColumnType
| FormColumnType
| GalleryColumnType
| (GridColumnType & FormColumnType & GalleryColumnType)
) &
ColumnType;
model?: TableType;
} & {
view?: FormType | GridType | GalleryType;
view?:
| FormType
| GridType
| GalleryType
| (FormType & GridType & GalleryType);
},
any
>({

8
scripts/sdk/swagger.json

@ -5713,7 +5713,7 @@
"columns": {
"allOf": [
{
"oneOf": [
"anyOf": [
{
"$ref": "#/components/schemas/GridColumn"
},
@ -5739,7 +5739,7 @@
"type": "object",
"properties": {
"view": {
"oneOf": [
"anyOf": [
{
"$ref": "#/components/schemas/Form"
},
@ -7787,7 +7787,7 @@
"type": "number"
},
"view": {
"oneOf": [
"anyOf": [
{
"$ref": "#/components/schemas/Form"
},
@ -8471,7 +8471,7 @@
},
"meta": {},
"colOptions": {
"oneOf": [
"anyOf": [
{
"$ref": "#/components/schemas/LinkToAnotherRecord"
},

Loading…
Cancel
Save