chore(cb): orgs (#320)

* chore(cb): orgs * remove dead imports * feat: schema changes for orgs * iterate * fix * fix test * build fixin --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
badass-courses · Nov 14, 2024 · d6caa19 · d6caa19
1 parent 34456e1
commit d6caa19
Show file tree

Hide file tree

Showing 77 changed files with 790 additions and 149 deletions.
diff --git a/.changeset/breezy-cameras-sit.md b/.changeset/breezy-cameras-sit.md
@@ -0,0 +1,8 @@
+---
+"@coursebuilder/adapter-drizzle": major
+"utils": major
+"@coursebuilder/core": major
+"@coursebuilder/ui": major
+---
+
+adds organizations for multi-tenant
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -22,7 +22,6 @@
 		"epic-web",
 		"pro-nextjs",
 		"astro-party",
-		"js-visualized",
 		"egghead",
 		"epic-react",
 		"ai-hero",

diff --git a/apps/ai-hero/.env.development b/apps/ai-hero/.env.development
@@ -13,7 +13,7 @@ NEXT_PUBLIC_PRODUCT_DESCRIPTION="From Zero to AI Hero"
 # App Features
 CREATE_USER_ON_LOGIN=true
 LOG_VERIFICATION_URL=true
-SKIP_EMAIL=true
+SKIP_EMAIL=false
 SKIP_CK_TAGGING=true
 DEFAULT_COUNTRY=US
 
diff --git a/apps/ai-hero/package.json b/apps/ai-hero/package.json
@@ -5,7 +5,7 @@
 	"type": "module",
 	"scripts": {
 		"dev": "concurrently --kill-others-on-fail \"npm:dev:*\"",
-		"dev:next": "next dev --turbo",
+		"dev:next": "next dev",
 		"dev:inngest": "pnpx inngest-cli@latest dev --no-discovery -u http://localhost:3000/api/inngest",
 		"dev:party": "pnpx partykit dev",
 		"tunnel": "ngrok http --domain=neatly-diverse-goldfish.ngrok-free.app 3000",
@@ -139,6 +139,7 @@
 		"holy-loader": "^2.2.10",
 		"html-to-text": "^9.0.5",
 		"i": "^0.3.7",
+		"import-in-the-middle": "^1.11.2",
 		"inngest": "^3.22.5",
 		"intl-segmenter-polyfill": "^0.4.4",
 		"js-cookie": "^3.0.5",

diff --git a/apps/ai-hero/src/db/schema.ts b/apps/ai-hero/src/db/schema.ts
@@ -60,4 +60,14 @@ export const {
 	commentsRelations,
 	userPrefs,
 	userPrefsRelations,
+	organization,
+	organizationRelations,
+	organizationMemberships,
+	organizationMembershipRelations,
+	organizationMembershipRoles,
+	organizationMembershipRolesRelations,
+	merchantSubscription,
+	merchantSubscriptionRelations,
+	subscription,
+	subscriptionRelations,
 } = getCourseBuilderSchema(mysqlTable)
diff --git a/apps/ai-hero/src/lib/lessons.ts b/apps/ai-hero/src/lib/lessons.ts
@@ -1,27 +1,32 @@
 import { z } from 'zod'
 
-import { ContentResourceResourceSchema } from '@coursebuilder/core/schemas/content-resource-schema'
+import {
+	ContentResourceResourceSchema,
+	ContentResourceSchema,
+} from '@coursebuilder/core/schemas/content-resource-schema'
 
-export const LessonSchema = z.object({
-	id: z.string(),
-	type: z.string(),
-	createdById: z.string(),
-	createdAt: z.coerce.date().nullable(),
-	updatedAt: z.coerce.date().nullable(),
-	deletedAt: z.coerce.date().nullable(),
-	fields: z.object({
-		title: z.string().min(2).max(90),
-		body: z.string().optional(),
-		slug: z.string(),
-		description: z.string().optional(),
-		state: z
-			.enum(['draft', 'published', 'archived', 'deleted'])
-			.default('draft'),
-		visibility: z.enum(['public', 'private', 'unlisted']).default('unlisted'),
-		github: z.string().optional(),
-		gitpod: z.string().optional(),
+export const LessonSchema = ContentResourceSchema.merge(
+	z.object({
+		id: z.string(),
+		type: z.string(),
+		createdById: z.string(),
+		createdAt: z.coerce.date().nullable(),
+		updatedAt: z.coerce.date().nullable(),
+		deletedAt: z.coerce.date().nullable(),
+		fields: z.object({
+			title: z.string().min(2).max(90),
+			body: z.string().optional(),
+			slug: z.string(),
+			description: z.string().optional(),
+			state: z
+				.enum(['draft', 'published', 'archived', 'deleted'])
+				.default('draft'),
+			visibility: z.enum(['public', 'private', 'unlisted']).default('unlisted'),
+			github: z.string().optional(),
+			gitpod: z.string().optional(),
+		}),
+		resources: z.array(ContentResourceResourceSchema).default([]).nullable(),
 	}),
-	resources: z.array(ContentResourceResourceSchema).default([]).nullable(),
-})
+)
 
 export type Lesson = z.infer<typeof LessonSchema>
diff --git a/apps/ai-hero/src/lib/pages-query.ts b/apps/ai-hero/src/lib/pages-query.ts
@@ -38,7 +38,7 @@ export async function getPages(): Promise<Page[]> {
 
 	const pagesParsed = z.array(PageSchema).safeParse(pages)
 	if (!pagesParsed.success) {
-		console.error('Error parsing pages', pagesParsed)
+		console.debug('Error parsing pages', pagesParsed.error)
 		return []
 	}
 

diff --git a/apps/astro-party/package.json b/apps/astro-party/package.json
@@ -11,10 +11,10 @@
 		"tunnel": "ngrok http --domain=neatly-diverse-goldfish.ngrok-free.app 3000",
 		"email:preview": "email dev --dir ./src/emails",
 		"build": "next build",
-		"db:push": "dotenv drizzle-kit push mysql",
+		"db:push": "dotenv drizzle-kit push",
 		"db:studio": "dotenv drizzle-kit studio",
 		"db:seed": "dotenv tsx ./src/db/seed.ts",
-		"db:generate": "dotenv drizzle-kit generate mysql",
+		"db:generate": "dotenv drizzle-kit generate",
 		"lint": "next lint",
 		"start": "next start",
 		"typecheck": "tsc --noEmit",

diff --git a/apps/astro-party/src/db/schema.ts b/apps/astro-party/src/db/schema.ts
@@ -56,4 +56,10 @@ export const {
 	contentResourceProductRelations,
 	upgradableProducts,
 	upgradableProductsRelations,
+	organization,
+	organizationRelations,
+	organizationMemberships,
+	organizationMembershipRelations,
+	organizationMembershipRoles,
+	organizationMembershipRolesRelations,
 } = getCourseBuilderSchema(mysqlTable)
diff --git a/apps/astro-party/src/lib/lessons.ts b/apps/astro-party/src/lib/lessons.ts
@@ -1,28 +1,33 @@
 import { z } from 'zod'
 
-import { ContentResourceResourceSchema } from '@coursebuilder/core/schemas/content-resource-schema'
+import {
+	ContentResourceResourceSchema,
+	ContentResourceSchema,
+} from '@coursebuilder/core/schemas/content-resource-schema'
 
-export const LessonSchema = z.object({
-	id: z.string(),
-	type: z.string(),
-	createdById: z.string(),
-	createdAt: z.coerce.date().nullable(),
-	updatedAt: z.coerce.date().nullable(),
-	deletedAt: z.coerce.date().nullable(),
-	fields: z.object({
-		title: z.string().min(2).max(90),
-		body: z.string().optional(),
-		slug: z.string(),
-		description: z.string().optional(),
-		state: z
-			.enum(['draft', 'published', 'archived', 'deleted'])
-			.default('draft'),
-		visibility: z.enum(['public', 'private', 'unlisted']).default('unlisted'),
-		github: z.string().optional(),
-		gitpod: z.string().optional(),
+export const LessonSchema = ContentResourceSchema.merge(
+	z.object({
+		id: z.string(),
+		type: z.string(),
+		createdById: z.string(),
+		createdAt: z.coerce.date().nullable(),
+		updatedAt: z.coerce.date().nullable(),
+		deletedAt: z.coerce.date().nullable(),
+		fields: z.object({
+			title: z.string().min(2).max(90),
+			body: z.string().optional(),
+			slug: z.string(),
+			description: z.string().optional(),
+			state: z
+				.enum(['draft', 'published', 'archived', 'deleted'])
+				.default('draft'),
+			visibility: z.enum(['public', 'private', 'unlisted']).default('unlisted'),
+			github: z.string().optional(),
+			gitpod: z.string().optional(),
+		}),
+		resources: z.array(ContentResourceResourceSchema).default([]).nullable(),
 	}),
-	resources: z.array(ContentResourceResourceSchema).default([]).nullable(),
-})
+)
 
 export type Lesson = z.infer<typeof LessonSchema>
 

diff --git a/apps/course-builder-video-blog/package.json b/apps/course-builder-video-blog/package.json
@@ -11,9 +11,9 @@
 		"tunnel": "ngrok http --domain=neatly-diverse-goldfish.ngrok-free.app 3000",
 		"email:preview": "email dev --dir ./src/emails",
 		"build": "next build",
-		"db:push": "dotenv drizzle-kit push mysql",
+		"db:push": "dotenv drizzle-kit push",
 		"db:studio": "dotenv drizzle-kit studio",
-		"db:generate": "dotenv drizzle-kit generate mysql",
+		"db:generate": "dotenv drizzle-kit generate",
 		"db:seed": "dotenv tsx ./src/db/seed.ts",
 		"lint": "next lint",
 		"start": "next start",

diff --git a/apps/course-builder-video-blog/src/db/schema.ts b/apps/course-builder-video-blog/src/db/schema.ts
@@ -39,4 +39,10 @@ export const {
 	deviceVerificationRelations,
 	deviceAccessToken,
 	deviceAccessTokenRelations,
+	organization,
+	organizationRelations,
+	organizationMemberships,
+	organizationMembershipRelations,
+	organizationMembershipRoles,
+	organizationMembershipRolesRelations,
 } = getCourseBuilderSchema(mysqlTable)
diff --git a/apps/course-builder-web/package.json b/apps/course-builder-web/package.json
@@ -11,9 +11,9 @@
 		"tunnel": "ngrok http --domain=neatly-diverse-goldfish.ngrok-free.app 3000",
 		"email:preview": "email dev --dir ./src/emails",
 		"build": "next build",
-		"db:push": "dotenv drizzle-kit push mysql",
+		"db:push": "dotenv drizzle-kit push",
 		"db:studio": "dotenv drizzle-kit studio",
-		"db:generate": "dotenv drizzle-kit generate mysql",
+		"db:generate": "dotenv drizzle-kit generate",
 		"db:seed": "dotenv tsx ./src/db/seed.ts",
 		"lint": "next lint",
 		"start": "next start",

diff --git a/apps/course-builder-web/src/db/schema.ts b/apps/course-builder-web/src/db/schema.ts
@@ -56,4 +56,10 @@ export const {
 	contentResourceProductRelations,
 	upgradableProducts,
 	upgradableProductsRelations,
+	organization,
+	organizationRelations,
+	organizationMemberships,
+	organizationMembershipRelations,
+	organizationMembershipRoles,
+	organizationMembershipRolesRelations,
 } = getCourseBuilderSchema(mysqlTable)
diff --git a/apps/egghead/package.json b/apps/egghead/package.json
@@ -11,9 +11,9 @@
 		"tunnel": "ngrok http --domain=neatly-diverse-goldfish.ngrok-free.app 3000",
 		"email:preview": "email dev --dir ./src/emails",
 		"build": "next build",
-		"db:push": "dotenv drizzle-kit push mysql",
+		"db:push": "dotenv drizzle-kit push",
 		"db:studio": "dotenv drizzle-kit studio",
-		"db:generate": "dotenv drizzle-kit generate mysql",
+		"db:generate": "dotenv drizzle-kit generate",
 		"db:seed": "dotenv tsx ./src/db/seed.ts",
 		"lint": "next lint",
 		"start": "next start",

diff --git a/apps/egghead/src/app/api/auth/[...nextauth]/route.ts b/apps/egghead/src/app/api/auth/[...nextauth]/route.ts
@@ -1,5 +1,4 @@
 import { GET as authGet, POST as authPost } from '@/server/auth'
-import { withSkill } from '@/server/with-skill'
 
-export const GET = withSkill(authGet)
-export const POST = withSkill(authPost)
+export const GET = authGet
+export const POST = authPost
diff --git a/apps/egghead/src/db/schema.ts b/apps/egghead/src/db/schema.ts
@@ -45,4 +45,10 @@ export const {
 	deviceVerificationRelations,
 	deviceAccessToken,
 	deviceAccessTokenRelations,
+	organization,
+	organizationRelations,
+	organizationMemberships,
+	organizationMembershipRelations,
+	organizationMembershipRoles,
+	organizationMembershipRolesRelations,
 } = getCourseBuilderSchema(mysqlTable)
diff --git a/apps/epic-react/package.json b/apps/epic-react/package.json
@@ -11,9 +11,9 @@
 		"tunnel": "ngrok http --domain=neatly-diverse-goldfish.ngrok-free.app 3000",
 		"email:preview": "email dev --dir ./src/emails",
 		"build": "next build",
-		"db:push": "dotenv drizzle-kit push mysql",
+		"db:push": "dotenv drizzle-kit push",
 		"db:studio": "dotenv drizzle-kit studio",
-		"db:generate": "dotenv drizzle-kit generate mysql",
+		"db:generate": "dotenv drizzle-kit generate",
 		"db:seed": "dotenv tsx ./src/db/seed.ts",
 		"lint": "next lint",
 		"start": "next start",

diff --git a/apps/epic-react/src/db/schema.ts b/apps/epic-react/src/db/schema.ts
@@ -35,4 +35,10 @@ export const {
 	contributionTypes,
 	contributionTypesRelations,
 	resourceProgress,
+	organization,
+	organizationRelations,
+	organizationMemberships,
+	organizationMembershipRelations,
+	organizationMembershipRoles,
+	organizationMembershipRolesRelations,
 } = getCourseBuilderSchema(mysqlTable)
diff --git a/apps/epic-web/package.json b/apps/epic-web/package.json
@@ -11,8 +11,8 @@
 		"tunnel": "ngrok http --domain=neatly-diverse-goldfish.ngrok-free.app 3000",
 		"email:preview": "email dev --dir ./src/emails",
 		"build": "next build",
-		"db:push": "dotenv drizzle-kit push mysql",
-		"db:generate": "dotenv drizzle-kit generate mysql",
+		"db:push": "dotenv drizzle-kit push",
+		"db:generate": "dotenv drizzle-kit generate",
 		"db:studio": "dotenv drizzle-kit studio",
 		"db:seed": "dotenv tsx ./src/db/seed.ts",
 		"lint": "next lint",

diff --git a/apps/epic-web/src/db/schema.ts b/apps/epic-web/src/db/schema.ts
@@ -65,4 +65,10 @@ export const {
 	userPrefs,
 	userPrefsRelations,
 	lessonProgress,
+	organization,
+	organizationRelations,
+	organizationMemberships,
+	organizationMembershipRelations,
+	organizationMembershipRoles,
+	organizationMembershipRolesRelations,
 } = getCourseBuilderSchema(mysqlTable)
diff --git a/apps/go-local-first/src/components/navigation/index.tsx b/apps/go-local-first/src/components/navigation/index.tsx
@@ -3,19 +3,16 @@
 import * as React from 'react'
 import Link from 'next/link'
 import { useParams, usePathname, useRouter } from 'next/navigation'
-import { createAppAbility } from '@/ability'
 import config from '@/config'
-import { env } from '@/env.mjs'
 import { useFeedback } from '@/feedback-widget/feedback-context'
 import { useSaleToastNotifier } from '@/hooks/use-sale-toast-notifier'
 import { api } from '@/trpc/react'
 import { cn } from '@/utils/cn'
-import { Menu, X } from 'lucide-react'
+import { X } from 'lucide-react'
 import { useSession } from 'next-auth/react'
 
 import { Button } from '@coursebuilder/ui'
 
-import { useLiveEventToastNotifier } from '../app/use-live-event-toast-notifier'
 import { useNavLinks } from '../app/use-nav-links'
 import { LogoMark } from '../logo'
 import { NavLinkItem } from './nav-link-item'

diff --git a/apps/go-local-first/src/db/mysql-table.ts b/apps/go-local-first/src/db/mysql-table.ts
@@ -9,5 +9,5 @@ import { mysqlTableCreator } from 'drizzle-orm/mysql-core'
  */
 export const mysqlTable = mysqlTableCreator(
 	(name) =>
-		`${env.DATABASE_TABLE_PREFIX ? `${env.DATABASE_TABLE_PREFIX}_${name}` : ''}${name}`,
+		`${env.DATABASE_TABLE_PREFIX ? `${env.DATABASE_TABLE_PREFIX}_${name}` : name}`,
 )
diff --git a/apps/go-local-first/src/db/schema.ts b/apps/go-local-first/src/db/schema.ts
@@ -60,4 +60,10 @@ export const {
 	commentsRelations,
 	userPrefs,
 	userPrefsRelations,
+	organization,
+	organizationRelations,
+	organizationMemberships,
+	organizationMembershipRelations,
+	organizationMembershipRoles,
+	organizationMembershipRolesRelations,
 } = getCourseBuilderSchema(mysqlTable)