Merge pull request #2161 from undb-io/release/v1.0.0-127

Release version v1.0.0-127
undb-io · Nov 24, 2024 · 59ebe02 · 59ebe02
2 parents 6f0af02 + 51a7c95
commit 59ebe02
Show file tree

Hide file tree

Showing 12 changed files with 98 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.0-127
+
+
+### 🏡 Chore
+
+- Add logging ([8decb41](https://github.com/undb-io/undb/commit/8decb41))
+
+### ❤️ Contributors
+
+- Nichenqin ([@nichenqin](http://github.com/nichenqin))
+
 ## v1.0.0-126
 
 

diff --git a/apps/backend/src/app.ts b/apps/backend/src/app.ts
@@ -35,9 +35,14 @@ const openapi = container.resolve(OpenAPI)
 const opentelemetry = container.resolve(OpenTelemetryModule)
 const template = container.resolve(TemplateModule)
 
+const logger = createLogger("app")
+
 export const app = new Elysia()
-  .onStart(async () => {
+  .on("start", async () => {
+    logger.info("db migrate start")
     await dbMigrate()
+    logger.info("db migrate done")
+    await auth.onStart()
   })
   .use(opentelemetry.plugin())
   .use(loggerPlugin())
@@ -64,7 +69,6 @@ export const app = new Elysia()
     set.headers["Server-Timing"] = `handle;dur=${(await end) - begin}`
   })
   .onStart(async () => {
-    const logger = createLogger("app onstart")
     const pubsub = container.resolve(PubSubContext)
     const webhookEventHandler = container.resolve(WebhookEventsHandler)
     // const auditEventHandler = container.resolve(AuditEventHandler)

diff --git a/apps/backend/src/modules/auth/auth.ts b/apps/backend/src/modules/auth/auth.ts
@@ -173,62 +173,64 @@ export class Auth {
     }
   }
 
-  route() {
-    const oauth = container.resolve(OAuth)
-    return new Elysia()
-      .use(oauth.route())
-      .onStart(async (ctx) => {
-        const adminEmail = env.UNDB_ADMIN_EMAIL
-        const adminPassword = env.UNDB_ADMIN_PASSWORD
-        if (env.UNDB_DISABLE_REGISTRATION) {
-          this.logger.info("Registration is disabled")
-          if (!adminEmail || !adminPassword) {
-            const message =
-              "Registration is disabled but admin user is not set, please set UNDB_ADMIN_EMAIL and UNDB_ADMIN_PASSWORD environment variables"
-            this.logger.fatal(message)
-            throw new Error(message)
-          }
+  async onStart() {
+    const adminEmail = env.UNDB_ADMIN_EMAIL
+    const adminPassword = env.UNDB_ADMIN_PASSWORD
+    if (env.UNDB_DISABLE_REGISTRATION) {
+      this.logger.info("Registration is disabled")
+      if (!adminEmail || !adminPassword) {
+        const message =
+          "Registration is disabled but admin user is not set, please set UNDB_ADMIN_EMAIL and UNDB_ADMIN_PASSWORD environment variables"
+        this.logger.fatal(message)
+        throw new Error(message)
+      }
 
-          const user = await this.queryBuilder
-            .selectFrom("undb_user")
-            .selectAll()
-            .where((eb) => eb.eb("email", "=", adminEmail))
-            .executeTakeFirst()
+      const user = await this.queryBuilder
+        .selectFrom("undb_user")
+        .selectAll()
+        .where((eb) => eb.eb("email", "=", adminEmail))
+        .executeTakeFirst()
 
-          if (!user) {
-            const userId = generateIdFromEntropySize(10) // 16 characters long
-            const passwordHash = await Bun.password.hash(adminPassword)
-            const username = getUsernameFromEmail(adminEmail)
+      if (!user) {
+        this.logger.info("Admin user not found, creating...")
+        const userId = generateIdFromEntropySize(10) // 16 characters long
+        const passwordHash = await Bun.password.hash(adminPassword)
+        const username = getUsernameFromEmail(adminEmail)
+
+        executionContext.enterWith({
+          requestId: v7(),
+          user: {
+            userId,
+            username,
+            email: adminEmail,
+          },
+        })
 
-            executionContext.enterWith({
-              requestId: v7(),
-              user: {
-                userId,
-                username,
-                email: adminEmail,
-              },
+        await withTransaction(this.queryBuilder)(async () => {
+          await getCurrentTransaction()
+            .insertInto("undb_user")
+            .values({
+              email: adminEmail,
+              username: username!,
+              id: userId,
+              password: passwordHash,
+              email_verified: true,
             })
+            .execute()
 
-            await withTransaction(this.queryBuilder)(async () => {
-              await getCurrentTransaction()
-                .insertInto("undb_user")
-                .values({
-                  email: adminEmail,
-                  username: username!,
-                  id: userId,
-                  password: passwordHash,
-                  email_verified: true,
-                })
-                .execute()
+          const space = await this.spaceService.createSpace({ name: username! })
+          await this.spaceMemberService.createMember(userId, space.id.value, "owner")
 
-              const space = await this.spaceService.createSpace({ name: username! })
-              await this.spaceMemberService.createMember(userId, space.id.value, "owner")
+          this.logger.info("Admin user created")
+        })
+      }
+    }
+  }
 
-              this.logger.info("Admin user created")
-            })
-          }
-        }
-      })
+  route() {
+    const oauth = container.resolve(OAuth)
+    return new Elysia()
+      .use(oauth.route())
       .onAfterResponse((ctx) => {
         const requestId = executionContext.getStore()?.requestId
         this.logger.info(

diff --git a/apps/frontend/src/lib/components/blocks/field-options/button-field-option.svelte b/apps/frontend/src/lib/components/blocks/field-options/button-field-option.svelte
@@ -17,7 +17,7 @@
   import { Button } from "$lib/components/ui/button"
   import Separator from "$lib/components/ui/separator/separator.svelte"
   import { writable } from "svelte/store"
-  import type { ZodUndefined } from "@undb/zod"
+  import { Switch } from "$lib/components/ui/switch"
   import FiltersEditor from "../filters-editor/filters-editor.svelte"
   import { onMount, tick } from "svelte"
 
@@ -40,15 +40,18 @@
       confirm: true,
     },
   }
-  const value = writable<MaybeConditionGroup<ZodUndefined> | undefined>()
+  const value = writable<MaybeConditionGroup<any> | undefined>()
   $: validValue = $table && $value ? parseValidViewFilter($table.schema, $value) : undefined
   $: if (validValue) {
     option.disabled = validValue
   }
 
+  let disabledWhen = false
+
   onMount(() => {
     if (option.disabled) {
       value.set(toMaybeConditionGroup(option.disabled))
+      disabledWhen = true
     }
   })
 
@@ -63,14 +66,19 @@
   <Label for="label">Label</Label>
   <Input class="w-full" placeholder="Button" id="label" bind:value={option.label} />
 
-  <div class="space-y-2 rounded-sm border pt-2">
-    <Label class="pl-4 text-xs font-semibold" for="disabled">Disabled When...</Label>
-    <FiltersEditor
-      bind:value={$value}
-      table={$table}
-      filter={(field) => visibleFields.some((f) => f.id.value === field.id) && getIsFilterableFieldType(field.type)}
-    ></FiltersEditor>
-  </div>
+  <Label class="flex items-center gap-2 text-xs font-semibold" for="disabled">
+    <Switch id="disabled" bind:checked={disabledWhen} size="sm" />
+    Disabled When...
+  </Label>
+  {#if disabledWhen}
+    <div class="space-y-2 rounded-sm border pt-2">
+      <FiltersEditor
+        bind:value={$value}
+        table={$table}
+        filter={(field) => visibleFields.some((f) => f.id.value === field.id) && getIsFilterableFieldType(field.type)}
+      ></FiltersEditor>
+    </div>
+  {/if}
 
   <div class="space-y-2 rounded-md border px-4 py-3">
     <p class="text-xs font-semibold">Update Value when Click Button</p>

diff --git a/apps/frontend/src/lib/components/blocks/field-options/field-options.svelte b/apps/frontend/src/lib/components/blocks/field-options/field-options.svelte
@@ -31,7 +31,6 @@
   export let disabled = false
   export let type: NoneSystemFieldType
 
-
   const map: Record<NoneSystemFieldType, ComponentType> = {
     string: StringFieldOption,
     longText: LongTextFieldOption,
@@ -67,4 +66,5 @@
   bind:option
   {isNew}
   {field}
+  {...$$restProps}
 />
diff --git a/apps/frontend/src/lib/components/blocks/update-field/update-field.svelte b/apps/frontend/src/lib/components/blocks/update-field/update-field.svelte
@@ -113,6 +113,7 @@
             bind:constraint={$formData.constraint}
             bind:display={$formData.display}
             bind:defaultValue={$formData.defaultValue}
+            {...attrs}
           />
         </Form.Control>
         <Form.Description />

diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "undb",
-  "version": "1.0.0-126",
+  "version": "1.0.0-127",
   "private": true,
   "scripts": {
     "build": "NODE_ENV=production bun --bun turbo build",

diff --git a/packages/authz/src/space-member/space-member.service.ts b/packages/authz/src/space-member/space-member.service.ts
@@ -1,5 +1,6 @@
 import { inject, singleton } from "@undb/di"
 import { and, None, Option } from "@undb/domain"
+import { createLogger } from "@undb/logger"
 import { injectSpaceService, type ISpaceId, type ISpaceService } from "@undb/space"
 import type { SetContextValue } from "../../../context/src/context.type"
 import { MemberIdVO } from "../member/member-id.vo"
@@ -32,6 +33,7 @@ export const injectSpaceMemberService = () => inject(SPACE_MEMBER_SERVICE)
 
 @singleton()
 export class SpaceMemberService implements ISpaceMemberService {
+  private logger = createLogger("SpaceMemberService")
   constructor(
     @injectSpaceService()
     private readonly spaceService: ISpaceService,
@@ -110,6 +112,8 @@ export class SpaceMemberService implements ISpaceMemberService {
     spaceId: ISpaceId,
     userId: string,
   ): Promise<Option<SpaceMember>> {
+    this.logger.debug({ spaceId, userId }, "setSpaceMemberContext")
+
     if (!spaceId || !userId) {
       return None
     }

diff --git a/packages/space/package.json b/packages/space/package.json
@@ -5,6 +5,7 @@
   "types": "src/index.d.ts",
   "dependencies": {
     "@undb/context": "workspace:*",
+    "@undb/logger": "workspace:*",
     "ts-pattern": "^5.5.0"
   },
   "devDependencies": {

diff --git a/packages/space/src/space.service.ts b/packages/space/src/space.service.ts
@@ -1,5 +1,6 @@
 import type { SetContextValue } from "@undb/context"
 import { inject, singleton } from "@undb/di"
+import { createLogger } from "@undb/logger"
 import { None, Option, Some } from "oxide.ts"
 import { match, P } from "ts-pattern"
 import type { ICreateSpaceDTO, ISpaceDTO } from "./dto"
@@ -37,6 +38,7 @@ export const injectSpaceService = () => inject(SPACE_SERVICE)
 
 @singleton()
 export class SpaceService implements ISpaceService {
+  private logger = createLogger("SpaceService")
   constructor(
     @injectSpaceRepository()
     private readonly spaceRepository: ISpaceRepository,
@@ -86,6 +88,7 @@ export class SpaceService implements ISpaceService {
   }
 
   async setSpaceContext(setContext: SetContextValue, input: IGetSpaceInput): Promise<Space> {
+    this.logger.debug(input, "setSpaceContext")
     const space = await this.getSpace(input)
     setContext("spaceId", space.unwrap().id.value)
 

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.undefined()
+const buttonCondition = z.any()
 
 export const buttonDisabled = createConditionGroup(buttonCondition, buttonCondition)
 export type IButtonDisabled = z.infer<typeof buttonDisabled>