gwchq-textjam 0.1.90 → 0.1.91

package/dist/index.js

@@ -368547,15 +368547,16 @@ const Tooltip_1 = __importDefault(__webpack_require__(26982));
 const useHover_1 = __webpack_require__(78556);
 const HistoryButton = ({ className }) => {
     const project = (0, stores_1.useAppSelector)((state) => state.editor.project);
+    const commits = (0, stores_1.useAppSelector)((state) => state.editor.commits);
     const ref = (0, react_1.useRef)(null);
     const { hovered, hoverProps } = (0, useHover_1.useHover)();
     const [isContextOpen, setIsContextOpen] = (0, react_1.useState)(false);
     const handleClick = () => {
         setIsContextOpen((prev) => !prev);
     };
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.btnContainer, ...hoverProps, children: [(0, jsx_runtime_1.jsx)(Tooltip_1.default, { message: "Nothing here yet! Once you save your work, versions will appear here so you can restore them.", visible: hovered && !project.commits?.length, position: "bottom" }), (0, jsx_runtime_1.jsx)(Button_1.default, { buttonRef: ref, className: (0, classnames_1.default)(styles_module_scss_1.default.historyButton, className, {
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.btnContainer, ...hoverProps, children: [(0, jsx_runtime_1.jsx)(Tooltip_1.default, { message: "Nothing here yet! Once you save your work, versions will appear here so you can restore them.", visible: hovered && !commits?.length, position: "bottom" }), (0, jsx_runtime_1.jsx)(Button_1.default, { buttonRef: ref, className: (0, classnames_1.default)(styles_module_scss_1.default.historyButton, className, {
                             [styles_module_scss_1.default.historyActive]: isContextOpen,
-                        }), variant: "tertiary", onClickHandler: handleClick, ButtonIcon: () => (0, SvgIcon_1.SvgIcon)({ SvgElement: history_svg_1.default, size: 24 }), disabled: !project.commits?.length })] }), (0, jsx_runtime_1.jsx)(CommitHistoryMenu_1.CommitHistoryMenu, { isOpen: isContextOpen, onClose: () => setIsContextOpen(false), commits: project.commits, btnRef: ref, activeCommitId: project.commitId ?? undefined })] }));
+                        }), variant: "tertiary", onClickHandler: handleClick, ButtonIcon: () => (0, SvgIcon_1.SvgIcon)({ SvgElement: history_svg_1.default, size: 24 }), disabled: !commits?.length })] }), (0, jsx_runtime_1.jsx)(CommitHistoryMenu_1.CommitHistoryMenu, { isOpen: isContextOpen, onClose: () => setIsContextOpen(false), commits: commits, btnRef: ref, activeCommitId: project.commitId ?? undefined })] }));
 };
 exports["default"] = HistoryButton;
 
