Skip to content

[pull] main from calcom:main #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jan 5, 2026
Merged

[pull] main from calcom:main #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64b2cf0
fix(ci): add yarn prisma generate before cache key generation (#26439)
keithwillcode Jan 5, 2026
acee514
fix: show empty screen from event type availability tab (#26396)
anikdhabal Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/nextjs-bundle-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ./.github/actions/dangerous-git-checkout
- uses: ./.github/actions/yarn-install
- run: yarn prisma generate
- uses: ./.github/actions/cache-build
- name: Analyze bundle
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/production-build-without-database.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ./.github/actions/dangerous-git-checkout
- uses: ./.github/actions/yarn-install
- run: yarn prisma generate
- name: Generate cache key
id: cache-key
uses: ./.github/actions/cache-build-key
Expand Down
15 changes: 15 additions & 0 deletions apps/web/modules/event-types/components/tabs/availability/EventAvailabilityTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { SettingsToggle } from "@calcom/ui/components/form";
import { Icon } from "@calcom/ui/components/icon";
import { Spinner } from "@calcom/ui/components/icon";
import { SkeletonText } from "@calcom/ui/components/skeleton";
import { EmptyScreen } from "@calcom/ui/components/empty-screen";

export type ScheduleQueryData = RouterOutputs["viewer"]["availability"]["schedule"]["get"];

Expand Down Expand Up @@ -476,6 +477,20 @@ const EventTypeSchedule = ({
return <SelectSkeletonLoader />;
}

if (schedulesQueryData.length === 0) {
return (
<EmptyScreen
Icon="clock"
headline={t("create_availability_schedule")}
description={t("no_schedules_created_yet")}
className="w-full"
buttonRaw={<Button href="/availability" StartIcon="plus">
{t("create")}
</Button>}
/>
);
}

const options = schedulesQueryData.map((schedule) => ({
value: schedule.id,
label: schedule.name,
Expand Down
2 changes: 2 additions & 0 deletions apps/web/public/static/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,6 +1298,8 @@
"schedule_deleted_successfully": "Schedule deleted successfully",
"default_schedule_name": "Working Hours",
"new_schedule_heading": "Create an availability schedule",
"no_schedules_created_yet": "You haven't created any availability schedules yet. Create one to get started.",
"create_availability_schedule": "Create availability schedule",
"new_schedule_description": "Creating availability schedules allows you to manage availability across event types. They can be applied to one or more event types.",
"requires_ownership_of_a_token": "Requires ownership of a token belonging to the following address:",
"example_name": "John Doe",
Expand Down
Loading