Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-18 02:32:00 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
Ephraim Atta-Duncan
2024-11-22 11:12:49 +00:00
parent 2dd122aed3 cd5adce7df
commit 43ea76fae3
364 changed files with 31009 additions and 3755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/prisma/migrations/20240920084713_add_typed_signature_option/migration.sql Normal file
View File

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "DocumentMeta" ADD COLUMN "enabledTypedSignature" BOOLEAN NOT NULL DEFAULT false;

9
packages/prisma/migrations/20241017035042_rename_typed_signature_option/migration.sql Normal file
View File

@ -0,0 +1,9 @@
/*
Warnings:
- You are about to drop the column `enabledTypedSignature` on the `DocumentMeta` table. All the data in the column will be lost.
*/
-- AlterTable
ALTER TABLE "DocumentMeta" DROP COLUMN "enabledTypedSignature",
ADD COLUMN "typedSignatureEnabled" BOOLEAN NOT NULL DEFAULT false;

12
packages/prisma/migrations/20241021133616_add_global_team_settings/migration.sql Normal file
View File

@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "TeamGlobalSettings" (
"teamId" INTEGER NOT NULL,
"documentVisibility" "DocumentVisibility" NOT NULL DEFAULT 'EVERYONE',
"includeSenderDetails" BOOLEAN NOT NULL DEFAULT true
);
-- CreateIndex
CREATE UNIQUE INDEX "TeamGlobalSettings_teamId_key" ON "TeamGlobalSettings"("teamId");
-- AddForeignKey
ALTER TABLE "TeamGlobalSettings" ADD CONSTRAINT "TeamGlobalSettings_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;

5
packages/prisma/migrations/20241101103425_add_language_column_for_documents_and_templates/migration.sql Normal file
View File

@ -0,0 +1,5 @@
-- AlterTable
ALTER TABLE "DocumentMeta" ADD COLUMN "language" TEXT NOT NULL DEFAULT 'en';
-- AlterTable
ALTER TABLE "TemplateMeta" ADD COLUMN "language" TEXT NOT NULL DEFAULT 'en';

6
packages/prisma/migrations/20241107034521_add_branding_to_team_settings/migration.sql Normal file
View File

@ -0,0 +1,6 @@
-- AlterTable
ALTER TABLE "TeamGlobalSettings" ADD COLUMN "brandingCompanyDetails" TEXT NOT NULL DEFAULT '',
ADD COLUMN "brandingEnabled" BOOLEAN NOT NULL DEFAULT false,
ADD COLUMN "brandingHidePoweredBy" BOOLEAN NOT NULL DEFAULT false,
ADD COLUMN "brandingLogo" TEXT NOT NULL DEFAULT '',
ADD COLUMN "brandingUrl" TEXT NOT NULL DEFAULT '';

10
packages/prisma/migrations/20241107095908_add_document_email_setting/migration.sql Normal file
View File

@ -0,0 +1,10 @@
-- CreateEnum
CREATE TYPE "DocumentDistributionMethod" AS ENUM ('EMAIL', 'NONE');
-- AlterTable
ALTER TABLE "DocumentMeta" ADD COLUMN "distributionMethod" "DocumentDistributionMethod" NOT NULL DEFAULT 'EMAIL',
ADD COLUMN "emailSettings" JSONB;
-- AlterTable
ALTER TABLE "TemplateMeta" ADD COLUMN "distributionMethod" "DocumentDistributionMethod" NOT NULL DEFAULT 'EMAIL',
ADD COLUMN "emailSettings" JSONB;

2
packages/prisma/migrations/20241107223943_add_document_language_preference/migration.sql Normal file
View File

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "TeamGlobalSettings" ADD COLUMN "documentLanguage" TEXT NOT NULL DEFAULT 'en';

5
packages/prisma/migrations/20241112223435_add_rejection_status_and_reason_to_recipient_schema/migration.sql Normal file
View File

@ -0,0 +1,5 @@
-- AlterEnum
ALTER TYPE "SigningStatus" ADD VALUE 'REJECTED';
-- AlterTable
ALTER TABLE "Recipient" ADD COLUMN "rejectionReason" TEXT;

