@pantheon-systems/puck-css 0.4.0

package/dist/merge/components/merge-resolution/DocumentResolutionDetail.js

@@ -0,0 +1,167 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * DocumentResolutionDetail Component
+ *
+ * Expanded view for a single document showing strategy options,
+ * visual comparison via MergePreviewRenderer, cherry-pick visual panel,
+ * and delete-type conflict messages.
+ *
+ * All visual styling uses inline React styles.
+ */
+import { useEffect, useState, useRef, useCallback } from 'react';
+import { InlineMessage } from '@pantheon-systems/pds-toolkit-react';
+import { Render } from '@puckeditor/core';
+import { ResolutionStrategyPicker } from './ResolutionStrategyPicker.js';
+import { CherryPickVisualPanel } from './CherryPickVisualPanel.js';
+import { MergePreviewRenderer } from '../../../editor/components/merge-preview/MergePreviewRenderer.js';
+import { ScaledContent } from '../../../editor/components/merge-preview/ScaledContent.js';
+import { ViewModeSelector } from '../../../editor/components/merge-preview/ViewModeSelector.js';
+const baseClass = 'document-resolution-detail';
+// =============================================================================
+// Inline Style Constants
+// =============================================================================
+const detailHeaderStyle = {
+    display: 'flex',
+    alignItems: 'center',
+    gap: '12px',
+    marginBottom: '16px',
+    flexWrap: 'wrap',
+};
+const singlePanelContainerStyle = {
+    position: 'relative',
+    border: '1px solid #e5e7eb',
+    borderRadius: '8px',
+    overflow: 'hidden',
+    maxWidth: '50%',
+};
+const singlePanelLabelStyle = {
+    padding: '8px 12px',
+    fontWeight: 600,
+    fontSize: '13px',
+    background: '#f9fafb',
+    borderBottom: '1px solid #e5e7eb',
+};
+const singlePanelContentStyle = {
+    padding: '12px',
+};
+const overlayMessageStyle = {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    width: '100%',
+    height: '100%',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    background: 'rgba(255,255,255,0.7)',
+    fontSize: '16px',
+    fontWeight: 600,
+    color: '#6b7280',
+    pointerEvents: 'none',
+};
+const noContentStyle = {
+    padding: '40px',
+    textAlign: 'center',
+    color: '#999',
+    fontStyle: 'italic',
+};
+// =============================================================================
+// Private Helper Components
+// =============================================================================
+function getDeleteMessage(conflictType) {
+    if (conflictType === 'deleted-in-source') {
+        return 'This document was deleted in Draft.';
+    }
+    if (conflictType === 'deleted-in-target') {
+        return 'This document was deleted in Live.';
+    }
+    return null;
+}
+/**
+ * StrategyEmphasisWrapper: wraps MergePreviewRenderer and applies visual
+ * emphasis for accept-draft and accept-live strategies.
+ * Uses DOM queries to position dimming overlays on the non-selected panel.
+ */
+function StrategyEmphasisWrapper({ strategy, children, }) {
+    const wrapperRef = useRef(null);
+    const [panelRects, setPanelRects] = useState([]);
+    const updatePanelRects = useCallback(() => {
+        const wrapper = wrapperRef.current;
+        if (!wrapper)
+            return;
+        const panels = wrapper.querySelectorAll('.merge-preview-renderer__panel');
+        if (panels.length < 2)
+            return;
+        const wrapperRect = wrapper.getBoundingClientRect();
+        const rects = Array.from(panels).map((panel) => {
+            const r = panel.getBoundingClientRect();
+            return new DOMRect(r.left - wrapperRect.left, r.top - wrapperRect.top, r.width, r.height);
+        });
+        setPanelRects(rects);
+    }, []);
+    useEffect(() => {
+        updatePanelRects();
+        window.addEventListener('resize', updatePanelRects);
+        return () => window.removeEventListener('resize', updatePanelRects);
+    }, [updatePanelRects]);
+    // Panel 0 = source (Draft), Panel 1 = target (Live)
+    // accept-draft: highlight panel 0 (Draft), dim panel 1 (Live)
+    // accept-live: highlight panel 1 (Live), dim panel 0 (Draft)
+    const highlightIndex = strategy === 'accept-draft' ? 0 : 1;
+    const dimIndex = strategy === 'accept-draft' ? 1 : 0;
+    return (_jsxs("div", { ref: wrapperRef, className: "strategy-emphasis-wrapper", style: { position: 'relative' }, children: [children, panelRects[dimIndex] && (_jsx("div", { className: "strategy-emphasis-wrapper__dim-overlay", "data-testid": "strategy-dim-overlay", style: {
+                    position: 'absolute',
+                    top: panelRects[dimIndex].y,
+                    left: panelRects[dimIndex].x,
+                    width: panelRects[dimIndex].width,
+                    height: panelRects[dimIndex].height,
+                    background: 'rgba(255,255,255,0.5)',
+                    pointerEvents: 'none',
+                    borderRadius: '8px',
+                } })), panelRects[highlightIndex] && (_jsx("div", { className: "strategy-emphasis-wrapper__highlight", "data-testid": "strategy-highlight", style: {
+                    position: 'absolute',
+                    top: panelRects[highlightIndex].y,
+                    left: panelRects[highlightIndex].x,
+                    width: panelRects[highlightIndex].width,
+                    height: panelRects[highlightIndex].height,
+                    border: '2px solid #22c55e',
+                    borderRadius: '8px',
+                    pointerEvents: 'none',
+                    boxSizing: 'border-box',
+                } }))] }));
+}
+// =============================================================================
+// Main Component
+// =============================================================================
+export function DocumentResolutionDetail({ document: doc, sourceBranchName, targetBranchName, onSetStrategy, onCherryPickSelection, onAcceptAllComponentProps, config, diffs = [], }) {
+    const hasConfig = config != null;
+    const [viewMode, setViewMode] = useState('side-by-side');
+    if (!doc) {
+        return (_jsx("div", { className: baseClass, "data-testid": "merge-resolution-detail", style: { padding: 0 }, children: _jsx("p", { className: `${baseClass}__empty`, style: {
+                    color: '#999',
+                    fontStyle: 'italic',
+                    textAlign: 'center',
+                    padding: '40px 20px',
+                }, children: "Select a document to view details." }) }));
+    }
+    const isConflicting = doc.changeType === 'conflicting';
+    const isDeletedOnMain = doc.changeType === 'deleted-on-main';
+    const isDraftChanged = doc.changeType === 'draft-changed';
+    const isNewOnDraft = doc.changeType === 'new-on-draft';
+    const isDeletedOnDraft = doc.changeType === 'deleted-on-draft';
+    const deleteMessage = isConflicting ? getDeleteMessage(doc.conflictType) : null;
+    const hasBothSnapshots = !!doc.sourceSnapshot && !!doc.targetSnapshot;
+    const hasSourceOnly = !!doc.sourceSnapshot && !doc.targetSnapshot;
+    const hasNeitherSnapshot = !doc.sourceSnapshot && !doc.targetSnapshot;
+    // Show ViewModeSelector for comparisons (conflicts and non-conflicting changes with both snapshots)
+    const showViewModeSelector = hasBothSnapshots && (isConflicting || isDraftChanged);
+    return (_jsxs("div", { className: baseClass, "data-testid": "merge-resolution-detail", style: { padding: 0 }, children: [_jsxs("div", { className: `${baseClass}__header`, style: detailHeaderStyle, children: [_jsx("h3", { className: `${baseClass}__path`, style: {
+                            fontSize: '18px',
+                            fontWeight: 600,
+                            margin: 0,
+                            color: '#333',
+                            flex: '1 1 auto',
+                        }, children: doc.documentPath }), showViewModeSelector && (_jsx(ViewModeSelector, { viewMode: viewMode, onViewModeChange: setViewMode }))] }), (isConflicting || isDeletedOnMain) && (_jsxs(_Fragment, { children: [_jsx(ResolutionStrategyPicker, { currentStrategy: doc.strategy, conflictType: doc.conflictType, onSelect: (strategy) => onSetStrategy(doc.documentId, strategy) }), deleteMessage && (_jsx(InlineMessage, { type: "warning", title: deleteMessage })), doc.strategy === 'accept-draft' && hasBothSnapshots && (_jsx(InlineMessage, { type: "success", title: "Draft version will be kept." })), doc.strategy === 'accept-live' && hasBothSnapshots && (_jsx(InlineMessage, { type: "info", title: "Live version will be kept." })), doc.strategy === 'unresolved' && hasBothSnapshots && (_jsx(InlineMessage, { type: "warning", title: "Select a resolution strategy above." })), (doc.strategy === 'accept-draft' || doc.strategy === 'accept-live') && hasBothSnapshots && hasConfig && (_jsx(StrategyEmphasisWrapper, { strategy: doc.strategy, children: _jsx(MergePreviewRenderer, { sourceData: doc.sourceSnapshot, targetData: doc.targetSnapshot, diffs: diffs, config: config, viewMode: viewMode, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName }) })), doc.strategy === 'unresolved' && hasBothSnapshots && hasConfig && (_jsx(MergePreviewRenderer, { sourceData: doc.sourceSnapshot, targetData: doc.targetSnapshot, diffs: diffs, config: config, viewMode: viewMode, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName })), doc.strategy === 'cherry-pick' && hasBothSnapshots && hasConfig && (_jsx(CherryPickVisualPanel, { document: doc, config: config, diffs: diffs, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName, onCherryPickSelection: onCherryPickSelection, onAcceptAllComponentProps: onAcceptAllComponentProps })), doc.strategy === 'cherry-pick' && !hasConfig && doc.classifiedFields && (_jsx("div", { className: `${baseClass}__cherry-pick-fallback`, style: { marginTop: '16px' }, children: _jsx("p", { style: { fontSize: '13px', color: '#666', marginBottom: '12px' }, children: doc.classifiedFields.filter((f) => f.classification !== 'conflicting').length > 0 &&
+                                `${doc.classifiedFields.filter((f) => f.classification !== 'conflicting').length} fields auto-merged` }) })), !doc.sourceSnapshot && doc.targetSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: targetBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) }), _jsx("div", { className: `${baseClass}__overlay-message`, style: overlayMessageStyle, children: "Deleted in Draft" })] })), hasSourceOnly && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: sourceBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) }), _jsx("div", { className: `${baseClass}__overlay-message`, style: overlayMessageStyle, children: "New document" })] })), hasNeitherSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "No content available" }))] })), isDraftChanged && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "info", title: "Changed on Draft. No conflict to resolve." }), hasBothSnapshots && hasConfig && (_jsx(MergePreviewRenderer, { sourceData: doc.sourceSnapshot, targetData: doc.targetSnapshot, diffs: diffs, config: config, viewMode: viewMode, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName })), hasSourceOnly && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: sourceBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) })] })), !hasBothSnapshots && !hasSourceOnly && !doc.targetSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Document preview not available" })), !hasBothSnapshots && !hasSourceOnly && doc.targetSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: targetBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) })] }))] })), isNewOnDraft && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "success", title: "New document created on Draft." }), doc.sourceSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsxs("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: [sourceBranchName, " (new)"] }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) })] })), !doc.sourceSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Document preview not available" }))] })), isDeletedOnDraft && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "warning", title: "Deleted on Draft. This document will be removed from Live." }), doc.targetSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsxs("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: [targetBranchName, " (will be deleted)"] }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) })] })), !doc.targetSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Published version preview not available" }))] }))] }));
+}
+//# sourceMappingURL=DocumentResolutionDetail.js.map

