chore: 🔥 Remove ownerIds

2022-05-14 16:52:05 -07:00
parent 210bad32f9
commit bda4116fbc
47 changed files with 81 additions and 81 deletions
--- a/apps/builder/components/dashboard/FolderContent/TypebotButton.tsx
+++ b/apps/builder/components/dashboard/FolderContent/TypebotButton.tsx
@ -21,8 +21,8 @@ import { Typebot } from 'models'
 import { useTypebotDnd } from 'contexts/TypebotDndContext'
 import { useDebounce } from 'use-debounce'
 import { EmojiOrImageIcon } from 'components/shared/EmojiOrImageIcon'
-import { useUser } from 'contexts/UserContext'
 import { Plan } from 'db'
+import { useWorkspace } from 'contexts/WorkspaceContext'

 type ChatbotCardProps = {
  typebot: Pick<Typebot, 'id' | 'publishedTypebotId' | 'name' | 'icon'>
@ -38,7 +38,7 @@ export const TypebotButton = ({
  onMouseDown,
 }: ChatbotCardProps) => {
  const router = useRouter()
-  const { user } = useUser()
+  const { workspace } = useWorkspace()
  const { draggedTypebot } = useTypebotDnd()
  const [draggedTypebotDebounced] = useDebounce(draggedTypebot, 200)
  const {
@ -79,7 +79,7 @@ export const TypebotButton = ({
    if (!typebotToDuplicate) return { error: new Error('Typebot not found') }
    const { data: createdTypebot, error } = await importTypebot(
      data.typebot,
-      user?.plan ?? Plan.FREE
+      workspace?.plan ?? Plan.FREE
    )
    if (error)
      return toast({
--- a/apps/builder/components/share/ShareContent.tsx
+++ b/apps/builder/components/share/ShareContent.tsx
@ -12,7 +12,6 @@ import {
 import { TrashIcon } from 'assets/icons'
 import { UpgradeButton } from 'components/shared/buttons/UpgradeButton'
 import { useTypebot } from 'contexts/TypebotContext/TypebotContext'
-import { useUser } from 'contexts/UserContext'
 import { useWorkspace } from 'contexts/WorkspaceContext'
 import React from 'react'
 import { parseDefaultPublicId } from 'services/typebots'
--- a/apps/builder/components/share/customDomain/CustomDomainsDropdown.tsx
+++ b/apps/builder/components/share/customDomain/CustomDomainsDropdown.tsx
@ -13,7 +13,6 @@ import {
 } from '@chakra-ui/react'
 import { ChevronLeftIcon, PlusIcon, TrashIcon } from 'assets/icons'
 import React, { useState } from 'react'
-import { useUser } from 'contexts/UserContext'
 import { CustomDomainModal } from './CustomDomainModal'
 import { deleteCustomDomain, useCustomDomains } from 'services/user'
 import { useWorkspace } from 'contexts/WorkspaceContext'
--- a/apps/builder/components/shared/SupportBubble.tsx
+++ b/apps/builder/components/shared/SupportBubble.tsx
@ -1,7 +1,6 @@
 import { useTypebot } from 'contexts/TypebotContext'
 import { useUser } from 'contexts/UserContext'
 import { useWorkspace } from 'contexts/WorkspaceContext'
-import { Plan } from 'db'
 import React, { useEffect, useState } from 'react'
 import { isCloudProdInstance } from 'services/utils'
 import { planToReadable } from 'services/workspace'
--- a/apps/builder/components/templates/CreateNewTypebotButtons.tsx
+++ b/apps/builder/components/templates/CreateNewTypebotButtons.tsx
@ -40,7 +40,6 @@ export const CreateNewTypebotButtons = () => {
            ...typebot,
            folderId,
            workspaceId: workspace.id,
-            ownerId: user.id,
            theme: {
              ...typebot.theme,
              chat: {
--- a/apps/builder/pages/api/auth/adapter.ts
+++ b/apps/builder/pages/api/auth/adapter.ts
@ -34,7 +34,6 @@ export function CustomAdapter(p: PrismaClient): Adapter {
          ...data,
          id: user.id,
          apiToken: randomUUID(),
-          plan: process.env.ADMIN_EMAIL === data.email ? Plan.PRO : Plan.FREE,
          workspaces:
            workspaceInvitations.length > 0
              ? undefined
--- a/apps/builder/pages/api/typebots.ts
+++ b/apps/builder/pages/api/typebots.ts
@ -81,7 +81,6 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
          'blocks' in data
            ? data
            : (parseNewTypebot({
-                ownerId: user.id,
                ownerAvatarUrl: user.image,
                ...data,
              }) as Prisma.TypebotUncheckedCreateInput),
--- a/apps/builder/pages/typebots.tsx
+++ b/apps/builder/pages/typebots.tsx
@ -24,7 +24,7 @@ const DashboardPage = () => {

  useEffect(() => {
    const subscribePlan = query.subscribePlan as 'pro' | 'team' | undefined
-    if (workspace && subscribePlan && user && user.plan === 'FREE') {
+    if (workspace && subscribePlan && user && workspace.plan === 'FREE') {
      setIsLoading(true)
      pay({
        user,
--- a/apps/builder/playwright/fixtures/typebots/editor/buttonsDnd.json
+++ b/apps/builder/playwright/fixtures/typebots/editor/buttonsDnd.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T08:16:59.215Z",
  "updatedAt": "2022-02-04T08:16:59.215Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/integrations/easyConfigWebhook.json
+++ b/apps/builder/playwright/fixtures/typebots/integrations/easyConfigWebhook.json
@ -3,7 +3,6 @@
  "createdAt": "2022-03-21T15:01:46.107Z",
  "updatedAt": "2022-03-21T15:03:07.312Z",
  "name": "My typebot",
-  "ownerId": "cl10hgjy90000lm1a1gyccuqj",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/integrations/googleSheets.json
+++ b/apps/builder/playwright/fixtures/typebots/integrations/googleSheets.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T13:40:19.455Z",
  "updatedAt": "2022-02-04T13:40:19.455Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/integrations/googleSheetsGet.json
+++ b/apps/builder/playwright/fixtures/typebots/integrations/googleSheetsGet.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T13:40:19.455Z",
  "updatedAt": "2022-02-04T13:40:19.455Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/integrations/sendEmail.json
+++ b/apps/builder/playwright/fixtures/typebots/integrations/sendEmail.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-07T10:06:35.274Z",
  "updatedAt": "2022-02-07T10:06:35.274Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/integrations/webhook.json
+++ b/apps/builder/playwright/fixtures/typebots/integrations/webhook.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T13:44:30.386Z",
  "updatedAt": "2022-02-04T13:44:30.386Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/logic/code.json
+++ b/apps/builder/playwright/fixtures/typebots/logic/code.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T14:14:21.394Z",
  "updatedAt": "2022-02-04T14:14:21.394Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/logic/condition.json
+++ b/apps/builder/playwright/fixtures/typebots/logic/condition.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T13:47:42.459Z",
  "updatedAt": "2022-02-04T13:47:42.459Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/logic/linkTypebots/1.json
+++ b/apps/builder/playwright/fixtures/typebots/logic/linkTypebots/1.json
@ -3,7 +3,6 @@
  "createdAt": "2022-03-09T07:01:25.917Z",
  "updatedAt": "2022-03-09T07:01:25.917Z",
  "name": "My typebot",
-  "ownerId": "cl0cfi60r0000381a2bft9yis",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/logic/linkTypebots/2.json
+++ b/apps/builder/playwright/fixtures/typebots/logic/linkTypebots/2.json
@ -3,7 +3,6 @@
  "createdAt": "2022-03-08T17:18:50.337Z",
  "updatedAt": "2022-03-08T21:05:28.825Z",
  "name": "Another typebot",
-  "ownerId": "cl0cfi60r0000381a2bft9yis",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/logic/redirect.json
+++ b/apps/builder/playwright/fixtures/typebots/logic/redirect.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T14:14:21.394Z",
  "updatedAt": "2022-02-04T14:14:21.394Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/logic/setVariable.json
+++ b/apps/builder/playwright/fixtures/typebots/logic/setVariable.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T14:15:06.953Z",
  "updatedAt": "2022-02-04T14:15:06.953Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/results/submissionHeader.json
+++ b/apps/builder/playwright/fixtures/typebots/results/submissionHeader.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-05T06:21:16.522Z",
  "updatedAt": "2022-02-05T06:21:16.522Z",
  "name": "My typebot",
-  "ownerId": "ckzmhmiey001009mnzt5nkxu8",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/settings.json
+++ b/apps/builder/playwright/fixtures/typebots/settings.json
@ -3,7 +3,6 @@
  "createdAt": "2022-03-10T10:50:23.912Z",
  "updatedAt": "2022-03-10T10:50:23.912Z",
  "name": "My typebot",
-  "ownerId": "cl0cfi60r0000381a2bft9yis",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/singleChoiceTarget.json
+++ b/apps/builder/playwright/fixtures/typebots/singleChoiceTarget.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T14:17:20.022Z",
  "updatedAt": "2022-02-04T14:17:20.022Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/fixtures/typebots/theme.json
+++ b/apps/builder/playwright/fixtures/typebots/theme.json
@ -3,7 +3,6 @@
  "createdAt": "2022-02-04T14:19:29.412Z",
  "updatedAt": "2022-02-04T14:19:29.412Z",
  "name": "My typebot",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/playwright/services/database.ts
+++ b/apps/builder/playwright/services/database.ts
@ -249,7 +249,6 @@ const parseTypebotToPublicTypebot = (

 const parseTestTypebot = (partialTypebot: Partial<Typebot>): Typebot => ({
  id: partialTypebot.id ?? 'typebot',
-  ownerId: 'proUser',
  workspaceId: proWorkspaceId,
  folderId: null,
  name: 'My typebot',
@ -312,10 +311,9 @@ export const importTypebotInDatabase = async (
  path: string,
  updates?: Partial<Typebot>
 ) => {
-  const typebot: any = {
+  const typebot: Typebot = {
    ...JSON.parse(readFileSync(path).toString()),
    workspaceId: proWorkspaceId,
-    ownerId: 'proUser',
    ...updates,
  }
  await prisma.typebot.create({
--- a/apps/builder/public/bots/onboarding.json
+++ b/apps/builder/public/bots/onboarding.json
@ -3,7 +3,6 @@
  "createdAt": "2022-03-22T14:33:05.037Z",
  "updatedAt": "2022-03-22T16:33:37.928Z",
  "name": "Onboarding",
-  "ownerId": "ckzmhmiey001009mnzt5nkxu8",
  "publishedTypebotId": "cl128n64i00092e69wenv1dlx",
  "folderId": null,
  "blocks": [
--- a/apps/builder/public/templates/customer-support.json
+++ b/apps/builder/public/templates/customer-support.json
@ -4,7 +4,6 @@
  "updatedAt": "2022-03-25T15:42:12.544Z",
  "name": "Customer Support",
  "icon": "😍",
-  "ownerId": "cl13od3wt0000pl1aat7bdrxf",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/public/templates/lead-gen.json
+++ b/apps/builder/public/templates/lead-gen.json
@ -4,7 +4,6 @@
  "updatedAt": "2022-02-05T06:21:16.522Z",
  "name": "Lead Generation",
  "icon": "🤝",
-  "ownerId": "ckz6t9iep0006k31a22j05fwq",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/public/templates/lead-scoring.json
+++ b/apps/builder/public/templates/lead-scoring.json
@ -4,7 +4,6 @@
  "updatedAt": "2022-04-09T22:35:22.449Z",
  "icon": "🏆",
  "name": "Lead Scoring",
-  "ownerId": "cl1qykt2w00007w1agho81e26",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/public/templates/quiz.json
+++ b/apps/builder/public/templates/quiz.json
@ -4,7 +4,6 @@
  "updatedAt": "2022-04-08T23:03:34.726Z",
  "icon": "🕹️",
  "name": "Digital Marketing Quiz",
-  "ownerId": "cl1qykt2w00007w1agho81e26",
  "publishedTypebotId": null,
  "folderId": null,
  "blocks": [
--- a/apps/builder/services/credentials.ts
+++ b/apps/builder/services/credentials.ts
@ -24,7 +24,7 @@ export const useCredentials = ({
 }

 export const createCredentials = async (
-  credentials: Omit<Credentials, 'id' | 'iv' | 'createdAt' | 'ownerId'>
+  credentials: Omit<Credentials, 'id' | 'iv' | 'createdAt'>
 ) =>
  sendRequest<{
    credentials: Credentials
--- a/apps/builder/services/customDomains.ts
+++ b/apps/builder/services/customDomains.ts
@ -13,7 +13,7 @@ export const useCustomDomains = ({
  onError: (error: Error) => void
 }) => {
  const { data, error, mutate } = useSWR<
-    { customDomains: Omit<CustomDomain, 'createdAt' | 'ownerId'>[] },
+    { customDomains: Omit<CustomDomain, 'createdAt'>[] },
    Error
  >(
    workspaceId ? `/api/customDomains?${stringify({ workspaceId })}` : null,
@ -29,7 +29,7 @@ export const useCustomDomains = ({

 export const createCustomDomain = async (
  workspaceId: string,
-  customDomain: Omit<CustomDomain, 'createdAt' | 'workspaceId' | 'ownerId'>
+  customDomain: Omit<CustomDomain, 'createdAt' | 'workspaceId'>
 ) =>
  sendRequest<{
    credentials: Credentials
--- a/apps/builder/services/publicTypebot.tsx
+++ b/apps/builder/services/publicTypebot.tsx
@ -36,7 +36,6 @@ export const parsePublicTypebotToTypebot = (
  updatedAt: existingTypebot.updatedAt,
  publishedTypebotId: typebot.id,
  folderId: existingTypebot.folderId,
-  ownerId: existingTypebot.ownerId,
  icon: existingTypebot.icon,
  workspaceId: existingTypebot.workspaceId,
 })
--- a/apps/builder/services/typebots/typebots.ts
+++ b/apps/builder/services/typebots/typebots.ts
@ -418,7 +418,6 @@ export const parseNewTypebot = ({
    steps: [startStep],
  }
  return {
-    ownerId: null,
    folderId,
    name,
    workspaceId,