fix: Org profile slug [CAL-2252] by leog · Pull Request #10538 · calcom/cal.com

leog · 2023-08-02T15:36:38Z

What does this PR do?

Org slug could be undefined if it's an unpublished org, relying on metadata.requestedSlug as a fallback.

Type of change

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

How should this be tested?

Having orgs enabled and creating one without paying for subscription will produce an unpublished org. Going to the profile page fo that unpublished org should show the correct name and slug for the org.

linear · 2023-08-02T15:36:40Z

CAL-2252 Team name is empty

Captura de pantalla 2023-07-25 a las 15.19.15.png

It very often doesn't load any of the data here

vercel · 2023-08-02T15:36:45Z

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 11, 2023 11:52pm
cal-demo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 11, 2023 11:52pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 11, 2023 11:52pm
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 11, 2023 11:52pm

2 Ignored Deployments

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

github-actions · 2023-08-02T15:36:51Z

Thank you for following the naming conventions! 🙏

leog · 2023-08-02T15:36:56Z

packages/features/ee/organizations/pages/settings/profile.tsx

-      router.push(`${WEBAPP_URL}/teams`);
-    },
-  });
-


Unused code

leog · 2023-08-02T15:37:03Z

packages/features/ee/organizations/pages/settings/profile.tsx

-  function deleteTeam() {
-    if (currentOrganisation?.id) deleteTeamMutation.mutate({ teamId: currentOrganisation.id });
-  }
-


Unused code

leog · 2023-08-02T15:37:37Z

packages/features/ee/organizations/pages/settings/profile.tsx

      if (org) {
        form.setValue("name", org.name || "");
-        form.setValue("slug", org.slug || "");
+        form.setValue("slug", org.slug || org.metadata?.requestedSlug || "");


Also rely on metadata.requestedSlug for unpublished orgs

leog · 2023-08-02T15:38:08Z

packages/features/ee/organizations/pages/settings/profile.tsx

+                      disabled
+                      addOnSuffix={`.${subdomainSuffix()}`}
+                    />
+                  </div>


Grabbing form value from setted value after trpc returns org

leog · 2023-08-02T15:38:29Z

packages/trpc/server/routers/viewer/organizations/list.handler.ts

      accepted: membership?.accepted,
    },
    ...membership?.team,
+    metadata,


Providing the parsed metadata to access requestedSlug

alwaysmeticulous · 2023-08-02T15:38:58Z

🤖 Meticulous spotted visual differences in 62 of 137 screens tested: view and approve differences detected.

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

github-actions · 2023-08-02T15:43:37Z

📦 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-02T15:44:28Z

Current Playwright Test Results Summary

✅ 116 Passing - ⚠️ 4 Flaky

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

