fix: App Install Dropdown Sort Properly [CAL-2285] by joeauyeung · Pull Request #10672 · calcom/cal.com

joeauyeung · 2023-08-09T17:32:58Z

What does this PR do?

This PR fixes the app install dropdown menu to show data in the correct order of:

User
Org
Teams

This PR also fixes the placeholder for users that have not completed onboarding.

Fixes #10542

Requirement/Documentation

If there is a requirement document, please, share it here.
If there is ab UI/UX design document, please, share it here.

Type of change

Bug fix (non-breaking change which fixes an issue)

How should this be tested?

Create an org with multiple teams
Do not complete onboarding for the org admin or delete the name in the DB
Go to the app install page
It should look similar to the screenshot attached

Mandatory Tasks

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

Checklist

I haven't added tests that prove my fix is effective or that my feature works
I haven't checked if new and existing unit tests pass locally with my changes

linear · 2023-08-09T17:33:02Z

CAL-2285 Orgs: Apps - Install app on dropdown has unusual order and "Nameless"\

Returns "Nameless" user for me
The order currently is
- User
- Team
- Org
- Team
- Team

CleanShot 2023-08-02 at 16.47.502x.png

Ultimately we want org wide apps.

CleanShot 2023-08-02 at 16.51.132x.png

But in the mean time we should at least do

User
Org
Team
Team

CleanShot 2023-08-02 at 16.53.222x.png

vercel · 2023-08-09T17:33:05Z

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

Name	Status	Preview	Comments	Updated (UTC)
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 12, 2023 9:30pm
cal-demo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 12, 2023 9:30pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 12, 2023 9:30pm
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 12, 2023 9:30pm

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Aug 12, 2023 9:30pm
qa	⬜️ Ignored (Inspect)	Visit Preview		Aug 12, 2023 9:30pm

github-actions · 2023-08-09T17:33:11Z

Thank you for following the naming conventions! 🙏

alwaysmeticulous · 2023-08-09T17:33:20Z

🤖 Meticulous replayed 50 user sessions and took 155 screenshots. Meticulous has not yet run on 3ca43ce of the main branch and so there was nothing to compare against.

If you recently setup Meticulous, this is expected. Meticulous will start reporting comparisons for new pull requests after the next commit to the main branch.

_{Last updated for commit 3817aa9. This comment will update as new commits are pushed.}

github-actions · 2023-08-09T17:40:25Z

📦 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! 🙌

deploysentinel · 2023-08-09T17:41:55Z

Current Playwright Test Results Summary

✅ 116 Passing - ⚠️ 3 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 08/12/2023 09:29:31pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 3817aa9

Started: 08/12/2023 09:28:22pm UTC

⚠️ Flakes

📄 packages/app-store/routing-forms/playwright/tests/basic.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Routing Forms Seeded Routing Form Router URL should work Retry 1 • Initial Attempt	0% (0) 0 / 292 runs failed over last 7 days	2.40% (7) 7 / 292 runs flaked over last 7 days

📄 apps/web/playwright/webhook.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
FORM_SUBMITTED can submit a form and get a submission event Retry 1 • Initial Attempt	2.75% (8) 8 / 291 runs failed over last 7 days	27.15% (79) 79 / 291 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	4.38% (13) 13 / 297 runs failed over last 7 days	95.62% (284) 284 / 297 runs flaked over last 7 days

View Detailed Build Results

Udit-takkar

LGTM. works fine

Udit-takkar · 2023-08-10T17:15:50Z

packages/features/ee/teams/lib/getUserAdminTeams.ts

      const userObject = {
        id: user.id,
-        name: user.name || "Nameless",
+        name: user.name || "Me",


NIT: use i18n here

joeauyeung · 2023-08-11T14:10:46Z

apps/web/components/apps/InstallAppButtonChild.tsx

                }}>
                <p>
-                  {team.name} {isInstalled && `(${t("installed")})`}
+                  {t(team.name)} {isInstalled && `(${t("installed")})`}


The team.name will cover "me" so it'll grab the translation. Any other team name will be passed through as normal. @Udit-takkar

leog

LGTM, thanks for taking care of this

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

