Merge pull request #1972 from undb-io/release/v1.0.0-49

Release version v1.0.0-49
undb-io · Aug 31, 2024 · 1d24fa7 · 1d24fa7
2 parents e981449 + 39ed643
commit 1d24fa7
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 
+## v1.0.0-49
+
 ## v1.0.0-48
 
 

diff --git a/apps/frontend/src/lib/components/blocks/filters-editor/field-filter-control.svelte b/apps/frontend/src/lib/components/blocks/filters-editor/field-filter-control.svelte
@@ -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>
diff --git a/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte b/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte
@@ -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")}

diff --git a/apps/frontend/src/lib/components/blocks/option/option-picker.svelte b/apps/frontend/src/lib/components/blocks/option/option-picker.svelte
@@ -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} />

diff --git a/package.json b/package.json
@@ -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",

diff --git a/packages/table/src/modules/schema/fields/variants/button-field/button-field.vo.ts b/packages/table/src/modules/schema/fields/variants/button-field/button-field.vo.ts
@@ -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>

diff --git a/packages/table/src/modules/schema/schema.vo.ts b/packages/table/src/modules/schema/schema.vo.ts
@@ -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,
     )
@@ -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,