Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

✨ Launch Zoom: docs, pricing table and provider order (#3521)

Luke Vella8b1ac581c4a7
diff --git a/apps/docs/api-reference/openapi.json b/apps/docs/api-reference/openapi.json
index 7d04035e0..c89682029 100644
--- a/apps/docs/api-reference/openapi.json
+++ b/apps/docs/api-reference/openapi.json
@@ -60,7 +60,7 @@
"properties": {
"provider": {
"type": "string",
- "const": "zoom"
+ "const": "meet"
}
},
"required": [
@@ -72,7 +72,7 @@
"properties": {
"provider": {
"type": "string",
- "const": "meet"
+ "const": "zoom"
}
},
"required": [
@@ -131,7 +131,7 @@
"type": "null"
}
],
- "description": "The video call for the event, or `null`. A `zoom`, `meet`, `teams` or `webex` entry has no link until the poll is finalized; a `custom` entry carries the organizer's label and, when given, the link.",
+ "description": "The video call for the event, or `null`. A `meet`, `zoom`, `teams` or `webex` entry has no link until the poll is finalized; a `custom` entry carries the organizer's label and, when given, the link.",
"example": {
"provider": "zoom"
}
@@ -421,7 +421,7 @@
"maxLength": 255
},
"conferencing": {
- "description": "The video call for the event. `zoom`, `meet`, `teams` and `webex` need the organizer to have connected that account in their Conferencing settings; the meeting link is created when the poll is finalized. `custom` names any call, with an optional link participants join with.",
+ "description": "The video call for the event. `meet`, `zoom`, `teams` and `webex` need the organizer to have connected that account in their Conferencing settings; the meeting link is created when the poll is finalized. `custom` names any call, with an optional link participants join with.",
"examples": [
{
"provider": "zoom"
@@ -438,7 +438,7 @@
"properties": {
"provider": {
"type": "string",
- "const": "zoom"
+ "const": "meet"
}
},
"required": [
@@ -450,7 +450,7 @@
"properties": {
"provider": {
"type": "string",
- "const": "meet"
+ "const": "zoom"
}
},
"required": [
@@ -606,7 +606,7 @@
"maxLength": 255
},
"conferencing": {
- "description": "The video call for the event. `zoom`, `meet`, `teams` and `webex` need the organizer to have connected that account in their Conferencing settings; the meeting link is created when the poll is finalized. `custom` names any call, with an optional link participants join with.",
+ "description": "The video call for the event. `meet`, `zoom`, `teams` and `webex` need the organizer to have connected that account in their Conferencing settings; the meeting link is created when the poll is finalized. `custom` names any call, with an optional link participants join with.",
"examples": [
{
"provider": "zoom"
@@ -623,7 +623,7 @@
"properties": {
"provider": {
"type": "string",
- "const": "zoom"
+ "const": "meet"
}
},
"required": [
@@ -635,7 +635,7 @@
"properties": {
"provider": {
"type": "string",
- "const": "meet"
+ "const": "zoom"
}
},
"required": [
diff --git a/apps/docs/docs.json b/apps/docs/docs.json
index 794b6f167..1b869f49e 100644
--- a/apps/docs/docs.json
+++ b/apps/docs/docs.json
@@ -36,6 +36,7 @@
"group": "Integrations",
"pages": [
"integrations/google-meet",
+ "integrations/zoom",
"integrations/microsoft-teams",
"integrations/webex"
]
diff --git a/apps/docs/images/integrations/google-meet/connect-account.png b/apps/docs/images/integrations/google-meet/connect-account.png
index 654f6e61a..4f04b13b4 100644
Binary files a/apps/docs/images/integrations/google-meet/connect-account.png and b/apps/docs/images/integrations/google-meet/connect-account.png differ
diff --git a/apps/docs/images/integrations/google-meet/connected-account.png b/apps/docs/images/integrations/google-meet/connected-account.png
index 496616887..88f58f748 100644
Binary files a/apps/docs/images/integrations/google-meet/connected-account.png and b/apps/docs/images/integrations/google-meet/connected-account.png differ
diff --git a/apps/docs/images/integrations/google-meet/disconnect-menu.png b/apps/docs/images/integrations/google-meet/disconnect-menu.png
index c66c42e41..773ae56bb 100644
Binary files a/apps/docs/images/integrations/google-meet/disconnect-menu.png and b/apps/docs/images/integrations/google-meet/disconnect-menu.png differ
diff --git a/apps/docs/images/integrations/google-meet/meet-not-connected.png b/apps/docs/images/integrations/google-meet/meet-not-connected.png
deleted file mode 100644
index 140615281..000000000
Binary files a/apps/docs/images/integrations/google-meet/meet-not-connected.png and /dev/null differ
diff --git a/apps/docs/images/integrations/google-meet/meet-selected.png b/apps/docs/images/integrations/google-meet/meet-selected.png
deleted file mode 100644
index 6e1175ab4..000000000
Binary files a/apps/docs/images/integrations/google-meet/meet-selected.png and /dev/null differ
diff --git a/apps/docs/images/integrations/google-meet/not-connected.png b/apps/docs/images/integrations/google-meet/not-connected.png
new file mode 100644
index 000000000..ff8ebb18f
Binary files /dev/null and b/apps/docs/images/integrations/google-meet/not-connected.png differ
diff --git a/apps/docs/images/integrations/google-meet/selected.png b/apps/docs/images/integrations/google-meet/selected.png
new file mode 100644
index 000000000..072d891ca
Binary files /dev/null and b/apps/docs/images/integrations/google-meet/selected.png differ
diff --git a/apps/docs/images/integrations/google-meet/video-call-menu.png b/apps/docs/images/integrations/google-meet/video-call-menu.png
index 43ae1a1e7..edc3cf4c0 100644
Binary files a/apps/docs/images/integrations/google-meet/video-call-menu.png and b/apps/docs/images/integrations/google-meet/video-call-menu.png differ
diff --git a/apps/docs/images/integrations/microsoft-teams/connect-account.png b/apps/docs/images/integrations/microsoft-teams/connect-account.png
index c1ac7fd7a..4f04b13b4 100644
Binary files a/apps/docs/images/integrations/microsoft-teams/connect-account.png and b/apps/docs/images/integrations/microsoft-teams/connect-account.png differ
diff --git a/apps/docs/images/integrations/microsoft-teams/connected-account.png b/apps/docs/images/integrations/microsoft-teams/connected-account.png
index acc99538d..7b292ee5d 100644
Binary files a/apps/docs/images/integrations/microsoft-teams/connected-account.png and b/apps/docs/images/integrations/microsoft-teams/connected-account.png differ
diff --git a/apps/docs/images/integrations/microsoft-teams/selected.png b/apps/docs/images/integrations/microsoft-teams/selected.png
index 2f8d61961..a214a27b8 100644
Binary files a/apps/docs/images/integrations/microsoft-teams/selected.png and b/apps/docs/images/integrations/microsoft-teams/selected.png differ
diff --git a/apps/docs/images/integrations/microsoft-teams/video-call-menu.png b/apps/docs/images/integrations/microsoft-teams/video-call-menu.png
index aef908b4e..41128e42e 100644
Binary files a/apps/docs/images/integrations/microsoft-teams/video-call-menu.png and b/apps/docs/images/integrations/microsoft-teams/video-call-menu.png differ
diff --git a/apps/docs/images/integrations/webex/connect-account.png b/apps/docs/images/integrations/webex/connect-account.png
index c1ac7fd7a..4f04b13b4 100644
Binary files a/apps/docs/images/integrations/webex/connect-account.png and b/apps/docs/images/integrations/webex/connect-account.png differ
diff --git a/apps/docs/images/integrations/webex/connected-account.png b/apps/docs/images/integrations/webex/connected-account.png
index b1ad7a545..328b5ac72 100644
Binary files a/apps/docs/images/integrations/webex/connected-account.png and b/apps/docs/images/integrations/webex/connected-account.png differ
diff --git a/apps/docs/images/integrations/webex/selected.png b/apps/docs/images/integrations/webex/selected.png
index d51346b62..13187a22d 100644
Binary files a/apps/docs/images/integrations/webex/selected.png and b/apps/docs/images/integrations/webex/selected.png differ
diff --git a/apps/docs/images/integrations/webex/video-call-menu.png b/apps/docs/images/integrations/webex/video-call-menu.png
index f948d6c25..23c4a03e9 100644
Binary files a/apps/docs/images/integrations/webex/video-call-menu.png and b/apps/docs/images/integrations/webex/video-call-menu.png differ
diff --git a/apps/docs/images/integrations/zoom/connect-account.png b/apps/docs/images/integrations/zoom/connect-account.png
index fbabb281f..4f04b13b4 100644
Binary files a/apps/docs/images/integrations/zoom/connect-account.png and b/apps/docs/images/integrations/zoom/connect-account.png differ
diff --git a/apps/docs/images/integrations/zoom/connected-account.png b/apps/docs/images/integrations/zoom/connected-account.png
index ac8d312a0..a03d24a25 100644
Binary files a/apps/docs/images/integrations/zoom/connected-account.png and b/apps/docs/images/integrations/zoom/connected-account.png differ
diff --git a/apps/docs/images/integrations/zoom/disconnect-menu.png b/apps/docs/images/integrations/zoom/disconnect-menu.png
index 9cb4e38a3..69981bd2a 100644
Binary files a/apps/docs/images/integrations/zoom/disconnect-menu.png and b/apps/docs/images/integrations/zoom/disconnect-menu.png differ
diff --git a/apps/docs/images/integrations/zoom/not-connected.png b/apps/docs/images/integrations/zoom/not-connected.png
new file mode 100644
index 000000000..60085d0b4
Binary files /dev/null and b/apps/docs/images/integrations/zoom/not-connected.png differ
diff --git a/apps/docs/images/integrations/zoom/poll-page.png b/apps/docs/images/integrations/zoom/poll-page.png
index 1069c1877..2c8fc5825 100644
Binary files a/apps/docs/images/integrations/zoom/poll-page.png and b/apps/docs/images/integrations/zoom/poll-page.png differ
diff --git a/apps/docs/images/integrations/zoom/selected.png b/apps/docs/images/integrations/zoom/selected.png
new file mode 100644
index 000000000..ad04daa97
Binary files /dev/null and b/apps/docs/images/integrations/zoom/selected.png differ
diff --git a/apps/docs/images/integrations/zoom/video-call-menu.png b/apps/docs/images/integrations/zoom/video-call-menu.png
index 2303f7173..28a9dd8bf 100644
Binary files a/apps/docs/images/integrations/zoom/video-call-menu.png and b/apps/docs/images/integrations/zoom/video-call-menu.png differ
diff --git a/apps/docs/images/integrations/zoom/zoom-not-connected.png b/apps/docs/images/integrations/zoom/zoom-not-connected.png
deleted file mode 100644
index 6a6c54f2b..000000000
Binary files a/apps/docs/images/integrations/zoom/zoom-not-connected.png and /dev/null differ
diff --git a/apps/docs/images/integrations/zoom/zoom-selected.png b/apps/docs/images/integrations/zoom/zoom-selected.png
deleted file mode 100644
index 04276ae8d..000000000
Binary files a/apps/docs/images/integrations/zoom/zoom-selected.png and /dev/null differ
diff --git a/apps/docs/integrations/google-meet.mdx b/apps/docs/integrations/google-meet.mdx
index 99f5fd766..b387d6419 100644
--- a/apps/docs/integrations/google-meet.mdx
+++ b/apps/docs/integrations/google-meet.mdx
@@ -30,7 +30,7 @@ The meeting space belongs to the Google account you connected, so it follows tha
Next to **Google Meet**, click **Connect**. You are sent to Google to choose an account and approve the connection.
<Frame>
- <img src="/images/integrations/google-meet/connect-account.png" alt="The Conferencing settings page listing Zoom and Google Meet, each with a Connect button" />
+ <img src="/images/integrations/google-meet/connect-account.png" alt="The Conferencing settings page listing Google Meet, Zoom, Microsoft Teams and Webex, each with a Connect button" />
</Frame>
</Step>
<Step title="Approve the permissions">
@@ -63,13 +63,13 @@ When creating a poll, click **Add video call** and choose **Google Meet**.
The form shows "Google Meet" as the video call for this poll.
<Frame>
- <img src="/images/integrations/google-meet/meet-selected.png" alt="The poll form with Google Meet chosen as the video call" />
+ <img src="/images/integrations/google-meet/selected.png" alt="The poll form with Google Meet chosen as the video call" />
</Frame>
If your Google Meet account is not connected, the form tells you so and links to Conferencing settings.
<Frame>
- <img src="/images/integrations/google-meet/meet-not-connected.png" alt="The poll form showing the message that Google Meet is not connected, with a link to Conferencing settings" />
+ <img src="/images/integrations/google-meet/not-connected.png" alt="The poll form showing the message that Google Meet is not connected, with a link to Conferencing settings" />
</Frame>
Participants see "Google Meet" on the poll page while voting is open. No meeting link exists yet.
diff --git a/apps/docs/integrations/microsoft-teams.mdx b/apps/docs/integrations/microsoft-teams.mdx
index 62f71811e..abcb95671 100644
--- a/apps/docs/integrations/microsoft-teams.mdx
+++ b/apps/docs/integrations/microsoft-teams.mdx
@@ -35,7 +35,7 @@ The meeting is created on the Microsoft account you connected, so it follows you
Next to **Microsoft Teams**, click **Connect**. You are sent to Microsoft to pick your work or school account and sign in.
<Frame>
- <img src="/images/integrations/microsoft-teams/connect-account.png" alt="The Conferencing settings page listing Microsoft Teams with a Connect button" />
+ <img src="/images/integrations/microsoft-teams/connect-account.png" alt="The Conferencing settings page listing Google Meet, Zoom, Microsoft Teams and Webex, each with a Connect button" />
</Frame>
</Step>
<Step title="Approve the permissions">
diff --git a/apps/docs/integrations/webex.mdx b/apps/docs/integrations/webex.mdx
index 35f2b0f16..ec12fdd1e 100644
--- a/apps/docs/integrations/webex.mdx
+++ b/apps/docs/integrations/webex.mdx
@@ -34,7 +34,7 @@ The meeting is created on the Webex account you connected, so it follows that ac
Next to **Webex**, click **Connect**. You are sent to Webex to sign in.
<Frame>
- <img src="/images/integrations/webex/connect-account.png" alt="The Conferencing settings page listing Webex with a Connect button" />
+ <img src="/images/integrations/webex/connect-account.png" alt="The Conferencing settings page listing Google Meet, Zoom, Microsoft Teams and Webex, each with a Connect button" />
</Frame>
</Step>
<Step title="Approve the permissions">
diff --git a/apps/docs/integrations/zoom.mdx b/apps/docs/integrations/zoom.mdx
index a67fb9e41..e9d99b25f 100644
--- a/apps/docs/integrations/zoom.mdx
+++ b/apps/docs/integrations/zoom.mdx
@@ -33,7 +33,7 @@ The meeting is created on the Zoom account you connected, so it follows that acc
Next to **Zoom**, click **Connect**. You are sent to Zoom to sign in and approve the connection.
<Frame>
- <img src="/images/integrations/zoom/connect-account.png" alt="The Conferencing settings page listing Zoom and Google Meet, each with a Connect button" />
+ <img src="/images/integrations/zoom/connect-account.png" alt="The Conferencing settings page listing Google Meet, Zoom, Microsoft Teams and Webex, each with a Connect button" />
</Frame>
</Step>
<Step title="Approve the permissions">
@@ -60,13 +60,13 @@ When creating a poll, click **Add video call** and choose **Zoom**.
The form shows "Zoom" as the video call for this poll.
<Frame>
- <img src="/images/integrations/zoom/zoom-selected.png" alt="The poll form with Zoom chosen as the video call" />
+ <img src="/images/integrations/zoom/selected.png" alt="The poll form with Zoom chosen as the video call" />
</Frame>
If your Zoom account is not connected, the form tells you so and links to Conferencing settings.
<Frame>
- <img src="/images/integrations/zoom/zoom-not-connected.png" alt="The poll form showing the message that Zoom is not connected, with a link to Conferencing settings" />
+ <img src="/images/integrations/zoom/not-connected.png" alt="The poll form showing the message that Zoom is not connected, with a link to Conferencing settings" />
</Frame>
Participants see "Zoom" on the poll page while voting is open. No meeting exists yet.
diff --git a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx b/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
index c0af8677e..ee920dbc6 100644
--- a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
@@ -24,6 +24,7 @@ import { Trans } from "react-i18next/TransWithoutContext";
import GoogleMeetIcon from "@/assets/google-meet.svg";
import MicrosoftTeamsIcon from "@/assets/microsoft-teams.svg";
import WebexIcon from "@/assets/webex.svg";
+import ZoomIcon from "@/assets/zoom.svg";
import {
CompareTable,
CompareTableCell,
@@ -848,6 +849,9 @@ export default async function Page(props: {
<CompareTableLogo label="Google Meet">
<GoogleMeetIcon aria-hidden="true" />
</CompareTableLogo>
+ <CompareTableLogo label="Zoom">
+ <ZoomIcon aria-hidden="true" />
+ </CompareTableLogo>
<CompareTableLogo label="Microsoft Teams">
<MicrosoftTeamsIcon aria-hidden="true" />
</CompareTableLogo>
diff --git a/apps/landing/src/assets/zoom.svg b/apps/landing/src/assets/zoom.svg
new file mode 100644
index 000000000..4fd669bc8
--- /dev/null
+++ b/apps/landing/src/assets/zoom.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+ <rect width="64" height="64" rx="14" fill="#0B5CFF"/>
+ <path fill="#fff" d="M14 22.5A4.5 4.5 0 0 1 18.5 18h16a6.5 6.5 0 0 1 6.5 6.5v17a4.5 4.5 0 0 1-4.5 4.5h-16A6.5 6.5 0 0 1 14 39.5v-17Zm30 6.2 7.6-5.3a1.5 1.5 0 0 1 2.4 1.2v14.8a1.5 1.5 0 0 1-2.4 1.2L44 35.3v-6.6Z"/>
+</svg>
diff --git a/apps/web/src/app/api/v1/schemas.ts b/apps/web/src/app/api/v1/schemas.ts
index 357f09c0c..af1704ece 100644
--- a/apps/web/src/app/api/v1/schemas.ts
+++ b/apps/web/src/app/api/v1/schemas.ts
@@ -181,7 +181,7 @@ const pollSettingsFields = {
}),
conferencing: pollConferencingSchema.optional().meta({
description:
- "The video call for the event. `zoom`, `meet`, `teams` and `webex` need the organizer to have connected that account in their Conferencing settings; the meeting link is created when the poll is finalized. `custom` names any call, with an optional link participants join with.",
+ "The video call for the event. `meet`, `zoom`, `teams` and `webex` need the organizer to have connected that account in their Conferencing settings; the meeting link is created when the poll is finalized. `custom` names any call, with an optional link participants join with.",
examples: [
{ provider: "zoom" },
{
@@ -446,7 +446,7 @@ const pollSchema = z
location: z.string().nullable().meta({ example: "Conference Room A" }),
conferencing: pollConferencingSchema.nullable().meta({
description:
- "The video call for the event, or `null`. A `zoom`, `meet`, `teams` or `webex` entry has no link until the poll is finalized; a `custom` entry carries the organizer's label and, when given, the link.",
+ "The video call for the event, or `null`. A `meet`, `zoom`, `teams` or `webex` entry has no link until the poll is finalized; a `custom` entry carries the organizer's label and, when given, the link.",
example: { provider: "zoom" },
}),
timeZone: z.string().nullable().meta({ example: "Europe/London" }),
diff --git a/apps/web/src/env.ts b/apps/web/src/env.ts
index 0d29dc097..20f5692e7 100644
--- a/apps/web/src/env.ts
+++ b/apps/web/src/env.ts
@@ -122,7 +122,7 @@ export const env = createEnv({
.enum(["capterra", "g2"])
.default("capterra"),
/**
- * Conferencing integrations (Zoom, Google Meet, Microsoft Teams, Webex).
+ * Conferencing integrations (Google Meet, Zoom, Microsoft Teams, Webex).
* The flag needs at least one provider's OAuth app configured; see
* createFinalSchema below.
*/
@@ -135,8 +135,8 @@ export const env = createEnv({
WEBEX_CLIENT_SECRET: z.string().optional(),
// Comma separated. While set, only these accounts are offered the
// provider: an unpublished or unverified OAuth app authorizes no one else.
- ZOOM_ALLOWED_EMAILS: z.string().optional(),
GOOGLE_MEET_ALLOWED_EMAILS: z.string().optional(),
+ ZOOM_ALLOWED_EMAILS: z.string().optional(),
MICROSOFT_TEAMS_ALLOWED_EMAILS: z.string().optional(),
WEBEX_ALLOWED_EMAILS: z.string().optional(),
diff --git a/apps/web/src/features/conferencing/constants.ts b/apps/web/src/features/conferencing/constants.ts
index add62aa5d..58b825fd3 100644
--- a/apps/web/src/features/conferencing/constants.ts
+++ b/apps/web/src/features/conferencing/constants.ts
@@ -12,12 +12,12 @@ export function getAvailableConferencingProviders(): ConferencingProvider[] {
return [];
}
const providers: ConferencingProvider[] = [];
- if (process.env.ZOOM_CLIENT_ID && process.env.ZOOM_CLIENT_SECRET) {
- providers.push("zoom");
- }
if (process.env.GOOGLE_CLIENT_ID && process.env.GOOGLE_CLIENT_SECRET) {
providers.push("meet");
}
+ if (process.env.ZOOM_CLIENT_ID && process.env.ZOOM_CLIENT_SECRET) {
+ providers.push("zoom");
+ }
if (process.env.MICROSOFT_CLIENT_ID && process.env.MICROSOFT_CLIENT_SECRET) {
providers.push("teams");
}
@@ -32,8 +32,8 @@ export function getAvailableConferencingProviders(): ConferencingProvider[] {
// authorizes nobody else. Only an unset variable opens the provider to
// everyone; a set but empty list lets nobody in.
const providerAllowlists: Record<ConferencingProvider, string | undefined> = {
- zoom: process.env.ZOOM_ALLOWED_EMAILS,
meet: process.env.GOOGLE_MEET_ALLOWED_EMAILS,
+ zoom: process.env.ZOOM_ALLOWED_EMAILS,
teams: process.env.MICROSOFT_TEAMS_ALLOWED_EMAILS,
webex: process.env.WEBEX_ALLOWED_EMAILS,
};
diff --git a/apps/web/src/features/conferencing/schema.ts b/apps/web/src/features/conferencing/schema.ts
index 5f06ac6fb..875350c0b 100644
--- a/apps/web/src/features/conferencing/schema.ts
+++ b/apps/web/src/features/conferencing/schema.ts
@@ -3,8 +3,8 @@ import * as z from "zod";
// Providers Rallly can mint links for. Distinct from the stored-link union
// below, which also covers links pasted by hand (custom) and phone dial-ins.
export const conferencingProviderSchema = z.enum([
- "zoom",
"meet",
+ "zoom",
"teams",
"webex",
]);
@@ -15,8 +15,8 @@ export type ConferencingProvider = z.infer<typeof conferencingProviderSchema>;
// account needed). The link is optional: most organizers announce the tool
// first and send the link once the time is set.
export const pollConferencingSchema = z.discriminatedUnion("provider", [
- z.object({ provider: z.literal("zoom") }),
z.object({ provider: z.literal("meet") }),
+ z.object({ provider: z.literal("zoom") }),
z.object({ provider: z.literal("teams") }),
z.object({ provider: z.literal("webex") }),
z.object({
@@ -32,7 +32,7 @@ export const disconnectConferencingConnectionSchema = z.object({
});
const webConferencingSchema = z.object({
- provider: z.enum(["zoom", "meet", "teams", "webex"]),
+ provider: z.enum(["meet", "zoom", "teams", "webex"]),
uri: z.url(),
meetingId: z.string().optional(),
password: z.string().optional(),
diff --git a/apps/web/src/features/conferencing/utils.ts b/apps/web/src/features/conferencing/utils.ts
index 39f5a8b5d..143bdc809 100644
--- a/apps/web/src/features/conferencing/utils.ts
+++ b/apps/web/src/features/conferencing/utils.ts
@@ -9,8 +9,8 @@ export const conferencingProviderIntegrations: Record<
ConferencingProvider,
{ integrationId: string; oauthProvider: string }
> = {
- zoom: { integrationId: "zoom", oauthProvider: "zoom" },
meet: { integrationId: "google-meet", oauthProvider: "google" },
+ zoom: { integrationId: "zoom", oauthProvider: "zoom" },
teams: { integrationId: "microsoft-teams", oauthProvider: "microsoft" },
webex: { integrationId: "webex", oauthProvider: "webex" },
};
@@ -30,8 +30,8 @@ export function integrationIdToConferencingProvider(
export const conferencingProviderLabels: Record<ConferencingProvider, string> =
{
- zoom: "Zoom",
meet: "Google Meet",
+ zoom: "Zoom",
teams: "Microsoft Teams",
webex: "Webex",
};
diff --git a/packages/screenshots/capture/docs-conferencing.spec.ts b/packages/screenshots/capture/docs-conferencing.spec.ts
index a772df259..75306390c 100644
--- a/packages/screenshots/capture/docs-conferencing.spec.ts
+++ b/packages/screenshots/capture/docs-conferencing.spec.ts
@@ -8,21 +8,50 @@ import { docsImagePath } from "./helpers";
test.use({ deviceScaleFactor: 2 });
const userId = "user-1";
+const pollId = "docs-conferencing-poll";
+// Listed in the order the app offers them, so each guide's screenshots show
+// the same settings page and menu.
const providers = [
+ {
+ provider: "meet",
+ label: "Google Meet",
+ dir: "google-meet",
+ credentialProvider: "google",
+ integrationId: "google-meet",
+ scopes: ["https://www.googleapis.com/auth/meetings.space.created"],
+ email: "[email protected]",
+ extras: { notConnected: true, disconnect: true, pollPage: false },
+ },
+ {
+ provider: "zoom",
+ label: "Zoom",
+ dir: "zoom",
+ credentialProvider: "zoom",
+ integrationId: "zoom",
+ scopes: ["user:read:user", "meeting:write:meeting"],
+ email: "[email protected]",
+ extras: { notConnected: true, disconnect: true, pollPage: true },
+ },
{
provider: "teams",
label: "Microsoft Teams",
dir: "microsoft-teams",
+ credentialProvider: "microsoft",
+ integrationId: "microsoft-teams",
scopes: ["OnlineMeetings.ReadWrite"],
+ extras: { notConnected: false, disconnect: false, pollPage: false },
},
{
provider: "webex",
label: "Webex",
dir: "webex",
+ credentialProvider: "webex",
+ integrationId: "webex",
scopes: ["meeting:schedules_write", "spark:people_read"],
+ extras: { notConnected: false, disconnect: false, pollPage: false },
},
] as const;
@@ -31,17 +60,22 @@ async function clearConnections() {
where: { userId, provider: { in: providers.map((p) => p.provider) } },
});
await prisma.credential.deleteMany({
- where: { userId, provider: { in: ["microsoft", "webex"] } },
+ where: { userId, providerAccountId: { startsWith: "docs-" } },
});
+ await prisma.poll.deleteMany({ where: { id: pollId } });
}
async function seedConnection({
provider,
+ credentialProvider,
+ integrationId,
scopes,
email,
label,
}: {
provider: string;
+ credentialProvider: string;
+ integrationId: string;
scopes: readonly string[];
email: string;
label: string;
@@ -50,8 +84,6 @@ async function seedConnection({
if (!secretPassword) {
throw new Error("SECRET_PASSWORD is required to seed a credential");
}
- const credentialProvider = provider === "teams" ? "microsoft" : provider;
- const integrationId = provider === "teams" ? "microsoft-teams" : provider;
const providerAccountId = `docs-${provider}`;
const credential = await prisma.credential.create({
data: {
@@ -84,10 +116,86 @@ async function settle(page: Page) {
await page.evaluate(() => document.fonts.ready);
}
-test.beforeAll(clearConnections);
-test.afterAll(clearConnections);
+// The Pro space, so Zoom, Teams and Webex are offered without the pay wall.
+// Selecting it and switching off its custom branding are both undone after
+// the run, so the guides show the default theme and other captures start
+// from the space they expect.
+const proSpaceId = "space-2";
+const proMembershipId = "sm-2";
+let savedBranding: { primaryColor: string | null; showBranding: boolean };
+let savedLastSelectedAt: Date;
-for (const { provider, label, dir, scopes, email } of providers) {
+test.beforeAll(async () => {
+ await clearConnections();
+ ({ lastSelectedAt: savedLastSelectedAt } =
+ await prisma.spaceMember.findUniqueOrThrow({
+ where: { id: proMembershipId },
+ select: { lastSelectedAt: true },
+ }));
+ await prisma.spaceMember.update({
+ where: { id: proMembershipId },
+ data: { lastSelectedAt: new Date() },
+ });
+ savedBranding = await prisma.space.findUniqueOrThrow({
+ where: { id: proSpaceId },
+ select: { primaryColor: true, showBranding: true },
+ });
+ await prisma.space.update({
+ where: { id: proSpaceId },
+ data: { primaryColor: null, showBranding: false },
+ });
+});
+test.afterAll(async () => {
+ await clearConnections();
+ await prisma.space.update({
+ where: { id: proSpaceId },
+ data: savedBranding,
+ });
+ await prisma.spaceMember.update({
+ where: { id: proMembershipId },
+ data: { lastSelectedAt: savedLastSelectedAt },
+ });
+});
+
+async function openPollForm(page: Page) {
+ await page.goto("/new");
+ await settle(page);
+ await page.getByLabel("Title").fill("Design review");
+ const form = page.locator("#create-poll");
+ const formBox = await form.boundingBox();
+ if (!formBox) throw new Error("poll form not visible");
+ return { form, formBox };
+}
+
+async function chooseProvider(page: Page, label: string) {
+ await page.getByRole("button", { name: "Add video call" }).click();
+ await page.getByRole("menuitem", { name: label }).click();
+}
+
+const pad = 24;
+
+function formClip(
+ formBox: { x: number; y: number; width: number },
+ bottom: number,
+) {
+ return {
+ x: formBox.x - pad,
+ y: formBox.y - pad,
+ width: formBox.width + pad * 2,
+ height: bottom - formBox.y + pad * 2,
+ };
+}
+
+async function formBottom(page: Page) {
+ const addDescription = await page
+ .getByRole("button", { name: "Add description" })
+ .boundingBox();
+ if (!addDescription) throw new Error("form buttons not visible");
+ return addDescription.y + addDescription.height;
+}
+
+for (const config of providers) {
+ const { provider, label, dir, extras } = config;
test(`${dir} screenshots`, async ({ page }) => {
await clearConnections();
await page.setViewportSize({ width: 1280, height: 900 });
@@ -101,7 +209,18 @@ for (const { provider, label, dir, scopes, email } of providers) {
clip: { x: 0, y: 0, width: 1280, height: 640 },
});
- await seedConnection({ provider, scopes, email, label });
+ if (extras.notConnected) {
+ const { form, formBox } = await openPollForm(page);
+ await chooseProvider(page, label);
+ await form.getByText(`${label} is not connected`).waitFor();
+ await page.mouse.move(0, 0);
+ await page.screenshot({
+ path: docsImagePath(`integrations/${dir}/not-connected`),
+ clip: formClip(formBox, await formBottom(page)),
+ });
+ }
+
+ await seedConnection(config);
await page.goto("/settings/conferencing");
await settle(page);
await page.screenshot({
@@ -109,39 +228,57 @@ for (const { provider, label, dir, scopes, email } of providers) {
clip: { x: 0, y: 0, width: 1280, height: 640 },
});
- await page.goto("/new");
- await settle(page);
- const form = page.locator("#create-poll");
- const formBox = await form.boundingBox();
- if (!formBox) throw new Error("poll form not visible");
+ if (extras.disconnect) {
+ await page.getByRole("button", { name: "More options" }).click();
+ await page.getByRole("menuitem", { name: "Disconnect" }).waitFor();
+ await page.screenshot({
+ path: docsImagePath(`integrations/${dir}/disconnect-menu`),
+ clip: { x: 0, y: 0, width: 1280, height: 640 },
+ });
+ await page.keyboard.press("Escape");
+ }
+
+ const { form, formBox } = await openPollForm(page);
await page.getByRole("button", { name: "Add video call" }).click();
await page.getByRole("menuitem", { name: label }).waitFor();
const menuBox = await page.getByRole("menu").boundingBox();
if (!menuBox) throw new Error("menu not visible");
await page.screenshot({
path: docsImagePath(`integrations/${dir}/video-call-menu`),
- clip: {
- x: formBox.x,
- y: formBox.y,
- width: formBox.width,
- height: menuBox.y + menuBox.height - formBox.y + 24,
- },
+ clip: formClip(formBox, menuBox.y + menuBox.height),
});
await page.getByRole("menuitem", { name: label }).click();
await form.getByText(label, { exact: true }).waitFor();
- const addDescription = await page
- .getByRole("button", { name: "Add description" })
- .boundingBox();
- if (!addDescription) throw new Error("form buttons not visible");
+ await page.mouse.move(0, 0);
await page.screenshot({
path: docsImagePath(`integrations/${dir}/selected`),
- clip: {
- x: formBox.x,
- y: formBox.y,
- width: formBox.width,
- height: addDescription.y + addDescription.height - formBox.y + 24,
- },
+ clip: formClip(formBox, await formBottom(page)),
});
+
+ if (extras.pollPage) {
+ await prisma.poll.create({
+ data: {
+ id: pollId,
+ title: "Design review",
+ userId,
+ spaceId: proSpaceId,
+ status: "open",
+ timeZone: "America/New_York",
+ conferencing: { provider },
+ options: {
+ create: [
+ { startTime: new Date(Date.now() + 7 * 864e5), duration: 60 },
+ ],
+ },
+ },
+ });
+ await page.goto(`/poll/${pollId}`);
+ await settle(page);
+ await page.screenshot({
+ path: docsImagePath(`integrations/${dir}/poll-page`),
+ clip: { x: 0, y: 0, width: 1280, height: 320 },
+ });
+ }
});
}