gwchq-textjam 0.2.12 → 0.2.14

package/dist/index.js

@@ -68344,8 +68344,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
-/* harmony import */ var _Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53986);
+/* harmony import */ var _Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
+/* harmony import */ var _Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53986);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51649);
 /* harmony import */ var _hello_pangea_dnd__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(98850);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14062);
@@ -68369,7 +68369,7 @@ var DraggableTab = _ref => {
       panelIndex,
       fileIndex
     } = _ref,
-    otherProps = (0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)(_ref, _excluded);
+    otherProps = (0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)(_ref, _excluded);
   var openFiles = (0,react_redux__WEBPACK_IMPORTED_MODULE_1__.useSelector)(state => state.editor.openedFiles);
   var openFilesCount = openFiles[panelIndex].length;
   var dispatch = (0,react_redux__WEBPACK_IMPORTED_MODULE_1__.useDispatch)();
@@ -68386,7 +68386,7 @@ var DraggableTab = _ref => {
       switchToFileTab(panelIndex, (fileIndex + openFilesCount - 1) % openFilesCount);
     }
   };
-  var InnerTab = () => /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_2__.Tab, (0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
+  var InnerTab = () => /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_2__.Tab, (0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
     onClick: e => {
       e.stopPropagation();
       switchToFileTab(panelIndex, fileIndex);
@@ -68404,7 +68404,7 @@ var DraggableTab = _ref => {
         draggableProps,
         dragHandleProps
       } = _ref2;
-      return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", (0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
+      return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", (0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
         className: "draggable-tab",
         ref: innerRef
       }, draggableProps), dragHandleProps), {}, {
@@ -68426,8 +68426,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(89379);
-/* harmony import */ var _Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(53986);
+/* harmony import */ var _Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(89379);
+/* harmony import */ var _Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(53986);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51649);
 /* harmony import */ var _hello_pangea_dnd__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(98850);
 /* harmony import */ var react_tabs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39243);
@@ -68446,8 +68446,8 @@ var DroppableTabList = _ref => {
       children: _children,
       index
     } = _ref,