(Last updated on 08/11/2023 11:56:38pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: d968f32

Started: 08/11/2023 11:55:14pm UTC

⚠️ Flakes

📄 apps/web/playwright/booking-pages.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
pro user can reschedule a booking Retry 1 • Initial Attempt	2.41% (8) 8 / 332 runs failed over last 7 days	6.93% (23) 23 / 332 runs flaked over last 7 days

📄 apps/web/playwright/booking-seats.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Booking with Seats User can create a seated event (2 seats as example) Retry 1 • Initial Attempt	0% (0) 0 / 322 runs failed over last 7 days	0.62% (2) 2 / 322 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.50% (8) 8 / 320 runs failed over last 7 days	27.50% (88) 88 / 320 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.88% (16) 16 / 328 runs failed over last 7 days	95.12% (312) 312 / 328 runs flaked over last 7 days

View Detailed Build Results

Udit-takkar

Your changes look fine but i am not able to create a new team after creating a org.

I get 404 at this step

and this team's profile page just keeps loading

leog · 2023-08-07T14:20:18Z

Your changes look fine but i am not able to create a new team after creating a org.
and this team's profile page just keeps loading

Thanks @Udit-takkar. Please try again, the fix for that was pushed in a different PR that is merged now.

Udit-takkar

@leog this works fine but as a user i am confused if i do not publish a team then it still shown in /settings as a normal team and how do i publish it?

leog · 2023-08-11T15:17:22Z

@leog this works fine but as a user i am confused if i do not publish a team then it still shown in /settings as a normal team and how do i publish it?

We have banners to ask the user to upgrade in order to use either teams or organizations, the thing is that locally, we have that turned off. If you want to check it, search the constant IS_TEAM_BILLING_ENABLED and make it true 😉

Udit-takkar

LGTM

zomars

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

Fixing org slug

932b45e

leog requested a review from a team August 2, 2023 15:36

leog self-assigned this Aug 2, 2023

github-actions bot added teams area: teams, round robin, collective, managed event-types 🐛 bug Something isn't working labels Aug 2, 2023

leog commented Aug 2, 2023

View reviewed changes

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

leog commented Aug 2, 2023

View reviewed changes

vercel bot deployed to Preview – api August 2, 2023 15:38 View deployment

leog commented Aug 2, 2023

View reviewed changes

vercel bot deployed to Preview – dev August 2, 2023 15:38 View deployment

vercel bot deployed to Preview – cal-demo August 2, 2023 15:41 View deployment

Merge branch 'main' into fix/org-profile-slug

7cbe016

vercel bot deployed to Preview – ui August 2, 2023 17:26 View deployment

vercel bot deployed to Preview – api August 2, 2023 17:28 View deployment

vercel bot deployed to Preview – dev August 2, 2023 17:28 View deployment

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

Udit-takkar reviewed Aug 3, 2023

View reviewed changes

leog added the Low priority Created by Linear-GitHub Sync label Aug 3, 2023

Merge branch 'main' into fix/org-profile-slug

8ca8701

leog requested a review from Udit-takkar August 7, 2023 14:20

vercel bot had a problem deploying to Preview – api August 7, 2023 14:23 Failure

vercel bot deployed to Preview – ui August 7, 2023 14:23 View deployment

vercel bot deployed to Preview – dev August 7, 2023 14:25 View deployment

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

Udit-takkar reviewed Aug 11, 2023

View reviewed changes

Merge branch 'main' into fix/org-profile-slug

99f6e69

vercel bot deployed to Preview – ui August 11, 2023 15:20 View deployment

vercel bot deployed to Preview – api August 11, 2023 15:21 View deployment

vercel bot deployed to Preview – dev August 11, 2023 15:22 View deployment

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

Udit-takkar approved these changes Aug 11, 2023

View reviewed changes

leog enabled auto-merge (squash) August 11, 2023 18:24

zomars approved these changes Aug 11, 2023

View reviewed changes

Merge branch 'main' into fix/org-profile-slug

d968f32

vercel bot deployed to Preview – ui August 11, 2023 23:51 View deployment

vercel bot deployed to Preview – api August 11, 2023 23:52 View deployment

vercel bot deployed to Preview – dev August 11, 2023 23:52 View deployment

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

leog merged commit 268ab88 into main Aug 11, 2023

leog deleted the fix/org-profile-slug branch August 11, 2023 23:57

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

Fixing org slug (#10538)

1148983

Conversation

leog commented Aug 2, 2023

What does this PR do?

Type of change

How should this be tested?

Uh oh!

linear bot commented Aug 2, 2023

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

leog Aug 2, 2023

Choose a reason for hiding this comment

Uh oh!

leog Aug 2, 2023

Choose a reason for hiding this comment

Uh oh!

leog Aug 2, 2023

Choose a reason for hiding this comment

Uh oh!

leog Aug 2, 2023

Choose a reason for hiding this comment

Uh oh!

leog Aug 2, 2023

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

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

Test Case Results

Uh oh!

Udit-takkar left a comment

Choose a reason for hiding this comment

Uh oh!

leog commented Aug 7, 2023

Uh oh!

Udit-takkar left a comment

Choose a reason for hiding this comment

Uh oh!

leog commented Aug 11, 2023

Uh oh!

Udit-takkar left a comment

Choose a reason for hiding this comment

Uh oh!

zomars 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 2, 2023 •

edited

Loading

github-actions bot commented Aug 2, 2023 •

edited

Loading

alwaysmeticulous bot commented Aug 2, 2023 •

edited

Loading

github-actions bot commented Aug 2, 2023 •

edited

Loading

deploysentinel bot commented Aug 2, 2023 •

edited

Loading