package/dist/merge/components/merge-resolution/DocumentResolutionDetail.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DocumentResolutionDetail.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/DocumentResolutionDetail.tsx"],"names":[],"mappings":"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"}

package/dist/merge/components/merge-resolution/DocumentResolutionList.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import type { DocumentResolution, DocumentResolutionStrategy } from '../../useMergeResolution.js';
+export interface DiffCounts {
+    added: number;
+    removed: number;
+    modified: number;
+}
+export interface DocumentResolutionListProps {
+    documents: DocumentResolution[];
+    currentIndex: number;
+    goToNext: () => void;
+    goToPrevious: () => void;
+    goToNextUnresolved: () => void;
+    goToDocument: (index: number) => void;
+    setStrategy: (documentId: string, strategy: DocumentResolutionStrategy) => void;
+    setRemainingStrategy: (strategy: 'accept-draft' | 'accept-live') => void;
+    onToggleDetail?: () => void;
+    diffCounts?: Map<string, DiffCounts>;
+}
+export declare function DocumentResolutionList({ documents, currentIndex, goToNext, goToPrevious, goToNextUnresolved, goToDocument, setStrategy, setRemainingStrategy, onToggleDetail, diffCounts, }: DocumentResolutionListProps): React.ReactElement;
+//# sourceMappingURL=DocumentResolutionList.d.ts.map

