@parhelia/core 0.1.11180 → 0.1.11199

package/README.md

@@ -1,34 +1,34 @@
-# @parhelia/core
-
-Core components and utilities for the Parhelia visual content editor for Sitecore.
-
-## Installation
-
-```bash
-npm install @parhelia/core
-```
-
-## Usage
-
-```typescript
-import { /* components */ } from '@parhelia/core';
-import '@parhelia/core/styles.css';
-```
-
-## Features
-
-- Visual editor components
-- UI component library
-- Content management utilities
-- Agent-based AI assistance
-- Page wizard functionality
-- Field editing capabilities
-
-## License
-
-See LICENSE file for details.
-
-## Documentation
-
-For complete documentation, visit [https://parhelia.ai](https://parhelia.ai)
-
+# @parhelia/core
+
+Core components and utilities for the Parhelia visual content editor for Sitecore.
+
+## Installation
+
+```bash
+npm install @parhelia/core
+```
+
+## Usage
+
+```typescript
+import { /* components */ } from '@parhelia/core';
+import '@parhelia/core/styles.css';
+```
+
+## Features
+
+- Visual editor components
+- UI component library
+- Content management utilities
+- Agent-based AI assistance
+- Page wizard functionality
+- Field editing capabilities
+
+## License
+
+See LICENSE file for details.
+
+## Documentation
+
+For complete documentation, visit [https://parhelia.ai](https://parhelia.ai)
+

package/dist/editor/Editor.js

@@ -2,21 +2,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { EditorShell } from "./client/EditorShell";
 import { useEffect, useState, useRef } from "react";
-import { flushSync } from "react-dom";
 import { getUserInfo } from "./services/editService";
 import { getSystemStatus, getEditorSettings, saveUserPreferences, } from "./services/systemService";
-import { checkSetupStatus } from "./services/setupService";
-import { SetupWizardPage } from "../setup/SetupWizardPage";
 import uuid from "react-uuid";
 import { getConfiguration } from "../config/config";
-import { SetupLoadingScreen } from "./SetupLoadingScreen";
 export function Editor({ configure, className, page, children, }) {
     const [config, setConfig] = useState();
     const [userInfo, setUserInfo] = useState();
     const [systemStatus, setSystemStatus] = useState();
     const [parheliaSettings, setParheliaSettings] = useState();
-    const [setupStatus, setSetupStatus] = useState(null);
-    const [checkingSetup, setCheckingSetup] = useState(true);
     const hasInitializedRef = useRef(false);
     const sessionId = typeof window !== "undefined"
         ? sessionStorage.getItem("sessionId") || uuid()
@@ -46,37 +40,6 @@ export function Editor({ configure, className, page, children, }) {
                 setParheliaSettings(settings.data);
             }
         });
-        // Check setup status
-        checkSetupStatus()
-            .then((result) => {
-            setSetupStatus(result);
-        })
-            .catch((err) => {
-            console.error("Failed to check setup status:", err);
-            // Continue anyway if setup check fails
-            setSetupStatus({
-                isComplete: true,
-                hasIssues: false,
-                issues: [],
-                isAdministrator: false,
-                missingCount: 0,
-                outdatedCount: 0,
-            });
-        })
-            .finally(() => {
-            // Trigger view transition when setup check completes
-            if (typeof document !== "undefined" &&
-                typeof document.startViewTransition === "function") {
-                document.startViewTransition(() => {
-                    flushSync(() => {
-                        setCheckingSetup(false);
-                    });
-                });
-            }
-            else {
-                setCheckingSetup(false);
-            }
-        });
     }, []);
     useEffect(() => {
         if (!userInfo || !systemStatus)
@@ -87,19 +50,6 @@ export function Editor({ configure, className, page, children, }) {
         });
         setConfig(config);
     }, [userInfo, systemStatus]);
-    // Show loading while checking setup
-    if (checkingSetup) {
-        return _jsx(SetupLoadingScreen, {});
-    }
-    // Show setup wizard if setup is incomplete
-    if (setupStatus?.hasIssues) {
-        return (_jsx(SetupWizardPage, { onComplete: () => {
-                // Refresh setup status
-                checkSetupStatus().then((result) => {
-                    setSetupStatus(result);
-                });
-            } }));
-    }
     if (!userInfo || !systemStatus)
         return null;
     if (systemStatus.messages.some((m) => m.severity === "error")) {

package/dist/editor/Editor.js.map

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

package/dist/editor/client/EditorShell.js

@@ -8,7 +8,7 @@ import { useRouter, useSearchParams, usePathname } from "next/navigation";
 import { findComponent, getComponentById } from "../componentTreeHelper";
 import { getOperationsContext } from "./operations";
 import { handleErrorResult } from "./helpers";
-import { executeFieldAction as executeFieldServerAction, connectSocket, getEditHistory, releaseFieldLocks, validateItems, } from "../services/editService";
+import { executeFieldAction as executeFieldServerAction, connectSocket, getEditHistory, getRunningOperations, releaseFieldLocks, validateItems, } from "../services/editService";
 import { useEditorWebSocket } from "./hooks/useEditorWebSocket";
 import { useSocketMessageHandler } from "./hooks/useSocketMessageHandler";
 import "react-json-view-lite/dist/index.css";
@@ -1209,14 +1209,24 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         setItemVersions(v);
         setItemLanguages(result.data.languages);
     }, [currentItemDescriptorRef.current, setItemVersions, setItemLanguages]);
