Merge branch 'main' into refactor/get-booking

calcom · Oct 14, 2024 · ca9bb4b · ca9bb4b
2 parents 84385ff + cd06141
commit ca9bb4b
Show file tree

Hide file tree

Showing 203 changed files with 4,732 additions and 1,548 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           filters: |
             has-files-requiring-all-checks:
-              - "!(**.md|.github/CODEOWNERS)"
+              - "!(**.md|.github/CODEOWNERS|docs/**|apps/web/public/static/locales/**/common.json)"
       - name: Get Latest Commit SHA
         id: get_sha
         run: |

diff --git a/apps/api/v1/lib/validations/booking.ts b/apps/api/v1/lib/validations/booking.ts
@@ -73,6 +73,7 @@ export const schemaBookingReadPublic = Booking.extend({
   attendees: z
     .array(
       _AttendeeModel.pick({
+        id: true,
         email: true,
         name: true,
         timeZone: true,

diff --git a/apps/api/v1/package.json b/apps/api/v1/package.json
@@ -33,7 +33,7 @@
     "@sentry/nextjs": "^8.8.0",
     "bcryptjs": "^2.4.3",
     "memory-cache": "^0.2.0",
-    "next": "^13.5.4",
+    "next": "^13.5.6",
     "next-api-middleware": "^1.0.1",
     "next-axiom": "^0.17.0",
     "next-swagger-doc": "^0.3.6",

diff --git a/apps/api/v2/package.json b/apps/api/v2/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.44",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.45",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",

diff --git a/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.ts b/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.ts
@@ -30,7 +30,7 @@ import { CONFERENCING_APPS, GOOGLE_MEET, SUCCESS_STATUS } from "@calcom/platform
   path: "/v2/conferencing",
   version: API_VERSIONS_VALUES,
 })
-@DocsTags("Platform / Conferencing")
+@DocsTags("Conferencing")
 export class ConferencingController {
   private readonly logger = new Logger("Platform Gcal Provider");
 

diff --git a/apps/api/v2/swagger/documentation.json b/apps/api/v2/swagger/documentation.json
@@ -63,121 +63,6 @@
         ]
       }
     },
-    "/v2/conferencing/{app}/connect": {
-      "post": {
-        "operationId": "ConferencingController_connect",
-        "summary": "connect your conferencing application",
-        "parameters": [
-          {
-            "name": "app",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ConferencingAppOutputResponseDto"
-                }
-              }
-            }
-          }
-        },
-        "tags": [
-          "Platform / Conferencing"
-        ]
-      }
-    },
-    "/v2/conferencing": {
-      "get": {
-        "operationId": "ConferencingController_listConferencingApps",
-        "summary": "list your conferencing applications",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ConferencingAppsOutputResponseDto"
-                }
-              }
-            }
-          }
-        },
-        "tags": [
-          "Platform / Conferencing"
-        ]
-      }
-    },
-    "/v2/conferencing/{app}/default": {
-      "post": {
-        "operationId": "ConferencingController_default",
-        "summary": "set your default conferencing application",
-        "parameters": [
-          {
-            "name": "app",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/SetDefaultConferencingAppOutputResponseDto"
-                }
-              }
-            }
-          }
-        },
-        "tags": [
-          "Platform / Conferencing"
-        ]
-      }
-    },
-    "/v2/conferencing/{app}/disconnect": {
-      "delete": {
-        "operationId": "ConferencingController_disconnect",
-        "summary": "disconnect your conferencing application",
-        "parameters": [
-          {
-            "name": "app",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ConferencingAppOutputResponseDto"
-                }
-              }
-            }
-          }
-        },
-        "tags": [
-          "Platform / Conferencing"
-        ]
-      }
-    },
     "/v2/gcal/oauth/auth-url": {
       "get": {
         "operationId": "GcalController_redirect",
@@ -3657,6 +3542,121 @@
         ]
       }
     },
