Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release version v1.0.0-49 #1972

Merged
merged 5 commits into from
Aug 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog


## v1.0.0-49

## v1.0.0-48


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
$: hasValue = op ? (field?.isOpHasValue(op) ?? false) : false
</script>

<div class="col-span-8 flex flex-1 items-center gap-0">
<div class={cn("col-span-8 flex flex-1 items-center gap-0", $$restProps.class)}>
<OpPicker {disabled} {field} bind:value={op} class={cn("rounded-l-none", hasValue && "rounded-r-none")} />
{#if hasValue}
<FilterInput {disabled} class="w-full flex-1" {field} bind:value {op} />
<FilterInput {disabled} class="flex-1" {field} bind:value {op} />
{/if}
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
bind:value={child.field}
class={cn("col-span-4 rounded-r-none border-r-0")}
/>
<FieldFilterControl {disabled} {field} bind:op={child.op} bind:value={child.value} />
<FieldFilterControl class="col-span-8 overflow-hidden" {disabled} {field} bind:op={child.op} bind:value={child.value} />
</div>
<div class="col-span-1 flex items-center gap-2">
{#if !readonly && $hasPermission("table:update")}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
variant="outline"
role="combobox"
aria-expanded={open}
class={cn("w-full justify-between overflow-hidden", $$restProps.class)}
{disabled}
{...$$restProps}
class={cn("w-full justify-between overflow-hidden", $$restProps.class)}
>
{#if selectedValue}
<Option option={selectedValue} />
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "undb",
"version": "1.0.0-48",
"version": "1.0.0-49",
"private": true,
"scripts": {
"build": "NODE_ENV=production bun --bun turbo build",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const buttonFieldUpdateAction = z.object({
confirm: z.boolean().optional(),
})

const buttonCondition = z.null()
const buttonCondition = z.undefined()

export const buttonDisabled = createConditionGroup(buttonCondition, buttonCondition)
export type IButtonDisabled = z.infer<typeof buttonDisabled>
Expand Down
4 changes: 2 additions & 2 deletions packages/table/src/modules/schema/schema.vo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export class Schema extends ValueObject<Field[]> {

get readableSchema() {
const schema = objectify(
this.fields,
this.fields.filter((f) => f.type !== "button"),
(f) => f.name.value,
(f) => f.valueSchema,
)
Expand All @@ -185,7 +185,7 @@ export class Schema extends ValueObject<Field[]> {
}

getViewReadableSchema(table: TableDo, view: View) {
const viewFields = table.getOrderedVisibleFields(view.id.value)
const viewFields = table.getOrderedVisibleFields(view.id.value).filter((f) => f.type !== "button")
const schema = objectify(
viewFields,
(f) => f.name.value,
Expand Down
Loading