-    const showErrorToast = useCallback(({ summary, details }) => {
-        toast.error(details || summary || "An error occurred");
+    const showErrorToast = useCallback((error) => {
+        // Handle case where raw result object is passed instead of error shape
+        if (error && typeof error === "object" && ("summary" in error || "details" in error)) {
+            const { summary, details } = error;
+            toast.error(details || summary || "An error occurred");
+        }
+        else {
+            console.warn("showErrorToast called with unexpected value:", error);
+            toast.error("An error occurred");
+        }
     }, []);
     const showInfoToast = useCallback(({ summary, details }) => {
         toast.info(details || summary || "Information");
     }, []);
     const onOperationExecuted = useCallback((op) => {
-        // Replace the operation in edit history with the executed operation
+        // Replace or add the operation in edit history
+        // For long-running operations, this is called immediately with executionStatus: "executing"
+        // so we need to add them to history to show the progress UI
         setEditHistory((prev) => {
             const existingOpIndex = prev.findIndex((x) => x.id === op.id);
             if (existingOpIndex >= 0) {
@@ -1224,7 +1234,8 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 next[existingOpIndex] = op;
                 return next;
             }
-            return prev;
+            // Add the operation if it doesn't exist (e.g., long-running operations)
+            return [op, ...prev];
         });
         if (contentEditorItem?.id === op.mainItem?.id &&
             contentEditorItem?.language === op.mainItem?.language &&
@@ -1278,7 +1289,8 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             }
             return false;
         };
-        if (!matchesScope()) {
+        const scopeMatches = matchesScope();
+        if (!scopeMatches) {
             // Operation doesn't match current scope, don't update history
             return;
         }
@@ -1286,13 +1298,24 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             const existingOpIndex = prev.findIndex((x) => x.id === op.id);
             if (existingOpIndex >= 0) {
                 const next = [...prev];
-                next[existingOpIndex] = op;
+                const existingOp = prev[existingOpIndex];
+                if (!existingOp)
+                    return prev; // Should never happen, but satisfies TypeScript
+                // Merge the update with the existing operation to preserve fields
+                // that aren't included in partial updates (like from operation:progress)
+                // IMPORTANT: Never allow progress to decrease (monotonic progress)
+                const mergedProgress = (existingOp.progress !== undefined && op.progress !== undefined && op.progress < existingOp.progress)
+                    ? existingOp.progress // Keep higher progress
+                    : op.progress;
+                next[existingOpIndex] = { ...existingOp, ...op, progress: mergedProgress };
                 return next;
             }
             // If operation doesn't exist and matches scope, add it
             return [op, ...prev];
         });
     }, [historyMode, showOnlyMyChanges, sessionId, contentEditorItem]);
+    // Ref for markOperationComplete callback (needed because operationsContext is created later)
+    const markOperationCompleteRef = useRef(null);
     // WebSocket message handler and connection
     const messageHandler = useSocketMessageHandler({
         sessionId,
@@ -1313,13 +1336,29 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         socketMessageListeners,
         isItemUsedInCurrentPage,
         updateOperationInHistory,
+        markOperationComplete: (operationId) => {
+            markOperationCompleteRef.current?.(operationId);
+        },
     });
     const { socketRef: socketInstanceRef } = useEditorWebSocket({
         sessionId,
         onMessage: messageHandler,
-        onOpen: () => {
+        onOpen: async () => {
             // Increment socket connection version to trigger re-subscriptions
             setSocketConnectionVersion((v) => v + 1);
+            // Fetch any running operations on (re)connect for auto-resume
+            // This ensures the UI shows operations that are still executing
+            try {
+                const result = await getRunningOperations();
+                if (result.type === "success" && Array.isArray(result.data)) {
+                    result.data.forEach((op) => {
+                        updateOperationInHistory(op);
+                    });
+                }
+            }
+            catch (err) {
+                console.error("Failed to fetch running operations:", err);
+            }
         },
         onError: (error) => console.error("WebSocket error:", error),
         connectSocket,
@@ -1404,6 +1443,10 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
     }, [editContextRef, pathname, router, searchParams, openDialog]);
     const operationsContext = getOperationsContext(state, ui);
     const operations = operationsContext.ops;
+    // Update the ref for markOperationComplete so the socket handler can access it
+    useEffect(() => {
+        markOperationCompleteRef.current = operationsContext.context.markOperationComplete;
+    }, [operationsContext.context.markOperationComplete]);
     // Cleanup pending debounced operations on unmount to prevent stuck "saving" states
     useEffect(() => {
         return () => {
@@ -1855,7 +1898,14 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         },
         selectMedia: media.selectMedia,
         showToast: (message) => {
-            toast(message);
+            // Ensure only strings are passed to toast to prevent accidental JSON display
+            if (typeof message === "string") {
+                toast(message);
+            }
+            else {
+                console.warn("showToast called with non-string value:", message);
+                toast("An operation occurred");
+            }
         },
         scrollIntoView,
         setScrollIntoView,