package/dist/merge/components/merge-resolution/DocumentResolutionList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DocumentResolutionList.d.ts","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/DocumentResolutionList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAC9D,OAAO,KAAK,EACV,kBAAkB,EAClB,0BAA0B,EAE3B,MAAM,6BAA6B,CAAC;AAErC,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChF,oBAAoB,EAAE,CAAC,QAAQ,EAAE,cAAc,GAAG,aAAa,KAAK,IAAI,CAAC;IACzE,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACtC;AAmDD,wBAAgB,sBAAsB,CAAC,EACrC,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,WAAW,EACX,oBAAoB,EACpB,cAAc,EACd,UAAU,GACX,EAAE,2BAA2B,GAAG,KAAK,CAAC,YAAY,CAkIlD"}

package/dist/merge/components/merge-resolution/DocumentResolutionList.js

@@ -0,0 +1,106 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useRef, useCallback } from 'react';
+const baseClass = 'document-resolution-list';
+const strategyLabels = {
+    'accept-draft': 'Draft',
+    'accept-live': 'Live',
+    'cherry-pick': 'Cherry-pick',
+    unresolved: 'Unresolved',
+};
+const strategyStatusTypes = {
+    'accept-draft': 'success',
+    'accept-live': 'info',
+    'cherry-pick': 'warning',
+    unresolved: 'critical',
+};
+const strategyKeyMap = {
+    '1': 'accept-draft',
+    '2': 'accept-live',
+    '3': 'cherry-pick',
+};
+const changeTypeLabels = {
+    conflicting: 'Conflict',
+    'deleted-on-main': 'Deleted on Live',
+    'draft-changed': 'Changed',
+    'new-on-draft': 'New',
+    'deleted-on-draft': 'Deleted',
+};
+const changeTypeStatusTypes = {
+    conflicting: 'critical',
+    'deleted-on-main': 'critical',
+    'draft-changed': 'info',
+    'new-on-draft': 'success',
+    'deleted-on-draft': 'disabled',
+};
+function StatusBadge({ statusType, label }) {
+    return (_jsxs("span", { className: "pds-status-badge pds-status-badge--neutral", children: [_jsx("span", { className: `pds-status-badge__status pds-status-badge__status--${statusType}`, children: _jsxs("span", { className: "visually-hidden", children: ["Status: ", label.toLowerCase()] }) }), _jsx("span", { className: "pds-status-badge__label", children: label })] }));
+}
+export function DocumentResolutionList({ documents, currentIndex, goToNext, goToPrevious, goToNextUnresolved, goToDocument, setStrategy, setRemainingStrategy, onToggleDetail, diffCounts, }) {
+    const listRef = useRef(null);
+    const itemRefs = useRef(new Map());
+    useEffect(() => {
+        const item = itemRefs.current.get(currentIndex);
+        if (item) {
+            item.scrollIntoView?.({ block: 'nearest', behavior: 'smooth' });
+        }
+    }, [currentIndex]);
+    const handleKeyDown = useCallback((e) => {
+        const target = e.target;
+        if (target.tagName === 'INPUT' ||
+            target.tagName === 'TEXTAREA' ||
+            target.tagName === 'SELECT' ||
+            target.isContentEditable) {
+            return;
+        }
+        const key = e.key;
+        if (key === 'ArrowDown' || key === 'j') {
+            e.preventDefault();
+            goToNext();
+            return;
+        }
+        if (key === 'ArrowUp' || key === 'k') {
+            e.preventDefault();
+            goToPrevious();
+            return;
+        }
+        if (key === 'n') {
+            e.preventDefault();
+            goToNextUnresolved();
+            return;
+        }
+        if (key === 'Enter') {
+            e.preventDefault();
+            onToggleDetail?.();
+            return;
+        }
+        if (key in strategyKeyMap && !e.shiftKey) {
+            e.preventDefault();
+            const currentDoc = documents[currentIndex];
+            if (currentDoc) {
+                const strategy = strategyKeyMap[key];
+                if (strategy)
+                    setStrategy(currentDoc.documentId, strategy);
+            }
+            return;
+        }
+        if (key === 'D' && e.shiftKey) {
+            e.preventDefault();
+            setRemainingStrategy('accept-draft');
+            return;
+        }
+        if (key === 'L' && e.shiftKey) {
+            e.preventDefault();
+            setRemainingStrategy('accept-live');
+        }
+    }, [documents, currentIndex, goToNext, goToPrevious, goToNextUnresolved, setStrategy, setRemainingStrategy, onToggleDetail]);
+    return (_jsx("ul", { className: baseClass, onKeyDown: handleKeyDown, tabIndex: 0, ref: listRef, children: documents.map((doc, index) => {
+            const counts = diffCounts?.get(doc.documentId);
+            const isSelected = index === currentIndex;
+            const isConflict = doc.changeType === 'conflicting' || doc.changeType === 'deleted-on-main';
+            return (_jsxs("li", { className: `${baseClass}__item${isSelected ? ` ${baseClass}__item--selected` : ''}`, "aria-selected": isSelected, role: "listitem", ref: (el) => {
+                    if (el)
+                        itemRefs.current.set(index, el);
+                }, onClick: () => goToDocument(index), children: [_jsxs("div", { className: `${baseClass}__item-row`, children: [_jsx("span", { className: `${baseClass}__path`, children: doc.documentPath }), isConflict ? (_jsx(StatusBadge, { statusType: strategyStatusTypes[doc.strategy], label: strategyLabels[doc.strategy] })) : (_jsx(StatusBadge, { statusType: changeTypeStatusTypes[doc.changeType], label: changeTypeLabels[doc.changeType] }))] }), counts && (counts.added > 0 || counts.removed > 0 || counts.modified > 0) && (_jsxs("div", { className: `${baseClass}__diff-counts`, children: [counts.added > 0 && (_jsxs("span", { className: `${baseClass}__diff-badge ${baseClass}__diff-badge--added`, children: ["+", counts.added, " added"] })), counts.removed > 0 && (_jsxs("span", { className: `${baseClass}__diff-badge ${baseClass}__diff-badge--removed`, children: ["-", counts.removed, " removed"] })), counts.modified > 0 && (_jsxs("span", { className: `${baseClass}__diff-badge ${baseClass}__diff-badge--modified`, children: ["~", counts.modified, " modified"] }))] }))] }, doc.documentId));
+        }) }));
+}
+//# sourceMappingURL=DocumentResolutionList.js.map

