Skip to content

[Staging] Dev to Stage merge 08/06/2026 - #202

Merged
aishwaryamathuria merged 34 commits into
stagefrom
dev
Jun 9, 2026
Merged

[Staging] Dev to Stage merge 08/06/2026#202
aishwaryamathuria merged 34 commits into
stagefrom
dev

Conversation

adisharm and others added 30 commits May 22, 2026 20:06
MWPW-193821 added support for custom version label
…otation mode #181

MWPW-196249 | Add auto comment apply option on stream comments in annotation mode
- Introduces an auto apply option on comment threads, allowing suggested text or image changes to be applied directly from the comment panel without manual inline editing.
- Adds text regeneration and asset (image) regeneration through the auto apply flow, letting reviewers trigger content regeneration and immediately reapply results as a new comment suggestion.
- Adds an edit type filter to the comments panel so users can filter between text edits and image edits.
- Restricts image update actions to permitted image types only — SVG assets are now excluded from the update flow.
- Fixes multiple comment threading bugs: users can now add multiple comments on a section and reply to existing comments (previously only a single comment was allowed per section).
- Fixes comment marker focus behavior so clicking a thread marker correctly focuses the right thread.
- Cleans up comment controls UX - layout, spacing, and button states polished across the panel.
- Fixes asset display in the annotation and AI SEO annotation panels - simplifies and consolidates panel CSS, removes redundant styles.
- Fixes a display issue for updated images after an asset replacement is applied, ensuring the preview reflects the new image immediately.
Changes Implemented for comment Thread status changes.
This reverts commit d3c2dd1.

The status update PR was opened on FE but it is failing on dev as the BE changes are not ready.
Will need to merge after the api changes are deployed on dev
Jira:
https://jira.corp.adobe.com/browse/MWPW-194556 

Summary:

Delete for existing Page Metadata rows: native DA rows (not only “Add text/image” rows) get a trash control and can be removed from the DOM with the same store cleanup as user-added rows.
Delete for user-added rows: unchanged behavior, with re-attach after inline edit / Medium Editor via refreshPageMetadataDeleteButtons.
Persist cleanup: sanitizeMetadataDivForPersist strips delete buttons and removes empty .stream-metadata-user-value-chrome wrappers so saved HTML stays DA-shaped.
Layout/CSS: metadata grid / column styling so key/value cells stay even for user + native rows.
…" (#187)

This reverts commit 18f4e00.
Reverts #180 as this is causing save and da push functionalities to fail
Viewport-aware asset editing: Inline image/alt edits now record the viewport (mobile/tablet/desktop) and a blockGlobalIndex + picIndexInBlock at capture time. When the collab draft is saved, edits are applied to the correct picture element within the correct block instance, even when the same block appears multiple times or the same image source is reused across breakpoints.
Regen button flickering fix: Increased hide timers from 200–350 ms to 5 s for both text and image regen buttons. Added per-image mouseleave listeners and a MutationObserver so buttons hide cleanly when annotation modes change, eliminating the flickering caused by rapid mouse movement.
Owner-only auto-apply: The annotation-card-auto-apply-btn is now disabled for non-owner collaborators, with a descriptive tooltip explaining the restriction.
Collab space setup reliability: copyDaPage is now awaited and a 15 s wait is added after the copy to ensure the DA page is available before the draft workflow continues.
…pty until Save), Save assigns content.da.live, Push promotes; apply only latest image edit per element
…n top, prior read-only); Discard steps back one image
…AssetCard) too; text From/To links everywhere
…sset items through image-src edits; renderCommentsPanel was the real renderer, renderAssetsPanel was unused)
…edit timestamp on Save/Push (chronological panel order); text push falls back to global replace so marquee header edits land
Changes Implemented for comment Thread status changes.
Adding new status - Open, Accepted, Rejected and Closed
[MWPW-196468] Inline text edit changelist: change history, discard, revert-on-reload, and card redesign
[MWPW-196468] Asset replacement changelist - history, discard, and Save/Push persistence
…g the Images and Texts via "Auto apply comment" (#194)

MWPW-197373 | MWPW-197353 | Unable to save the changes after Replacing the Images and Texts via "Auto apply comment"

Images updated via the regen button (stream-img-regen-btn) now create an image-src easyEdit entry with the generated API URL as to, matching how manual uploads are tracked. Alt text changes from regen are also written to the edit store. Regen assets carry a skipUploadAndPromotion flag so they bypass uploadLocalAssets and batchPromote — their content.da.live URL is already final and requires no re-upload. The from field uses data-stream-original-src (the canonical server URL) rather than the live DOM src.

Extracted a shared setAssetLinkHref helper used across all three card builders. Real URLs (regen API URL, DA URL, original src) are set as href directly when only a base64 data URL is available (unsaved uploads), a blob URL is created on click to bypass Chrome's data: navigation block.
MWPW-197412 | Passing version label for push to da via annotation
…viewport (#196)

CSS changes to improve readability on the annotation panel in mobile mode.

Scrollable filter tabs: the annotation-panel-filter-tabs bar now scrolls horizontally when tabs overflow, with scrollbars hidden across all browsers (Firefox, Chrome/Safari, IE/Edge)
Responsive comment cards: at narrow panel widths (≤260px), comment cards adapt: the header wraps, the username truncates with ellipsis, status controls move to their own row, and action buttons shrink to 18×18px
40% screen size to the annotations
… for annotaion (#197)

This PR restores and metadata persistence in annotation/collab mode, temporarily till the new metadata management via edits is enabled

Metadata save fixed: Page metadata edits are agin pushed to DA as part of saveAnnotationChanges.
Annotation edits recorded against the metadata block are ignored during the full page push - metadata is handled exclusively via the save flow above.
Metadata state cached across refreshes: cachedPageMetadataHtml persists the last-saved metadata HTML so that initializePreview can restore the correct state on re-render without re-fetching from DA.
shrutisuresh16 and others added 4 commits June 5, 2026 14:58
… scroll-to-block (#198)

JIRA: MWPW-197357

When users select comment, edit, or asset cards in the right panel, scroll the preview to the anchored element and pulse the matching flag
Fix asset card click behavior: uploaded image cards now carry data-edit-id and resolve their target via store.getElementForEdit(), enabling scroll-to-block and flag pulse for asset replacements
Regression: fragment flow not working when we select last block and above in page.
Summary
Adds a "Select an image model" dropdown above the prompt textarea in the image regeneration overlay
Options are fetched from image-models.json on the live stream-mapper config with hardcoded defaults (firefly, nano-banana) as fallback
Selected model value is sent as imageModel in the image generation API payload
Feature is gated via getMapperEnv() !== 'prod' — visible on dev/stage, hidden on prod
@aem-code-sync

aem-code-sync Bot commented Jun 8, 2026

Copy link
Copy Markdown

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch and validate page speed.
In case there are problems, just click a checkbox below to rerun the respective action.

  • Re-run all PSI checks
  • Re-run failed PSI checks
  • Re-sync branch
Commits

@aishwaryamathuria aishwaryamathuria changed the title [Staging] Dev to Stage merge 8/06/2026 [Staging] Dev to Stage merge 08/06/2026 Jun 8, 2026
@aishwaryamathuria
aishwaryamathuria merged commit 4200e8c into stage Jun 9, 2026
2 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants