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

Merge branch 'develop' into refactor/timezone-locale

pull/5719/head
Wing-Kam Wong 2 years ago
parent
fe3443ec72 e41f22ddbe
commit
975033c533
6 changed files with 135 additions and 127 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. 33
      packages/nc-gui/components/cell/SingleSelect.vue
  2. 11
      packages/nc-gui/composables/useSharedFormViewStore.ts
  3. 5
      packages/nocodb/src/Noco.ts
  4. 2
      packages/nocodb/src/controllers/filters.controller.ts
  5. 209
      packages/nocodb/src/schema/swagger.json
  6. 2
      packages/nocodb/src/services/filters.service.ts

33
packages/nc-gui/components/cell/SingleSelect.vue
Unescape View File

@ -68,6 +68,10 @@ const { isPg, isMysql } = useProject()
// temporary until it's add the option to column meta // temporary until it's add the option to column meta
const tempSelectedOptState = ref<string>() const tempSelectedOptState = ref<string>()
const isNewOptionCreateEnabled = computed(
() => !isPublic.value && !disableOptionCreation && (hasRole('owner', true) || hasRole('creator', true)),
)
const options = computed<(SelectOptionType & { value: string })[]>(() => { const options = computed<(SelectOptionType & { value: string })[]>(() => {
if (column?.value.colOptions) { if (column?.value.colOptions) {
const opts = column.value.colOptions const opts = column.value.colOptions
@ -93,11 +97,9 @@ const editAllowed = computed(() => (hasEditRoles.value || isForm.value) && (acti
const vModel = computed({ const vModel = computed({
get: () => tempSelectedOptState.value ?? modelValue, get: () => tempSelectedOptState.value ?? modelValue,
set: (val) => { set: (val) => {
if (isOptionMissing.value && val === searchVal.value) { if (val && isNewOptionCreateEnabled.value && (options.value ?? []).every((op) => op.title !== val)) {
tempSelectedOptState.value = val tempSelectedOptState.value = val
return addIfMissingAndSave().finally(() => { return addIfMissingAndSave()
tempSelectedOptState.value = undefined
})
} }
emit('update:modelValue', val || null) emit('update:modelValue', val || null)
}, },
@ -146,10 +148,11 @@ useSelectedCellKeyupListener(isOpen, (e) => {
}) })
async function addIfMissingAndSave() { async function addIfMissingAndSave() {
if (!searchVal.value || isPublic.value) return false if (!tempSelectedOptState.value || isPublic.value) return false
const newOptValue = searchVal.value const newOptValue = tempSelectedOptState.value
searchVal.value = '' searchVal.value = ''
tempSelectedOptState.value = undefined
if (newOptValue && !options.value.some((o) => o.title === newOptValue)) { if (newOptValue && !options.value.some((o) => o.title === newOptValue)) {
try { try {
@ -305,17 +308,7 @@ const selectedOpt = computed(() => {
</span> </span>
</a-tag> </a-tag>
</a-select-option> </a-select-option>
<a-select-option <a-select-option v-if="searchVal && isOptionMissing && isNewOptionCreateEnabled" :key="searchVal" :value="searchVal">
v-if="
searchVal &&
isOptionMissing &&
!isPublic &&
!disableOptionCreation &&
(hasRole('owner', true) || hasRole('creator', true))
"
:key="searchVal"
:value="searchVal"
>
<div class="flex gap-2 text-gray-500 items-center h-full"> <div class="flex gap-2 text-gray-500 items-center h-full">
<component :is="iconMap.plusThick" class="min-w-4" /> <component :is="iconMap.plusThick" class="min-w-4" />
<div class="text-xs whitespace-normal"> <div class="text-xs whitespace-normal">
@ -351,12 +344,6 @@ const selectedOpt = computed(() => {
@apply !px-0; @apply !px-0;
} }
:deep(.ant-select-selection-search) {
// following a-select with mode = multiple | tags
// initial width will block @mouseover in Grid.vue
@apply !w-[5px];
}
:deep(.ant-select-selection-search-input) { :deep(.ant-select-selection-search-input) {
@apply !text-xs; @apply !text-xs;
} }

11
packages/nc-gui/composables/useSharedFormViewStore.ts
Unescape View File

@ -1,7 +1,16 @@
import useVuelidate from '@vuelidate/core' import useVuelidate from '@vuelidate/core'
import { helpers, minLength, required } from '@vuelidate/validators' import { helpers, minLength, required } from '@vuelidate/validators'
import type { Ref } from 'vue' import type { Ref } from 'vue'
import type { BoolType, ColumnType, FormType, LinkToAnotherRecordType, StringOrNullType, TableType, ViewType, FormColumnType } from 'nocodb-sdk' import type {
BoolType,
ColumnType,
FormColumnType,
FormType,
LinkToAnotherRecordType,
StringOrNullType,
TableType,
ViewType,
} from 'nocodb-sdk'
import { ErrorMessages, RelationTypes, UITypes, isVirtualCol } from 'nocodb-sdk' import { ErrorMessages, RelationTypes, UITypes, isVirtualCol } from 'nocodb-sdk'
import { isString } from '@vueuse/core' import { isString } from '@vueuse/core'
import { import {

5
packages/nocodb/src/Noco.ts
Unescape View File

@ -4,6 +4,8 @@ import clear from 'clear';
import * as express from 'express'; import * as express from 'express';
import NcToolGui from 'nc-lib-gui'; import NcToolGui from 'nc-lib-gui';
import { IoAdapter } from '@nestjs/platform-socket.io'; import { IoAdapter } from '@nestjs/platform-socket.io';
import requestIp from 'request-ip';
import cookieParser from 'cookie-parser';
import { AppModule } from './app.module'; import { AppModule } from './app.module';
import { NC_LICENSE_KEY } from './constants'; import { NC_LICENSE_KEY } from './constants';
@ -102,6 +104,9 @@ export default class Noco {
nestApp.useWebSocketAdapter(new IoAdapter(httpServer)); nestApp.useWebSocketAdapter(new IoAdapter(httpServer));
nestApp.use(requestIp.mw());
nestApp.use(cookieParser());
nestApp.use( nestApp.use(
express.json({ limit: process.env.NC_REQUEST_BODY_SIZE || '50mb' }), express.json({ limit: process.env.NC_REQUEST_BODY_SIZE || '50mb' }),
); );

2
packages/nocodb/src/controllers/filters.controller.ts
Unescape View File

@ -71,7 +71,7 @@ export class FiltersController {
@Get('/api/v1/db/meta/filters/:filterParentId/children') @Get('/api/v1/db/meta/filters/:filterParentId/children')
@Acl('filterChildrenList') @Acl('filterChildrenList')
async filterChildrenRead(filterParentId: string) { async filterChildrenRead(@Param('filterParentId') filterParentId: string) {
return new PagedResponseImpl( return new PagedResponseImpl(
await this.filtersService.filterChildrenList({ await this.filtersService.filterChildrenList({
filterId: filterParentId, filterId: filterParentId,

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

@ -14000,7 +14000,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "95rfb0httdmw0" "id": "c7i7cfci4kobt"
} }
}, },
"ApiTokenReq": { "ApiTokenReq": {
@ -14021,13 +14021,13 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "h3g2houpa6y9y" "id": "53ux6deypkuwb"
} }
}, },
"ApiTokenList": { "ApiTokenList": {
"description": "Model for API Token List", "description": "Model for API Token List",
"x-stoplight": { "x-stoplight": {
"id": "35b7cvjplxmfm" "id": "t24xmch4x2o30"
}, },
"examples": [ "examples": [
{ {
@ -14132,7 +14132,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "pbx8hqgwdz7lw" "id": "mjewsbpmazrwe"
} }
}, },
"AttachmentReq": { "AttachmentReq": {
@ -14170,7 +14170,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "jmahtr8c5rw7f" "id": "6cr1iwhbyxncd"
} }
}, },
"Audit": { "Audit": {
@ -14293,7 +14293,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "i5ug0n7j1wub8" "id": "n44nqsmhm56c7"
} }
}, },
"AuditRowUpdateReq": { "AuditRowUpdateReq": {
@ -14333,7 +14333,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "jcw57b1yv3xog" "id": "2fzwvc4m1k5or"
} }
}, },
"Base": { "Base": {
@ -14410,7 +14410,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "9hy3cgp0r2c95" "id": "qyzsky82ovjiv"
} }
}, },
"BaseList": { "BaseList": {
@ -14512,7 +14512,7 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "kk8uqxeefumma" "id": "tty21vb01bfr0"
} }
}, },
"BaseReq": { "BaseReq": {
@ -14568,7 +14568,7 @@
"title": "Base Request", "title": "Base Request",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "j2z6ain3204zi" "id": "ky2ak9xsyl3b5"
} }
}, },
"Bool": { "Bool": {
@ -14590,7 +14590,7 @@
], ],
"title": "Bool Model", "title": "Bool Model",
"x-stoplight": { "x-stoplight": {
"id": "8n3vnyr22sbvj" "id": "y0m76u8t9x2tn"
} }
}, },
"Column": { "Column": {
@ -14878,7 +14878,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "3a4lsn477mx4e" "id": "y9jx9r6o6x0h6"
} }
}, },
"ColumnList": { "ColumnList": {
@ -14986,7 +14986,7 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "rldg44w1alasg" "id": "rsk9o5cs00wh5"
} }
}, },
"ColumnReq": { "ColumnReq": {
@ -15078,7 +15078,7 @@
"title": "Column Request Model", "title": "Column Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "dvbn9dnme6jgi" "id": "aipiq4098ocg3"
} }
}, },
"CommentReq": { "CommentReq": {
@ -15111,13 +15111,13 @@
}, },
"required": ["fk_model_id", "row_id"], "required": ["fk_model_id", "row_id"],
"x-stoplight": { "x-stoplight": {
"id": "7nwlyinuliuvy" "id": "ohotsd0vq6d8w"
} }
}, },
"CommentUpdateReq": { "CommentUpdateReq": {
"description": "Model for Comment Update Request", "description": "Model for Comment Update Request",
"x-stoplight": { "x-stoplight": {
"id": "r0f3ng2rahe38" "id": "5shp04hfghm3a"
}, },
"examples": [ "examples": [
{ {
@ -15290,7 +15290,7 @@
"title": "Filter Model", "title": "Filter Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "f8vsb8alix01i" "id": "txz3lsqh1rbsu"
} }
}, },
"FilterList": { "FilterList": {
@ -15379,13 +15379,13 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "mfxg43iomcoue" "id": "wbc42cyev1qzt"
} }
}, },
"FilterLogList": { "FilterLogList": {
"description": "Model for Filter Log List", "description": "Model for Filter Log List",
"x-stoplight": { "x-stoplight": {
"id": "0voe9zdizy5qd" "id": "jbgae8q40szhc"
}, },
"examples": [ "examples": [
{ {
@ -15486,7 +15486,7 @@
"title": "Filter Request Model", "title": "Filter Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "pugjn1hobswqf" "id": "f95qy45zzlhei"
}, },
"properties": { "properties": {
"comparison_op": { "comparison_op": {
@ -15707,7 +15707,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "918aga51qb7w1" "id": "szw7mwcmvrj90"
} }
}, },
"FormUpdateReq": { "FormUpdateReq": {
@ -15778,7 +15778,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "zn4juts75pksq" "id": "gqdmtil2ni0ln"
} }
}, },
"FormColumn": { "FormColumn": {
@ -15872,7 +15872,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "gm46pinkspvrz" "id": "rs2uh5opf10q6"
} }
}, },
"FormColumnReq": { "FormColumnReq": {
@ -15939,7 +15939,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "nmffmb1p3wkg9" "id": "a1vgymjna1ose"
} }
}, },
"Formula": { "Formula": {
@ -15980,7 +15980,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "hlu7yokpavxwb" "id": "syn5ameyiipp7"
} }
}, },
"FormulaColumnReq": { "FormulaColumnReq": {
@ -16017,7 +16017,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "v26r0c9hlimtv" "id": "tvczns7x7nj73"
} }
}, },
"Gallery": { "Gallery": {
@ -16111,7 +16111,7 @@
"title": "Gallery Model", "title": "Gallery Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "i0h7av37o4eks" "id": "brih3mxjli606"
} }
}, },
"GalleryColumn": { "GalleryColumn": {
@ -16146,13 +16146,13 @@
"title": "Gallery Column Model", "title": "Gallery Column Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "jdhvl7gb33fqo" "id": "auloy6128iwh9"
} }
}, },
"GalleryUpdateReq": { "GalleryUpdateReq": {
"description": "Model for Gallery View Update Request", "description": "Model for Gallery View Update Request",
"x-stoplight": { "x-stoplight": {
"id": "x57k1fq4101e1" "id": "8o7b279bp9wmg"
}, },
"examples": [ "examples": [
{ {
@ -16205,7 +16205,7 @@
"title": "Geo Location Model", "title": "Geo Location Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "685e1l91iuxhv" "id": "jv0zkileq99er"
} }
}, },
"Grid": { "Grid": {
@ -16315,13 +16315,13 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "1xswddf91q5pu" "id": "wlj101286bua3"
} }
}, },
"Grid - copy": { "Grid - copy": {
"description": "Model for Grid", "description": "Model for Grid",
"x-stoplight": { "x-stoplight": {
"id": "xheueli0578g0" "id": "9hiq0xt18jao0"
}, },
"examples": [ "examples": [
{ {
@ -16509,7 +16509,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "g06nri6t6h6ke" "id": "195gzd7s6p7nv"
} }
}, },
"GridColumnReq": { "GridColumnReq": {
@ -16547,13 +16547,13 @@
"title": "Grid Column Request Model", "title": "Grid Column Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "8v9cxve0332zg" "id": "9yhalgmix6d0m"
} }
}, },
"GridUpdateReq": { "GridUpdateReq": {
"description": "Model for Grid View Update", "description": "Model for Grid View Update",
"x-stoplight": { "x-stoplight": {
"id": "g10t5gray4bk5" "id": "v0hz01gynll1t"
}, },
"examples": [ "examples": [
{ {
@ -16604,7 +16604,7 @@
"title": "Hook Model", "title": "Hook Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "32blg2oqo6g7p" "id": "5jvfnece2nu6w"
}, },
"properties": { "properties": {
"active": { "active": {
@ -16695,7 +16695,7 @@
"HookReq": { "HookReq": {
"description": "Model for Hook", "description": "Model for Hook",
"x-stoplight": { "x-stoplight": {
"id": "85vr8fx3oea31" "id": "btj9o665l08xj"
}, },
"examples": [ "examples": [
{ {
@ -16880,7 +16880,7 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "n2sbatqu55day" "id": "oza9z6dpygn29"
} }
}, },
"HookLog": { "HookLog": {
@ -16905,7 +16905,7 @@
"title": "Hook Log Model", "title": "Hook Log Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "ni303795b18y5" "id": "alkb2a68ewbpz"
}, },
"properties": { "properties": {
"base_id": { "base_id": {
@ -16997,7 +16997,7 @@
"HookLogList": { "HookLogList": {
"description": "Model for Hook Log List", "description": "Model for Hook Log List",
"x-stoplight": { "x-stoplight": {
"id": "tfv7y629w2ap2" "id": "ck3ymtqepbl7e"
}, },
"examples": [], "examples": [],
"title": "Hook Log List Model", "title": "Hook Log List Model",
@ -17098,7 +17098,7 @@
}, },
"required": ["hook", "payload"], "required": ["hook", "payload"],
"x-stoplight": { "x-stoplight": {
"id": "w64q11jiv01np" "id": "fmxwekzyi46za"
} }
}, },
"Id": { "Id": {
@ -17109,7 +17109,7 @@
"title": "ID Model", "title": "ID Model",
"type": "string", "type": "string",
"x-stoplight": { "x-stoplight": {
"id": "obj8r7jhyfoqg" "id": "upw7it13u2dkn"
} }
}, },
"Kanban": { "Kanban": {
@ -17176,7 +17176,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "sfbbvgbcv7je6" "id": "gu721t0zw7jqq"
} }
}, },
"KanbanColumn": { "KanbanColumn": {
@ -17249,7 +17249,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "epfedw9ccxgxe" "id": "psbv6c6y9qvbu"
} }
}, },
"KanbanUpdateReq": { "KanbanUpdateReq": {
@ -17326,7 +17326,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "b1jlyk12kfuwx" "id": "9zirjgj9k1gqa"
} }
}, },
"LicenseReq": { "LicenseReq": {
@ -17347,7 +17347,7 @@
"title": "License Key Request Model", "title": "License Key Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "trgk6qlmgdyfo" "id": "4vo9hms4s6uie"
} }
}, },
"LinkToAnotherColumnReq": { "LinkToAnotherColumnReq": {
@ -17396,7 +17396,7 @@
"title": "LinkToAnotherColumn Request Model", "title": "LinkToAnotherColumn Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "x59gz5reg12x3" "id": "ke4urwgcmt83x"
} }
}, },
"LinkToAnotherRecord": { "LinkToAnotherRecord": {
@ -17472,7 +17472,7 @@
"title": "LinkToAnotherRecord Model", "title": "LinkToAnotherRecord Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "27q0vnr79hxla" "id": "tcn1muyj67810"
} }
}, },
"Lookup": { "Lookup": {
@ -17512,7 +17512,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "guyozhka8sx1t" "id": "53ff6kxwlgjrb"
} }
}, },
"LookupColumnReq": { "LookupColumnReq": {
@ -17549,7 +17549,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "hmeckhq2ciwpf" "id": "rmmtwpsofeqo5"
} }
}, },
"Map": { "Map": {
@ -17626,13 +17626,13 @@
"title": "Map Model", "title": "Map Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "hd60sf3k0bs3w" "id": "bg6hvpyk90f0p"
} }
}, },
"MapUpdateReq": { "MapUpdateReq": {
"description": "Model for Map", "description": "Model for Map",
"x-stoplight": { "x-stoplight": {
"id": "3hceyh9ukp5ln" "id": "2me98w8ot1e6o"
}, },
"examples": [ "examples": [
{ {
@ -17707,7 +17707,7 @@
"title": "Map Column Model", "title": "Map Column Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "bvk0acuepoqw1" "id": "01nfqgzhqlqoe"
} }
}, },
"Meta": { "Meta": {
@ -17726,7 +17726,7 @@
], ],
"title": "Meta Model", "title": "Meta Model",
"x-stoplight": { "x-stoplight": {
"id": "2ohjoms6hjcym" "id": "daskjldw4zldd"
} }
}, },
"ModelRoleVisibility": { "ModelRoleVisibility": {
@ -17769,7 +17769,7 @@
"title": "ModelRoleVisibility Model", "title": "ModelRoleVisibility Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "68m1dblcswem2" "id": "cxh7walcnpkn0"
} }
}, },
"NormalColumnRequest": { "NormalColumnRequest": {
@ -17948,7 +17948,7 @@
"type": "object", "type": "object",
"required": ["column_name"], "required": ["column_name"],
"x-stoplight": { "x-stoplight": {
"id": "b67hswwa49t9u" "id": "fn3gqmojvswv2"
} }
}, },
"OrgUserReq": { "OrgUserReq": {
@ -17973,7 +17973,7 @@
"title": "Organisation User Request Model", "title": "Organisation User Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "hs5aforkqjbkb" "id": "n484boi6jv3up"
} }
}, },
"Paginated": { "Paginated": {
@ -18015,7 +18015,7 @@
"title": "Paginated Model", "title": "Paginated Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "ny0v2losvmitz" "id": "2x65v3n9xo8q3"
} }
}, },
"Password": { "Password": {
@ -18026,7 +18026,7 @@
"title": "Password Model", "title": "Password Model",
"type": "string", "type": "string",
"x-stoplight": { "x-stoplight": {
"id": "c6iocwuo2j8z8" "id": "s7gk265anpyc7"
} }
}, },
"PasswordChangeReq": { "PasswordChangeReq": {
@ -18050,7 +18050,7 @@
"title": "Password Change Request Model", "title": "Password Change Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "99dogahvh0gla" "id": "wvritsht82jyy"
} }
}, },
"PasswordForgotReq": { "PasswordForgotReq": {
@ -18071,7 +18071,7 @@
"title": "Password Forgot Request Model", "title": "Password Forgot Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "1kkft7m54ax45" "id": "qj6pb0nc6dtb1"
} }
}, },
"PasswordResetReq": { "PasswordResetReq": {
@ -18093,7 +18093,7 @@
"title": "Password Reset Request Model", "title": "Password Reset Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "i3gzz403zjwh8" "id": "24ig9uh9evw2p"
} }
}, },
"Plugin": { "Plugin": {
@ -18210,7 +18210,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "uux5n95kbh2r5" "id": "xxoy0oe5kab93"
} }
}, },
"PluginReq": { "PluginReq": {
@ -18223,18 +18223,25 @@
], ],
"title": "Plugin Reqeust", "title": "Plugin Reqeust",
"type": "object", "type": "object",
"x-stoplight": {
"id": "qcriv4xl88hyu"
},
"properties": { "properties": {
"active": { "active": {
"$ref": "#/components/schemas/Bool", "$ref": "#/components/schemas/Bool",
"description": "Is Plugin Active?" "description": "Is Plugin Active?"
}, },
"input": { "input": {
"$ref": "#/components/schemas/StringOrNull", "description": "Plugin Input",
"description": "Plugin Input" "oneOf": [
{
"type": "string"
},
{
"type": "null"
}
]
} }
},
"x-stoplight": {
"id": "pci8zg4wgn3bx"
} }
}, },
"PluginTestReq": { "PluginTestReq": {
@ -18276,7 +18283,7 @@
}, },
"required": ["title", "input", "category"], "required": ["title", "input", "category"],
"x-stoplight": { "x-stoplight": {
"id": "gest5kbecpjdi" "id": "zrvjtpfx9wc54"
} }
}, },
"Project": { "Project": {
@ -18366,7 +18373,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "gae6rj3whdnj9" "id": "t8uouhop01ndi"
} }
}, },
"ProjectList": { "ProjectList": {
@ -18462,7 +18469,7 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "xbosckfm1h9l0" "id": "fr75wwwzt951h"
} }
}, },
"ProjectReq": { "ProjectReq": {
@ -18520,13 +18527,13 @@
"title": "Project Request Model", "title": "Project Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "aicbp4keo57ld" "id": "f5k929rrvfy92"
} }
}, },
"ProjectUpdateReq": { "ProjectUpdateReq": {
"description": "Model for Project Update Request", "description": "Model for Project Update Request",
"x-stoplight": { "x-stoplight": {
"id": "83257b35r118q" "id": "0fq3a94qjgb5f"
}, },
"examples": [ "examples": [
{ {
@ -18596,7 +18603,7 @@
}, },
"required": ["email", "roles"], "required": ["email", "roles"],
"x-stoplight": { "x-stoplight": {
"id": "tq2wpd2agebjz" "id": "3bvgqk9tn16ur"
} }
}, },
"Rollup": { "Rollup": {
@ -18645,7 +18652,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "vdzh0qojyn9a9" "id": "imknmkksc8bqk"
} }
}, },
"RollupColumnReq": { "RollupColumnReq": {
@ -18696,7 +18703,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "uw9fq6lp1lone" "id": "ayjjv1pfxmvlv"
} }
}, },
"SelectOption": { "SelectOption": {
@ -18738,7 +18745,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "onnh5qie1ul32" "id": "y9gglydcl3zjr"
} }
}, },
"SelectOptions": { "SelectOptions": {
@ -18769,7 +18776,7 @@
}, },
"required": ["options"], "required": ["options"],
"x-stoplight": { "x-stoplight": {
"id": "3i68n0spduuf9" "id": "3rx8jyy2ufbc3"
} }
}, },
"SharedBaseReq": { "SharedBaseReq": {
@ -18797,7 +18804,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "ep7ikmx3sudcl" "id": "4jvab8fa8ibxv"
} }
}, },
"SharedView": { "SharedView": {
@ -18835,7 +18842,7 @@
} }
], ],
"x-stoplight": { "x-stoplight": {
"id": "fqfohevz2zj4u" "id": "gagdto3i3c0fb"
} }
}, },
"SharedViewList": { "SharedViewList": {
@ -18929,7 +18936,7 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "zdpekhmw0wvj3" "id": "5gnbbmgal3om3"
} }
}, },
"SharedViewReq": { "SharedViewReq": {
@ -18953,7 +18960,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "0g3o2uo9y4h4g" "id": "hbj6j87gyi7ap"
} }
}, },
"SignInReq": { "SignInReq": {
@ -18979,7 +18986,7 @@
"title": "Signin Request Model", "title": "Signin Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "dxxafjky40cz1" "id": "efb2gvnypydy9"
} }
}, },
"SignUpReq": { "SignUpReq": {
@ -19038,7 +19045,7 @@
}, },
"required": ["email", "password"], "required": ["email", "password"],
"x-stoplight": { "x-stoplight": {
"id": "2rcbk0flkc4yu" "id": "6ia1chyii9w48"
} }
}, },
"Sort": { "Sort": {
@ -19091,7 +19098,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "3jjbe2mjzy5li" "id": "25fm97zsmwf6h"
} }
}, },
"SortList": { "SortList": {
@ -19172,7 +19179,7 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "fsq6d3pi8b3iz" "id": "us9qfo1go142f"
} }
}, },
"SortReq": { "SortReq": {
@ -19198,7 +19205,7 @@
} }
}, },
"x-stoplight": { "x-stoplight": {
"id": "lao7jfow2dbe7" "id": "8v8qzwm3w4v11"
} }
}, },
"StringOrNull": { "StringOrNull": {
@ -19215,7 +19222,7 @@
], ],
"title": "StringOrNull Model", "title": "StringOrNull Model",
"x-stoplight": { "x-stoplight": {
"id": "xh9dwrizrvfh6" "id": "p1g7xrgdsn540"
} }
}, },
"Table": { "Table": {
@ -19644,7 +19651,7 @@
}, },
"required": ["table_name", "title"], "required": ["table_name", "title"],
"x-stoplight": { "x-stoplight": {
"id": "rvdu5okgpz1xk" "id": "dkfoyjcny5am9"
} }
}, },
"TableList": { "TableList": {
@ -19774,7 +19781,7 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "25z7dodhqs3lc" "id": "urwk2euatlkjl"
} }
}, },
"TableReq": { "TableReq": {
@ -19915,7 +19922,7 @@
"title": "Table Request Model", "title": "Table Request Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "kilqakhuuzstv" "id": "sv3junrrevn31"
} }
}, },
"User": { "User": {
@ -19967,7 +19974,7 @@
}, },
"required": ["email", "email_verified", "firstname", "id", "lastname"], "required": ["email", "email_verified", "firstname", "id", "lastname"],
"x-stoplight": { "x-stoplight": {
"id": "nwug6wvbc5yrp" "id": "hcruzlenrwb2x"
} }
}, },
"UserInfo": { "UserInfo": {
@ -20011,7 +20018,7 @@
"title": "User Info Model", "title": "User Info Model",
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "qravubcoxvr6x" "id": "mzqg7tcf4hglo"
} }
}, },
"UserList": { "UserList": {
@ -20092,7 +20099,7 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "11epslmm9jcga" "id": "32mz06s4tgptq"
} }
}, },
"View": { "View": {
@ -20210,7 +20217,7 @@
}, },
"required": ["fk_model_id", "show", "title", "type"], "required": ["fk_model_id", "show", "title", "type"],
"x-stoplight": { "x-stoplight": {
"id": "pbahdgaroikdz" "id": "nobjewdlhxrkq"
} }
}, },
"ViewList": { "ViewList": {
@ -20338,13 +20345,13 @@
}, },
"required": ["list", "pageInfo"], "required": ["list", "pageInfo"],
"x-stoplight": { "x-stoplight": {
"id": "5wwtppugkhbeh" "id": "a1f99jvpiuugl"
} }
}, },
"ViewCreateReq": { "ViewCreateReq": {
"type": "object", "type": "object",
"x-stoplight": { "x-stoplight": {
"id": "lksv99846uy60" "id": "zvdo4i7c70jmo"
}, },
"title": "ViewCreateReq", "title": "ViewCreateReq",
"description": "Model for View Create Request", "description": "Model for View Create Request",
@ -20413,7 +20420,7 @@
"ViewUpdateReq": { "ViewUpdateReq": {
"description": "Model for View Update Request", "description": "Model for View Update Request",
"x-stoplight": { "x-stoplight": {
"id": "1enlswadfc6p5" "id": "7inf594lhs8mh"
}, },
"examples": [ "examples": [
{ {
@ -20478,7 +20485,7 @@
"ViewColumnUpdateReq": { "ViewColumnUpdateReq": {
"description": "Model for View Column Update Request", "description": "Model for View Column Update Request",
"x-stoplight": { "x-stoplight": {
"id": "ifzuv29axterb" "id": "7xso36z6hvh43"
}, },
"examples": [ "examples": [
{ {
@ -20507,7 +20514,7 @@
"ViewColumnReq": { "ViewColumnReq": {
"description": "Model for View Column Request", "description": "Model for View Column Request",
"x-stoplight": { "x-stoplight": {
"id": "z4bq84nyqkhd8" "id": "ofapz0gzl35z2"
}, },
"examples": [ "examples": [
{ {
@ -20598,7 +20605,7 @@
"title": "Visibility Rule Request Model", "title": "Visibility Rule Request Model",
"type": "array", "type": "array",
"x-stoplight": { "x-stoplight": {
"id": "vuo5q4vwtarx8" "id": "xu5zgt0fc3ms9"
} }
} }
}, },

2
packages/nocodb/src/services/filters.service.ts
Unescape View File

@ -51,7 +51,7 @@ export class FiltersService {
return filter; return filter;
} }
async filterChildrenList(param: { filterId: any }) { async filterChildrenList(param: { filterId: string }) {
return Filter.parentFilterList({ return Filter.parentFilterList({
parentId: param.filterId, parentId: param.filterId,
}); });

Write Preview
Loading…
Cancel
Save