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

Merge pull request #7792 from nocodb/chore/sync-main-to-dev 

Chore/sync main to dev
pull/7795/head
Pranav C 8 months ago committed by GitHub
parent
d8b73f7bf4 220d267ede
commit
1b734b671c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 226 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      packages/nc-lib-gui/package.json
  2. 2
      packages/nocodb-sdk/package.json
  3. 304
      packages/nocodb-sdk/src/lib/Api.ts
  4. 6
      packages/nocodb/package.json
  5. 16
      pnpm-lock.yaml

2
packages/nc-lib-gui/package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "nc-lib-gui",
"version": "0.204.2",
"version": "0.204.4",
"description": "NocoDB GUI",
"author": {
"name": "NocoDB",

2
packages/nocodb-sdk/package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "nocodb-sdk",
"version": "0.204.2",
"version": "0.204.4",
"description": "NocoDB SDK",
"main": "build/main/index.js",
"typings": "build/main/index.d.ts",

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

@ -89,6 +89,26 @@ export interface AttachmentReqType {
fileName?: string;
}
/**
* Model for Attachment Response
*/
export type AttachmentResType = {
/** The mimetype of the attachment */
mimetype?: string;
/** The attachment stored path */
path?: string;
/** The size of the attachment */
size?: number;
/** The title of the attachment used in UI */
title?: string;
/** The attachment stored url */
url?: string;
/** Attachment signedPath will allow to access attachment directly */
signedPath?: string;
/** Attachment signedUrl will allow to access attachment directly */
signedUrl?: string;
} | null;
/**
* Model for File Request
*/
@ -826,8 +846,8 @@ export interface FollowerType {
export interface FormType {
/** Unique ID */
id?: IdType;
/** Banner Image URL. Not in use currently. */
banner_image_url?: TextOrNullType;
/** Banner Image URL */
banner_image_url?: AttachmentResType;
/** Form Columns */
columns?: FormColumnType[];
/** Email to sned after form is submitted */
@ -852,8 +872,8 @@ export interface FormType {
* @example collaborative
*/
lock_type?: 'collaborative' | 'locked' | 'personal';
/** Logo URL. Not in use currently. */
logo_url?: TextOrNullType;
/** Logo URL */
logo_url?: AttachmentResType;
/** Meta Info for this view */
meta?: MetaType;
/** The numbers of seconds to redirect after form submission */
@ -882,8 +902,8 @@ export interface FormType {
* Model for Form Update Request
*/
export interface FormUpdateReqType {
/** Banner Image URL. Not in use currently. */
banner_image_url?: StringOrNullType;
/** Banner Image URL */
banner_image_url?: AttachmentReqType | null;
/** Email to sned after form is submitted */
email?: StringOrNullType;
/**
@ -891,8 +911,8 @@ export interface FormUpdateReqType {
* @example My Form
*/
heading?: string;
/** Logo URL. Not in use currently. */
logo_url?: StringOrNullType;
/** Logo URL */
logo_url?: AttachmentReqType | null;
/** Meta Info for this view */
meta?: MetaType;
/** The numbers of seconds to redirect after form submission */
@ -8634,49 +8654,6 @@ export class Api<
...params,
}),
/**
* @description Get the count of table view rows grouped by the dates
*
* @tags DB View Row
* @name CalendarCount
* @summary Count of Records in Dates in Calendar View
* @request GET:/api/v1/db/data/{orgs}/{baseName}/{tableName}/views/{viewName}/countByDate/
* @response `200` `any` OK
* @response `400` `{
\** @example BadRequest [Error]: <ERROR MESSAGE> *\
msg: string,
}`
*/
calendarCount: (
orgs: string,
baseName: string,
tableName: string,
viewName: string,
query?: {
sort?: any[];
where?: string;
/** @min 1 */
limit?: number;
/** @min 0 */
offset?: number;
},
params: RequestParams = {}
) =>
this.request<
any,
{
/** @example BadRequest [Error]: <ERROR MESSAGE> */
msg: string;
}
>({
path: `/api/v1/db/data/${orgs}/${baseName}/${tableName}/views/${viewName}/countByDate/`,
method: 'GET',
query: query,
format: 'json',
...params,
}),
/**
* @description Get the table view rows grouped by the given query
*
@ -8937,7 +8914,192 @@ export class Api<
...params,
}),
};
dbCalendarViewRow = {
/**
* @description List all rows in Calendar View of a Table
*
* @tags DB Calendar View Row
* @name List
* @summary List rows in Calendar View of a Table
* @request GET:/api/v1/db/calendar-data/{orgs}/{baseName}/{tableName}/views/{viewName}
*/
list: (
orgs: string,
baseName: string,
tableName: string,
viewName: string,
query: {
from_date: string;
to_date: string;
fields?: any[];
sort?: any[];
where?: string;
/** Query params for nested data */
nested?: any;
offset?: number;
},
params: RequestParams = {}
) =>
this.request<any, any>({
path: `/api/v1/db/calendar-data/${orgs}/${baseName}/${tableName}/views/${viewName}`,
method: 'GET',
query: query,
...params,
}),
/**
* @description List all rows in Calendar View of a Table
*
* @tags DB Calendar View Row
* @name PublicDataCalendarRowList
* @summary List rows in Calendar View of a Table
* @request GET:/api/v1/db/public/calendar-view/{sharedViewUuid}
*/
publicDataCalendarRowList: (
sharedViewUuid: string,
query: {
from_date: string;
to_date: string;
fields?: any[];
sort?: any[];
where?: string;
/** Query params for nested data */
nested?: any;
offset?: number;
},
params: RequestParams = {}
) =>
this.request<any, any>({
path: `/api/v1/db/public/calendar-view/${sharedViewUuid}`,
method: 'GET',
query: query,
...params,
}),
};
api = {
/**
* No description
*
* @name ResponsesApi
* @request RESPONSES:/api/v1/db/calendar-data/{orgs}/{baseName}/{tableName}/views/{viewName}
*/
responsesApi: (
orgs: string,
baseName: string,
tableName: string,
viewName: string,
params: RequestParams = {}
) =>
this.request<any, any>({
path: `/api/v1/db/calendar-data/${orgs}/${baseName}/${tableName}/views/${viewName}`,
method: 'RESPONSES',
...params,
}),
/**
* No description
*
* @name ResponsesApi2
* @request RESPONSES:/api/v1/db/public/calendar-view/{sharedViewUuid}
* @originalName responsesApi
* @duplicate
*/
responsesApi2: (sharedViewUuid: string, params: RequestParams = {}) =>
this.request<any, any>({
path: `/api/v1/db/public/calendar-view/${sharedViewUuid}`,
method: 'RESPONSES',
...params,
}),
};
dbCalendarViewRowCount = {
/**
* @description Get the count of table view rows grouped by the dates
*
* @tags DB Calendar View Row Count
* @name DbCalendarViewRowCount
* @summary Count of Records in Dates in Calendar View
* @request GET:/api/v1/db/calendar-data/{orgs}/{baseName}/{tableName}/views/{viewName}/countByDate/
* @response `200` `any` OK
* @response `400` `{
\** @example BadRequest [Error]: <ERROR MESSAGE> *\
msg: string,
}`
*/
dbCalendarViewRowCount: (
orgs: string,
baseName: string,
tableName: string,
viewName: string,
query: {
from_date: string;
to_date: string;
sort?: any[];
where?: string;
/** @min 1 */
limit?: number;
/** @min 0 */
offset?: number;
},
params: RequestParams = {}
) =>
this.request<
any,
{
/** @example BadRequest [Error]: <ERROR MESSAGE> */
msg: string;
}
>({
path: `/api/v1/db/calendar-data/${orgs}/${baseName}/${tableName}/views/${viewName}/countByDate/`,
method: 'GET',
query: query,
format: 'json',
...params,
}),
};
public = {
/**
* No description
*
* @tags Public
* @name DataCalendarRowCount
* @summary Count of Records in Dates in Calendar View
* @request GET:/api/v1/db/public/calendar-view/{sharedViewUuid}/countByDate
* @response `200` `any` OK
* @response `400` `{
\** @example BadRequest [Error]: <ERROR MESSAGE> *\
msg: string,
}`
*/
dataCalendarRowCount: (
sharedViewUuid: string,
query: {
from_date: string;
to_date: string;
sort?: any[];
where?: string;
/** @min 1 */
limit?: number;
/** @min 0 */
offset?: number;
},
params: RequestParams = {}
) =>
this.request<
any,
{
/** @example BadRequest [Error]: <ERROR MESSAGE> */
msg: string;
}
>({
path: `/api/v1/db/public/calendar-view/${sharedViewUuid}/countByDate`,
method: 'GET',
query: query,
format: 'json',
...params,
}),
/**
* @description List Shared View Grouped Data
*
@ -9015,46 +9177,6 @@ export class Api<
...params,
}),
/**
* No description
*
* @tags Public
* @name CalendarCount
* @summary Count of Records in Dates in Calendar View
* @request GET:/api/v1/db/public/shared-view/{sharedViewUuid}/countByDate
* @response `200` `any` OK
* @response `400` `{
\** @example BadRequest [Error]: <ERROR MESSAGE> *\
msg: string,
}`
*/
calendarCount: (
sharedViewUuid: string,
query?: {
sort?: any[];
where?: string;
/** @min 1 */
limit?: number;
/** @min 0 */
offset?: number;
},
params: RequestParams = {}
) =>
this.request<
any,
{
/** @example BadRequest [Error]: <ERROR MESSAGE> */
msg: string;
}
>({
path: `/api/v1/db/public/shared-view/${sharedViewUuid}/countByDate`,
method: 'GET',
query: query,
format: 'json',
...params,
}),
/**
* @description List all shared view rows
*

6
packages/nocodb/package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "nocodb",
"version": "0.204.2",
"version": "0.204.4",
"description": "NocoDB Backend",
"main": "dist/bundle.js",
"author": {
@ -132,7 +132,7 @@
"mysql2": "^3.9.2",
"nanoid": "^3.3.7",
"nc-help": "0.3.1",
"nc-lib-gui": "0.204.3",
"nc-lib-gui": "0.204.4",
"nc-plugin": "^0.1.3",
"ncp": "^2.0.0",
"nestjs-kafka": "^1.0.6",
@ -229,4 +229,4 @@
"coverageDirectory": "../coverage",
"testEnvironment": "node"
}
}
}

16
pnpm-lock.yaml
Unescape View File

@ -677,8 +677,8 @@ importers:
specifier: 0.3.1
version: 0.3.1(asn1.js@5.4.1)(debug@4.3.4)(knex@2.4.2)
nc-lib-gui:
specifier: 0.204.3
version: 0.204.3
specifier: 0.204.4
version: 0.204.4
nc-plugin:
specifier: ^0.1.3
version: 0.1.3
@ -892,7 +892,7 @@ importers:
version: 6.3.4
ts-jest:
specifier: 29.1.2
version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2)
version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2)
ts-loader:
specifier: ^9.5.1
version: 9.5.1(typescript@5.3.2)(webpack@5.90.3)
@ -962,7 +962,7 @@ importers:
version: 5.0.5
ts-jest:
specifier: ^29.1.2
version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2)
version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2)
tsc-alias:
specifier: ^1.8.8
version: 1.8.8
@ -20415,8 +20415,8 @@ packages:
- supports-color
dev: false
/nc-lib-gui@0.204.3:
resolution: {integrity: sha512-riTvYiri4vVSuOvZpq3ROWlMXdtI0Rxw7GeKN96kgflMiwIqqfK9E3Q7ppBakLAXe01PA0k5X/m5qc5CykD+rA==}
/nc-lib-gui@0.204.4:
resolution: {integrity: sha512-zLTGOpx3s9bPOa5AxHxDflfYdo08OaiYCvgvLnT9+XZSBDw+xCt/HBcvOQQ8TjjNYbg3KISdEkNDeiIt33pLNA==}
dependencies:
express: 4.18.3
transitivePeerDependencies:
@ -25218,7 +25218,7 @@ packages:
engines: {node: '>=14.0.0'}
dev: false
/ts-jest@29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2):
/ts-jest@29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2):
resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==}
engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0}
hasBin: true
@ -25239,7 +25239,7 @@ packages:
esbuild:
optional: true
dependencies:
'@babel/core': 7.23.9
'@babel/core': 7.23.7
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0
jest: 29.7.0(@types/node@20.11.24)(ts-node@10.9.2)

Write Preview
Loading…
Cancel
Save