fix: reset embed iframe queue consistently to preserve UI commands by hariombalhara · Pull Request #27419 · calcom/cal.com

hariombalhara · 2026-01-30T03:10:57Z

What does this PR do?

Fixes inconsistent queue reset behavior in the embed iframe. Previously, after processing queued actions, the queue was completely cleared (this.iframeDoQueue = []), while iframeReset() preserved UI-related commands. This PR extracts the queue filtering logic into a reusable resetQueue() method and uses it in both places to ensure consistent behavior.

The problem: When queued actions were processed, all commands including UI configuration commands were cleared. This meant UI settings wouldn't persist correctly across certain scenarios.

The fix: Extract the queue filtering logic into resetQueue() and call it both in iframeReset() and after processing queued actions, ensuring only commands in commandsPersistAcrossIframeResets are preserved.

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - internal implementation change only.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Create an embed with UI configuration commands (e.g., Cal("ui", {...}))
Trigger actions that cause the queue to be processed
Verify that UI configuration persists after queue processing
Verify that non-UI commands are properly cleared

Human Review Checklist

Verify that preserving UI commands after processing queued actions (not just during iframe reset) is the intended behavior change
Confirm commandsPersistAcrossIframeResets contains the correct set of commands that should persist

Summary by cubic

Make embed iframe queue reset consistent so only UI-related commands persist after reloads. This prevents stale actions and keeps UI config in sync across iframe resets.

Bug Fixes
- Added resetQueue() and used it in iframeReset and after processing queued actions, filtering the queue to only keep commands that should persist across resets.

^{Written for commit 9a13594. Summary will update on new commits.}

github-actions · 2026-01-30T03:11:06Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Reset queue correctly all places". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

cubic-dev-ai

No issues found across 1 file

* test: verify UI config persists on second modal open Co-Authored-By: [email protected] <[email protected]> * fix: update iframe selection logic in getEmbedIframe function Refactor the getEmbedIframe function to improve iframe selection by using a more specific selector and ensuring the last iframe is targeted in cases of repeated modal openings. This change enhances reliability in iframe handling during tests. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

github-actions · 2026-01-30T05:14:40Z

E2E results are ready!

Workflow #101782.1 latest results

devin-ai-integration

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no potential bugs to report.

View in Devin Review to see 3 additional flags.

cubic-dev-ai

1 issue found across 1 file (changes from recent commits).

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="packages/embeds/embed-core/playwright/lib/testUtils.ts">

<violation number="1" location="packages/embeds/embed-core/playwright/lib/testUtils.ts:90">
P2: `elementHandle()` does not wait for the iframe to exist; removing `waitFor()` can return null and exit early before the target iframe is attached. Re-introduce a wait for the locator to avoid flaky null returns when another embed has already set `iframeReady`.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

cubic-dev-ai · 2026-01-30T13:16:49Z

packages/embeds/embed-core/playwright/lib/testUtils.ts

+  const iframeSelector = `iframe[name="cal-embed=${calNamespace}"]`;
+  // In case of modal we don't cleanup previous iframe on repeat click, so we should read the last one by default as that would be the one actie
+  const targetIframeElement = page.locator(iframeSelector).last();
+  let elementHandle = await targetIframeElement.elementHandle();


P2: elementHandle() does not wait for the iframe to exist; removing waitFor() can return null and exit early before the target iframe is attached. Re-introduce a wait for the locator to avoid flaky null returns when another embed has already set iframeReady.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At packages/embeds/embed-core/playwright/lib/testUtils.ts, line 90: <comment>`elementHandle()` does not wait for the iframe to exist; removing `waitFor()` can return null and exit early before the target iframe is attached. Re-introduce a wait for the locator to avoid flaky null returns when another embed has already set `iframeReady`.</comment> <file context> @@ -87,14 +87,19 @@ export const getEmbedIframe = async ({ - await targetIframeElement.waitFor(); - const elementHandle = await targetIframeElement.elementHandle(); - const embedIframe = await elementHandle?.contentFrame(); + let elementHandle = await targetIframeElement.elementHandle(); + let embedIframe = await elementHandle?.contentFrame(); </file context>

I reviewed the Cubic AI feedback regarding the elementHandle() call at line 90 in packages/embeds/embed-core/playwright/lib/testUtils.ts.

The confidence score for this issue is 6/10, which is below the 9/10 threshold required for automated fixes. The issue suggests re-introducing a waitFor() call before elementHandle() to avoid potential null returns.

Since the confidence is below the threshold, I'm not making changes automatically. The PR author or reviewers should evaluate whether this is a valid concern that needs to be addressed manually.

github-actions · 2026-01-30T13:17:19Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

emrysal

Looks good to me, sensible change.

Reset queue correctly all places

3152072

pull-request-size bot added the size/S label Jan 30, 2026

devin-ai-integration bot changed the title ~~Reset queue correctly all places~~ fix: reset embed iframe queue consistently to preserve UI commands Jan 30, 2026

hariombalhara marked this pull request as ready for review January 30, 2026 03:42

hariombalhara requested a review from a team as a code owner January 30, 2026 03:42

hariombalhara added the ready-for-e2e label Jan 30, 2026

graphite-app bot added the enterprise area: enterprise, audit log, organisation, SAML, SSO label Jan 30, 2026

graphite-app bot requested a review from a team January 30, 2026 03:42

graphite-app bot added the core area: core, team members only label Jan 30, 2026

hariombalhara self-assigned this Jan 30, 2026

cubic-dev-ai bot reviewed Jan 30, 2026

View reviewed changes

hariombalhara mentioned this pull request Jan 30, 2026

test: verify UI config persists on second modal open #27422

Merged

6 tasks

pull-request-size bot added size/M and removed size/S labels Jan 30, 2026

fix test

9a13594

devin-ai-integration bot reviewed Jan 30, 2026

View reviewed changes

cubic-dev-ai bot reviewed Jan 30, 2026

View reviewed changes

hariombalhara enabled auto-merge (squash) January 30, 2026 13:18

emrysal approved these changes Feb 2, 2026

View reviewed changes

hariombalhara merged commit bc39258 into main Feb 2, 2026
57 checks passed

hariombalhara deleted the fix-embed-queue-issue-another-place branch February 2, 2026 13:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: reset embed iframe queue consistently to preserve UI commands#27419

fix: reset embed iframe queue consistently to preserve UI commands#27419
hariombalhara merged 3 commits intomainfrom
fix-embed-queue-issue-another-place

hariombalhara commented Jan 30, 2026 •

edited by cubic-dev-ai bot

Loading

Uh oh!

github-actions bot commented Jan 30, 2026 •

edited

Loading

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

github-actions bot commented Jan 30, 2026

Uh oh!

devin-ai-integration bot left a comment

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

cubic-dev-ai bot Jan 30, 2026 •

edited

Loading

Uh oh!

devin-ai-integration bot Jan 30, 2026

Uh oh!

github-actions bot commented Jan 30, 2026

Uh oh!

emrysal left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

hariombalhara commented Jan 30, 2026 • edited by cubic-dev-ai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Human Review Checklist

Summary by cubic

Uh oh!

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

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 30, 2026

E2E results are ready!

Uh oh!

devin-ai-integration bot left a comment

Choose a reason for hiding this comment

✅ Devin Review: No Issues Found

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jan 30, 2026 • 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!

devin-ai-integration bot Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 30, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

emrysal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hariombalhara commented Jan 30, 2026 •

edited by cubic-dev-ai bot

Loading

github-actions bot commented Jan 30, 2026 •

edited

Loading

cubic-dev-ai bot Jan 30, 2026 •

edited

Loading