@parhelia/core 0.1.12601 → 0.1.12612

package/dist/editor/client/EditorShell.js

@@ -21,6 +21,7 @@ import ConfirmationDialog from "../ConfirmationDialog";
 import { getItemDescriptor } from "../utils";
 import { EditContextMenu } from "../ContextMenu";
 import { InlineAiTrigger } from "../ai/InlineAiTrigger";
+import { EditorFormHintPopover } from "../page-viewer/EditorFormHintPopover";
 import { FieldEditorPopup } from "../FieldEditorPopup";
 import { ConcurrentUserLimitDialog } from "../ConcurrentUserLimitDialog";
 import { post } from "../services/serviceHelper";
@@ -54,6 +55,11 @@ import { useMediaSelector } from "./hooks/useMediaSelector";
 import { useGlobalEditorKeyDown } from "./hooks/useGlobalEditorKeyDown";
 import { useStartupChecks } from "../settings/status/index";
 import { FeatureGate, LicenseFeatures, LicenseProvider, LicenseOverlay, } from "../../licensing";
+// Sentinel written to the `sidebar` URL param when the user has explicitly closed
+// every sidebar. Distinguishes "no preference yet" (param absent) from "user wants
+// nothing open" (param present with this value) so reload can honor the user's intent.
+const SIDEBAR_NONE_SENTINEL = "none";
+const sidebarUrlValue = (ids) => ids.length ? ids.join(",") : SIDEBAR_NONE_SENTINEL;
 function AgentsSlotContextBridge({ slot }) {
     const editContext = useEditContext();
     const slotContext = useEditorSlotContext({
@@ -178,8 +184,12 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
     const [openSidebars, setOpenSidebars] = useState(() => {
         const sidebarParam = searchParams.get("sidebar");
         let sidebars = [];
-        if (sidebarParam) {
-            sidebars = sidebarParam.split(",").filter(Boolean);
+        // Presence check (not truthiness) so the sentinel "none" is respected across reloads.
+        if (sidebarParam !== null) {
+            sidebars =
+                sidebarParam === SIDEBAR_NONE_SENTINEL
+                    ? []
+                    : sidebarParam.split(",").filter(Boolean);
         }
         else {
             sidebars = [...(configuration.editor.defaultOpenSidebars ?? [])];
@@ -504,6 +514,10 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         });
     }, [editorSlots, showComponentNavigatorDefault]);
     const [showAgentsPanel, setShowAgentsPanel] = useState(userPreferences.showAgentsPanel ?? false);
+    const [editorFormHidden, setEditorFormHiddenState] = useState(userPreferences.editorFormHidden ?? false);
+    const [editorFormHintSeen, setEditorFormHintSeenState] = useState(userPreferences.editorFormHintSeen ?? false);
+    const [editorFormHintVisible, setEditorFormHintVisible] = useState(false);
+    const editorFormToggleButtonRef = useRef(null);
     const [showMinimap, setShowMinimap] = useState(userPreferences.showMinimap ?? true);
     const [showHelpTerminal, setShowHelpTerminal] = useState(false);
     const [helpTerminalInitialPrompt, setHelpTerminalInitialPrompt] = useState(undefined);
@@ -978,6 +992,26 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         setShowMinimap(newValue);
         setUserPreferences({ showMinimap: newValue });
     }, [showMinimap, setUserPreferences]);
+    const handleSetEditorFormHidden = useCallback((value) => {
+        setEditorFormHiddenState(value);
+        setUserPreferences({ editorFormHidden: value });
+    }, [setUserPreferences]);
+    const markEditorFormHintSeen = useCallback(() => {
+        setEditorFormHintSeenState(true);
+        setUserPreferences({ editorFormHintSeen: true });
+    }, [setUserPreferences]);
+    const showEditorFormHint = useCallback(() => {
+        setEditorFormHintVisible(true);
+    }, []);
+    const dismissEditorFormHint = useCallback(() => {
+        setEditorFormHintVisible(false);
+        setEditorFormHintSeenState((prev) => {
+            if (prev)
+                return prev;
+            setUserPreferences({ editorFormHintSeen: true });
+            return true;
+        });
+    }, [setUserPreferences]);
     const handleSetShowHelpTerminal = useCallback((value) => {
         const newValue = typeof value === "function" ? value(showHelpTerminal) : value;
         setShowHelpTerminal(newValue);
@@ -1094,7 +1128,10 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         lastUrlRef.current = window.location.href;
         const keepAliveUrl = "/parhelia/keepalive";
         const runSessionCheck = () => {
-            fetch(keepAliveUrl + "?ts=" + Date.now())
+            fetch(keepAliveUrl + "?ts=" + Date.now(), {
+                credentials: "include",
+                headers: { "Cache-Control": "no-cache" },
+            })
                 .then((response) => {
                 if (response.headers.get("X-Parhelia-Session-Revoked") === "true") {
                     window.dispatchEvent(new CustomEvent("parhelia:session-revoked", {
@@ -1102,15 +1139,23 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                     }));
                     return;
                 }
-                if (response.status === 401 || response.status === 403) {
-                    toast.error("Your session has expired", {
-                        description: "Please login again to continue editing.",
-                        action: {
-                            label: "Login",
-                            onClick: () => (window.location.href = "/sitecore/login"),
+                // A redirected response (e.g. to /sitecore/login) or an explicit
+                // 401/403 both mean the user is no longer authenticated. Let a
+                // single event-driven toast handle the UI.
+                const finalUrl = response.url || "";
+                const redirectedToLogin = response.redirected &&
+                    (/\/sitecore\/login/i.test(finalUrl) ||
+                        /[?&]returnUrl=/i.test(finalUrl));
+                if (redirectedToLogin ||
+                    response.status === 401 ||
+                    response.status === 403) {
+                    window.dispatchEvent(new CustomEvent("parhelia:session-expired", {
+                        detail: {
+                            reason: redirectedToLogin
+                                ? "login-redirect"
+                                : `status-${response.status}`,
                         },
-                        duration: Infinity,
-                    });
+                    }));
                 }
             })
                 .catch((error) => console.error("Keep Alive error:", error));
@@ -1974,16 +2019,12 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         if (!isWorkspaceTransitioning && current.get("workspace") !== viewName) {
             current.set("workspace", viewName);
         }
-        // Sync sidebar state
+        // Sync sidebar state. Always write a value (sentinel when empty) so that an
+        // explicit "user closed everything" state survives a reload.
         const currentSidebars = current.get("sidebar") ?? "";
-        const newSidebars = openSidebars.join(",");
+        const newSidebars = sidebarUrlValue(openSidebars);
         if (currentSidebars !== newSidebars) {
-            if (newSidebars) {
-                current.set("sidebar", newSidebars);
-            }
-            else {
-                current.delete("sidebar");
-            }
+            current.set("sidebar", newSidebars);
         }
         if (showHelpTerminal) {
             current.set("help", selectedHelpSectionId ?? "contents");
@@ -2679,6 +2720,31 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             window.removeEventListener("parhelia:session-revoked", handleRevoked);
         };
     }, [promptSessionReconnect]);
+    // Show a single "session expired" toast with a Login action when any
+    // service call (or the keepalive check) detects that the user is no
+    // longer authenticated. Using a stable toast id coalesces the toast so a
+    // burst of failing calls does not spam the UI with duplicate toasts.
+    useEffect(() => {
+        if (typeof window === "undefined")
+            return;
+        const handleExpired = () => {
+            toast.error("Your session has expired", {
+                id: "session-expired",
+                description: "Please login again to continue editing.",
+                action: {
+                    label: "Login",
+                    onClick: () => {
+                        window.location.href = "/sitecore/login";
+                    },
+                },
+                duration: Infinity,
+            });
+        };
+        window.addEventListener("parhelia:session-expired", handleExpired);
+        return () => {
+            window.removeEventListener("parhelia:session-expired", handleExpired);
+        };
+    }, []);
     const sendSocketMessage = useCallback((message) => {
         if (socketInstanceRef.current &&
             socketInstanceRef.current.readyState === WebSocket.OPEN) {
@@ -2795,7 +2861,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                 setUserPreferences({ showAgentsPanel: false });
             }
             startTransition(() => {
-                updateUrl({ sidebar: newSidebars.join(",") || undefined });
+                updateUrl({ sidebar: sidebarUrlValue(newSidebars) });
             });
             return;
         }
@@ -2818,7 +2884,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             setMobileEditorPanelOpenRaw(false);
         }
         startTransition(() => {
-            updateUrl({ sidebar: newSidebars.join(",") || undefined });
+            updateUrl({ sidebar: sidebarUrlValue(newSidebars) });
         });
     }, [
         updateUrl,
@@ -2856,7 +2922,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             setMobileEditorPanelOpenRaw(false);
         }
         startTransition(() => {
-            updateUrl({ sidebar: newSidebars.join(",") || undefined });
+            updateUrl({ sidebar: sidebarUrlValue(newSidebars) });
         });
     }, [
         updateUrl,
@@ -2936,7 +3002,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         openSidebarsRef.current = nextOpen;
         setOpenSidebars(nextOpen);
         startTransition(() => {
-            updateUrl({ sidebar: nextOpen.join(",") || undefined });
+            updateUrl({ sidebar: sidebarUrlValue(nextOpen) });
         });
         setSidebarStacks((prev) => {
             const normalized = normalizeSidebarStacks(nextOpen, prev);
@@ -3039,14 +3105,23 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
             panels: resolvedPanels,
         };
     }, [getSidebarsForWorkspace, workspaceId]);
+    // Track the last workspaceId this effect saw so we only auto-apply
+    // `currentWorkspace.defaultSidebars` on an actual workspace change. On initial mount
+    // the user's explicit empty state (sidebar=none in URL) must not be overwritten.
+    const prevWorkspaceIdForDefaultsRef = useRef(null);
     useEffect(() => {
         if (!currentWorkspace.supportsSidebars) {
             return;
         }
+        const prev = prevWorkspaceIdForDefaultsRef.current;
+        prevWorkspaceIdForDefaultsRef.current = workspaceId;
+        const isWorkspaceChange = prev !== null && prev !== workspaceId;
         const allowedIds = new Set(getSidebarsForWorkspace(workspaceId).map((sidebar) => sidebar.id));
         const currentOpen = openSidebarsRef.current;
         let nextOpen = currentOpen.filter((id) => allowedIds.has(id));
-        if (nextOpen.length === 0 && currentWorkspace.defaultSidebars?.length) {
+        if (isWorkspaceChange &&
+            nextOpen.length === 0 &&
+            currentWorkspace.defaultSidebars?.length) {
             nextOpen = currentWorkspace.defaultSidebars.filter((id) => allowedIds.has(id));
         }
         const unchanged = nextOpen.length === currentOpen.length &&
@@ -3058,7 +3133,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         setOpenSidebars(nextOpen);
         setSidebarStacks((prev) => normalizeSidebarStacks(nextOpen, prev));
         startTransition(() => {
-            updateUrl({ sidebar: nextOpen.join(",") || undefined });
+            updateUrl({ sidebar: sidebarUrlValue(nextOpen) });
         });
     }, [
         currentWorkspace,
@@ -4247,6 +4322,14 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         setComponentNavigatorOpenForSlot,
         showAgentsPanel,
         setShowAgentsPanel: handleSetShowAgentsPanel,
+        editorFormHidden,
+        setEditorFormHidden: handleSetEditorFormHidden,
+        editorFormHintSeen,
+        markEditorFormHintSeen,
+        editorFormHintVisible,
+        showEditorFormHint,
+        dismissEditorFormHint,
+        editorFormToggleButtonRef,
         showMinimap,
         setShowMinimap: handleSetShowMinimap,
         showHelpTerminal,
@@ -4410,6 +4493,14 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
         handleSetShowComponentNavigator,
         showAgentsPanel,
         handleSetShowAgentsPanel,
+        editorFormHidden,
+        handleSetEditorFormHidden,
+        editorFormHintSeen,
+        markEditorFormHintSeen,
+        editorFormHintVisible,
+        showEditorFormHint,
+        dismissEditorFormHint,
+        editorFormToggleButtonRef,
         showMinimap,
         handleSetShowMinimap,
         showHelpTerminal,
@@ -4716,6 +4807,6 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
                                     if (!open) {
                                         setConcurrentUserLimitError(null);
                                     }
-                                }, sessionId: sessionId, currentUsers: concurrentUserLimitError?.currentUsers ?? 0, maxUsers: concurrentUserLimitError?.maxUsers ?? 0, message: concurrentUserLimitError?.message ?? "", onRetry: handleRetryConnection, isAdministrator: userInfo.user.isAdministrator === true }), _jsx(QuickItemSwitcher, { visible: quickSwitcherVisible, entries: quickSwitcherEntries.slice(0, 5), selectedIndex: quickSwitcherSelectedIndex, onSelect: handleQuickSwitcherSelect, onClose: () => setQuickSwitcherVisible(false) }), _jsx(EditContextMenu, { ref: contextMenuRef }), _jsx(FeatureGate, { feature: LicenseFeatures.AI, children: _jsx(InlineAiTrigger, {}) }), media.mediaSelectorVisible && (_jsx(MediaSelector, { language: editContext.currentItemDescriptor.language, visible: media.mediaSelectorVisible, onHide: media.handleHide, onMediaSelected: media.onMediaSelect, selectedIdPath: media.selectedMediaIdPath, mode: media.mediaSelectorMode, initialSearchTerm: media.initialSearchTerm })), _jsx(FieldEditorPopup, { ref: fieldEditorPopupRef }), _jsx(LicenseOverlay, {})] }) }) }) }) }));
+                                }, sessionId: sessionId, currentUsers: concurrentUserLimitError?.currentUsers ?? 0, maxUsers: concurrentUserLimitError?.maxUsers ?? 0, message: concurrentUserLimitError?.message ?? "", onRetry: handleRetryConnection, isAdministrator: userInfo.user.isAdministrator === true }), _jsx(QuickItemSwitcher, { visible: quickSwitcherVisible, entries: quickSwitcherEntries.slice(0, 5), selectedIndex: quickSwitcherSelectedIndex, onSelect: handleQuickSwitcherSelect, onClose: () => setQuickSwitcherVisible(false) }), _jsx(EditContextMenu, { ref: contextMenuRef }), _jsx(EditorFormHintPopover, {}), _jsx(FeatureGate, { feature: LicenseFeatures.AI, children: _jsx(InlineAiTrigger, {}) }), media.mediaSelectorVisible && (_jsx(MediaSelector, { language: editContext.currentItemDescriptor.language, visible: media.mediaSelectorVisible, onHide: media.handleHide, onMediaSelected: media.onMediaSelect, selectedIdPath: media.selectedMediaIdPath, mode: media.mediaSelectorMode, initialSearchTerm: media.initialSearchTerm })), _jsx(FieldEditorPopup, { ref: fieldEditorPopupRef }), _jsx(LicenseOverlay, {})] }) }) }) }) }));
 }
 //# sourceMappingURL=EditorShell.js.map