* Init + get timezone + offset data agh * Add 12/24h mode - style correctly * User users timezone + working hours. Still some stuff to figure out * Multiple working hours * move calc to once per day * Demo with two users and differnt timezones * availabillity control tab via search params * WIP hover overlay * THIS WORKS ISH * fix: multiple duration getSchedule calls [CAL-2336] (#10709) Co-authored-by: Omar López <zomars@me.com> * New Crowdin translations by Github Action * fix: If the input type "Name" is selected, the label can't be changed from our default label "Your Name" (#10618) Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> * New Crowdin translations by Github Action * test: Create unit tests for react components in packages/ui/components/form/step (#10442) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> * feat: element call app added (#10585) Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * New Crowdin translations by Github Action * New Crowdin translations by Github Action * fix: e2e test for rescheduling overlapping time (#10721) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * feat: mailhog fixture (#10606) * feat: mailhog fixture * fix: nodemailer to dispatch emails with e2e env * fix: remove space from email subject * feat: fixture getFirstEventAsOwner * feat: assert email subjects * fix: and enable dynamic booking test (#10642) * fix and enable dynamic booking test * remove page pause --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> * fix: Broken team events if a user with the same name exists (#10724) * fix: Broken team events if a user with the same name exists * Fix tests + fix usernameList optionality * Try to list calendars, if not continue (#10720) Co-authored-by: Omar López <zomars@me.com> * v3.1.9 * link to org settings (#10718) * feat: app paypal payment (#8797) Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Omar López <zomars@me.com> * fix: RTL issues on booking pages + email confirmation (#10526) Co-authored-by: Peer Richelsen <peeroke@gmail.com> * fix: merge conflict * Fixing org slug (#10538) * fix: paypal build fixes * Fix avatar for org in Shell top (#10712) * feat: add range of dates for availability over-ride (#10462) * feat: add range of dates for availability over-ride * chore: changed range select to multiple select --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> * fix: border issue for time slots (#10577) Co-authored-by: Raghul D <v-raghuld@microsoft.com> * style: Fix text wrapping issue in button (#10725) Co-authored-by: Omar López <zomars@me.com> * New Crowdin translations by Github Action * fix: App Install Dropdown Sort Properly [CAL-2285] (#10672) Co-authored-by: Peer Richelsen <peeroke@gmail.com> * fix: link escaping in booking page (#10360) Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * chore: fix refund i18n message (#10731) * chore: remove tailwind-scrollbar warning (#10523) Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * New Crowdin translations by Github Action * chore: Simplified date overrides (#10728) * chore: Simplified date overrides * Fixed a test that had a date override that wasn't at midnight utc * Wrote test that showed a fixed Europe/Brussels * Lint fix * New Crowdin translations by Github Action * Fix offset time + fetching correct dates * Deal with awkward minute offsets * remove store overhead * Format H based on tz * Cleanup store logic * Cleanup * Remove comments * Remove comments * Remove yarn.lock * Dark mode & v-align text fixes * Move ButtonGroup to the left to prevent chevron from jumping * Shift based on timezone (non-hour) and have 15min granularity in hour display background color --------- Co-authored-by: Leo Giovanetti <hello@leog.me> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Zain Gulbaz <zaingulbaz8@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.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: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Suyash Srivastava <suyashsrivastava5053@gmail.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com> Co-authored-by: alannnc <alannnc@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Pradumn Kumar <pradumn@tealfeed.com> Co-authored-by: Raghul <123321540+Raghul18@users.noreply.github.com> Co-authored-by: Raghul D <v-raghuld@microsoft.com> Co-authored-by: ABDERRAHMANI IDRISSI HAMZA <97639117+idrissi-hamza@users.noreply.github.com> Co-authored-by: Nafees Nazik <84864519+G3root@users.noreply.github.com> Co-authored-by: Danila <daniil.demidovich@gmail.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

Sort by org members to put orgs first

d2fcecb

vercel bot deployed to Preview – cal-demo August 9, 2023 17:33 View deployment

vercel bot deployed to Preview – dev August 9, 2023 17:33 View deployment

joeauyeung self-assigned this Aug 9, 2023

joeauyeung requested a review from a team August 9, 2023 17:33

zomars added the core area: core, team members only label Aug 9, 2023

joeauyeung removed core area: core, team members only app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar app-store-template Created by Linear-GitHub Sync labels Aug 9, 2023

Udit-takkar previously approved these changes Aug 10, 2023

View reviewed changes

Udit-takkar reviewed Aug 10, 2023

View reviewed changes

Change "Me" to locale

3c841b8

joeauyeung dismissed Udit-takkar’s stale review via 3c841b8 August 11, 2023 14:09

joeauyeung commented Aug 11, 2023

View reviewed changes

joeauyeung requested a review from Udit-takkar August 11, 2023 14:10

Udit-takkar previously approved these changes Aug 11, 2023

View reviewed changes

Merge branch 'main' into fix/install-app-team-order

f2c24b0

joeauyeung dismissed Udit-takkar’s stale review via f2c24b0 August 11, 2023 14:12

zomars added the core area: core, team members only label Aug 11, 2023

vercel bot deployed to Preview – ui August 11, 2023 14:17 View deployment

vercel bot deployed to Preview – api August 11, 2023 14:20 View deployment

vercel bot deployed to Preview – dev August 11, 2023 14:21 View deployment

vercel bot deployed to Preview – cal-demo August 11, 2023 14:22 View deployment

leog approved these changes Aug 11, 2023

View reviewed changes

Merge branch 'main' into fix/install-app-team-order

3817aa9

PeerRich enabled auto-merge (squash) August 12, 2023 21:21

vercel bot deployed to Preview – ui August 12, 2023 21:25 View deployment

vercel bot deployed to Preview – api August 12, 2023 21:26 View deployment

vercel bot deployed to Preview – dev August 12, 2023 21:27 View deployment

vercel bot deployed to Preview – cal-demo August 12, 2023 21:30 View deployment

PeerRich merged commit cfef92a into main Aug 12, 2023

PeerRich deleted the fix/install-app-team-order branch August 12, 2023 21:30

sean-brydon pushed a commit that referenced this pull request Aug 14, 2023

fix: App Install Dropdown Sort Properly [CAL-2285] (#10672)

ab7df9c

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: App Install Dropdown Sort Properly [CAL-2285]#10672

fix: App Install Dropdown Sort Properly [CAL-2285]#10672
PeerRich merged 4 commits intomainfrom
fix/install-app-team-order

joeauyeung commented Aug 9, 2023

Uh oh!

linear bot commented Aug 9, 2023

Uh oh!

vercel bot commented Aug 9, 2023 •

edited

Loading

Uh oh!

github-actions bot commented Aug 9, 2023 •

edited

Loading

Uh oh!

alwaysmeticulous bot commented Aug 9, 2023 •

edited

Loading

Uh oh!

github-actions bot commented Aug 9, 2023 •

edited

Loading

Uh oh!

deploysentinel bot commented Aug 9, 2023 •

edited

Loading

Test Case Results

Test Case Results

Test Case Results

Uh oh!

Udit-takkar left a comment

Uh oh!

Udit-takkar Aug 10, 2023

Uh oh!

joeauyeung Aug 11, 2023 •

edited

Loading

Uh oh!

leog left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

joeauyeung commented Aug 9, 2023

What does this PR do?

Requirement/Documentation

Type of change

How should this be tested?

Mandatory Tasks

Checklist

Uh oh!

linear bot commented Aug 9, 2023

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

github-actions bot commented Aug 9, 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!

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

Uh oh!

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

Test Case Results

Uh oh!

Udit-takkar left a comment

Choose a reason for hiding this comment

Uh oh!

Udit-takkar Aug 10, 2023

Choose a reason for hiding this comment

Uh oh!

joeauyeung Aug 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

leog left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

vercel bot commented Aug 9, 2023 •

edited

Loading

github-actions bot commented Aug 9, 2023 •

edited

Loading

alwaysmeticulous bot commented Aug 9, 2023 •

edited

Loading

github-actions bot commented Aug 9, 2023 •

edited

Loading

deploysentinel bot commented Aug 9, 2023 •

edited

Loading

joeauyeung Aug 11, 2023 •

edited

Loading