package/dist/merge/components/merge-resolution/DocumentResolutionList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DocumentResolutionList.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/DocumentResolutionList.tsx"],"names":[],"mappings":"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"}

package/dist/merge/components/merge-resolution/MergeResolutionPage.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import type { P1Client } from '@pantheon-systems/css-client';
+export interface MergeResolutionPageProps {
+    client: P1Client;
+    siteId: string;
+    sourceBranchId: string;
+    targetBranchId: string;
+    sourceBranchName: string;
+    targetBranchName: string;
+    config: unknown;
+    onClose: () => void;
+    onMergeComplete?: () => void;
+}
+export declare function MergeResolutionPage({ client, siteId, sourceBranchId, targetBranchId, sourceBranchName, targetBranchName, config, onClose, onMergeComplete, }: MergeResolutionPageProps): React.ReactElement;
+//# sourceMappingURL=MergeResolutionPage.d.ts.map

package/dist/merge/components/merge-resolution/MergeResolutionPage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MergeResolutionPage.d.ts","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/MergeResolutionPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAS7D,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAID,wBAAgB,mBAAmB,CAAC,EAClC,MAAM,EACN,MAAM,EACN,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE,wBAAwB,GAAG,KAAK,CAAC,YAAY,CA0K/C"}

package/dist/merge/components/merge-resolution/MergeResolutionPage.js

