Merge branch 'master' into test-template-import
This commit is contained in:
commit
20ddc37606
10 changed files with 640 additions and 158 deletions
|
@ -40,7 +40,7 @@
|
|||
"build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal --ignore @budibase/account-portal-server --ignore @budibase/account-portal-ui",
|
||||
"build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal --scope @budibase/account-portal-server --scope @budibase/account-portal-ui",
|
||||
"build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
|
||||
"check:types": "lerna run check:types",
|
||||
"check:types": "lerna run --concurrency 2 check:types",
|
||||
"build:sdk": "lerna run --stream build:sdk",
|
||||
"deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular",
|
||||
"release": "lerna publish from-package --yes --force-publish --no-git-tag-version --no-push --no-git-reset",
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit c167c331ff9b8161fc18e2ecbaaf1ea5815ba964
|
||||
Subproject commit 39acfff42a063e5a8a7d58d36721ec3103e16348
|
|
@ -1,6 +1,11 @@
|
|||
import { Knex, knex } from "knex"
|
||||
import * as dbCore from "../db"
|
||||
import { isIsoDateString, isValidFilter, getNativeSql } from "./utils"
|
||||
import {
|
||||
isIsoDateString,
|
||||
isValidFilter,
|
||||
getNativeSql,
|
||||
isExternalTable,
|
||||
} from "./utils"
|
||||
import { SqlStatements } from "./sqlStatements"
|
||||
import SqlTableQueryBuilder from "./sqlTable"
|
||||
import {
|
||||
|
@ -21,6 +26,7 @@ import {
|
|||
SqlClient,
|
||||
QueryOptions,
|
||||
JsonTypes,
|
||||
prefixed,
|
||||
} from "@budibase/types"
|
||||
import environment from "../environment"
|
||||
import { helpers } from "@budibase/shared-core"
|
||||
|
@ -391,6 +397,16 @@ class InternalBuilder {
|
|||
contains(filters.containsAny, true)
|
||||
}
|
||||
|
||||
// when searching internal tables make sure long looking for rows
|
||||
if (filters.documentType && !isExternalTable(table)) {
|
||||
const tableRef = opts?.aliases?.[table._id!] || table._id
|
||||
// has to be its own option, must always be AND onto the search
|
||||
query.andWhereLike(
|
||||
`${tableRef}._id`,
|
||||
`${prefixed(filters.documentType)}%`
|
||||
)
|
||||
}
|
||||
|
||||
return query
|
||||
}
|
||||
|
||||
|
@ -592,6 +608,7 @@ class InternalBuilder {
|
|||
query = this.addFilters(query, filters, json.meta.table, {
|
||||
aliases: tableAliases,
|
||||
})
|
||||
|
||||
// add sorting to pre-query
|
||||
query = this.addSorting(query, json)
|
||||
const alias = tableAliases?.[tableName] || tableName
|
||||
|
|
|
@ -32,8 +32,14 @@
|
|||
onboarding = true
|
||||
try {
|
||||
const { password, firstName, lastName } = formData
|
||||
await users.acceptInvite(inviteCode, password, firstName, lastName)
|
||||
const user = await users.acceptInvite(
|
||||
inviteCode,
|
||||
password,
|
||||
firstName,
|
||||
lastName
|
||||
)
|
||||
notifications.success("Invitation accepted successfully")
|
||||
auth.setOrg(user.tenantId)
|
||||
await login()
|
||||
} catch (error) {
|
||||
notifications.error(error.message)
|
||||
|
@ -66,7 +72,7 @@
|
|||
notifications.success("Logged in successfully")
|
||||
$goto("../portal")
|
||||
} catch (err) {
|
||||
notifications.error(err.message ? err.message : "Invalid credentials") //not likely, considering.
|
||||
notifications.error(err.message ? err.message : "Something went wrong")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -141,12 +147,19 @@
|
|||
password: e.detail,
|
||||
}
|
||||
}}
|
||||
validateOn="blur"
|
||||
validate={() => {
|
||||
let fieldError = {}
|
||||
|
||||
fieldError["password"] = !formData.password
|
||||
? "Please enter a password"
|
||||
: undefined
|
||||
function validatePassword() {
|
||||
if (!formData.password) {
|
||||
return "Please enter a password"
|
||||
} else if (formData.password.length < 8) {
|
||||
return "Please enter at least 8 characters"
|
||||
}
|
||||
return undefined
|
||||
}
|
||||
fieldError["password"] = validatePassword()
|
||||
|
||||
fieldError["confirmationPassword"] =
|
||||
!passwordsMatch(
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import {
|
||||
DocumentType,
|
||||
FieldType,
|
||||
Operation,
|
||||
QueryJson,
|
||||
|
@ -148,7 +149,10 @@ export async function search(
|
|||
entityId: table._id!,
|
||||
operation: Operation.READ,
|
||||
},
|
||||
filters: cleanupFilters(query, allTables),
|
||||
filters: {
|
||||
...cleanupFilters(query, allTables),
|
||||
documentType: DocumentType.ROW,
|
||||
},
|
||||
table,
|
||||
meta: {
|
||||
table,
|
||||
|
|
|
@ -92,6 +92,7 @@ export interface AcceptUserInviteResponse {
|
|||
_id: string
|
||||
_rev: string
|
||||
email: string
|
||||
tenantId: string
|
||||
}
|
||||
|
||||
export interface SyncUserRequest {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { Operation, SortDirection } from "./datasources"
|
||||
import { Row, Table } from "../documents"
|
||||
import { Row, Table, DocumentType } from "../documents"
|
||||
import { SortType } from "../api"
|
||||
import { Knex } from "knex"
|
||||
|
||||
|
@ -62,11 +62,15 @@ export interface SearchFilters {
|
|||
[SearchFilterOperator.CONTAINS_ANY]?: {
|
||||
[key: string]: any[]
|
||||
}
|
||||
// specific to SQS/SQLite search on internal tables this can be used
|
||||
// to make sure the documents returned are always filtered down to a
|
||||
// specific document type (such as just rows)
|
||||
documentType?: DocumentType
|
||||
}
|
||||
|
||||
export type SearchFilterKey = keyof Omit<
|
||||
SearchFilters,
|
||||
"allOr" | "onEmptyFilter" | "fuzzyOr"
|
||||
"allOr" | "onEmptyFilter" | "fuzzyOr" | "documentType"
|
||||
>
|
||||
|
||||
export type SearchQueryFields = Omit<SearchFilters, "allOr" | "onEmptyFilter">
|
||||
|
|
|
@ -35,6 +35,7 @@ import {
|
|||
} from "@budibase/backend-core"
|
||||
import { checkAnyUserExists } from "../../../utilities/users"
|
||||
import { isEmailConfigured } from "../../../utilities/email"
|
||||
import { BpmStatusKey, BpmStatusValue } from "@budibase/shared-core"
|
||||
|
||||
const MAX_USERS_UPLOAD_LIMIT = 1000
|
||||
|
||||
|
@ -444,10 +445,16 @@ export const inviteAccept = async (
|
|||
|
||||
await cache.invite.deleteCode(inviteCode)
|
||||
|
||||
// make sure onboarding flow is cleared
|
||||
ctx.cookies.set(BpmStatusKey.ONBOARDING, BpmStatusValue.COMPLETED, {
|
||||
expires: new Date(0),
|
||||
})
|
||||
|
||||
ctx.body = {
|
||||
_id: user._id!,
|
||||
_rev: user._rev!,
|
||||
email: user.email,
|
||||
tenantId: user.tenantId,
|
||||
}
|
||||
}
|
||||
)
|
||||
|
|
|
@ -105,11 +105,6 @@ const NO_TENANCY_ENDPOINTS = [
|
|||
route: "/api/admin/auth/oidc/callback",
|
||||
method: "GET",
|
||||
},
|
||||
// tenant is determined from code in redis
|
||||
{
|
||||
route: "/api/global/users/invite/accept",
|
||||
method: "POST",
|
||||
},
|
||||
// global user search - no tenancy
|
||||
// :id is user id
|
||||
// TODO: this should really be `/api/system/users/:id`
|
||||
|
@ -117,6 +112,15 @@ const NO_TENANCY_ENDPOINTS = [
|
|||
route: "/api/global/users/tenant/:id",
|
||||
method: "GET",
|
||||
},
|
||||
// tenant is determined from code in redis
|
||||
{
|
||||
route: "/api/global/users/invite/accept",
|
||||
method: "POST",
|
||||
},
|
||||
{
|
||||
route: "/api/global/users/invite/:code",
|
||||
method: "GET",
|
||||
},
|
||||
]
|
||||
|
||||
// most public endpoints are gets, but some are posts
|
||||
|
|
Loading…
Reference in a new issue