+21









Nayan Bagale
GitHub
Tushar Bhatt
Udit Takkar
CarinaWolli
Peer Richelsen
Carina Wollendorfer
Benny Joo
Nizzy
nizzy
Syed Ali Shahbaz
GitHub Actions
Joe Au-Yeung
Hariom Balhara
Hariom Balhara
Eunjae Lee
Lauris Skraucis
Udit Takkar
Morgan
Vijay
supalarry
Alex van Andel
unknown
Bailey Pumfleet
Anik Dhabal Babu
Steven Tey
sean-brydon
amrit
Sanchit Tewari
Rajiv Sahal
Amit Sharma
7bff15cc47
* fix: replace react-hot-toast with sonner for toast notifications
* feat: add country code (#19264)
* perf: Move PlainChat up the hierarchy to remove rerenders (#19255)
* perf: Move PlainChat up the hierarchy to remove rerenders
* rmeove yarn lock
---------
Co-authored-by: Nizzy <nizabizaher@gmail.com>
Co-authored-by: nizzy <140507264+nizzyabi@users.noreply.github.com>
* hotfix (#19266)
* chore: release v4.9.11
* Handle cancelled status (#19272)
* feat: Use new /routing URL for routing forms (#19235)
* feat: Use new /routing URL for routing forms
* Fixes
* Fix bug
* precent crash
---------
Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com>
* fix: remove section on /bookings if no data exists (#19261)
* feat: v2 slots new version (#18758)
* refactor: version old slots
* feat: init new slots endpoints
* chore: range format
* fix: duratin
* fix: duratin
* test: slot releaseAt
* refactor: reserve slot response
* refactor variable name
* docs: have new slots controller in docs
* feat: crud for slots reservations
* refactor: use exclude all for response
* docs
* chore: slots input service
* refactor mini
* refactor: remove unused imports
* docs
* handle orgSlug for dynamic events
* refactor: correct name
* docs
* add optional organizationSlug to BySlug search
* refactor: slot output format
* refactor: return seated slot info
* docs
* rename functions
* refactor: slots seated response
* fix: handle same username in org and non org
* refactor: test format
* fix: allow reservationDuration only for authed requests
* chore: check if auth user has permissions to define custom reservation duration
* refactor: split e2e test files
* refactor: invalid request exception codes
* chore: old slots controller uses all old versions
* refactor: remove depreceated fields (#19279)
* refactor: remove depreceated fields
* chore: use v2 endpoint
* chore: update V2 Api type
* chore
* chore: Refactor to remove `getServerSideProps` for /teams route (#19286)
* remove getServerSideProps
* refactor teams route
* chore: release v4.9.12
* fix: Salesforce - if no contact throw Error (#19271)
* Throw error if no contact is passed to createEvent
* chore: update error message
* chore
---------
Co-authored-by: Udit Takkar <udit222001@gmail.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
* fix: missing await router controller (#19276)
* fix: Default people filter in bookings list for admin (#18035)
* default people filter for admin
* chore
* type check
* added test case
* made test concise to reduce flakiness
* add timeout to wait for second get response before counting
* update timeout
---------
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* feat: add CSAT to V2 bookings return (#19278)
* init
* test: v2 bookings returns rating
---------
Co-authored-by: supalarry <laurisskraucis@gmail.com>
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
* chore: disable v2 booking seats safe parse error logs (#19292)
* revert: Reapply "fix: Multiple rr-hosts combine to create erroneous availabil… (#19263)
* Reapply "fix: Multiple rr-hosts combine to create erroneous availability (#18772)"
This reverts commit 5dbc6d9ca6.
* Only thing left is a diff to show which slots are removed
* Add logging around time slot results
* Setup logging through axiom
* .... forgot
* fix: type errors
* Only log when there are differences
* Updated from old which had a failing test to new logic
* chore: release v4.9.13
* fix: flaky test (#19294)
* fix: flaky test
* fix another test
* update
---------
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
Co-authored-by: unknown <adhabal2002@gmail.com>
* chore: calendars controller v2 docs (#19291)
Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk>
* Merge branch 'main' into replace-toaster-with-sonner
* add ireland country code (#19117)
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
* perf: separate client vs server code from insights layout (#19285)
* add UpgradeTipWrapper
* refactor insights/layout.tsx
---------
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
* feat: Use Folders to organize SMS links on Dub (#19248)
* feat: Use Folders to organize SMS links on Dub
* Update yarn.lock
---------
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk>
* fix: removing-all-members-toggle-for-fh (#19277)
* fix : removing all members toggle for fh
* ux enhancements
* adding placeholder
* chore: release v5.0.0
* fix flake (#19306)
* chore: migrate `/apps/routing-forms/[...pages]` to App Router (#18956)
* wip
* fix
* fix
* refactor
* rename to routingServerSidePropsConfig
* refactor
* refactor
* add routing-link to useIsBookingPage hook
* remove Head component
* fix
* redirect user to apps/routing-forms/forms if user goes to apps/routing-forms
* refactor
* remove log
* remove client component not needed
* clean up code
* remove unneeded metadata
* clean up further
* clean up further 2
* fix type check
* routing-link does not need shell
* Fix title for Routing Form public link and also remove any
* Remove ; in HTML
* Remove unnecessary page reload
---------
Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com>
* chore: migrate api for team upgrade to App Router (#19100)
* remove old pages router api
* add new app router api
* fix
* fix redirect
* refactor
* fix: cut off and alignment bug (#19317)
* fix: assignment label cut-off
* fix: add all team members label is vertically aligned
* fix: nested scrolls on /bookings (#19284)
* fix: Can't change availability for managed event type (#19006)
* fix: flaky test organization.spec
* fix
* fix: bulk-update-in-scheduleId-in-detailed-view (#19295)
* fix: bulk-update-in-scheduleId-in-detailed-view
* minor-change
---------
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
* feat: prevent automatic query parameters when opening booking page (#18132)
- Resolve the user hindrance where the event's booking page should not have search parameters such as date and month in the initial page load
- Contains changes for the fix of issue #18094 as well as it is needed
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* feat: atoms adjustments with ui v3 styles (#19320)
* refactor: Clean out old code, no longer needed (#19323)
* refactor: Clean out old code, no longer needed
* Removed a sneaky one keen to stay behind
* chore: release v5.0.1
* feat: Create `UserCreationService` and use in API V1 create user endpoint (#19150)
* Create `createUser` method in `userCreationService`
* Refactor `UserRepository` create method to accept prisma input and remove business logic
* API use `UserCreationService`
* Move slugify to service
* Use hashPassword instead
* Type fixes in `UserCreationService`
* Add `userCreationService` tests
* API accept data object
* Type fixes
* Add user _post test
* Add test for locked user
* Add locked param to log
* Add user repository tests
* Do not return locked status
* Explicitly pass `locked` prop
* Fix tests when locked isn't returned
* Fix tests
* Pass locked prop
* Edit test name
* Use logger
* Fix passing hashed password
* fix (#19298)
* fix: timezone input text is now visible in dark mode (#19325)
* feat: make first tab active by default (#19315)
* feat: make first tab active by default
* perf: optimize event types tabs rendering with useMemo
---------
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* perf: Use one PageWrapper instance for all settings pages (#18752)
* add a layoutfile to use-page-wrapper route group
* refactor and move bookings status page to route group
* improve logic in pagesAndRewritePaths
* fix
* add use client directive
* move /403 and /500
* move /auth/error
* move /connect-and-join
* move /enterprise
* move /maintenance
* move /more
* move /upgrade
* chore: remove WithLayout from 8 low-risk single pages (#18745)
* move /403 and /500
* move /auth/error
* move /connect-and-join
* move /enterprise
* move /maintenance
* move /more
* move /upgrade
* move /availability pages
* move /event-types pages
* move /insights pages
* move /apps to use-page-wrapper group
* move /getting-started to use-page-wrapper group
* move /signup to use-page-wrapper group
* move /workflows to use-page-wrapper group
* move /video pages to use-page-wrapper group
* pass dehydratedState in layout
* pass dehydratedState in layout
* move settings/(settings-layout) to use-page-wrapper
* move settings/(admin-layout) to use-page-wrapper
* move remaining settings pages to (use-page-wrapper)
* fix test
* remove unused code
* remove unused files
* fix type check
* remove test tag
* remove page
* RSC should not default export client components
* fix: Can't use unsaved booking question as variable in event name (#18604)
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
* chore: remove WithLayout from not-found.tsx (#19331)
* fix: redirect logic in /settings/admin/apps (#19332)
* chore: v3 fixed filters, new profile view (#19312)
* fixed filters with badge
* aligned recurrence in bookings
* removed new badge
* new profile view
* fixed try for free button
* fixed form input
* fix: Issues with date changes in column view (#19258)
* fix: coulmn view date change
* Update store.ts
---------
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
* chore: fixed tooltip position for routing form (#19267)
* fixed tooltip position for routing form
* fixed offset
* fix: Fairness when routing (#18550)
* Partial push of new filters
* Let's always return the passed host array when a filter doesn't need to be applied
* fix: isFixed typing in same round robin host check
* Add main bulk of rewritten logic for routed fairness support
* Remove console.log
* Add getAttributeWithEnabledWeights to AttributeRepository
* Add OOO entry repository
* Use getOrderedListOfLuckyUsers in lead threshold filtering
* Shortfall already includes weight
* test against minShortfall
* first attempt to fix fallbacks
* Added testcase updates
* Partially fix filterHosts test
* Some test updates
* Removed email field from normalization
* fix no available users found error
* fix unit test
* remove fallback from same host reschedule return
* fixes and improvements for findQualifiedHosts
* include fallback logic in handleNewBooking
* use fallback in handleNewBooking
* fix for contact owner in handleNewBooking
* WIP - comment
* pass routingFormResponseId
* fix type error
* pass routingFormResponse
* fixes in treshold logic
* remove reason
* merge qualified and fallback availabilities
* fix type error
* add and fix tests
* clean up test file
* fix filterHostsBySameRoundRobinHost tests
* fix findQualifiedHosts.test.ts
* fix getRoutedUsers.test.ts
* fix tests
* fix isRerouting check
* fix start time for two weeks check
* fix fallback hosts
* fix test
* fallback hosts should also include qualified hosts
* fix type error
* fix typos
* add contact owner to fallbacks
* fix typo
* fix qualifiedRRUsers
* set fixed users when no hosts
* add tets + code clean up
* add test for reschedule with same host
* fix typo
* add more tests for findQualifiedHosts
* remove skip from test
* add comment
* remove unused code
* fix fallback users in loadAndValidateUsers
* improve naming for fallback
* rename missed fallback variable
* fix reschedule with same rr host in handleNewBooking
* fixes for fallback slots
* add more tests + small fixes for contact owner
* fix tests and type errors
* add logs for fallback
* add type:json to logger
* Fix small merge issue
* fix end time if two weeks are cut off
* add more tests for contact owner availability check
* add new logic for two weeks fallback
* fix reschedule same RR host test
---------
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
* fix: EditLocationDialog footer positioning and structure (#19335)
* fix: EditLocationDialog footer positioning and structure
* fix: make RescheduleDialog footer layout and button structure right
* fix: input dialogue glitch now works great
* made tests happy
---------
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Merge branch 'main' into replace-toaster-with-sonner
* chore: remove DefaultToast from toast.stories.mdx
---------
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
Co-authored-by: Nizzy <nizabizaher@gmail.com>
Co-authored-by: nizzy <140507264+nizzyabi@users.noreply.github.com>
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: GitHub Actions <github-actions@github.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmgmail.com>
Co-authored-by: Eunjae Lee <hey@eunjae.dev>
Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>
Co-authored-by: Udit Takkar <udit222001@gmail.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Co-authored-by: Vijay <vijayraghav22@gmail.com>
Co-authored-by: supalarry <laurisskraucis@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: unknown <adhabal2002@gmail.com>
Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Steven Tey <stevensteel97@gmail.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: amrit <iamamrit27@gmail.com>
Co-authored-by: Sanchit Tewari <46245135+sanchitttt@users.noreply.github.com>
Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>
Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
205 lines
7.1 KiB
TypeScript
205 lines
7.1 KiB
TypeScript
"use client";
|
|
|
|
import { signOut } from "next-auth/react";
|
|
import type { TFunction } from "next-i18next";
|
|
import { usePathname, useRouter } from "next/navigation";
|
|
import { Suspense } from "react";
|
|
import { Toaster } from "sonner";
|
|
import { z } from "zod";
|
|
|
|
import { classNames } from "@calcom/lib";
|
|
import { APP_NAME } from "@calcom/lib/constants";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
|
|
import { trpc } from "@calcom/trpc";
|
|
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
|
|
import { Button, StepCard, Steps } from "@calcom/ui";
|
|
import { Icon } from "@calcom/ui";
|
|
|
|
import type { getServerSideProps } from "@lib/getting-started/[[...step]]/getServerSideProps";
|
|
|
|
import { ConnectedCalendars } from "@components/getting-started/steps-views/ConnectCalendars";
|
|
import { ConnectedVideoStep } from "@components/getting-started/steps-views/ConnectedVideoStep";
|
|
import { SetupAvailability } from "@components/getting-started/steps-views/SetupAvailability";
|
|
import UserProfile from "@components/getting-started/steps-views/UserProfile";
|
|
import { UserSettings } from "@components/getting-started/steps-views/UserSettings";
|
|
|
|
const INITIAL_STEP = "user-settings";
|
|
const BASE_STEPS = [
|
|
"user-settings",
|
|
"connected-calendar",
|
|
"connected-video",
|
|
"setup-availability",
|
|
"user-profile",
|
|
] as const;
|
|
|
|
type StepType = (typeof BASE_STEPS)[number];
|
|
|
|
const getStepsAndHeadersForUser = (t: TFunction) => {
|
|
const baseHeaders: {
|
|
title: string;
|
|
subtitle: string[];
|
|
skipText?: string;
|
|
}[] = [
|
|
{
|
|
title: t("welcome_to_cal_header", { appName: APP_NAME }),
|
|
subtitle: [t("we_just_need_basic_info"), t("edit_form_later_subtitle")],
|
|
},
|
|
{
|
|
title: t("connect_your_calendar"),
|
|
subtitle: [t("connect_your_calendar_instructions")],
|
|
skipText: t("connect_calendar_later"),
|
|
},
|
|
{
|
|
title: t("connect_your_video_app"),
|
|
subtitle: [t("connect_your_video_app_instructions")],
|
|
skipText: t("set_up_later"),
|
|
},
|
|
{
|
|
title: t("set_availability"),
|
|
subtitle: [
|
|
t("set_availability_getting_started_subtitle_1"),
|
|
t("set_availability_getting_started_subtitle_2"),
|
|
],
|
|
},
|
|
{
|
|
title: t("nearly_there"),
|
|
subtitle: [t("nearly_there_instructions")],
|
|
},
|
|
];
|
|
|
|
return {
|
|
steps: [...BASE_STEPS],
|
|
headers: [...baseHeaders],
|
|
};
|
|
};
|
|
|
|
const stepRouteSchema = z.object({
|
|
step: z
|
|
.array(
|
|
z.enum(["user-settings", "setup-availability", "user-profile", "connected-calendar", "connected-video"])
|
|
)
|
|
.default([INITIAL_STEP]),
|
|
from: z.string().optional(),
|
|
});
|
|
|
|
export type PageProps = inferSSRProps<typeof getServerSideProps>;
|
|
const OnboardingPage = (props: PageProps) => {
|
|
const pathname = usePathname();
|
|
const params = useParamsWithFallback();
|
|
|
|
const router = useRouter();
|
|
const [user] = trpc.viewer.me.useSuspenseQuery();
|
|
const { t } = useLocale();
|
|
|
|
const result = stepRouteSchema.safeParse({
|
|
...params,
|
|
step: Array.isArray(params.step) ? params.step : [params.step],
|
|
});
|
|
|
|
const currentStep = result.success ? result.data.step[0] : INITIAL_STEP;
|
|
const from = result.success ? result.data.from : "";
|
|
|
|
// TODO: Add this in when we have solved the ability to move to tokens accept invite and note invitedto
|
|
// Ability to accept other pending invites if any (low priority)
|
|
// if (props.hasPendingInvites) {
|
|
// headers.unshift(
|
|
// props.hasPendingInvites && {
|
|
// title: `${t("email_no_user_invite_heading", { appName: APP_NAME })}`,
|
|
// subtitle: [], // TODO: come up with some subtitle text here
|
|
// }
|
|
// );
|
|
// }
|
|
const { steps, headers } = getStepsAndHeadersForUser(t);
|
|
const stepTransform = (step: StepType) => {
|
|
const stepIndex = steps.indexOf(step as (typeof steps)[number]);
|
|
|
|
if (stepIndex > -1) {
|
|
return steps[stepIndex];
|
|
}
|
|
return INITIAL_STEP;
|
|
};
|
|
const currentStepIndex = steps.indexOf(currentStep);
|
|
|
|
const goToNextStep = () => {
|
|
const nextIndex = currentStepIndex + 1;
|
|
const newStep = steps[nextIndex];
|
|
router.push(`/getting-started/${stepTransform(newStep)}`);
|
|
};
|
|
|
|
return (
|
|
<div
|
|
className={classNames(
|
|
"dark:bg-brand dark:text-brand-contrast text-emphasis min-h-screen [--cal-brand:#111827] dark:[--cal-brand:#FFFFFF]",
|
|
"[--cal-brand-emphasis:#101010] dark:[--cal-brand-emphasis:#e1e1e1]",
|
|
"[--cal-brand-subtle:#9CA3AF]",
|
|
"[--cal-brand-text:#FFFFFF] dark:[--cal-brand-text:#000000]"
|
|
)}
|
|
data-testid="onboarding"
|
|
key={pathname}>
|
|
<div className="mx-auto py-6 sm:px-4 md:py-24">
|
|
<div className="relative">
|
|
<div className="sm:mx-auto sm:w-full sm:max-w-[600px]">
|
|
<div className="mx-auto px-4 sm:max-w-[520px]">
|
|
<header>
|
|
<p className="font-cal mb-3 text-[28px] font-medium leading-7">
|
|
{headers[currentStepIndex]?.title || "Undefined title"}
|
|
</p>
|
|
|
|
{headers[currentStepIndex]?.subtitle.map((subtitle, index) => (
|
|
<p className="text-subtle font-sans text-sm font-normal" key={index}>
|
|
{subtitle}
|
|
</p>
|
|
))}
|
|
</header>
|
|
<Steps maxSteps={steps.length} currentStep={currentStepIndex + 1} nextStep={goToNextStep} />
|
|
</div>
|
|
<StepCard>
|
|
<Suspense fallback={<Icon name="loader" />}>
|
|
{currentStep === "user-settings" && (
|
|
<UserSettings nextStep={goToNextStep} hideUsername={from === "signup"} />
|
|
)}
|
|
{currentStep === "connected-calendar" && <ConnectedCalendars nextStep={goToNextStep} />}
|
|
|
|
{currentStep === "connected-video" && <ConnectedVideoStep nextStep={goToNextStep} />}
|
|
|
|
{currentStep === "setup-availability" && (
|
|
<SetupAvailability nextStep={goToNextStep} defaultScheduleId={user.defaultScheduleId} />
|
|
)}
|
|
{currentStep === "user-profile" && <UserProfile />}
|
|
</Suspense>
|
|
</StepCard>
|
|
|
|
{headers[currentStepIndex]?.skipText && (
|
|
<div className="flex w-full flex-row justify-center">
|
|
<Button
|
|
color="minimal"
|
|
data-testid="skip-step"
|
|
onClick={(event) => {
|
|
event.preventDefault();
|
|
goToNextStep();
|
|
}}
|
|
className="mt-8 cursor-pointer px-4 py-2 font-sans text-sm font-medium">
|
|
{headers[currentStepIndex]?.skipText}
|
|
</Button>
|
|
</div>
|
|
)}
|
|
</div>
|
|
<div className="flex w-full flex-row justify-center">
|
|
<Button
|
|
color="minimal"
|
|
data-testid="sign-out"
|
|
onClick={() => signOut({ callbackUrl: "/auth/logout" })}
|
|
className="mt-8 cursor-pointer px-4 py-2 font-sans text-sm font-medium">
|
|
{t("sign_out")}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<Toaster position="bottom-right" />
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default OnboardingPage;
|