@@ -0,0 +1,90 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useCallback, useMemo } from 'react';
+import { useMergeResolution } from '../../useMergeResolution.js';
+import { diffPuckDataWithPositions } from '../../../versioning/utils/diff.js';
+import { MergeResolutionToolbar } from './MergeResolutionToolbar.js';
+import { DocumentResolutionList } from './DocumentResolutionList.js';
+import { DocumentResolutionDetail } from './DocumentResolutionDetail.js';
+const baseClass = 'merge-resolution-page';
+export function MergeResolutionPage({ client, siteId, sourceBranchId, targetBranchId, sourceBranchName, targetBranchName, config, onClose, onMergeComplete, }) {
+    const hook = useMergeResolution({
+        client,
+        siteId,
+        sourceBranchId,
+        targetBranchId,
+        sourceBranchName,
+        targetBranchName,
+    });
+    useEffect(() => {
+        hook.loadPreview();
+    }, [hook.loadPreview]);
+    const handleExecuteMerge = useCallback(() => {
+        hook.executeMerge();
+    }, [hook.executeMerge]);
+    const handleCreateMergeRequest = useCallback(() => {
+        hook.createMergeRequest();
+    }, [hook.createMergeRequest]);
+    const handleApproveMergeRequest = useCallback(() => {
+        hook.approveMergeRequest();
+    }, [hook.approveMergeRequest]);
+    const conflictCount = useMemo(() => hook.documents.filter((d) => d.changeType === 'conflicting' || d.changeType === 'deleted-on-main').length, [hook.documents]);
+    useEffect(() => {
+        if (hook.mergeSuccess && onMergeComplete) {
+            onMergeComplete();
+        }
+    }, [hook.mergeSuccess, onMergeComplete]);
+    const documentDiffs = useMemo(() => {
+        const diffsMap = new Map();
+        for (const doc of hook.documents) {
+            if (doc.sourceSnapshot && doc.targetSnapshot) {
+                diffsMap.set(doc.documentId, diffPuckDataWithPositions(doc.sourceSnapshot, doc.targetSnapshot));
+            }
+        }
+        return diffsMap;
+    }, [hook.documents]);
+    const diffCounts = useMemo(() => {
+        const counts = new Map();
+        for (const [docId, diffs] of documentDiffs) {
+            const count = { added: 0, removed: 0, modified: 0 };
+            for (const diff of diffs) {
+                if (diff.type === 'added')
+                    count.added++;
+                else if (diff.type === 'removed')
+                    count.removed++;
+                else if (diff.type === 'modified')
+                    count.modified++;
+            }
+            counts.set(docId, count);
+        }
+        return counts;
+    }, [documentDiffs]);
+    const currentDiffs = hook.currentDocument
+        ? documentDiffs.get(hook.currentDocument.documentId) ?? []
+        : [];
+    const toolbarProps = {
+        sourceBranchName,
+        targetBranchName,
+        resolvedCount: hook.resolvedCount,
+        totalCount: hook.totalCount,
+        conflictCount,
+        allResolved: hook.allResolved,
+        mergeExecuting: hook.mergeExecuting,
+        onClose,
+        onExecuteMerge: handleExecuteMerge,
+        onSetAllStrategy: hook.setAllStrategy,
+        onSetRemainingStrategy: hook.setRemainingStrategy,
+        mergeRequest: hook.mergeRequest,
+        mergeRequestCreating: hook.mergeRequestCreating,
+        mergeRequestError: hook.mergeRequestError,
+        onCreateMergeRequest: handleCreateMergeRequest,
+        onApproveMergeRequest: handleApproveMergeRequest,
+    };
+    if (hook.previewLoading) {
+        return (_jsxs("div", { className: baseClass, "data-testid": "merge-resolution-page", children: [_jsx(MergeResolutionToolbar, { ...toolbarProps, resolvedCount: 0, totalCount: 0, allResolved: false, mergeExecuting: false, onExecuteMerge: () => { }, onSetAllStrategy: () => { } }), _jsx("p", { className: `${baseClass}__loading`, children: "Loading merge preview\u2026" })] }));
+    }
+    if (hook.previewError) {
+        return (_jsxs("div", { className: baseClass, "data-testid": "merge-resolution-page", children: [_jsx(MergeResolutionToolbar, { ...toolbarProps, resolvedCount: 0, totalCount: 0, allResolved: false, mergeExecuting: false, onExecuteMerge: () => { }, onSetAllStrategy: () => { } }), _jsx("p", { className: `${baseClass}__error`, children: hook.previewError })] }));
+    }
+    return (_jsxs("div", { className: baseClass, "data-testid": "merge-resolution-page", children: [_jsx(MergeResolutionToolbar, { ...toolbarProps }), hook.mergeError && (_jsx("p", { className: `${baseClass}__merge-error`, role: "alert", children: hook.mergeError })), hook.mergeSuccess && (_jsx("p", { className: `${baseClass}__merge-success`, role: "status", children: "Merge completed successfully." })), _jsxs("div", { className: `${baseClass}__content`, children: [_jsx("div", { className: `${baseClass}__list`, children: _jsx(DocumentResolutionList, { documents: hook.documents, currentIndex: hook.currentIndex, goToNext: hook.goToNext, goToPrevious: hook.goToPrevious, goToNextUnresolved: hook.goToNextUnresolved, goToDocument: hook.goToDocument, setStrategy: hook.setStrategy, setRemainingStrategy: hook.setRemainingStrategy, diffCounts: diffCounts }) }), _jsx("div", { className: `${baseClass}__detail`, children: _jsx(DocumentResolutionDetail, { document: hook.currentDocument, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName, onSetStrategy: hook.setStrategy, onCherryPickSelection: hook.setCherryPickSelection, onAcceptAllComponentProps: hook.acceptAllComponentProps, config: config, diffs: currentDiffs }) })] })] }));
+}
+//# sourceMappingURL=MergeResolutionPage.js.map

package/dist/merge/components/merge-resolution/MergeResolutionPage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MergeResolutionPage.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/MergeResolutionPage.tsx"],"names":[],"mappings":"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"}

package/dist/merge/components/merge-resolution/MergeResolutionToolbar.d.ts

@@ -0,0 +1,26 @@
+import React from 'react';
+import type { MergeRequestStatus } from '@pantheon-systems/css-client';
+export interface MergeResolutionToolbarProps {
+    sourceBranchName: string;
+    targetBranchName: string;
+    resolvedCount: number;
+    totalCount: number;
+    conflictCount?: number;
+    allResolved: boolean;
+    mergeExecuting: boolean;
+    onClose: () => void;
+    onExecuteMerge: () => void;
+    onSetAllStrategy: (strategy: 'accept-draft' | 'accept-live') => void;
+    onSetRemainingStrategy?: (strategy: 'accept-draft' | 'accept-live') => void;
+    mergeRequest?: {
+        id: string;
+        status: MergeRequestStatus;
+        title: string;
+    } | null;
+    mergeRequestCreating?: boolean;
+    mergeRequestError?: string | null;
+    onCreateMergeRequest?: () => void;
+    onApproveMergeRequest?: () => void;
+}
+export declare function MergeResolutionToolbar({ sourceBranchName, targetBranchName, resolvedCount, totalCount, allResolved, mergeExecuting, onClose, onExecuteMerge, onSetAllStrategy, onSetRemainingStrategy, conflictCount, mergeRequest, mergeRequestCreating, mergeRequestError, onCreateMergeRequest, onApproveMergeRequest, }: MergeResolutionToolbarProps): React.ReactElement;
+//# sourceMappingURL=MergeResolutionToolbar.d.ts.map

package/dist/merge/components/merge-resolution/MergeResolutionToolbar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MergeResolutionToolbar.d.ts","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/MergeResolutionToolbar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAExC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,gBAAgB,EAAE,CAAC,QAAQ,EAAE,cAAc,GAAG,aAAa,KAAK,IAAI,CAAC;IACrE,sBAAsB,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,GAAG,aAAa,KAAK,IAAI,CAAC;IAC5E,YAAY,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,kBAAkB,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChF,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,IAAI,CAAC;CACpC;AAID,wBAAgB,sBAAsB,CAAC,EACrC,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,WAAW,EACX,cAAc,EACd,OAAO,EACP,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,aAAa,EACb,YAAY,EACZ,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,GACtB,EAAE,2BAA2B,GAAG,KAAK,CAAC,YAAY,CAmLlD"}

