Merge branch 'v3-ui' into budi-8792-bigint-and-boolean-fields-dont-support-default-values
This commit is contained in:
commit
8b5dc8c877
|
@ -38,6 +38,10 @@
|
||||||
let loaded = false
|
let loaded = false
|
||||||
$: app = $appsStore.apps.find(app => $appStore.appId?.includes(app.appId))
|
$: app = $appsStore.apps.find(app => $appStore.appId?.includes(app.appId))
|
||||||
$: licensePlan = $auth.user?.license?.plan
|
$: licensePlan = $auth.user?.license?.plan
|
||||||
|
|
||||||
|
// Reset the page every time that a filter gets updated
|
||||||
|
$: pageInfo.reset(), automationId, status, timeRange
|
||||||
|
|
||||||
$: page = $pageInfo.page
|
$: page = $pageInfo.page
|
||||||
$: fetchLogs(automationId, status, page, timeRange)
|
$: fetchLogs(automationId, status, page, timeRange)
|
||||||
$: isCloud = $admin.cloud
|
$: isCloud = $admin.cloud
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit f6aebba94451ce47bba551926e5ad72bd75f71c6
|
Subproject commit 2ab8536b6005576684810d774f1ac22239218546
|
|
@ -763,12 +763,25 @@ describe.each([
|
||||||
expect(row.food).toEqual(["apple", "orange"])
|
expect(row.food).toEqual(["apple", "orange"])
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("creates a new row with a default value when given an empty list", async () => {
|
||||||
|
const row = await config.api.row.save(table._id!, { food: [] })
|
||||||
|
expect(row.food).toEqual(["apple", "orange"])
|
||||||
|
})
|
||||||
|
|
||||||
it("does not use default value if value specified", async () => {
|
it("does not use default value if value specified", async () => {
|
||||||
const row = await config.api.row.save(table._id!, {
|
const row = await config.api.row.save(table._id!, {
|
||||||
food: ["orange"],
|
food: ["orange"],
|
||||||
})
|
})
|
||||||
expect(row.food).toEqual(["orange"])
|
expect(row.food).toEqual(["orange"])
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("resets back to its default value when empty", async () => {
|
||||||
|
let row = await config.api.row.save(table._id!, {
|
||||||
|
food: ["orange"],
|
||||||
|
})
|
||||||
|
row = await config.api.row.save(table._id!, { ...row, food: [] })
|
||||||
|
expect(row.food).toEqual(["apple", "orange"])
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe("user column", () => {
|
describe("user column", () => {
|
||||||
|
|
|
@ -134,7 +134,12 @@ async function processDefaultValues(table: Table, row: Row) {
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const [key, schema] of Object.entries(table.schema)) {
|
for (const [key, schema] of Object.entries(table.schema)) {
|
||||||
if ("default" in schema && schema.default != null && row[key] == null) {
|
const isEmpty =
|
||||||
|
row[key] == null ||
|
||||||
|
row[key] === "" ||
|
||||||
|
(Array.isArray(row[key]) && row[key].length === 0)
|
||||||
|
|
||||||
|
if ("default" in schema && schema.default != null && isEmpty) {
|
||||||
let processed: string | string[]
|
let processed: string | string[]
|
||||||
if (Array.isArray(schema.default)) {
|
if (Array.isArray(schema.default)) {
|
||||||
processed = schema.default.map(val => processStringSync(val, ctx))
|
processed = schema.default.map(val => processStringSync(val, ctx))
|
||||||
|
|
Loading…
Reference in New Issue