gwchq-textjam 0.1.82 → 0.1.83

package/dist/index.js

@@ -371948,7 +371948,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 = [], loadCache = true, project: projectData, saveProject, isSaving, loadCommit = (commitId) => { }, commits = [], projectContent = null, isLoading = false, packageApiUrl, user, getTextJamTemplate, template, isCodeVisible = true, isSharedProject = false, shareLinks, } = props;
+    const { locale = "en", projectNameEditable = true, readOnly = false, sidebarOptions = [], loadCache = true, project: projectData, saveProject, isSaving, loadCommit, commits = [], projectContent = null, isLoading = false, packageApiUrl, user, getTextJamTemplate, template, isCodeVisible = true, isSharedProject = false, shareLinks, } = props;
     const dispatch = (0, react_redux_1.useDispatch)();
     const { t } = (0, react_i18next_1.useTranslation)();
     const project = (0, stores_1.useAppSelector)((state) => state.editor.project);
@@ -371972,7 +371972,8 @@ const WebComponentLoader = (props) => {
         dispatch((0, EditorSlice_1.setCommits)({ commits }));
     }, [commits, dispatch]);
     (0, react_1.useEffect)(() => {
-        dispatch((0, EditorSlice_1.setLoadCommit)({ loadCommit }));
+        if (loadCommit)
+            dispatch((0, EditorSlice_1.setLoadCommit)({ loadCommit }));
     }, [loadCommit, dispatch]);
     (0, react_1.useEffect)(() => {
         if (shareLinks)
@@ -372027,6 +372028,7 @@ const WebComponentLoader = (props) => {
         saveTriggered,
         onSave,
         user,
+        isShared: isSharedProject,
     });
     (0, react_1.useEffect)(() => {
         dispatch((0, EditorSlice_1.setReadOnly)(readOnly));
@@ -372676,7 +372678,8 @@ const useProject = ({ loadCache = true, identifier = null, projectData = null, t
             try {
                 let currentIndexDb = null;
                 try {
-                    currentIndexDb = await IndexedDb_1.IndexedDb.getProject(project.identifier) ?? null;
+                    currentIndexDb =
+                        (await IndexedDb_1.IndexedDb.getProject(project.identifier)) ?? null;
                 }
                 catch (e) { }
                 const currentCommit = commits.find((item) => item.id === projectData.commitId) ?? null;
@@ -372686,7 +372689,8 @@ const useProject = ({ loadCache = true, identifier = null, projectData = null, t
                     !!projectData.commitId &&
                     !!currentIndexDb &&
                     !currentIndexDb?.commitId &&
-                    !!projectContent) { //"Project was saved first time. Copy database. Remove old version from database"
+                    !!projectContent) {
+                    //"Project was saved first time. Copy database. Remove old version from database"
                     setAppliedCommit(projectData.commitId ?? null);
                     const loaded = {
                         ...currentIndexDb,
@@ -372700,18 +372704,27 @@ const useProject = ({ loadCache = true, identifier = null, projectData = null, t
                     //remove old project
                     await IndexedDb_1.IndexedDb.deleteProject(project.identifier);
                 }
-                else if ((!project.identifier || projectData.identifier === project.identifier) &&
+                else if ((!project.identifier ||
+                    projectData.identifier === project.identifier) &&
                     !!projectData.commitId &&
                     (!project.commitId || project.commitId === projectData.commitId) &&
                     !!currentCommit &&
-                    !appliedCommit) { // Handling commit loading when the project is accessed directly via a URL
-                    const savedAtDate = currentIndexDb?.savedAt ? new Date(currentIndexDb.savedAt) : null;
+                    !appliedCommit) {
+                    // Handling commit loading when the project is accessed directly via a URL
+                    const savedAtDate = currentIndexDb?.savedAt
+                        ? new Date(currentIndexDb.savedAt)
+                        : null;
                     const currentCommitDate = new Date(currentCommit.createdAt);
-                    const isCommitLater = savedAtDate ? savedAtDate < currentCommitDate : true;
-                    if ((!currentIndexDb || !currentIndexDb.commitId || isCommitLater) && !projectContent) { // The commit is newer than the cached version, so load the latest commit
+                    const isCommitLater = savedAtDate
+                        ? savedAtDate < currentCommitDate
+                        : true;
+                    if ((!currentIndexDb || !currentIndexDb.commitId || isCommitLater) &&
+                        !projectContent) {
+                        // The commit is newer than the cached version, so load the latest commit
                         loadCommit?.(projectData.commitId);
                     }
-                    else if (!!projectContent) { // Commit data has been loaded, now apply it to the project state
+                    else if (!!projectContent) {
+                        // Commit data has been loaded, now apply it to the project state
                         const identifier = projectData.identifier;
                         const { components, rootDirId } = await (0, loadProjectFromZip_1.loadProjectFromZip)({
                             zipBlob: projectContent,
@@ -372799,9 +372812,10 @@ const useProject = ({ loadCache = true, identifier = null, projectData = null, t
             return;
         // in case no identifier and no cached project, or provided identifier doesn't match cached project,
         // create default project
-        const defaultProject = template?.data ?? (projectData?.project_type === ProjectTypes_1.ProjectType.WEB
-            ? (0, defaultProjects_1.createDefaultWebProject)()
-            : (0, defaultProjects_1.createDefaultPythonProject)());
+        const defaultProject = template?.data ??
+            (projectData?.project_type === ProjectTypes_1.ProjectType.WEB
+                ? (0, defaultProjects_1.createDefaultWebProject)()
+                : (0, defaultProjects_1.createDefaultPythonProject)());
         // if no identifier is provided, generate basic project
         if (!identifier) {
             dispatch((0, EditorSlice_1.setProject)(defaultProject));
@@ -372825,7 +372839,15 @@ const useProject = ({ loadCache = true, identifier = null, projectData = null, t
             return;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [project?.identifier, cachedProject, cacheLoaded, i18n.language, template, templateId, projectContent]);
+    }, [
+        project?.identifier,
+        cachedProject,
+        cacheLoaded,
+        i18n.language,
+        template,
+        templateId,
+        projectContent,
+    ]);
 };
 exports.useProject = useProject;
 
@@ -372846,7 +372868,7 @@ const Notifications_1 = __webpack_require__(73606);
 const IndexedDb_1 = __webpack_require__(27161);
 const ProjectTypes_1 = __webpack_require__(27130);
 const COMBINED_FILE_SIZE_SOFT_LIMIT = 1000000;
-const useProjectPersistence = ({ user, project, justLoaded, hasShownSavePrompt, saveTriggered, onSave, }) => {
+const useProjectPersistence = ({ user, project, justLoaded, hasShownSavePrompt, saveTriggered, onSave, isShared, }) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const combinedFileSize = project?.components?.reduce((sum, component) => {
         if (component.type !== ProjectTypes_1.ProjectComponentType.FILE) {
@@ -372882,7 +372904,10 @@ const useProjectPersistence = ({ user, project, justLoaded, hasShownSavePrompt,
                 dispatch((0, EditorSlice_1.expireJustLoaded)());
             }
             else {
-                if (!hasShownSavePrompt && user && (0, projectHelpers_1.isOwner)(user, project)) {
+                if (!hasShownSavePrompt &&
+                    user &&
+                    (0, projectHelpers_1.isOwner)(user, project) &&
+                    !isShared) {
                     (0, Notifications_1.showSavePrompt)();
                     dispatch((0, EditorSlice_1.setHasShownSavePrompt)());
                 }

package/package.json

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