package/dist/merge/components/merge-resolution/MergeResolutionToolbar.js

@@ -0,0 +1,23 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState } from 'react';
+import { IconButton, UtilityButton } from '@pantheon-systems/pds-toolkit-react';
+const baseClass = 'merge-resolution-toolbar';
+export function MergeResolutionToolbar({ sourceBranchName, targetBranchName, resolvedCount, totalCount, allResolved, mergeExecuting, onClose, onExecuteMerge, onSetAllStrategy, onSetRemainingStrategy, conflictCount, mergeRequest, mergeRequestCreating, mergeRequestError, onCreateMergeRequest, onApproveMergeRequest, }) {
+    const [showConfirm, setShowConfirm] = useState(false);
+    const [showShortcuts, setShowShortcuts] = useState(false);
+    const progressPercent = totalCount > 0 ? Math.round((resolvedCount / totalCount) * 100) : 0;
+    const handleExecuteClick = () => {
+        if (showConfirm) {
+            onExecuteMerge();
+            setShowConfirm(false);
+        }
+        else {
+            setShowConfirm(true);
+        }
+    };
+    return (_jsxs("div", { className: baseClass, children: [_jsxs("div", { className: `${baseClass}__left`, children: [_jsx(IconButton, { ariaLabel: "Close", iconName: "xmark", size: "s", hasTooltip: false, hasBorder: false, onClick: onClose }), _jsxs("span", { className: `${baseClass}__branch-label`, children: ["Draft (", sourceBranchName, ") ", '\u2192', " ", targetBranchName] })] }), _jsxs("div", { className: `${baseClass}__center`, children: [_jsxs("span", { className: `${baseClass}__progress`, children: [conflictCount != null && conflictCount > 0
+                                ? `${conflictCount - (totalCount - resolvedCount)} of ${conflictCount} conflicts resolved`
+                                : `${totalCount} documents`, conflictCount != null && totalCount > conflictCount && (_jsxs("span", { className: `${baseClass}__progress-auto`, children: [' ', "(", totalCount - conflictCount, " auto-merged)"] }))] }), _jsx("div", { className: `${baseClass}__progress-bar`, role: "progressbar", "aria-valuenow": progressPercent, "aria-valuemin": 0, "aria-valuemax": 100, "aria-label": `${progressPercent}% resolved`, children: _jsx("div", { className: `${baseClass}__progress-bar-fill`, style: { width: `${progressPercent}%` } }) })] }), _jsxs("div", { className: `${baseClass}__right`, children: [_jsxs("div", { className: "pds-utility-button-group", children: [_jsx(UtilityButton, { label: "Accept all from Draft", onClick: () => onSetAllStrategy('accept-draft') }), _jsx(UtilityButton, { label: "Accept all from Live", onClick: () => onSetAllStrategy('accept-live') }), onSetRemainingStrategy && (_jsxs(_Fragment, { children: [_jsx(UtilityButton, { label: "Accept remaining from Draft", onClick: () => onSetRemainingStrategy('accept-draft') }), _jsx(UtilityButton, { label: "Accept remaining from Live", onClick: () => onSetRemainingStrategy('accept-live') })] })), _jsx("span", { className: "pds-utility-button-group__separator" }), _jsx(UtilityButton, { label: "Keyboard shortcuts", iconName: "command", onClick: () => setShowShortcuts(!showShortcuts), buttonProps: { 'aria-expanded': showShortcuts } })] }), mergeRequestError && _jsx("span", { className: `${baseClass}__mr-error`, children: mergeRequestError }), !mergeRequest && onCreateMergeRequest && (_jsx("button", { type: "button", className: "pds-button pds-button--sm", disabled: !allResolved || mergeRequestCreating, onClick: onCreateMergeRequest, children: mergeRequestCreating ? 'Creating\u2026' : 'Create merge request' })), mergeRequest && mergeRequest.status === 'open' && onApproveMergeRequest && (_jsx("button", { type: "button", className: "pds-button pds-button--sm", onClick: onApproveMergeRequest, children: "Approve merge request" })), mergeRequest &&
+                        (mergeRequest.status === 'approved' || mergeRequest.status === 'conflicted') && (_jsx(_Fragment, { children: showConfirm ? (_jsxs("span", { className: `${baseClass}__confirm`, children: [_jsx("span", { className: `${baseClass}__confirm-text`, children: "Are you sure?" }), _jsx("button", { type: "button", className: `pds-button pds-button--sm ${baseClass}__confirm-button`, onClick: handleExecuteClick, disabled: mergeExecuting, children: mergeExecuting ? 'Merging\u2026' : 'Confirm merge' }), _jsx("button", { type: "button", className: "pds-button pds-button--secondary pds-button--sm", onClick: () => setShowConfirm(false), children: "Cancel" })] })) : (_jsx("button", { type: "button", className: "pds-button pds-button--sm", disabled: mergeExecuting, onClick: handleExecuteClick, children: mergeExecuting ? 'Merging\u2026' : 'Execute merge' })) })), mergeRequest && mergeRequest.status === 'merged' && (_jsxs("span", { className: "pds-status-badge pds-status-badge--neutral", children: [_jsx("span", { className: "pds-status-badge__status pds-status-badge__status--success", children: _jsx("span", { className: "visually-hidden", children: "Status: merged" }) }), _jsx("span", { className: "pds-status-badge__label", children: "Merged" })] }))] }), showShortcuts && (_jsx("div", { className: `${baseClass}__shortcuts`, "data-testid": "keyboard-shortcuts", children: _jsxs("dl", { className: `${baseClass}__shortcuts-list`, children: [_jsx("dt", { children: "J / ArrowDown" }), _jsx("dd", { children: "Next document" }), _jsx("dt", { children: "K / ArrowUp" }), _jsx("dd", { children: "Previous document" }), _jsx("dt", { children: "N" }), _jsx("dd", { children: "Next unresolved" }), _jsx("dt", { children: "1 / 2 / 3" }), _jsx("dd", { children: "Accept Draft / Live / Cherry-pick" }), _jsx("dt", { children: "Shift+D" }), _jsx("dd", { children: "Accept all remaining from Draft" }), _jsx("dt", { children: "Shift+L" }), _jsx("dd", { children: "Accept all remaining from Live" }), _jsx("dt", { children: "Enter" }), _jsx("dd", { children: "Toggle detail view" })] }) }))] }));
+}
+//# sourceMappingURL=MergeResolutionToolbar.js.map