70
packages/prisma/schema.prisma
View File

@ -358,17 +358,26 @@ model DocumentData {
Template Template?
}
enum DocumentDistributionMethod {
EMAIL
NONE
}
model DocumentMeta {
id String @id @default(cuid())
subject String?
message String?
timezone String? @default("Etc/UTC") @db.Text
password String?
dateFormat String? @default("yyyy-MM-dd hh:mm a") @db.Text
documentId Int @unique
document Document @relation(fields: [documentId], references: [id], onDelete: Cascade)
redirectUrl String?
signingOrder DocumentSigningOrder @default(PARALLEL)
id String @id @default(cuid())
subject String?
message String?
timezone String? @default("Etc/UTC") @db.Text
password String?
dateFormat String? @default("yyyy-MM-dd hh:mm a") @db.Text
documentId Int @unique
document Document @relation(fields: [documentId], references: [id], onDelete: Cascade)
redirectUrl String?
signingOrder DocumentSigningOrder @default(PARALLEL)
typedSignatureEnabled Boolean @default(false)
language String @default("en")
distributionMethod DocumentDistributionMethod @default(EMAIL)
emailSettings Json?
}
enum ReadStatus {
@ -384,6 +393,7 @@ enum SendStatus {
enum SigningStatus {
NOT_SIGNED
SIGNED
REJECTED
}
enum RecipientRole {
@ -405,6 +415,7 @@ model Recipient {
signedAt DateTime?
authOptions Json?
signingOrder Int?
rejectionReason String?
role RecipientRole @default(SIGNER)
readStatus ReadStatus @default(NOT_OPENED)
signingStatus SigningStatus @default(NOT_SIGNED)
@ -499,6 +510,21 @@ enum TeamMemberInviteStatus {
DECLINED
}
model TeamGlobalSettings {
teamId Int @unique
documentVisibility DocumentVisibility @default(EVERYONE)
documentLanguage String @default("en")
includeSenderDetails Boolean @default(true)
brandingEnabled Boolean @default(false)
brandingLogo String @default("")
brandingUrl String @default("")
brandingCompanyDetails String @default("")
brandingHidePoweredBy Boolean @default(false)
team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
}
model Team {
id Int @id @default(autoincrement())
name String
@ -513,6 +539,7 @@ model Team {
teamEmail TeamEmail?
emailVerification TeamEmailVerification?
transferVerification TeamTransferVerification?
teamGlobalSettings TeamGlobalSettings?
avatarImage AvatarImage? @relation(fields: [avatarImageId], references: [id], onDelete: SetNull)
profile TeamProfile?
@ -601,16 +628,19 @@ enum TemplateType {
}
model TemplateMeta {
id String @id @default(cuid())
subject String?
message String?
timezone String? @default("Etc/UTC") @db.Text
password String?
dateFormat String? @default("yyyy-MM-dd hh:mm a") @db.Text
signingOrder DocumentSigningOrder? @default(PARALLEL)
templateId Int @unique
template Template @relation(fields: [templateId], references: [id], onDelete: Cascade)
redirectUrl String?
id String @id @default(cuid())
subject String?
message String?
timezone String? @default("Etc/UTC") @db.Text
password String?
dateFormat String? @default("yyyy-MM-dd hh:mm a") @db.Text
signingOrder DocumentSigningOrder? @default(PARALLEL)
templateId Int @unique
template Template @relation(fields: [templateId], references: [id], onDelete: Cascade)
redirectUrl String?
language String @default("en")
distributionMethod DocumentDistributionMethod @default(EMAIL)
emailSettings Json?
}
model Template {

2
packages/prisma/seed/teams.ts
View File

@ -42,7 +42,7 @@ export const seedTeam = async ({
createMany: {
data: [teamOwner, ...teamMembers].map((user) => ({
userId: user.id,
role: TeamMemberRole.ADMIN,
role: user === teamOwner ? TeamMemberRole.ADMIN : TeamMemberRole.MEMBER,
})),
},
},