Skip to content

Commit

Permalink
feat: editmode availbility slider (calcom#11197)
Browse files Browse the repository at this point in the history
* Add loading data and banner

* [WIP] hasEditPerms middleware

* fix: type error in booker (calcom#11011)

* New Crowdin translations by Github Action

* refactor: removed redundant test (calcom#10785)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com>

* feat: 2fa backup codes (calcom#10600)

Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* Delete add-PRs-to-project-reviewing-PRs.yml (calcom#11008)

Co-authored-by: alannnc <alannnc@gmail.com>

* New Crowdin translations by Github Action

* fix: multiple duration when booking (calcom#11032)

* fix: other reported issues (calcom#11015)

* fix: weird margin top in avatar

* fix: pending users are shown on booking page

* fix: avatar and naming issues

* fix: toast alignment and removing unneeded titles

* missing changes from toast improvements

* feat: empty state for teams without event types

* Removing console.log

* feat: cal ai (calcom#10992)

Co-authored-by: nicktrn <55853254+nicktrn@users.noreply.github.com>
Co-authored-by: tedspare <ted.spare@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>

* New Crowdin translations by Github Action

* fix: meeting ended trigger for webhooks and zapier sometimes not working (calcom#10946)

Co-authored-by: mohammed gehad <mohammed.gehad.1998@gmail.com>
Co-authored-by: Monto <138862352+monto7926@users.noreply.github.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>

* feat: team admin: see connected apps of team members (calcom#11036)

* added feature:team admin can see connected apps of members

* fixed the type error

* Update packages/lib/server/queries/teams/index.ts

* Minor fixes

---------

Co-authored-by: alannnc <alannnc@gmail.com>

* fix: lower case slugs in teams (calcom#11026)

* fix: lower case slugs in teams

Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>

* fix: use slugify

Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>

---------

Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>

* refactor: improvements on german translation (calcom#10898)

* fix: fix-tablet-menu-not-centered-sidebar (calcom#11020)

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

* chore: add Popover in storybook (calcom#11021)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>

* fix: Set mobile availability (calcom#11027)

* chore: add ColorPicker in storybook (CALCOM-10760) (calcom#10866)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>

* feat: adds next cold start profiler (calcom#11014)

* Handle disabling of ORGANIZATIONS_ENABLED flag (calcom#11041)

* New Crowdin translations by Github Action

* styles:dark mode color fix (calcom#11004)

* chore: sheet darkmode and improve responsive (calcom#11047)

* fix: handle collective multiple host on destinationCalendar (calcom#10967)

* fix: include app data and credentials from DB (calcom#11048)

* include app data and credentials from DB

* Improve performance

* fix: Error when running storybook (calcom#11037)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* fix: broken company profile link on team booking page (calcom#10978)

* chore: add ErrorBoundary in storybook (CALCOM-10760) (calcom#10872)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>

* feat: sorting for workflow and routing forms (calcom#10780)

Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* resolve zod versions across child packages (calcom#11052)

* fix: List storybook file is empty (fix-list) (calcom#10965)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>

* fix: admin org list without members (calcom#11051)

Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* chore: add ToggleGroup in storybook (calcom#10802)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>

* fix: add metadata to stripe payment intent (calcom#11053)

* fix: Logo storybook file with invalid icons (fix-logo) (calcom#11018)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>

* fix: Add controls for Select Field storybook file (calcom#10936)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>

* fix: Fix tooltip control on ButtonPlayground storybook file (fix-ButtonTooltip) (calcom#10937)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>

* fix: email embed – remove collapsible and permanently show times (calcom#10996)

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Mehul <mehulzr@gmail.com>

* chore: add Timezone Select in storybook (CALCOM-10760) (calcom#10966)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* chore: add Switch in storybook (CALCOM-10760) (calcom#10804)

Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* Sync packages

* fix: zod utils due to upgrade

* easy fix (calcom#11054)

* fix sub quantity update stripe (calcom#11057)

* v3.2.7

* Revert "feat: adds next cold start profiler (calcom#11014)" (calcom#11072)

This reverts commit 05631d0.

* fix: Fixes username invite issue (calcom#10998)

* Fixes username invite issue

* Ensure we only suggest email invites in org members

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

* Fix sheet layout

* WIP permissions when userschedule doesnt match

* WIP get handler weird behaviour

* Update toast

* add disabled - handle membership overlap

* Handle permissions + perf improvments

* use input uid

* Remove Console.log

* Clean up

* Revert changes accidental

* Fix merge artifacts

* Remove dead code

* Remove code after return

* Update read permission check

* Revert avatar changes as fixed elsewhere

* Handle if user has not completed onboarding

* Disable button

* Update packages/lib/hasEditPermissionForUser.ts

* Correct Error throwing

* Update packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx

* Fix type erro

* Add i18n

* Improve Spacing

* Update yarn.lock

---------

Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: GitStart-Cal.com <121884634+gitstart-calcom@users.noreply.github.com>
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com>
Co-authored-by: nicktrn <55853254+nicktrn@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: DexterStorey <36115192+DexterStorey@users.noreply.github.com>
Co-authored-by: tedspare <ted.spare@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Monto <138862352+montocoder@users.noreply.github.com>
Co-authored-by: mohammed gehad <mohammed.gehad.1998@gmail.com>
Co-authored-by: Monto <138862352+monto7926@users.noreply.github.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: Abhijeet Singh <asingh9829@gmail.com>
Co-authored-by: Kamil B. Demirci <kamil.demirci@indyaner.ch>
Co-authored-by: Denzil Samuel <71846487+samueldenzil@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Sahil Padvi <71093044+Sahil25061999@users.noreply.github.com>
Co-authored-by: Patel Divyesh <pateldivyesh1323@gmail.com>
Co-authored-by: neo773 <62795688+neo773@users.noreply.github.com>
Co-authored-by: Mehul <mehulzr@gmail.com>
  • Loading branch information
1 parent 67ba2a4 commit 1796a93
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 34 deletions.
2 changes: 0 additions & 2 deletions apps/web/public/static/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -2057,7 +2057,5 @@
"view_only_edit_availability_not_onboarded":"This user has not completed onboarding. You will not be able to set their availability until they have completed onboarding.",
"view_only_edit_availability":"You are viewing this user's availability. You can only edit your own availability.",
"edit_users_availability":"Edit user's availability: {{username}}",
"resend_invitation": "Resend invitation",
"invitation_resent": "The invitation was resent.",
"ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
}
Original file line number Diff line number Diff line change
@@ -1,31 +1,18 @@
<<<<<<< HEAD
import type { PrismaClient } from "@calcom/prisma";

=======
>>>>>>> a2d1dbebb (feat: editmode availbility slider (#11197))
import type { TrpcSessionUser } from "../../../../trpc";
import { getHandler } from "./get.handler";
import type { TGetByUserIdInputSchema } from "./getScheduleByUserId.schema";

type GetOptions = {
ctx: {
user: NonNullable<TrpcSessionUser>;
<<<<<<< HEAD
prisma: PrismaClient;
=======
>>>>>>> a2d1dbebb (feat: editmode availbility slider (#11197))
};
input: TGetByUserIdInputSchema;
};

const EMPTY_SCHEDULE = [[], [], [], [], [], [], []];

export const getScheduleByUserIdHandler = async ({ ctx, input }: GetOptions) => {
<<<<<<< HEAD
const foundUserDefaultId = await ctx.prisma.user.findUnique({
=======
const foundUserDefaultId = await prisma.user.findUnique({
>>>>>>> a2d1dbebb (feat: editmode availbility slider (#11197))
where: {
id: input.userId,
},
Expand Down
20 changes: 1 addition & 19 deletions packages/trpc/server/routers/viewer/teams/_router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import { ZGetInputSchema } from "./get.schema";
import { ZGetMemberAvailabilityInputSchema } from "./getMemberAvailability.schema";
import { ZGetMembershipbyUserInputSchema } from "./getMembershipbyUser.schema";
import { ZHasEditPermissionForUserSchema } from "./hasEditPermissionForUser.schema";
import { ZHasEditPermissionForUserSchema } from "./hasEditPermissionForUser.schema";
import { ZInviteMemberInputSchema } from "./inviteMember/inviteMember.schema";
import { ZInviteMemberByTokenSchemaInputSchema } from "./inviteMemberByToken.schema";
import { ZListMembersInputSchema } from "./listMembers.schema";
import { ZPublishInputSchema } from "./publish.schema";
import { ZRemoveMemberInputSchema } from "./removeMember.schema";
import { ZResendInvitationInputSchema } from "./resendInvitation.schema";
import { ZSetInviteExpirationInputSchema } from "./setInviteExpiration.schema";
import { ZUpdateInputSchema } from "./update.schema";
import { ZUpdateMembershipInputSchema } from "./updateMembership.schema";
Expand Down Expand Up @@ -44,7 +44,6 @@ type TeamsRouterHandlerCache = {
deleteInvite?: typeof import("./deleteInvite.handler").deleteInviteHandler;
inviteMemberByToken?: typeof import("./inviteMemberByToken.handler").inviteMemberByTokenHandler;
hasEditPermissionForUser?: typeof import("./hasEditPermissionForUser.handler").hasEditPermissionForUser;
resendInvitation?: typeof import("./resendInvitation.handler").resendInvitationHandler;
};

const UNSTABLE_HANDLER_CACHE: TeamsRouterHandlerCache = {};
Expand Down Expand Up @@ -456,21 +455,4 @@ export const viewerTeamsRouter = router({
input,
});
}),
resendInvitation: authedProcedure.input(ZResendInvitationInputSchema).mutation(async ({ ctx, input }) => {
if (!UNSTABLE_HANDLER_CACHE.resendInvitation) {
UNSTABLE_HANDLER_CACHE.resendInvitation = await import("./resendInvitation.handler").then(
(mod) => mod.resendInvitationHandler
);
}

// Unreachable code but required for type safety
if (!UNSTABLE_HANDLER_CACHE.resendInvitation) {
throw new Error("Failed to load handler");
}

return UNSTABLE_HANDLER_CACHE.resendInvitation({
ctx,
input,
});
}),
});
107 changes: 107 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4213,6 +4213,113 @@ __metadata:
languageName: unknown
linkType: soft

"@calcom/website@workspace:apps/website":
version: 0.0.0-use.local
resolution: "@calcom/website@workspace:apps/website"
dependencies:
"@algora/sdk": ^0.1.2
"@calcom/app-store": "*"
"@calcom/config": "*"
"@calcom/dayjs": "*"
"@calcom/embed-react": "workspace:^"
"@calcom/features": "*"
"@calcom/lib": "*"
"@calcom/prisma": "*"
"@calcom/tsconfig": "*"
"@calcom/ui": "*"
"@datocms/cma-client-node": ^2.0.0
"@floating-ui/react-dom": ^1.0.0
"@graphql-codegen/cli": ^5.0.0
"@graphql-codegen/typed-document-node": ^5.0.1
"@graphql-codegen/typescript": ^4.0.1
"@graphql-codegen/typescript-operations": ^4.0.1
"@graphql-typed-document-node/core": ^3.2.0
"@headlessui/react": ^1.5.0
"@heroicons/react": ^1.0.6
"@hookform/resolvers": ^2.9.7
"@juggle/resize-observer": ^3.4.0
"@next/bundle-analyzer": ^13.1.6
"@radix-ui/react-accordion": ^1.0.0
"@radix-ui/react-dropdown-menu": ^2.0.5
"@radix-ui/react-navigation-menu": ^1.0.0
"@radix-ui/react-portal": ^1.0.0
"@radix-ui/react-slider": ^1.0.0
"@radix-ui/react-tabs": ^1.0.0
"@radix-ui/react-tooltip": ^1.0.0
"@stripe/stripe-js": ^1.35.0
"@tanstack/react-query": ^4.3.9
"@typeform/embed-react": ^1.2.4
"@types/bcryptjs": ^2.4.2
"@types/debounce": ^1.2.1
"@types/gtag.js": ^0.0.10
"@types/micro": 7.3.7
"@types/node": 16.9.1
"@types/react": 18.0.26
"@types/react-gtm-module": ^2.0.1
"@types/xml2js": ^0.4.11
"@vercel/analytics": ^0.1.6
"@vercel/edge-functions-ui": ^0.2.1
"@vercel/og": ^0.5.0
autoprefixer: ^10.4.12
bcryptjs: ^2.4.3
clsx: ^1.2.1
cobe: ^0.4.1
concurrently: ^7.6.0
cross-env: ^7.0.3
datocms-structured-text-to-plain-text: ^2.0.4
datocms-structured-text-utils: ^2.0.4
debounce: ^1.2.1
dotenv: ^16.3.1
enquirer: ^2.4.1
env-cmd: ^10.1.0
eslint: ^8.34.0
fathom-client: ^3.5.0
globby: ^13.1.3
graphql: ^16.8.0
graphql-request: ^6.1.0
gray-matter: ^4.0.3
gsap: ^3.11.0
i18n-unused: ^0.13.0
iframe-resizer-react: ^1.1.0
keen-slider: ^6.8.0
lucide-react: ^0.171.0
micro: ^10.0.1
next: ^13.4.6
next-auth: ^4.22.1
next-axiom: ^0.17.0
next-i18next: ^13.2.2
next-seo: ^6.0.0
playwright: ^1.31.2
postcss: ^8.4.18
prism-react-renderer: ^1.3.5
react: ^18.2.0
react-confetti: ^6.0.1
react-datocms: ^3.1.0
react-device-detect: ^2.2.2
react-dom: ^18.2.0
react-fast-marquee: ^1.3.5
react-github-btn: ^1.4.0
react-hook-form: ^7.43.3
react-hot-toast: ^2.3.0
react-live-chat-loader: ^2.8.1
react-merge-refs: 1.1.0
react-twemoji: ^0.3.0
react-use-measure: ^2.1.1
react-wrap-balancer: ^1.0.0
remark: ^14.0.2
remark-html: ^14.0.1
remeda: ^1.24.1
stripe: ^9.16.0
tailwind-merge: ^1.13.2
tailwindcss: ^3.3.1
ts-node: ^10.9.1
typescript: ^4.9.4
wait-on: ^7.0.1
xml2js: ^0.6.0
zod: ^3.22.2
languageName: unknown
linkType: soft

"@calcom/whatsapp@workspace:packages/app-store/whatsapp":
version: 0.0.0-use.local
resolution: "@calcom/whatsapp@workspace:packages/app-store/whatsapp"
Expand Down

0 comments on commit 1796a93

Please sign in to comment.