package/dist/merge/components/merge-resolution/MergeResolutionToolbar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MergeResolutionToolbar.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/MergeResolutionToolbar.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAsBhF,MAAM,SAAS,GAAG,0BAA0B,CAAC;AAE7C,MAAM,UAAU,sBAAsB,CAAC,EACrC,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,WAAW,EACX,cAAc,EACd,OAAO,EACP,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,aAAa,EACb,YAAY,EACZ,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,GACO;IAC5B,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,eAAe,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5F,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC9B,IAAI,WAAW,EAAE,CAAC;YAChB,cAAc,EAAE,CAAC;YACjB,cAAc,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACvB,eAAK,SAAS,EAAE,GAAG,SAAS,QAAQ,aAClC,KAAC,UAAU,IACT,SAAS,EAAC,OAAO,EACjB,QAAQ,EAAC,OAAO,EAChB,IAAI,EAAC,GAAG,EACR,UAAU,EAAE,KAAK,EACjB,SAAS,EAAE,KAAK,EAChB,OAAO,EAAE,OAAO,GAChB,EACF,gBAAM,SAAS,EAAE,GAAG,SAAS,gBAAgB,wBACnC,gBAAgB,QAAI,QAAQ,OAAG,gBAAgB,IAClD,IACH,EAEN,eAAK,SAAS,EAAE,GAAG,SAAS,UAAU,aACpC,gBAAM,SAAS,EAAE,GAAG,SAAS,YAAY,aACtC,aAAa,IAAI,IAAI,IAAI,aAAa,GAAG,CAAC;gCACzC,CAAC,CAAC,GAAG,aAAa,GAAG,CAAC,UAAU,GAAG,aAAa,CAAC,OAAO,aAAa,qBAAqB;gCAC1F,CAAC,CAAC,GAAG,UAAU,YAAY,EAC5B,aAAa,IAAI,IAAI,IAAI,UAAU,GAAG,aAAa,IAAI,CACtD,gBAAM,SAAS,EAAE,GAAG,SAAS,iBAAiB,aAC3C,GAAG,OACF,UAAU,GAAG,aAAa,qBACvB,CACR,IACI,EACP,cACE,SAAS,EAAE,GAAG,SAAS,gBAAgB,EACvC,IAAI,EAAC,aAAa,mBACH,eAAe,mBACf,CAAC,mBACD,GAAG,gBACN,GAAG,eAAe,YAAY,YAE1C,cACE,SAAS,EAAE,GAAG,SAAS,qBAAqB,EAC5C,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,eAAe,GAAG,EAAE,GACvC,GACE,IACF,EAEN,eAAK,SAAS,EAAE,GAAG,SAAS,SAAS,aACnC,eAAK,SAAS,EAAC,0BAA0B,aACvC,KAAC,aAAa,IACZ,KAAK,EAAC,uBAAuB,EAC7B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAC/C,EACF,KAAC,aAAa,IACZ,KAAK,EAAC,sBAAsB,EAC5B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAC9C,EACD,sBAAsB,IAAI,CACzB,8BACE,KAAC,aAAa,IACZ,KAAK,EAAC,6BAA6B,EACnC,OAAO,EAAE,GAAG,EAAE,CAAC,sBAAsB,CAAC,cAAc,CAAC,GACrD,EACF,KAAC,aAAa,IACZ,KAAK,EAAC,4BAA4B,EAClC,OAAO,EAAE,GAAG,EAAE,CAAC,sBAAsB,CAAC,aAAa,CAAC,GACpD,IACD,CACJ,EACD,eAAM,SAAS,EAAC,qCAAqC,GAAG,EACxD,KAAC,aAAa,IACZ,KAAK,EAAC,oBAAoB,EAC1B,QAAQ,EAAC,SAAS,EAClB,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,CAAC,aAAa,CAAC,EAC/C,WAAW,EAAE,EAAE,eAAe,EAAE,aAAa,EAAmD,GAChG,IACE,EAEL,iBAAiB,IAAI,eAAM,SAAS,EAAE,GAAG,SAAS,YAAY,YAAG,iBAAiB,GAAQ,EAE1F,CAAC,YAAY,IAAI,oBAAoB,IAAI,CACxC,iBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,2BAA2B,EACrC,QAAQ,EAAE,CAAC,WAAW,IAAI,oBAAoB,EAC9C,OAAO,EAAE,oBAAoB,YAE5B,oBAAoB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,sBAAsB,GAC1D,CACV,EAEA,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,MAAM,IAAI,qBAAqB,IAAI,CAC1E,iBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,2BAA2B,EACrC,OAAO,EAAE,qBAAqB,sCAGvB,CACV,EAEA,YAAY;wBACX,CAAC,YAAY,CAAC,MAAM,KAAK,UAAU,IAAI,YAAY,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI,CAC9E,4BACG,WAAW,CAAC,CAAC,CAAC,CACb,gBAAM,SAAS,EAAE,GAAG,SAAS,WAAW,aACtC,eAAM,SAAS,EAAE,GAAG,SAAS,gBAAgB,8BAAsB,EACnE,iBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,6BAA6B,SAAS,kBAAkB,EACnE,OAAO,EAAE,kBAAkB,EAC3B,QAAQ,EAAE,cAAc,YAEvB,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,GAC5C,EACT,iBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,iDAAiD,EAC3D,OAAO,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,uBAG7B,IACJ,CACR,CAAC,CAAC,CAAC,CACF,iBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,2BAA2B,EACrC,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,kBAAkB,YAE1B,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,GAC5C,CACV,GACA,CACJ,EAEF,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,QAAQ,IAAI,CACnD,gBAAM,SAAS,EAAC,4CAA4C,aAC1D,eAAM,SAAS,EAAC,4DAA4D,YAC1E,eAAM,SAAS,EAAC,iBAAiB,+BAAsB,GAClD,EACP,eAAM,SAAS,EAAC,yBAAyB,uBAAc,IAClD,CACR,IACG,EAEL,aAAa,IAAI,CAChB,cAAK,SAAS,EAAE,GAAG,SAAS,aAAa,iBAAc,oBAAoB,YACzE,cAAI,SAAS,EAAE,GAAG,SAAS,kBAAkB,aAC3C,yCAAsB,EACtB,yCAAsB,EACtB,uCAAoB,EACpB,6CAA0B,EAC1B,6BAAU,EACV,2CAAwB,EACxB,qCAAkB,EAClB,6DAA0C,EAC1C,mCAAgB,EAChB,2DAAwC,EACxC,mCAAgB,EAChB,0DAAuC,EACvC,iCAAc,EACd,8CAA2B,IACxB,GACD,CACP,IACG,CACP,CAAC;AACJ,CAAC"}

