Merge branch 'master' of github.com:budibase/budibase into budi-8722-default-value-on-user-columns
This commit is contained in:
commit
c622ef7e90
|
@ -14,15 +14,39 @@ jobs:
|
||||||
release:
|
release:
|
||||||
if: |
|
if: |
|
||||||
(github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase') &&
|
(github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase') &&
|
||||||
contains(github.event.pull_request.labels.*.name, 'feature-branch')
|
(
|
||||||
|
contains(github.event.pull_request.labels.*.name, 'feature-branch') ||
|
||||||
|
contains(github.event.pull_request.labels.*.name, 'feature-branch-pro') ||
|
||||||
|
contains(github.event.pull_request.labels.*.name, 'feature-branch-team') ||
|
||||||
|
contains(github.event.pull_request.labels.*.name, 'feature-branch-business') ||
|
||||||
|
contains(github.event.pull_request.labels.*.name, 'feature-branch-enterprise')
|
||||||
|
)
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set PAYLOAD_LICENSE_TYPE
|
||||||
|
id: set_license_type
|
||||||
|
run: |
|
||||||
|
if [[ "${{ contains(github.event.pull_request.labels.*.name, 'feature-branch') }}" == "true" ]]; then
|
||||||
|
echo "PAYLOAD_LICENSE_TYPE=free" >> $GITHUB_ENV
|
||||||
|
elif [[ "${{ contains(github.event.pull_request.labels.*.name, 'feature-branch-pro') }}" == "true" ]]; then
|
||||||
|
echo "PAYLOAD_LICENSE_TYPE=pro" >> $GITHUB_ENV
|
||||||
|
elif [[ "${{ contains(github.event.pull_request.labels.*.name, 'feature-branch-team') }}" == "true" ]]; then
|
||||||
|
echo "PAYLOAD_LICENSE_TYPE=team" >> $GITHUB_ENV
|
||||||
|
elif [[ "${{ contains(github.event.pull_request.labels.*.name, 'feature-branch-business') }}" == "true" ]]; then
|
||||||
|
echo "PAYLOAD_LICENSE_TYPE=business" >> $GITHUB_ENV
|
||||||
|
elif [[ "${{ contains(github.event.pull_request.labels.*.name, 'feature-branch-enterprise') }}" == "true" ]]; then
|
||||||
|
echo "PAYLOAD_LICENSE_TYPE=enterprise" >> $GITHUB_ENV
|
||||||
|
else
|
||||||
|
echo "PAYLOAD_LICENSE_TYPE=free" >> $GITHUB_ENV
|
||||||
|
fi
|
||||||
|
|
||||||
- uses: passeidireto/trigger-external-workflow-action@main
|
- uses: passeidireto/trigger-external-workflow-action@main
|
||||||
env:
|
env:
|
||||||
PAYLOAD_BRANCH: ${{ github.head_ref }}
|
PAYLOAD_BRANCH: ${{ github.head_ref }}
|
||||||
PAYLOAD_PR_NUMBER: ${{ github.event.pull_request.number }}
|
PAYLOAD_PR_NUMBER: ${{ github.event.pull_request.number }}
|
||||||
PAYLOAD_LICENSE_TYPE: "free"
|
PAYLOAD_LICENSE_TYPE: ${{ env.PAYLOAD_LICENSE_TYPE }}
|
||||||
with:
|
with:
|
||||||
repository: budibase/budibase-deploys
|
repository: budibase/budibase-deploys
|
||||||
event: featurebranch-qa-deploy
|
event: featurebranch-qa-deploy
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||||
"version": "2.32.16",
|
"version": "2.32.17",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/*",
|
"packages/*",
|
||||||
|
|
|
@ -273,6 +273,7 @@ class InternalBuilder {
|
||||||
const col = parts.pop()!
|
const col = parts.pop()!
|
||||||
const schema = this.table.schema[col]
|
const schema = this.table.schema[col]
|
||||||
let identifier = this.quotedIdentifier(field)
|
let identifier = this.quotedIdentifier(field)
|
||||||
|
|
||||||
if (
|
if (
|
||||||
schema.type === FieldType.STRING ||
|
schema.type === FieldType.STRING ||
|
||||||
schema.type === FieldType.LONGFORM ||
|
schema.type === FieldType.LONGFORM ||
|
||||||
|
@ -957,6 +958,13 @@ class InternalBuilder {
|
||||||
return query
|
return query
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isAggregateField(field: string): boolean {
|
||||||
|
const found = this.query.resource?.aggregations?.find(
|
||||||
|
aggregation => aggregation.name === field
|
||||||
|
)
|
||||||
|
return !!found
|
||||||
|
}
|
||||||
|
|
||||||
addSorting(query: Knex.QueryBuilder): Knex.QueryBuilder {
|
addSorting(query: Knex.QueryBuilder): Knex.QueryBuilder {
|
||||||
let { sort, resource } = this.query
|
let { sort, resource } = this.query
|
||||||
const primaryKey = this.table.primary
|
const primaryKey = this.table.primary
|
||||||
|
@ -979,6 +987,9 @@ class InternalBuilder {
|
||||||
nulls = value.direction === SortOrder.ASCENDING ? "first" : "last"
|
nulls = value.direction === SortOrder.ASCENDING ? "first" : "last"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.isAggregateField(key)) {
|
||||||
|
query = query.orderBy(key, direction, nulls)
|
||||||
|
} else {
|
||||||
let composite = `${aliased}.${key}`
|
let composite = `${aliased}.${key}`
|
||||||
if (this.client === SqlClient.ORACLE) {
|
if (this.client === SqlClient.ORACLE) {
|
||||||
query = query.orderByRaw(
|
query = query.orderByRaw(
|
||||||
|
@ -989,6 +1000,7 @@ class InternalBuilder {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// add sorting by the primary key if the result isn't already sorted by it,
|
// add sorting by the primary key if the result isn't already sorted by it,
|
||||||
// to make sure result is deterministic
|
// to make sure result is deterministic
|
||||||
|
|
|
@ -27,9 +27,7 @@
|
||||||
let candidateIndex
|
let candidateIndex
|
||||||
let lastSearchId
|
let lastSearchId
|
||||||
let searching = false
|
let searching = false
|
||||||
let container
|
|
||||||
let anchor
|
let anchor
|
||||||
let relationshipFields
|
|
||||||
|
|
||||||
$: fieldValue = parseValue(value)
|
$: fieldValue = parseValue(value)
|
||||||
$: oneRowOnly = schema?.relationshipType === "one-to-many"
|
$: oneRowOnly = schema?.relationshipType === "one-to-many"
|
||||||
|
@ -56,12 +54,6 @@
|
||||||
return acc
|
return acc
|
||||||
}, {})
|
}, {})
|
||||||
|
|
||||||
$: showRelationshipFields =
|
|
||||||
relationshipFields &&
|
|
||||||
Object.keys(relationshipFields).length &&
|
|
||||||
focused &&
|
|
||||||
!isOpen
|
|
||||||
|
|
||||||
const parseValue = value => {
|
const parseValue = value => {
|
||||||
if (Array.isArray(value) && value.every(x => x?._id)) {
|
if (Array.isArray(value) && value.every(x => x?._id)) {
|
||||||
return value
|
return value
|
||||||
|
@ -242,14 +234,6 @@
|
||||||
return value
|
return value
|
||||||
}
|
}
|
||||||
|
|
||||||
const displayRelationshipFields = relationship => {
|
|
||||||
relationshipFields = relationFields[relationship._id]
|
|
||||||
}
|
|
||||||
|
|
||||||
const hideRelationshipFields = () => {
|
|
||||||
relationshipFields = undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
api = {
|
api = {
|
||||||
focus: open,
|
focus: open,
|
||||||
|
@ -269,7 +253,7 @@
|
||||||
style="--color:{color};"
|
style="--color:{color};"
|
||||||
bind:this={anchor}
|
bind:this={anchor}
|
||||||
>
|
>
|
||||||
<div class="container" bind:this={container}>
|
<div class="container">
|
||||||
<div
|
<div
|
||||||
class="values"
|
class="values"
|
||||||
class:wrap={editable || contentLines > 1}
|
class:wrap={editable || contentLines > 1}
|
||||||
|
@ -281,9 +265,7 @@
|
||||||
<div
|
<div
|
||||||
class="badge"
|
class="badge"
|
||||||
class:extra-info={!!relationFields[relationship._id]}
|
class:extra-info={!!relationFields[relationship._id]}
|
||||||
on:mouseover={() => displayRelationshipFields(relationship)}
|
|
||||||
on:focus={() => {}}
|
on:focus={() => {}}
|
||||||
on:mouseleave={() => hideRelationshipFields()}
|
|
||||||
>
|
>
|
||||||
<span>
|
<span>
|
||||||
{readable(
|
{readable(
|
||||||
|
@ -358,21 +340,6 @@
|
||||||
</GridPopover>
|
</GridPopover>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if showRelationshipFields}
|
|
||||||
<GridPopover {anchor} minWidth={300} maxWidth={400}>
|
|
||||||
<div class="relationship-fields">
|
|
||||||
{#each Object.entries(relationshipFields) as [fieldName, fieldValue]}
|
|
||||||
<div class="relationship-field-name">
|
|
||||||
{fieldName}
|
|
||||||
</div>
|
|
||||||
<div class="relationship-field-value">
|
|
||||||
{fieldValue}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
</GridPopover>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.wrapper {
|
.wrapper {
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
|
@ -539,25 +506,4 @@
|
||||||
.search :global(.spectrum-Form-item) {
|
.search :global(.spectrum-Form-item) {
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.relationship-fields {
|
|
||||||
margin: var(--spacing-m) var(--spacing-l);
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: minmax(auto, 50%) auto;
|
|
||||||
grid-row-gap: var(--spacing-m);
|
|
||||||
grid-column-gap: var(--spacing-m);
|
|
||||||
}
|
|
||||||
|
|
||||||
.relationship-field-name {
|
|
||||||
text-transform: uppercase;
|
|
||||||
color: var(--spectrum-global-color-gray-600);
|
|
||||||
font-size: var(--font-size-xs);
|
|
||||||
}
|
|
||||||
.relationship-field-value {
|
|
||||||
overflow: hidden;
|
|
||||||
display: -webkit-box;
|
|
||||||
-webkit-box-orient: vertical;
|
|
||||||
-webkit-line-clamp: 3;
|
|
||||||
line-clamp: 3;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit aca9828117bb97f54f40ee359f1a3f6e259174e7
|
Subproject commit fc4c7f4925139af078480217965c3d6338dc0a7f
|
|
@ -3381,6 +3381,124 @@ describe.each([
|
||||||
expect(rows).toHaveLength(1)
|
expect(rows).toHaveLength(1)
|
||||||
expect(rows[0].sum).toEqual(3)
|
expect(rows[0].sum).toEqual(3)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("should be able to sort by group by field", async () => {
|
||||||
|
const table = await config.api.table.save(
|
||||||
|
saveTableRequest({
|
||||||
|
schema: {
|
||||||
|
quantity: {
|
||||||
|
type: FieldType.NUMBER,
|
||||||
|
name: "quantity",
|
||||||
|
},
|
||||||
|
price: {
|
||||||
|
type: FieldType.NUMBER,
|
||||||
|
name: "price",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const view = await config.api.viewV2.create({
|
||||||
|
tableId: table._id!,
|
||||||
|
name: generator.guid(),
|
||||||
|
type: ViewV2Type.CALCULATION,
|
||||||
|
schema: {
|
||||||
|
quantity: { visible: true },
|
||||||
|
sum: {
|
||||||
|
visible: true,
|
||||||
|
calculationType: CalculationType.SUM,
|
||||||
|
field: "price",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
await config.api.row.bulkImport(table._id!, {
|
||||||
|
rows: [
|
||||||
|
{
|
||||||
|
quantity: 1,
|
||||||
|
price: 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
quantity: 1,
|
||||||
|
price: 2,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
quantity: 2,
|
||||||
|
price: 10,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})
|
||||||
|
|
||||||
|
const { rows } = await config.api.viewV2.search(view.id, {
|
||||||
|
query: {},
|
||||||
|
sort: "quantity",
|
||||||
|
sortOrder: SortOrder.DESCENDING,
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(rows).toEqual([
|
||||||
|
expect.objectContaining({ quantity: 2, sum: 10 }),
|
||||||
|
expect.objectContaining({ quantity: 1, sum: 3 }),
|
||||||
|
])
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should be able to sort by a calculation", async () => {
|
||||||
|
const table = await config.api.table.save(
|
||||||
|
saveTableRequest({
|
||||||
|
schema: {
|
||||||
|
quantity: {
|
||||||
|
type: FieldType.NUMBER,
|
||||||
|
name: "quantity",
|
||||||
|
},
|
||||||
|
price: {
|
||||||
|
type: FieldType.NUMBER,
|
||||||
|
name: "price",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
await config.api.row.bulkImport(table._id!, {
|
||||||
|
rows: [
|
||||||
|
{
|
||||||
|
quantity: 1,
|
||||||
|
price: 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
quantity: 1,
|
||||||
|
price: 2,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
quantity: 2,
|
||||||
|
price: 10,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})
|
||||||
|
|
||||||
|
const view = await config.api.viewV2.create({
|
||||||
|
tableId: table._id!,
|
||||||
|
name: generator.guid(),
|
||||||
|
type: ViewV2Type.CALCULATION,
|
||||||
|
schema: {
|
||||||
|
quantity: { visible: true },
|
||||||
|
sum: {
|
||||||
|
visible: true,
|
||||||
|
calculationType: CalculationType.SUM,
|
||||||
|
field: "price",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const { rows } = await config.api.viewV2.search(view.id, {
|
||||||
|
query: {},
|
||||||
|
sort: "sum",
|
||||||
|
sortOrder: SortOrder.DESCENDING,
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(rows).toEqual([
|
||||||
|
expect.objectContaining({ quantity: 2, sum: 10 }),
|
||||||
|
expect.objectContaining({ quantity: 1, sum: 3 }),
|
||||||
|
])
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
!isLucene &&
|
!isLucene &&
|
||||||
|
|
|
@ -418,6 +418,16 @@ export async function search(
|
||||||
|
|
||||||
if (params.sort) {
|
if (params.sort) {
|
||||||
const sortField = table.schema[params.sort]
|
const sortField = table.schema[params.sort]
|
||||||
|
const isAggregateField = aggregations.some(agg => agg.name === params.sort)
|
||||||
|
|
||||||
|
if (isAggregateField) {
|
||||||
|
request.sort = {
|
||||||
|
[params.sort]: {
|
||||||
|
direction: params.sortOrder || SortOrder.ASCENDING,
|
||||||
|
type: SortType.NUMBER,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
} else if (sortField) {
|
||||||
const sortType =
|
const sortType =
|
||||||
sortField.type === FieldType.NUMBER ? SortType.NUMBER : SortType.STRING
|
sortField.type === FieldType.NUMBER ? SortType.NUMBER : SortType.STRING
|
||||||
request.sort = {
|
request.sort = {
|
||||||
|
@ -426,6 +436,9 @@ export async function search(
|
||||||
type: sortType as SortType,
|
type: sortType as SortType,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
throw new Error(`Unable to sort by ${params.sort}`)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params.bookmark && typeof params.bookmark !== "number") {
|
if (params.bookmark && typeof params.bookmark !== "number") {
|
||||||
|
|
|
@ -172,7 +172,7 @@ export const processSearchFilters = (
|
||||||
.sort((a, b) => {
|
.sort((a, b) => {
|
||||||
return a.localeCompare(b)
|
return a.localeCompare(b)
|
||||||
})
|
})
|
||||||
.filter(key => key in filter)
|
.filter(key => filter[key])
|
||||||
|
|
||||||
if (filterPropertyKeys.length == 1) {
|
if (filterPropertyKeys.length == 1) {
|
||||||
const key = filterPropertyKeys[0],
|
const key = filterPropertyKeys[0],
|
||||||
|
|
Loading…
Reference in New Issue