feat: team admin: see connected apps of team members by abhijeetsingh-22 · Pull Request #11036 · calcom/cal.com

abhijeetsingh-22 · 2023-08-30T21:53:44Z

What does this PR do?

Added feature to show the connected apps of team members if the logged in user is Admin

Following are the screenshots of team members page visible to different type of team users (admin, member, pending member)

Team Free Example User (Member)

Team Pro Example 2 User (Invitation Pending Member)

Team Pro Example 3 User (Owner)

Team Pro Example 3 User (Owner) video

Team.Pro.Example.3.User.Owner.video.webm

Type of change

[ x] New feature (non-breaking change which adds functionality)

How should this be tested?

To test this, create a team. Connect different apps from different member account. Now when you login as Admin you can view the logo of the connected apps of the team member.
If the connected app is of type calendar then a tooltip will be shown on hovering on the logo which will show the email from which the calendar is connected

Mandatory Tasks

[ x] Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

vercel · 2023-08-30T21:53:49Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
ui	❌ Failed (Inspect)			Aug 31, 2023 1:14am

vercel · 2023-08-30T21:53:50Z

@abhijeetsingh-22 is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2023-08-30T21:53:59Z

Thank you for following the naming conventions! 🙏

github-actions · 2023-08-30T22:01:05Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

PeerRich

really awesome stuff! UI looks great, waiting for code review, maybe @alannnc can review this

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

alannnc

Really nice work! Pushed some minor changes.

* 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>

* Add loading data and banner * [WIP] hasEditPerms middleware * fix: type error in booker (#11011) * New Crowdin translations by Github Action * refactor: removed redundant test (#10785) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com> * feat: 2fa backup codes (#10600) Co-authored-by: Peer Richelsen <peeroke@gmail.com> * Delete add-PRs-to-project-reviewing-PRs.yml (#11008) Co-authored-by: alannnc <alannnc@gmail.com> * New Crowdin translations by Github Action * fix: multiple duration when booking (#11032) * fix: other reported issues (#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 (#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 (#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 (#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 (#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 (#10898) * fix: fix-tablet-menu-not-centered-sidebar (#11020) Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * chore: add Popover in storybook (#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 (#11027) * chore: add ColorPicker in storybook (CALCOM-10760) (#10866) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> * feat: adds next cold start profiler (#11014) * Handle disabling of ORGANIZATIONS_ENABLED flag (#11041) * New Crowdin translations by Github Action * styles:dark mode color fix (#11004) * chore: sheet darkmode and improve responsive (#11047) * fix: handle collective multiple host on destinationCalendar (#10967) * fix: include app data and credentials from DB (#11048) * include app data and credentials from DB * Improve performance * fix: Error when running storybook (#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 (#10978) * chore: add ErrorBoundary in storybook (CALCOM-10760) (#10872) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> * feat: sorting for workflow and routing forms (#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 (#11052) * fix: List storybook file is empty (fix-list) (#10965) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> * fix: admin org list without members (#11051) Co-authored-by: Peer Richelsen <peeroke@gmail.com> * chore: add ToggleGroup in storybook (#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 (#11053) * fix: Logo storybook file with invalid icons (fix-logo) (#11018) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> * fix: Add controls for Select Field storybook file (#10936) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> * fix: Fix tooltip control on ButtonPlayground storybook file (fix-ButtonTooltip) (#10937) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> * fix: email embed – remove collapsible and permanently show times (#10996) Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Mehul <mehulzr@gmail.com> * chore: add Timezone Select in storybook (CALCOM-10760) (#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) (#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 (#11054) * fix sub quantity update stripe (#11057) * v3.2.7 * Revert "feat: adds next cold start profiler (#11014)" (#11072) This reverts commit 05631d0. * fix: Fixes username invite issue (#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>

* 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>

added feature:team admin can see connected apps of members

2cbdf62

algora-pbc bot mentioned this pull request Aug 30, 2023

[CAL-1604] team admin: see connected apps of team members #8564

Closed

github-actions bot added Medium priority Created by Linear-GitHub Sync teams area: teams, round robin, collective, managed event-types ✨ feature New feature or request 💎 Bounty A bounty on Algora.io labels Aug 30, 2023

vercel bot had a problem deploying to Preview – ui August 30, 2023 21:57 Failure

fixed the type error

21b5e76

vercel bot had a problem deploying to Preview – ui August 30, 2023 22:39 Failure

PeerRich previously approved these changes Aug 30, 2023

View reviewed changes

alannnc reviewed Aug 31, 2023

View reviewed changes

packages/lib/server/queries/teams/index.ts Outdated Show resolved Hide resolved

alannnc reviewed Aug 31, 2023

View reviewed changes

packages/lib/server/queries/teams/index.ts Outdated Show resolved Hide resolved

alannnc dismissed PeerRich’s stale review via cb321d6 August 31, 2023 00:17

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

cb321d6

vercel bot had a problem deploying to Preview – ui August 31, 2023 00:22 Failure

Minor fixes

e683fae

vercel bot had a problem deploying to Preview – ui August 31, 2023 01:01 Failure

Merge branch 'main' into feature_show_connected_apps

cf713ce

alannnc approved these changes Aug 31, 2023

View reviewed changes

alannnc enabled auto-merge (squash) August 31, 2023 01:11

alannnc requested a review from a team August 31, 2023 01:12

vercel bot had a problem deploying to Preview – ui August 31, 2023 01:14 Failure

alannnc merged commit 3204d0a into calcom:main Aug 31, 2023

PeerRich mentioned this pull request Aug 31, 2023

refactor: show apps of user query #11040

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: team admin: see connected apps of team members#11036

feat: team admin: see connected apps of team members#11036
alannnc merged 5 commits intocalcom:mainfrom
abhijeetsingh-22:feature_show_connected_apps

abhijeetsingh-22 commented Aug 30, 2023

Uh oh!

vercel bot commented Aug 30, 2023 •

edited

Loading

Uh oh!

vercel bot commented Aug 30, 2023

Uh oh!

github-actions bot commented Aug 30, 2023 •

edited

Loading

Uh oh!

github-actions bot commented Aug 30, 2023 •

edited

Loading

Uh oh!

PeerRich left a comment

Uh oh!

Uh oh!

Uh oh!

alannnc left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

abhijeetsingh-22 commented Aug 30, 2023

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

Uh oh!

vercel bot commented Aug 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel bot commented Aug 30, 2023

Uh oh!

github-actions bot commented Aug 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Aug 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Uh oh!

PeerRich left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

alannnc left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vercel bot commented Aug 30, 2023 •

edited

Loading

github-actions bot commented Aug 30, 2023 •

edited

Loading

github-actions bot commented Aug 30, 2023 •

edited

Loading