@@ -370482,14 +370483,14 @@ const ContextMenu = (props) => {
             maxHeight: menuHeight ? `${menuHeight}px` : "fit-content",
         }, position: "anchor", viewScroll: "initial", overflow: "auto", portal: {
             target: portalTarget,
-        }, menuClassName: `${styles_module_scss_1.default.contextMenu} ${styles_module_scss_1.default.visibleScrollbar}`, menuItemFocus: { position: "first" }, state: opened ? "open" : "closed", anchorRef: anchorRef, onClose: onClose, anchorPoint: anchorPoint, gap: gap, children: [(0, jsx_runtime_1.jsx)(react_menu_1.MenuHeader, { className: styles_module_scss_1.default.contextHeader, children: title }), menuOptions.map((option, i) => ((0, jsx_runtime_1.jsxs)(react_menu_1.MenuItem, { className: (0, classnames_1.default)(styles_module_scss_1.default.contextItem, {
-                    [styles_module_scss_1.default.contextItemActive]: option.id === activeItemId,
+        }, menuClassName: `${styles_module_scss_1.default.contextMenu} ${styles_module_scss_1.default.visibleScrollbar}`, menuItemFocus: { position: "first" }, state: opened ? "open" : "closed", anchorRef: anchorRef, onClose: onClose, anchorPoint: anchorPoint, gap: gap, children: [title && ((0, jsx_runtime_1.jsx)(react_menu_1.MenuHeader, { className: styles_module_scss_1.default.contextHeader, children: title })), menuOptions.map((option, i) => ((0, jsx_runtime_1.jsxs)(react_menu_1.MenuItem, { className: (0, classnames_1.default)(styles_module_scss_1.default.contextItem, {
+                    [styles_module_scss_1.default.contextItemActive]: option.id && option.id === activeItemId,
                     [styles_module_scss_1.default.withDivider]: showDivider && i !== menuOptions.length - 1,
                 }), onClick: (e) => {
                     e.stopPropagation = true;
                     option.action?.();
                     onClose();
-                }, children: [(0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.optionContent, children: [option.icon ?? null, option.text] }), hoverElement && option.id !== activeItemId && ((0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.hoverElement, children: hoverElement }))] }, option.id ?? i)))] }));
+                }, children: [(0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.optionContent, children: [option.icon ?? null, option.text] }), hoverElement && ((0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.hoverElement, children: hoverElement }))] }, option.id ?? i)))] }));
 };
 exports["default"] = ContextMenu;
 
@@ -371573,7 +371574,7 @@ const stores_1 = __webpack_require__(32132);
 const ProjectHistoryModal = () => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const isModalOpen = (0, stores_1.useAppSelector)((state) => state.editor.modalWindowShowing === types_1.ModalType.RESTORE_VERSION);
