blsmedia/bot
2
0
Fork 0
Code Activity

🐛 Remove publicId and customDomain duplication on imported bots

Browse Source
This commit is contained in:
Baptiste Arnaud
2023-08-17 16:32:37 +02:00
parent 906845bd76
commit 304dfe2dab
17 changed files with 61 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
apps/builder/src/features/billing/api/getUsage.ts
View File

@@ -2,6 +2,7 @@ import prisma from '@/lib/prisma'
import { authenticatedProcedure } from '@/helpers/server/trpc'
import { TRPCError } from '@trpc/server'
import { z } from 'zod'
import { isReadWorkspaceFobidden } from '@/features/workspace/helpers/isReadWorkspaceFobidden'
export const getUsage = authenticatedProcedure
.meta({
@@ -25,10 +26,19 @@ export const getUsage = authenticatedProcedure
const workspace = await prisma.workspace.findFirst({
where: {
id: workspaceId,
members: { some: { userId: user.id } },
},
select: {
members: {
select: {
userId: true,
},
},
typebots: {
select: { id: true, results: { select: { id: true } } },
},
},
})
if (!workspace)
if (!workspace || isReadWorkspaceFobidden(workspace, user))
throw new TRPCError({
code: 'NOT_FOUND',
message: 'Workspace not found',
@@ -36,40 +46,25 @@ export const getUsage = authenticatedProcedure
const now = new Date()
const firstDayOfMonth = new Date(now.getFullYear(), now.getMonth(), 1)
const [
totalChatsUsed,
{
_sum: { storageUsed: totalStorageUsed },
},
] = await prisma.$transaction(async (tx) => {
const typebots = await tx.typebot.findMany({
const totalChatsUsed = await prisma.result.count({
where: {
workspace: {
id: workspaceId,
},
},
})
return Promise.all([
prisma.result.count({
where: {
typebotId: { in: typebots.map((typebot) => typebot.id) },
typebotId: { in: workspace.typebots.map((typebot) => typebot.id) },
hasStarted: true,
createdAt: {
gte: firstDayOfMonth,
},
},
}),
prisma.answer.aggregate({
})
const {
_sum: { storageUsed: totalStorageUsed },
} = await prisma.answer.aggregate({
where: {
storageUsed: { gt: 0 },
result: {
typebotId: { in: typebots.map((typebot) => typebot.id) },
typebotId: { in: workspace.typebots.map((typebot) => typebot.id) },
},
},
_sum: { storageUsed: true },
}),
])
})
return {

2
apps/builder/src/features/credentials/api/createCredentials.ts
View File

@@ -48,7 +48,7 @@ export const createCredentials = authenticatedProcedure
},
select: { id: true, members: true },
})
if (!workspace || (await isWriteWorkspaceForbidden(workspace, user)))
if (!workspace || isWriteWorkspaceForbidden(workspace, user))
throw new TRPCError({ code: 'NOT_FOUND', message: 'Workspace not found' })
const { encryptedData, iv } = await encrypt(credentials.data)

2
apps/builder/src/features/credentials/api/deleteCredentials.ts
View File

@@ -33,7 +33,7 @@ export const deleteCredentials = authenticatedProcedure
},
select: { id: true, members: true },
})
if (!workspace || (await isWriteWorkspaceForbidden(workspace, user)))
if (!workspace || isWriteWorkspaceForbidden(workspace, user))
throw new TRPCError({
code: 'NOT_FOUND',
message: 'Workspace not found',

2
apps/builder/src/features/credentials/api/listCredentials.ts
View File

@@ -51,7 +51,7 @@ export const listCredentials = authenticatedProcedure
},
},
})
if (!workspace || (await isReadWorkspaceFobidden(workspace, user)))
if (!workspace || isReadWorkspaceFobidden(workspace, user))
throw new TRPCError({ code: 'NOT_FOUND', message: 'Workspace not found' })
return { credentials: workspace.credentials }

8
apps/builder/src/features/folders/components/TypebotButton.tsx
View File