package/dist/merge/components/merge-resolution/MergeReviewPage.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+export interface MergeReviewPageProps {
+    /** Puck config for rendering previews. */
+    config: unknown;
+    /** Called when user navigates away from the merge page. */
+    onClose?: () => void;
+    /** Called after a successful merge execution. */
+    onMergeComplete?: () => void;
+}
+export declare function MergeReviewPage({ config, onClose, onMergeComplete, }: MergeReviewPageProps): React.ReactElement;
+//# sourceMappingURL=MergeReviewPage.d.ts.map

package/dist/merge/components/merge-resolution/MergeReviewPage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MergeReviewPage.d.ts","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/MergeReviewPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAKrD,MAAM,WAAW,oBAAoB;IACnC,0CAA0C;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,iDAAiD;IACjD,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAID,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE,oBAAoB,GAAG,KAAK,CAAC,YAAY,CA0F3C"}

package/dist/merge/components/merge-resolution/MergeReviewPage.js

@@ -0,0 +1,26 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState, useCallback } from 'react';
+import { IconButton } from '@pantheon-systems/pds-toolkit-react';
+import { useP1Puck } from '../../../core/P1PuckContext.js';
+import { MergeResolutionPage } from './MergeResolutionPage.js';
+const baseClass = 'merge-review-page';
+export function MergeReviewPage({ config, onClose, onMergeComplete, }) {
+    const { client, siteId, branchId, branches, branchesLoading } = useP1Puck();
+    const [showResolveConflicts, setShowResolveConflicts] = useState(false);
+    const mainBranch = branches.find((b) => b.isMain);
+    const currentBranch = branches.find((b) => b.id === branchId);
+    const isMainBranch = currentBranch?.isMain ?? false;
+    const targetBranchId = mainBranch?.id ?? '';
+    const sourceBranchName = currentBranch?.name ?? '';
+    const targetBranchName = 'Live';
+    const canReview = !branchesLoading && !isMainBranch && !!targetBranchId && branchId !== targetBranchId;
+    const handleMergeComplete = useCallback(() => {
+        setShowResolveConflicts(false);
+        onMergeComplete?.();
+    }, [onMergeComplete]);
+    if (showResolveConflicts && canReview) {
+        return (_jsx(MergeResolutionPage, { client: client, siteId: siteId, sourceBranchId: branchId, targetBranchId: targetBranchId, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName, config: config, onClose: () => setShowResolveConflicts(false), onMergeComplete: handleMergeComplete }));
+    }
+    return (_jsxs("div", { className: baseClass, children: [_jsx("header", { className: `${baseClass}__header`, children: _jsxs("div", { className: `${baseClass}__header-leading`, children: [onClose && (_jsx(IconButton, { ariaLabel: "Close", iconName: "xmark", size: "s", hasTooltip: false, hasBorder: false, onClick: onClose })), _jsx("h2", { className: `${baseClass}__title`, children: "Merge review" })] }) }), _jsx("div", { className: `${baseClass}__body`, children: isMainBranch ? (_jsx("p", { className: `${baseClass}__message`, children: "Switch to a workstream to review and merge changes." })) : (_jsxs("div", { className: `${baseClass}__branch-selectors`, children: [_jsxs("div", { className: `${baseClass}__branch-field`, children: [_jsx("span", { className: `${baseClass}__label`, children: "Draft" }), _jsx("div", { className: `${baseClass}__branch-display`, children: branchesLoading ? '…' : sourceBranchName })] }), _jsx("span", { className: `${baseClass}__arrow`, children: '\u2192' }), _jsxs("div", { className: `${baseClass}__branch-field`, children: [_jsx("span", { className: `${baseClass}__label`, children: "Live" }), _jsx("div", { className: `${baseClass}__branch-display ${baseClass}__branch-display--target`, children: targetBranchName })] }), _jsx("button", { type: "button", className: "pds-button pds-button--sm", disabled: !canReview, onClick: () => setShowResolveConflicts(true), children: branchesLoading ? 'Loading…' : 'Review and merge' })] })) })] }));
+}
+//# sourceMappingURL=MergeReviewPage.js.map

package/dist/merge/components/merge-resolution/MergeReviewPage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MergeReviewPage.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/MergeReviewPage.tsx"],"names":[],"mappings":"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"}