-    const project = (0, stores_1.useAppSelector)((state) => state.editor.project);
+    const commits = (0, stores_1.useAppSelector)((state) => state.editor.commits);
     const args = (0, stores_1.useAppSelector)((state) => state.editor.modalWindowArgs);
     const handleClose = () => dispatch((0, EditorSlice_1.closeModal)());
     const handleRevert = () => {
@@ -371584,7 +371585,7 @@ const ProjectHistoryModal = () => {
         dispatch((0, EditorSlice_1.closeModal)());
     };
     const commitTimestamp = args?.type === types_1.ModalType.RESTORE_VERSION
-        ? project.commits?.find((c) => c.id === args.commitId)?.createdAtFormatted
+        ? commits?.find((c) => c.id === args.commitId)?.createdAtFormatted
         : undefined;
     return ((0, jsx_runtime_1.jsx)(BaseModal_1.default, { isOpen: isModalOpen, closeModal: handleClose, withCloseButton: true, 
         // @ts-ignore
@@ -372128,7 +372129,7 @@ const createProjectArchive_1 = __webpack_require__(46514);
 const Loading_1 = __importDefault(__webpack_require__(34466));
 const stores_1 = __webpack_require__(32132);
 const WebComponentLoader = (props) => {
-    const { locale = "en", projectNameEditable = true, readOnly = false, sidebarOptions = [], project: projectData, saveProject, isSaving, loadProjectContent, projectContent = null, isLoading = false, packageApiUrl, user, isCodeVisible = true, isSharedProject = false, shareLinks, isContentLoaded = null, isSaveSuccess = null, } = props;
+    const { locale = "en", projectNameEditable = true, readOnly = false, sidebarOptions = [], project: projectData, saveProject, isSaving, loadProjectContent, projectContent = null, isLoading = false, packageApiUrl, user, isCodeVisible = true, isSharedProject = false, shareLinks, isContentLoaded = null, isSaveSuccess = null, loadTemplateProjectData, isTemplateDataLoaded = false, } = props;
     const dispatch = (0, react_redux_1.useDispatch)();
     const { t } = (0, react_i18next_1.useTranslation)();
     const [searchParams] = (0, react_router_dom_1.useSearchParams)();
@@ -372190,6 +372191,8 @@ const WebComponentLoader = (props) => {
         isContentLoaded,
         projectContent,
         loadProjectContent,
+        loadTemplateProjectData,
+        isTemplateDataLoaded,
     });
     const onSave = async () => {
         if (!project?.components?.length)
@@ -372872,7 +372875,7 @@ const useIsMounted_1 = __webpack_require__(76314);
 const useProjectCache_1 = __webpack_require__(69557);
 const helpers_1 = __webpack_require__(59578);
 const isFinalLoadingState = (state) => state === types_1.LoadingState.SUCCESS || state === types_1.LoadingState.FAILED;
-const useProject = ({ projectData, projectContent = null, isContentLoaded = null, isLoading = false, loadProjectContent, }) => {
+const useProject = ({ projectData, projectContent = null, isContentLoaded = null, isLoading = false, loadProjectContent, loadTemplateProjectData, isTemplateDataLoaded, }) => {
     const project = (0, stores_1.useAppSelector)((state) => state.editor.project);
     const loadingState = (0, stores_1.useAppSelector)((state) => state.editor.loading);
     const isPreview = (0, stores_1.useAppSelector)((state) => state.editor.isOutputOnly);
@@ -372926,14 +372929,20 @@ const useProject = ({ projectData, projectContent = null, isContentLoaded = null
             dispatch((0, EditorSlice_1.setCommitIdLoadTriggered)(projectData.commitId));
             return;
         }
-        // if no specific commitId provided and not preview, set default data
-        if (!projectData?.commitId && !isPreview) {
-            setProjectDataFromTemplate(projectData);
-            return;
-        }
         // if cached data found and it's not outdated, load from cache
         if (cachedProject && !isCurrentOutdated) {
             dispatch((0, EditorSlice_1.setProject)(cachedProject));
+            dispatch((0, EditorSlice_1.setCommits)({ commits: projectData?.commits ?? [] }));
+            return;
+        }
+        // if no specific commitId provided and not preview, set default data
+        if (!projectData?.commitId && !isPreview) {
+            if (!loadTemplateProjectData || isTemplateDataLoaded) {
+                setProjectDataFromTemplate(projectData);
+            }
+            else {
+                loadTemplateProjectData?.();
+            }
             return;
         }
         // if no flows above applied, set failed loading status
@@ -372953,6 +372962,8 @@ const useProject = ({ projectData, projectContent = null, isContentLoaded = null
         isPreview,
         cacheKey,
         isContentLoaded,
+        loadTemplateProjectData,
+        isTemplateDataLoaded,
     ]);
     // Load commit data when commitIdLoadTriggered is set
     (0, react_1.useEffect)(() => {
@@ -372990,12 +373001,14 @@ const useProject = ({ projectData, projectContent = null, isContentLoaded = null
             // ensure this is the latest load call to avoid race conditions
             if (projectLoadCallIdRef.current !== callId)
                 return;
+            const { commits, ...rest } = projectData;
             dispatch((0, EditorSlice_1.setProject)({
-                ...projectData,
+                ...rest,
                 commitId: commitIdLoadTriggered,
                 components: loadedProject.components,
                 rootDirId: loadedProject.rootDirId,
             }));
+            dispatch((0, EditorSlice_1.setCommits)({ commits: commits ?? [] }));
         })
             .catch((error) => {
             console.error("Error loading project from zip:", error);
@@ -373338,7 +373351,7 @@ exports.EditorSlice = (0, toolkit_1.createSlice)({
         },
         updateProjectCommits: (state, action) => {
             state.project.commitId = action.payload.commitId;
-            state.project.commits = action.payload.commits;
+            state.commits = action.payload.commits;
         },
         updateProjectIdentifier: (state, action) => {
             state.project.identifier = action.payload;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gwchq-textjam",
   "description": "Embeddable React editor used in Raspberry Pi text-based projects.",
-  "version": "0.1.90",
+  "version": "0.1.91",
   "license": "Apache-2.0",
   "homepage": "https://github.com/GirlsFirst/gwchq-textjam",
   "author": "Girls Who Code HQ",