@@ -25,6 +25,7 @@ import { useScopedI18n } from '@/locales'
import { TypebotInDashboard } from '@/features/dashboard/types'
import { isMobile } from '@/helpers/isMobile'
import { trpc, trpcVanilla } from '@/lib/trpc'
import { duplicateName } from '@/features/typebot/helpers/duplicateName'
type Props = {
typebot: TypebotInDashboard
@@ -221,10 +222,3 @@ export const TypebotButton = ({
</Button>
)
}
const duplicateName = (name: string | `${string} (${number})`) => {
const match = name.match(/^(.*) \((\d+)\)$/)
if (!match) return `${name} (1)`
const [, nameWithoutNumber, number] = match
return `${nameWithoutNumber} (${Number(number) + 1})`
}

8
apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx
View File

@@ -56,7 +56,13 @@ export const CreateNewTypebotButtons = () => {
mutate({
workspaceId: workspace.id,
typebot: {
...(typebot ? { ...typebot } : {}),
...(typebot
? {
...typebot,
publicId: undefined,
customDomain: undefined,
}
: {}),
folderId,
},
})

5
apps/builder/src/features/templates/components/ImportTypebotFromFileButton.tsx
View File

@@ -19,13 +19,12 @@ export const ImportTypebotFromFileButton = ({
const file = e.target.files[0]
const fileContent = await readFile(file)
try {
const typebot = parseInvalidTypebot(JSON.parse(fileContent))
typebotSchema
const typebot = typebotSchema
.omit({
createdAt: true,
updatedAt: true,
})
.parse(typebot)
.parse(parseInvalidTypebot(JSON.parse(fileContent)))
onNewTypebot(typebot as Typebot)
} catch (err) {
console.error(err)

6
apps/builder/src/features/typebot/helpers/duplicateName.ts Normal file
View File

@@ -0,0 +1,6 @@
export const duplicateName = (name: string | `${string} (${number})`) => {
const match = name.match(/^(.*) \((\d+)\)$/)
if (!match) return `${name} (1)`
const [, nameWithoutNumber, number] = match
return `${nameWithoutNumber} (${Number(number) + 1})`
}

2
apps/builder/src/features/workspace/api/deleteWorkspace.ts
View File

@@ -30,7 +30,7 @@ export const deleteWorkspace = authenticatedProcedure
include: { members: true },
})
if (!workspace || (await isAdminWriteWorkspaceForbidden(workspace, user)))
if (!workspace || isAdminWriteWorkspaceForbidden(workspace, user))
throw new TRPCError({ code: 'NOT_FOUND', message: 'No workspaces found' })
await prisma.workspace.deleteMany({

2
apps/builder/src/features/workspace/api/getWorkspace.ts
View File

@@ -31,7 +31,7 @@ export const getWorkspace = authenticatedProcedure
include: { members: true },
})
if (!workspace || (await isReadWorkspaceFobidden(workspace, user)))
if (!workspace || isReadWorkspaceFobidden(workspace, user))
throw new TRPCError({ code: 'NOT_FOUND', message: 'No workspaces found' })
return {

2
apps/builder/src/features/workspace/api/listInvitationsInWorkspace.ts
View File

@@ -31,7 +31,7 @@ export const listInvitationsInWorkspace = authenticatedProcedure
include: { members: true, invitations: true },
})
if (!workspace || (await isReadWorkspaceFobidden(workspace, user)))
if (!workspace || isReadWorkspaceFobidden(workspace, user))
throw new TRPCError({ code: 'NOT_FOUND', message: 'No workspaces found' })
return { invitations: workspace.invitations }

2
apps/builder/src/features/workspace/api/listMembersInWorkspace.ts
View File

@@ -37,7 +37,7 @@ export const listMembersInWorkspace = authenticatedProcedure
},
})
if (!workspace || (await isReadWorkspaceFobidden(workspace, user)))
if (!workspace || isReadWorkspaceFobidden(workspace, user))
throw new TRPCError({ code: 'NOT_FOUND', message: 'No workspaces found' })
return {

2
apps/builder/src/features/workspace/api/updateWorkspace.ts
View File

@@ -41,7 +41,7 @@ export const updateWorkspace = authenticatedProcedure
if (!workspace)
throw new TRPCError({ code: 'NOT_FOUND', message: 'Workspace not found' })
if (await isAdminWriteWorkspaceForbidden(workspace, user))
if (isAdminWriteWorkspaceForbidden(workspace, user))
throw new TRPCError({
code: 'FORBIDDEN',
message: 'You are not allowed to update this workspace',

2
apps/builder/src/features/workspace/helpers/isAdminWriteWorkspaceForbidden.ts
View File

@@ -1,6 +1,6 @@
import { MemberInWorkspace, User } from '@typebot.io/prisma'
export const isAdminWriteWorkspaceForbidden = async (
export const isAdminWriteWorkspaceForbidden = (
workspace: {
members: MemberInWorkspace[]
},

4
apps/builder/src/features/workspace/helpers/isReadWorkspaceFobidden.ts
View File

@@ -1,8 +1,8 @@
import { MemberInWorkspace, User } from '@typebot.io/prisma'
export const isReadWorkspaceFobidden = async (
export const isReadWorkspaceFobidden = (
workspace: {
members: MemberInWorkspace[]
members: Pick<MemberInWorkspace, 'userId'>[]
},
user: Pick<User, 'email' | 'id'>
) => {

2
apps/builder/src/features/workspace/helpers/isWriteWorkspaceForbidden copy.ts
View File

@@ -1,6 +1,6 @@
import { MemberInWorkspace, User } from '@typebot.io/prisma'
export const isWriteWorkspaceForbidden = async (
export const isWriteWorkspaceForbidden = (
workspace: {
members: MemberInWorkspace[]
},

15
apps/docs/openapi/builder/_spec_.json
View File

@@ -426,7 +426,7 @@
}
}
},
"/linkedTypebots": {
"/typebots/{typebotId}/linkedTypebots": {
"get": {
"operationId": "getLinkedTypebots",
"summary": "Get linked typebots",
@@ -440,21 +440,12 @@
],
"parameters": [
{
"name": "workspaceId",
"in": "query",
"name": "typebotId",
"in": "path",
"required": true,
"schema": {
"type": "string"
}
},
{
"name": "typebotIds",
"in": "query",
"required": true,
"schema": {
"type": "string"
},
"description": "Comma separated list of typebot ids"
}
],
"responses": {