diff --git a/.yarn/versions/0f63a127.yml b/.yarn/versions/0f63a127.yml new file mode 100644 index 0000000000..9164d55660 --- /dev/null +++ b/.yarn/versions/0f63a127.yml @@ -0,0 +1,8 @@ +undecided: + - calcom-monorepo + - "@calcom/app-store-cli" + - "@calcom/platform-constants" + - "@calcom/platform-enums" + - "@calcom/platform-types" + - "@calcom/platform-utils" + - "@calcom/prisma" diff --git a/apps/web/package.json b/apps/web/package.json index 2882447b40..e7fd32e5ea 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@calcom/web", - "version": "4.7.19", + "version": "4.7.20", "private": true, "scripts": { "analyze": "ANALYZE=true next build", diff --git a/packages/app-store-cli/.yarn/ci-cache/install-state.gz b/packages/app-store-cli/.yarn/ci-cache/install-state.gz index 8e754bb2fc..cc33442997 100644 Binary files a/packages/app-store-cli/.yarn/ci-cache/install-state.gz and b/packages/app-store-cli/.yarn/ci-cache/install-state.gz differ diff --git a/packages/platform/constants/.yarn/ci-cache/install-state.gz b/packages/platform/constants/.yarn/ci-cache/install-state.gz index 8e754bb2fc..cc33442997 100644 Binary files a/packages/platform/constants/.yarn/ci-cache/install-state.gz and b/packages/platform/constants/.yarn/ci-cache/install-state.gz differ diff --git a/packages/platform/enums/.yarn/ci-cache/install-state.gz b/packages/platform/enums/.yarn/ci-cache/install-state.gz index 8e754bb2fc..cc33442997 100644 Binary files a/packages/platform/enums/.yarn/ci-cache/install-state.gz and b/packages/platform/enums/.yarn/ci-cache/install-state.gz differ diff --git a/packages/platform/types/.yarn/ci-cache/install-state.gz b/packages/platform/types/.yarn/ci-cache/install-state.gz index 8e754bb2fc..cc33442997 100644 Binary files a/packages/platform/types/.yarn/ci-cache/install-state.gz and b/packages/platform/types/.yarn/ci-cache/install-state.gz differ diff --git a/packages/platform/utils/.yarn/ci-cache/install-state.gz b/packages/platform/utils/.yarn/ci-cache/install-state.gz index 8e754bb2fc..cc33442997 100644 Binary files a/packages/platform/utils/.yarn/ci-cache/install-state.gz and b/packages/platform/utils/.yarn/ci-cache/install-state.gz differ diff --git a/packages/prisma/.yarn/ci-cache/install-state.gz b/packages/prisma/.yarn/ci-cache/install-state.gz index 57e683d074..cc33442997 100644 Binary files a/packages/prisma/.yarn/ci-cache/install-state.gz and b/packages/prisma/.yarn/ci-cache/install-state.gz differ diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 51cfd9f7f2..cf472ef5a6 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -373,7 +373,6 @@ model User { @@index([identityProvider]) @@index([identityProviderId]) @@map(name: "users") - } model NotificationsSubscriptions { @@ -1633,21 +1632,21 @@ model AttributeToUser { attributeOption AttributeOption @relation(fields: [attributeOptionId], references: [id], onDelete: Cascade) attributeOptionId String - - weight Int? - + + weight Int? + // We don't intentionally delete assignments on deletion of a user/directory sync - createdAt DateTime @default(now()) - createdById Int? - createdBy User? @relation("createdBy", fields: [createdById], references: [id], onDelete: SetNull) - createdByDSyncId String? - createdByDSync DSyncData? @relation("createdByDSync", fields: [createdByDSyncId], references: [directoryId], onDelete: SetNull) - - updatedAt DateTime? @updatedAt - updatedBy User? @relation("updatedBy", fields: [updatedById], references: [id], onDelete: SetNull) - updatedById Int? - updatedByDSyncId String? - updatedByDSync DSyncData? @relation("updatedByDSync", fields: [updatedByDSyncId], references: [directoryId], onDelete: SetNull) + createdAt DateTime @default(now()) + createdById Int? + createdBy User? @relation("createdBy", fields: [createdById], references: [id], onDelete: SetNull) + createdByDSyncId String? + createdByDSync DSyncData? @relation("createdByDSync", fields: [createdByDSyncId], references: [directoryId], onDelete: SetNull) + + updatedAt DateTime? @updatedAt + updatedBy User? @relation("updatedBy", fields: [updatedById], references: [id], onDelete: SetNull) + updatedById Int? + updatedByDSyncId String? + updatedByDSync DSyncData? @relation("updatedByDSync", fields: [updatedByDSyncId], references: [directoryId], onDelete: SetNull) @@unique([memberId, attributeOptionId]) } diff --git a/yarn.lock b/yarn.lock index 365da5ce3c..0cffc6a5bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3505,7 +3505,7 @@ __metadata: "@axiomhq/winston": ^1.2.0 "@calcom/platform-constants": "*" "@calcom/platform-enums": "*" - "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.69" + "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.70" "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2" "@calcom/platform-types": "*" "@calcom/platform-utils": "*" @@ -3683,7 +3683,9 @@ __metadata: autoprefixer: ^10.4.19 class-variance-authority: ^0.4.0 clsx: ^2.0.0 + dompurify: ^3.2.3 jest: ^29.7.0 + marked: ^15.0.3 postcss: ^8.4.38 postcss-import: ^16.1.0 postcss-prefixer: ^3.0.0 @@ -4491,14 +4493,14 @@ __metadata: languageName: node linkType: hard -"@calcom/platform-libraries@npm:@calcom/platform-libraries@0.0.69": - version: 0.0.69 - resolution: "@calcom/platform-libraries@npm:0.0.69" +"@calcom/platform-libraries@npm:@calcom/platform-libraries@0.0.70": + version: 0.0.70 + resolution: "@calcom/platform-libraries@npm:0.0.70" dependencies: "@calcom/core": "*" "@calcom/features": "*" "@calcom/lib": "*" - checksum: c7b1309b3f2b6b7a94d1f760be3bcd57a325395432249446774456f8c87efb1b1eea380606992fa3fa6d3692409fe4880c7c89ef53ba09ef3a9cad487d9ef6ae + checksum: e1e4e7eacb7cfb19aa460111f1d8525e0708b5390ba38fcb3848d241617b99ca1c473ec2fd96fdc2eb3575133c7c36ba0a66e3424332407998cb86aadc937a79 languageName: node linkType: hard @@ -16944,7 +16946,7 @@ __metadata: languageName: node linkType: hard -"@types/trusted-types@npm:*": +"@types/trusted-types@npm:*, @types/trusted-types@npm:^2.0.7": version: 2.0.7 resolution: "@types/trusted-types@npm:2.0.7" checksum: 8e4202766a65877efcf5d5a41b7dd458480b36195e580a3b1085ad21e948bc417d55d6f8af1fd2a7ad008015d4117d5fdfe432731157da3c68678487174e4ba3 @@ -23258,6 +23260,18 @@ __metadata: languageName: node linkType: hard +"dompurify@npm:^3.2.3": + version: 3.2.3 + resolution: "dompurify@npm:3.2.3" + dependencies: + "@types/trusted-types": ^2.0.7 + dependenciesMeta: + "@types/trusted-types": + optional: true + checksum: cd66ae8b22e1cfe5bc207b95fc119ce62f9a56eb313a9a1af6262d789d84e7bd27e29f26ed80110d108670dacb9527cb96ddf48a1da89126a37ec8b48702279a + languageName: node + linkType: hard + "domutils@npm:^2.5.2, domutils@npm:^2.8.0": version: 2.8.0 resolution: "domutils@npm:2.8.0" @@ -32362,6 +32376,15 @@ __metadata: languageName: node linkType: hard +"marked@npm:^15.0.3": + version: 15.0.3 + resolution: "marked@npm:15.0.3" + bin: + marked: bin/marked.js + checksum: 0e492aac261b449a13776fa0561eb2c9265f6162c810231de9143417d2995ed2f43e0d926cba6b39339dc365e6e6b5e88860d38d27ca7ccd291798219f95f2b5 + languageName: node + linkType: hard + "maxmin@npm:^2.1.0": version: 2.1.0 resolution: "maxmin@npm:2.1.0"