+    "/v2/conferencing/{app}/connect": {
+      "post": {
+        "operationId": "ConferencingController_connect",
+        "summary": "Connect your conferencing application",
+        "parameters": [
+          {
+            "name": "app",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConferencingAppOutputResponseDto"
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "Conferencing"
+        ]
+      }
+    },
+    "/v2/conferencing": {
+      "get": {
+        "operationId": "ConferencingController_listConferencingApps",
+        "summary": "List your conferencing applications",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConferencingAppsOutputResponseDto"
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "Conferencing"
+        ]
+      }
+    },
+    "/v2/conferencing/{app}/default": {
+      "post": {
+        "operationId": "ConferencingController_default",
+        "summary": "Set your default conferencing application",
+        "parameters": [
+          {
+            "name": "app",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SetDefaultConferencingAppOutputResponseDto"
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "Conferencing"
+        ]
+      }
+    },
+    "/v2/conferencing/{app}/disconnect": {
+      "delete": {
+        "operationId": "ConferencingController_disconnect",
+        "summary": "Disconnect your conferencing application",
+        "parameters": [
+          {
+            "name": "app",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConferencingAppOutputResponseDto"
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "Conferencing"
+        ]
+      }
+    },
     "/v2/destination-calendars": {
       "put": {
         "operationId": "DestinationCalendarsController_updateDestinationCalendars",
@@ -11149,7 +11149,9 @@
               "RECORDING_READY",
               "INSTANT_MEETING",
               "RECORDING_TRANSCRIPTION_GENERATED",
-              "OOO_CREATED"
+              "OOO_CREATED",
+              "AFTER_HOSTS_CAL_VIDEO_NO_SHOW",
+              "AFTER_GUESTS_CAL_VIDEO_NO_SHOW"
             ]
           },
           "active": {
@@ -11223,7 +11225,9 @@
               "RECORDING_READY",
               "INSTANT_MEETING",
               "RECORDING_TRANSCRIPTION_GENERATED",
-              "OOO_CREATED"
+              "OOO_CREATED",
+              "AFTER_HOSTS_CAL_VIDEO_NO_SHOW",
+              "AFTER_GUESTS_CAL_VIDEO_NO_SHOW"
             ]
           },
           "active": {
@@ -13126,7 +13130,7 @@
           "type": {
             "type": "string",
             "example": "google_video",
-            "description": "type of conferencing app"
+            "description": "Type of conferencing app"
           },
           "userId": {
             "type": "number",

diff --git a/apps/storybook/package.json b/apps/storybook/package.json
@@ -24,7 +24,7 @@
     "@storybook/blocks": "^7.6.3",
     "@storybook/nextjs": "^7.6.3",
     "@storybook/preview-api": "^7.6.3",
-    "next": "^13.5.4",
+    "next": "^13.5.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "storybook-addon-rtl-direction": "^0.0.19"

diff --git a/apps/swagger/package.json b/apps/swagger/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "highlight.js": "^11.6.0",
     "isarray": "2.0.5",
-    "next": "^13.5.4",
+    "next": "^13.5.6",
     "openapi-snippet": "^0.13.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/apps/web/app/future/apps/[slug]/[...pages]/page.tsx b/apps/web/app/future/apps/[slug]/[...pages]/page.tsx
@@ -1,5 +1,5 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
-import { PageProps } from "app/_types";
+import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
 import type { GetServerSidePropsResult } from "next";

diff --git a/...(settings)/my-account/appearance/page.tsx → ...gs-layout)/my-account/appearance/page.tsx b/...(settings)/my-account/appearance/page.tsx → ...gs-layout)/my-account/appearance/page.tsx
diff --git a/.../(settings)/my-account/calendars/page.tsx → ...ngs-layout)/my-account/calendars/page.tsx b/.../(settings)/my-account/calendars/page.tsx → ...ngs-layout)/my-account/calendars/page.tsx
diff --git a/...ettings)/my-account/conferencing/page.tsx → ...-layout)/my-account/conferencing/page.tsx b/...ettings)/my-account/conferencing/page.tsx → ...-layout)/my-account/conferencing/page.tsx
diff --git a/...gs/(settings)/my-account/general/page.tsx → ...tings-layout)/my-account/general/page.tsx b/...gs/(settings)/my-account/general/page.tsx → ...tings-layout)/my-account/general/page.tsx
@@ -1,5 +1,6 @@
 import { _generateMetadata } from "app/_utils";
 import { getFixedT } from "app/_utils";
+import { revalidatePath } from "next/cache";
 
 import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -16,9 +17,14 @@ const Page = async () => {
   const session = await getServerSessionForAppDir();
 
   const t = await getFixedT(session?.user.locale || "en");
+  const revalidatePage = async () => {
+    "use server";
+    revalidatePath("settings/my-account/general");
+  };
+
   return (
     <SettingsHeader title={t("general")} description={t("general_description")} borderInShellHeader={true}>
-      <GeneralQueryView />
+      <GeneralQueryView revalidatePage={revalidatePage} />
     </SettingsHeader>
   );
 };

diff --git a/...ttings)/my-account/out-of-office/page.tsx → ...layout)/my-account/out-of-office/page.tsx b/...ttings)/my-account/out-of-office/page.tsx → ...layout)/my-account/out-of-office/page.tsx
diff --git a/...gs/(settings)/my-account/profile/page.tsx → ...tings-layout)/my-account/profile/page.tsx b/...gs/(settings)/my-account/profile/page.tsx → ...tings-layout)/my-account/profile/page.tsx
diff --git a/apps/web/components/PageWrapper.tsx b/apps/web/components/PageWrapper.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { DefaultSeo } from "next-seo";
 import { Inter } from "next/font/google";
 import localFont from "next/font/local";

diff --git a/apps/web/components/dialog/EditLocationDialog.tsx b/apps/web/components/dialog/EditLocationDialog.tsx
@@ -232,7 +232,7 @@ export const EditLocationDialog = (props: ISetLocationDialog) => {
             <div className="mt-3 text-center sm:mt-0 sm:text-left" />
 
             <p className="text-emphasis mb-2 ml-1 mt-6 text-sm font-bold">{t("current_location")}:</p>
-            <p className="text-emphasis mb-2 ml-1 text-sm">
+            <p className="text-emphasis mb-2 ml-1 break-all text-sm">
               {getHumanReadableLocationValue(booking.location, t)}
             </p>
             <Form