fix: remove usage of custom jsonb after the upgrage of drizzle-orm

§
diconium · Oct 1, 2024 · 6b78c1d · 6b78c1d
1 parent af2f6e2
commit 6b78c1d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 54 deletions.
diff --git a/.changeset/real-poets-unite.md b/.changeset/real-poets-unite.md
@@ -0,0 +1,5 @@
+---
+'@ethereal-nexus/dashboard': patch
+---
+
+fix: remove usage of custom jsonb after the upgrage of drizzle-orm
diff --git a/web/dashboard/src/data/components/schema.ts b/web/dashboard/src/data/components/schema.ts
@@ -1,6 +1,5 @@
 import { jsonb, pgEnum, pgTable, primaryKey, text, timestamp, uuid } from 'drizzle-orm/pg-core';
 import { relations } from 'drizzle-orm';
-import { customJson } from '@/db/custom-types';
 
 export const assetTypeEnum = pgEnum('asset_type', ['css', 'js', 'chunk', 'server']);
 

diff --git a/web/dashboard/src/data/events/schema.ts b/web/dashboard/src/data/events/schema.ts
@@ -1,6 +1,5 @@
-import { pgEnum, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core';
+import { jsonb, pgEnum, pgTable, timestamp, uuid } from 'drizzle-orm/pg-core';
 import {users} from "@/data/users/schema";
-import { customJsonb } from '@/db/custom-types';
 
 export const eventsTypeEnum = pgEnum('event_type', [
   'component_deactivated',
@@ -23,5 +22,5 @@ export const events = pgTable("event", {
   resource_id: uuid('resource_id').notNull(),
   user_id: uuid('user_id').notNull().references(() => users.id),
   timestamp: timestamp("timestamp").defaultNow().notNull(),
-  data: customJsonb('data'),
+  data: jsonb('data'),
 })
diff --git a/web/dashboard/src/data/users/actions.ts b/web/dashboard/src/data/users/actions.ts
@@ -359,13 +359,12 @@ export async function upsertApiKey(
       .insert(apiKeys)
       .values({
         ...input.data,
-        permission: sql`${input.data.permissions}::jsonb`,
       })
       .onConflictDoUpdate({
         target: apiKeys.id,
         set: {
           alias: input.data.alias,
-          permissions: sql`${input.data.permissions}::jsonb`,
+          permissions: input.data.permissions,
         },
       })
       .returning();

diff --git a/web/dashboard/src/data/users/schema.ts b/web/dashboard/src/data/users/schema.ts
@@ -1,5 +1,4 @@
-import { pgEnum, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core';
-import { customJsonb } from '@/db/custom-types';
+import { jsonb, pgEnum, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core';
 
 export const userRolesEnum = pgEnum('roles', ['admin', 'user', 'viewer']);
 
@@ -20,7 +19,7 @@ export const apiKeys = pgTable('api_key', {
     .notNull()
     .references(() => users.id, { onDelete: 'cascade' }),
   alias: text('alias'),
-  permissions: customJsonb('permissions'),
+  permissions: jsonb('permissions'),
   created_at: timestamp('created_at').defaultNow().notNull(),
 });
 

diff --git a/web/dashboard/src/db/custom-types.ts b/web/dashboard/src/db/custom-types.ts