Skip to content

feat: Weekly calendar event border color#11907

Merged
Udit-takkar merged 3 commits intomainfrom
10-15-stack-troubleshooter-border-color-support
Oct 16, 2023
Merged

feat: Weekly calendar event border color#11907
Udit-takkar merged 3 commits intomainfrom
10-15-stack-troubleshooter-border-color-support

Conversation

@sean-brydon
Copy link
Copy Markdown
Member

@sean-brydon sean-brydon commented Oct 15, 2023

Smaller PR seperated from the stack that is safe to merge by its self.

Adds basic support for custom colors for the up coming troubleshooter that uses calendar view

Safe PR that removes the times displayed for 30 mins events

adds support for a custom border color in events

Figma: https://www.figma.com/file/UajFu4M1APhn2AywAEJkJr/New-Features?type=design&node-id=5966-558456&mode=design

CleanShot 2023-10-15 at 21.35.43.png

@vercel
Copy link
Copy Markdown

vercel Bot commented Oct 15, 2023

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

Name Status Preview Comments Updated (UTC)
ai ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2023 11:42am
api ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2023 11:42am
cal-demo ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2023 11:42am
dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2023 11:42am
qa 🔄 Building (Inspect) Visit Preview 💬 Add feedback Oct 16, 2023 11:42am
2 Ignored Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Visit Preview Oct 16, 2023 11:42am
ui ⬜️ Ignored (Inspect) Visit Preview Oct 16, 2023 11:42am

@sean-brydon
Copy link
Copy Markdown
Member Author

Current dependencies on/for this PR:

This comment was auto-generated by Graphite.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Oct 15, 2023

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link to collect XP and win prizes!

@zomars zomars added the core area: core, team members only label Oct 15, 2023
@sean-brydon sean-brydon changed the title stack-troubleshooter-border-color-support feat: Weekly calendar event border color Oct 15, 2023
disabled?: boolean;
};

const eventClasses = cva(
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using CVA for this as its less complicated than what we had

{event.title}
</div>
{eventDuration >= 30 && (
{eventDuration > 30 && (
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

30 min time slots were being cut off from overflow. Removing the displayed time if the event is 30mins and only show > than

Comment on lines +54 to +60
const borderColor = options?.borderColor ? "custom" : options?.status;

const styles = options?.borderColor
? {
borderColor: options?.borderColor,
}
: {};
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use a "custom" border prop that applies 0 styling L:38

Allowing us to use the dynamic styles

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Oct 15, 2023

📦 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
Copy link
Copy Markdown

deploysentinel Bot commented Oct 15, 2023

Current Playwright Test Results Summary

✅ 154 Passing - ⚠️ 3 Flaky

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

(Last updated on 10/16/2023 11:44:45am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: f7b22df

Started: 10/16/2023 11:42:25am UTC

⚠️ Flakes

📄   packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 2 Flakes

Top 1 Common Error Messages

null

2 Test Cases Affected

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Popup Tests should be able to reschedule
Retry 2Retry 1Initial Attempt
7.69% (24) 24 / 312 runs
failed over last 7 days
91.03% (284) 284 / 312 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when no theme is configured through Embed API
Retry 1Initial Attempt
3.19% (10) 10 / 313 runs
failed over last 7 days
37.70% (118) 118 / 313 runs
flaked over last 7 days

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Teams Non admin team members cannot create team in org
Retry 1Initial Attempt
20% (2) 2 / 10 runs
failed over last 7 days
30% (3) 3 / 10 runs
flaked over last 7 days

View Detailed Build Results


Copy link
Copy Markdown
Contributor

@Udit-takkar Udit-takkar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Great Work

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core area: core, team members only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants