fix: Remove the right date override on removal #13988

emrysal · 2024-03-05T21:23:50Z

What does this PR do?

Fixes translations on the Weekday in the date override listing
Deletes the right list item on delete
Adds test to verify the delete behaviour
Further tests to add verify text display client-side.

github-actions · 2024-03-05T21:24:04Z

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

vercel · 2024-03-05T21:24:47Z

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

4 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	Mar 13, 2024 8:21pm
cal	⬜️ Ignored (Inspect)	Visit Preview	Mar 13, 2024 8:21pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview	Mar 13, 2024 8:21pm
qa	⬜️ Ignored (Inspect)	Visit Preview	Mar 13, 2024 8:21pm

github-actions · 2024-03-05T21:33:48Z

📦 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 · 2024-03-05T21:34:37Z

Current Playwright Test Results Summary

✅ 304 Passing - ⚠️ 5 Flaky

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

(Last updated on 03/13/2024 08:29:33pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: be1f979

Started: 03/13/2024 08:25:59pm UTC

⚠️ Flakes

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Preview Preview - embed-core should load Retry 1 • Initial Attempt	0% (0) 0 / 247 runs failed over last 7 days	36.03% (89) 89 / 247 runs flaked over last 7 days

📄 apps/web/playwright/organization/organization-invitation.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Organization Email not matching orgAutoAcceptEmail nonexisting user invited to an organization Retry 1 • Initial Attempt	0.45% (1) 1 / 220 run failed over last 7 days	10% (22) 22 / 220 runs flaked over last 7 days

📄 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 Routing Link - Reporting and CSV Download Retry 1 • Initial Attempt	0% (0) 0 / 246 runs failed over last 7 days	1.22% (3) 3 / 246 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Availablity it can delete date overrides Retry 1 • Initial Attempt	25% (1) 1 / 4 run failed over last 7 days	50% (2) 2 / 4 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Inline Iframe Inline Iframe - Configured with Dark Theme Retry 1 • Initial Attempt	4.44% (11) 11 / 248 runs failed over last 7 days	46.37% (115) 115 / 248 runs flaked over last 7 days

View Detailed Build Results

socket-security · 2024-03-07T17:56:46Z

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/@types/[email protected]	None	`0`	1.63 MB	types
npm/[email protected]	None	`0`	687 kB	davidgoli
npm/[email protected]	environment	`0`	212 kB	skn0tt

View full report↗︎

graphite-app · 2024-03-11T23:00:12Z

Graphite Automations

"Add foundation team as reviewer" took an action on this PR • (03/11/24)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add consumer team as reviewer" took an action on this PR • (03/11/24)

1 reviewer was added to this PR based on Keith Williams's automation.

Udit-takkar · 2024-03-12T11:40:18Z

apps/web/pages/availability/[schedule].tsx

    name: "dateOverrides",
  });
-  const excludedDates = fields.map((field) => dayjs(field.ranges[0].start).utc().format("YYYY-MM-DD"));
+  const excludedDates = useExcludedDates();


why can't we use

fields.map((field) => dayjs(field.ranges[0].start).utc().format("YYYY-MM-DD")); here?

apps/web/pages/availability/[schedule].tsx

Udit-takkar · 2024-03-12T11:56:34Z

apps/web/playwright/availability.e2e.ts

+    await page.getByTestId("add-override-submit-btn").click();
+    await page.getByTestId("dialog-rejection").click();
+
+    const dateOverrideList = page.locator('[data-testid="date-overrides-list"] > li');


no await required here ?

Udit-takkar

Works fine. Just left some comments

apps/web/pages/availability/[schedule].tsx

+  const router = useRouter();
+  const utils = trpc.useUtils();
+  const { isPending, mutate } = trpc.viewer.availability.schedule.delete.useMutation({
+    onError: withErrorFromUnknown((err) => {


zomars · 2024-03-13T20:08:14Z

packages/lib/getClientErrorFromUnknown.ts

cc @emrysal

socket-security · 2024-03-13T20:19:51Z

🚨 Potential security issues detected. Learn more about Socket for GitHub ↗︎

To accept the risk, merge this PR and you will not be notified again.

Alert	Package	Note	Source
Install scripts	npm/[email protected]	Install script: postinstall Source: `node -e "try{require('./postinstall')}catch(e){}"`	orphan: npm/[email protected]

View full report↗︎

Next steps

What is an install script?

Install scripts are run when the package is installed. The majority of malware in npm is hidden in install scripts.

Packages should not be running non-essential scripts during install and there are often solutions to problems people solve with install scripts that can be run at publish time instead.

Take a deeper look at the dependency

Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev.

Remove the package

If you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency.

Mark a package as acceptable risk

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of ecosystem/package-name@version specifiers. e.g. @SocketSecurity ignore npm/[email protected] or ignore all packages with @SocketSecurity ignore-all

@SocketSecurity ignore npm/[email protected]

fix: Remove the right date override on removal

fa46303

emrysal requested a review from sean-brydon March 5, 2024 21:23

keithwillcode added core area: core, team members only foundation labels Mar 5, 2024

vercel bot deployed to Preview – ai March 5, 2024 21:24 View deployment

vercel bot deployed to Preview – api March 5, 2024 21:27 View deployment

vercel bot deployed to Preview – dev March 5, 2024 21:37 View deployment

WIP impl. of DateOverrideTest (vitest)

492bfef

vercel bot deployed to Preview – ai March 6, 2024 10:36 View deployment

vercel bot deployed to Preview – api March 6, 2024 10:40 View deployment

vercel bot deployed to Preview – dev March 6, 2024 10:49 View deployment

keithwillcode linked an issue Mar 6, 2024 that may be closed by this pull request

[CAL-3169] Wrong override being deleted #13766

Closed

keithwillcode added this to the v3.9 milestone Mar 7, 2024

PeerRich added the Medium priority Created by Linear-GitHub Sync label Mar 7, 2024

Translate days & add testing for removing list items

9087793

github-actions bot added consumer 🐛 bug Something isn't working labels Mar 11, 2024

vercel bot deployed to Preview – api March 11, 2024 18:54 View deployment

emrysal added High priority Created by Linear-GitHub Sync and removed Medium priority Created by Linear-GitHub Sync labels Mar 11, 2024

Remove now redundant remove parameter

e4b9a21

github-actions bot added the Medium priority Created by Linear-GitHub Sync label Mar 11, 2024

Merge branch 'main' into bugfix/wrong-date-override-removed-on-remove

04b17b3

vercel bot deployed to Preview – ai March 11, 2024 19:04 View deployment

vercel bot deployed to Preview – api March 11, 2024 19:12 View deployment

Fixed vitest matcher configurations

78ffdb6

vercel bot deployed to Preview – api March 11, 2024 22:41 View deployment

vercel bot deployed to Preview – dev March 11, 2024 22:51 View deployment

emrysal marked this pull request as ready for review March 11, 2024 22:59

graphite-app bot requested review from a team March 11, 2024 22:59

emrysal removed the request for review from a team March 11, 2024 22:59

Udit-takkar reviewed Mar 12, 2024

View reviewed changes

apps/web/pages/availability/[schedule].tsx Outdated Show resolved Hide resolved

Udit-takkar reviewed Mar 12, 2024

View reviewed changes

zomars added 3 commits March 13, 2024 12:37

Merge branch 'main' into bugfix/wrong-date-override-removed-on-remove

bf06635

add: helper for client errors

91b9cc2

Update yarn.lock

114df3f

zomars reviewed Mar 13, 2024

View reviewed changes

apps/web/pages/availability/[schedule].tsx

const router = useRouter();

const utils = trpc.useUtils();

const { isPending, mutate } = trpc.viewer.availability.schedule.delete.useMutation({

onError: withErrorFromUnknown((err) => {

This comment was marked as resolved.

Sign in to view

zomars reviewed Mar 13, 2024

View reviewed changes

packages/lib/getClientErrorFromUnknown.ts Outdated

Copy link

Member

zomars Mar 13, 2024

Choose a reason for hiding this comment

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

cc @emrysal

vercel bot deployed to Preview – ai March 13, 2024 20:09 View deployment

zomars previously approved these changes Mar 13, 2024

View reviewed changes

vercel bot deployed to Preview – api March 13, 2024 20:12 View deployment

Update getClientErrorFromUnknown.ts

be1f979

zomars dismissed their stale review via be1f979 March 13, 2024 20:14

zomars approved these changes Mar 13, 2024

View reviewed changes

zomars enabled auto-merge (squash) March 13, 2024 20:19

vercel bot deployed to Preview – api March 13, 2024 20:19 View deployment

zomars merged commit 2803b50 into main Mar 13, 2024
36 of 38 checks passed

zomars deleted the bugfix/wrong-date-override-removed-on-remove branch March 13, 2024 20:30

vercel bot deployed to Preview – dev March 13, 2024 20:40 View deployment

emrysal mentioned this pull request Mar 19, 2024

fix: Some tests weren't running #14145

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Remove the right date override on removal #13988

fix: Remove the right date override on removal #13988

emrysal commented Mar 5, 2024 •

edited

Loading

github-actions bot commented Mar 5, 2024 •

edited

Loading

vercel bot commented Mar 5, 2024 •

edited

Loading

github-actions bot commented Mar 5, 2024 •

edited

Loading

deploysentinel bot commented Mar 5, 2024 •

edited

Loading

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

socket-security bot commented Mar 7, 2024 •

edited

Loading

graphite-app bot commented Mar 11, 2024

Udit-takkar Mar 12, 2024

Udit-takkar Mar 12, 2024 •

edited

Loading

Udit-takkar left a comment

This comment was marked as resolved.

zomars Mar 13, 2024

socket-security bot commented Mar 13, 2024

fix: Remove the right date override on removal #13988

fix: Remove the right date override on removal #13988

Conversation

emrysal commented Mar 5, 2024 • edited Loading

What does this PR do?

github-actions bot commented Mar 5, 2024 • edited Loading

vercel bot commented Mar 5, 2024 • edited Loading

github-actions bot commented Mar 5, 2024 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Mar 5, 2024 • edited Loading

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

socket-security bot commented Mar 7, 2024 • edited Loading

graphite-app bot commented Mar 11, 2024

Graphite Automations

Udit-takkar Mar 12, 2024

Choose a reason for hiding this comment

Udit-takkar Mar 12, 2024 • edited Loading

Choose a reason for hiding this comment

Udit-takkar left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

zomars Mar 13, 2024

Choose a reason for hiding this comment

socket-security bot commented Mar 13, 2024

Next steps

emrysal commented Mar 5, 2024 •

edited

Loading

github-actions bot commented Mar 5, 2024 •

edited

Loading

vercel bot commented Mar 5, 2024 •

edited

Loading

github-actions bot commented Mar 5, 2024 •

edited

Loading

deploysentinel bot commented Mar 5, 2024 •

edited

Loading

socket-security bot commented Mar 7, 2024 •

edited

Loading

Udit-takkar Mar 12, 2024 •

edited

Loading