-    otherProps = (0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(_ref, _excluded);
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_1__.TabList, (0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({}, otherProps), {}, {
+    otherProps = (0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(_ref, _excluded);
+  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_1__.TabList, (0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({}, otherProps), {}, {
     children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_hello_pangea_dnd__WEBPACK_IMPORTED_MODULE_6__.Droppable, {
       direction: "horizontal",
       droppableId: index.toString(),
@@ -68457,7 +68457,7 @@ var DroppableTabList = _ref => {
           droppableProps,
           placeholder
         } = _ref2;
-        return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", (0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({
+        return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", (0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({
           className: "droppable-tab-list"
         }, droppableProps), {}, {
           ref: innerRef,
@@ -103011,7 +103011,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
+/* harmony import */ var _Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51649);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14062);
 /* harmony import */ var _redux_EditorSlice__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(68512);
@@ -103091,7 +103091,7 @@ var ProjectName = _ref => {
       id: "project_name_label",
       className: _styles_module_scss__WEBPACK_IMPORTED_MODULE_3__["default"].projectLabel,
       children: "Project Name"
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", (0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,_Users_hanna_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", (0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,_Users_valeriya_projects_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
       className: classnames__WEBPACK_IMPORTED_MODULE_2___default()(_styles_module_scss__WEBPACK_IMPORTED_MODULE_3__["default"].projectName, className)
     }, hoverProps), {}, {
       children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)((components_Tooltip_Tooltip__WEBPACK_IMPORTED_MODULE_8___default()), {
@@ -373846,6 +373846,7 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
         }
         catch (e) {
             console.error(e);
+            dispatch((0, EditorSlice_1.setSaveTriggered)(false));
             dispatch((0, EditorSlice_1.setSaving)(types_1.SavingState.FAILED));
         }
         // do not include external fn saveProject in dependencies to avoid unwanted calls
@@ -373857,14 +373858,8 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
         project.commitId,
         project.identifier,
     ]);
-    // handle saving update
+    // finish the process if save failed
     (0, react_1.useEffect)(() => {
-        if (!projectData?.commitId ||
-            projectData.commitId === project.commitId ||
-            !saveTriggered ||
-            saving === types_1.SavingState.PROCESS)
-            return;
-        // finish the process if save failed
         if (saving === types_1.SavingState.FAILED) {
             dispatch((0, EditorSlice_1.setSaveTriggered)(false));
             if (leaveFlow.requestId && leaveFlow.status === LeaveFlowSlice_1.LeaveFlowStatus.SAVING)
@@ -373874,6 +373869,14 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
                 }));
             return;
         }
+    }, [dispatch, leaveFlow.requestId, leaveFlow.status, saving]);
+    // handle successful saving update
+    (0, react_1.useEffect)(() => {
+        if (!projectData?.commitId ||
+            projectData.commitId === project.commitId ||
+            !saveTriggered ||
+            saving !== types_1.SavingState.SUCCESS)
+            return;
         const incomingCommits = projectData.commits ?? [];
         const commitsById = new Map();
         [...existingCommits, ...incomingCommits].forEach((commit) => {
@@ -375045,6 +375048,10 @@ const STORE_PROJECTS = "projects";
 const STORE_PROJECT_BIN_INDEX = "project_files";
 const DB_VERSION = 1;
 let dbPromise = null;
+// Helper to reset dbPromise (force reopen)
+function resetDBPromise() {
+    dbPromise = null;
+}
 const openDB = () => {
     if (dbPromise)
         return dbPromise;
@@ -375067,6 +375074,31 @@ const openDB = () => {
     });
     return dbPromise;
 };
+// Silent reopening wrapper for IndexedDb operations
+async function withSilentReopen(fn) {
+    try {
+        return await fn();
+    }
+    catch (err) {
+        if (err &&
+            (err.name === "InvalidStateError" ||
+                err.name === "TransactionInactiveError" ||
+                err.message?.includes("The database connection is closing") ||
+                err.message?.includes("The database connection is not open"))) {
+            resetDBPromise();
+            return await fn();
+        }
+        throw err;
+    }
+}
+// Helper to run a transaction with minimal duplication and silent reopening
+async function runTx(store, mode, op) {
+    return withSilentReopen(async () => {
+        const db = await openDB();
+        const tx = db.transaction(store, mode);
+        return op(tx);
+    });
+}
 function txDone(tx) {
     return new Promise((resolve, reject) => {
         tx.oncomplete = () => resolve();
@@ -375087,69 +375119,74 @@ async function readWithTx(tx, req) {
 }
 exports.IndexedDb = {
     async set(fileId, blob) {
-        const db = await openDB();
-        const tx = db.transaction(STORE_BIN, "readwrite");
-        tx.objectStore(STORE_BIN).put(blob, fileId);
-        await txDone(tx);
+        return runTx(STORE_BIN, "readwrite", async (tx) => {
+            tx.objectStore(STORE_BIN).put(blob, fileId);
+            await txDone(tx);
+        });
     },
     async get(fileId) {
-        const db = await openDB();
-        const tx = db.transaction(STORE_BIN, "readonly");
-        const req = tx.objectStore(STORE_BIN).get(fileId);
-        return readWithTx(tx, req);
+        return runTx(STORE_BIN, "readonly", async (tx) => {
+            const req = tx.objectStore(STORE_BIN).get(fileId);
+            return readWithTx(tx, req);
+        });
     },
     async delete(fileId) {
-        const db = await openDB();
-        const tx = db.transaction(STORE_BIN, "readwrite");
-        tx.objectStore(STORE_BIN).delete(fileId);
-        await txDone(tx);
+        return runTx(STORE_BIN, "readwrite", async (tx) => {
+            tx.objectStore(STORE_BIN).delete(fileId);
+            await txDone(tx);
+        });
     },
     async setProject(projectKey, project) {
         if (!projectKey)
             return;
-        const db = await openDB();
-        const tx = db.transaction(STORE_PROJECTS, "readwrite");
-        tx.objectStore(STORE_PROJECTS).put({ ...project, savedAt: new Date().toISOString() }, projectKey);
-        await txDone(tx);
+        return runTx(STORE_PROJECTS, "readwrite", async (tx) => {
+            tx.objectStore(STORE_PROJECTS).put({
+                ...project,
+                savedAt: new Date().toISOString(),
+            }, projectKey);
+            await txDone(tx);
+        });
     },
     async getProject(projectKey) {
-        const db = await openDB();
-        const tx = db.transaction(STORE_PROJECTS, "readonly");
-        const req = tx.objectStore(STORE_PROJECTS).get(projectKey);
-        return readWithTx(tx, req);
+        return runTx(STORE_PROJECTS, "readonly", async (tx) => {
+            const req = tx.objectStore(STORE_PROJECTS).get(projectKey);
+            return readWithTx(tx, req);
+        });
     },
     async deleteProject(projectKey) {
-        const db = await openDB();
-        const tx = db.transaction(STORE_PROJECTS, "readwrite");
-        tx.objectStore(STORE_PROJECTS).delete(projectKey);
-        await txDone(tx);
+        return runTx(STORE_PROJECTS, "readwrite", async (tx) => {
+            tx.objectStore(STORE_PROJECTS).delete(projectKey);
+            await txDone(tx);
+        });
     },
     async setProjectFileIds(projectKey, fileIds) {
-        const db = await openDB();
-        const tx = db.transaction(STORE_PROJECT_BIN_INDEX, "readwrite");
-        tx.objectStore(STORE_PROJECT_BIN_INDEX).put(fileIds, projectKey);
-        await txDone(tx);
+        return runTx(STORE_PROJECT_BIN_INDEX, "readwrite", async (tx) => {
+            tx.objectStore(STORE_PROJECT_BIN_INDEX).put(fileIds, projectKey);
+            await txDone(tx);
+        });
     },
     async getProjectFileIds(projectKey) {
-        const db = await openDB();
-        const tx = db.transaction(STORE_PROJECT_BIN_INDEX, "readonly");
-        const req = tx.objectStore(STORE_PROJECT_BIN_INDEX).get(projectKey);
-        const res = await readWithTx(tx, req);
-        return res ?? [];
+        return runTx(STORE_PROJECT_BIN_INDEX, "readonly", async (tx) => {
+            const req = tx
+                .objectStore(STORE_PROJECT_BIN_INDEX)
+                .get(projectKey);
+            const res = await readWithTx(tx, req);
+            return res ?? [];
+        });
     },
     async deleteProjectFileIds(projectKey) {
-        const db = await openDB();
-        const tx = db.transaction(STORE_PROJECT_BIN_INDEX, "readwrite");
-        tx.objectStore(STORE_PROJECT_BIN_INDEX).delete(projectKey);
-        await txDone(tx);
+        return runTx(STORE_PROJECT_BIN_INDEX, "readwrite", async (tx) => {
+            tx.objectStore(STORE_PROJECT_BIN_INDEX).delete(projectKey);
+            await txDone(tx);
+        });
     },
     async clearAll() {
-        const db = await openDB();
-        const tx = db.transaction([STORE_BIN, STORE_PROJECTS, STORE_PROJECT_BIN_INDEX], "readwrite");
-        tx.objectStore(STORE_BIN).clear();
-        tx.objectStore(STORE_PROJECTS).clear();
-        tx.objectStore(STORE_PROJECT_BIN_INDEX).clear();
-        await txDone(tx);
+        return runTx([STORE_BIN, STORE_PROJECTS, STORE_PROJECT_BIN_INDEX], "readwrite", async (tx) => {
+            tx.objectStore(STORE_BIN).clear();
+            tx.objectStore(STORE_PROJECTS).clear();
+            tx.objectStore(STORE_PROJECT_BIN_INDEX).clear();
+            await txDone(tx);
+        });
     },
 };
 

package/package.json

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