gwchq-textjam 0.1.63 → 0.1.65

package/dist/index.js

@@ -106163,6 +106163,20 @@ var WebComponentLoader = props => {
       i18n.changeLanguage(locale);
     }
   }, [locale, i18n]);
+  (0,external_react_.useEffect)(() => {
+    var cancelled = false;
+    if (!(projectData !== null && projectData !== void 0 && projectData.templateId)) return;
+    _asyncToGenerator(function* () {
+      if (cancelled) return;
+      var projectCache = yield IndexedDb.IndexedDb.getProject(projectData.identifier);
+      if (!projectCache && !template.isLoading) {
+        yield getTextJamTemplate(projectData.templateId);
+      }
+      return () => {
+        cancelled = true;
+      };
+    })().catch(console.error);
+  }, [projectData === null || projectData === void 0 ? void 0 : projectData.templateId]);
   (0,useProject/* useProject */.U)({
     identifier: projectData === null || projectData === void 0 ? void 0 : projectData.identifier,
     projectData,
@@ -106192,21 +106206,6 @@ var WebComponentLoader = props => {
       document.body.removeChild(script);
     };
   }, []);
-  (0,external_react_.useEffect)(() => {
-    var cancelled = false;
-    if (!projectData) return;
-    _asyncToGenerator(function* () {
-      if (cancelled) return;
-      var projectCache = yield IndexedDb.IndexedDb.getProject(projectData.identifier);
-      if (!projectCache && !template.isLoading) {
-        (0,EditorSlice.setLoading)(types.LoadingState.IDLE);
-        yield getTextJamTemplate(projectData.templateId);
-      }
-      return () => {
-        cancelled = true;
-      };
-    })().catch(console.error);
-  }, [projectData === null || projectData === void 0 ? void 0 : projectData.templateId]);
   var modal = (_ModalTypeToComponent = Modals.ModalTypeToComponentMap[modalWindowShowing]) !== null && _ModalTypeToComponent !== void 0 ? _ModalTypeToComponent : null;
   var renderSuccessState = () => /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)(settings/* SettingsContext */.l.Provider, {
@@ -371237,6 +371236,7 @@ const react_router_dom_1 = __webpack_require__(92648);
 const AuthContext_1 = __webpack_require__(55471);
 __webpack_require__(72788);
 const editorListener_1 = __webpack_require__(41824);
+const Loading_1 = __importDefault(__webpack_require__(34466));
 (0, editorListener_1.registerEditorListeners)();
 const TextJamEditor = ({ onLogoutClick = () => { }, onViewProfileClick = () => { }, onHomeClick = () => { }, getTextJamTemplate = (templateId) => { }, template = {
     isLoading: false,
@@ -371263,7 +371263,7 @@ const TextJamEditor = ({ onLogoutClick = () => { }, onViewProfileClick = () => {
         getTextJamTemplate,
         template,
     };
-    return ((0, jsx_runtime_1.jsx)(react_1.default.StrictMode, { children: (0, jsx_runtime_1.jsx)("div", { id: "textjam-editor", children: (0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: (0, jsx_runtime_1.jsx)("div", { children: "Loading editor\u2026" }), children: (0, jsx_runtime_1.jsx)(react_redux_1.Provider, { store: stores_1.default, children: (0, jsx_runtime_1.jsx)(react_router_dom_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(AuthContext_1.AuthProvider, { onLogout: onLogoutClick, onViewProfile: onViewProfileClick, onHome: onHomeClick, children: (0, jsx_runtime_1.jsx)(WebComponentLoader_1.default, { ...mergedProps }) }) }) }) }) }) }));
+    return ((0, jsx_runtime_1.jsx)(react_1.default.StrictMode, { children: (0, jsx_runtime_1.jsx)("div", { id: "textjam-editor", children: (0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: (0, jsx_runtime_1.jsx)(Loading_1.default, {}), children: (0, jsx_runtime_1.jsx)(react_redux_1.Provider, { store: stores_1.default, children: (0, jsx_runtime_1.jsx)(react_router_dom_1.BrowserRouter, { children: (0, jsx_runtime_1.jsx)(AuthContext_1.AuthProvider, { onLogout: onLogoutClick, onViewProfile: onViewProfileClick, onHome: onHomeClick, children: (0, jsx_runtime_1.jsx)(WebComponentLoader_1.default, { ...mergedProps }) }) }) }) }) }) }));
 };
 exports.TextJamEditor = TextJamEditor;
 
@@ -374752,8 +374752,6 @@ const useProject = ({ loadCache = true, identifier = null, projectData = null, t
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [cacheKey, isEmbedded, isBrowserPreview, isLoading]);
     (0, react_1.useEffect)(() => {
-        if (!!templateId && !template?.data)
-            return;
         if (template?.isLoading)
             return;
         if (project?.identifier === identifier)
@@ -374769,6 +374767,8 @@ const useProject = ({ loadCache = true, identifier = null, projectData = null, t
             dispatch((0, EditorSlice_1.setProject)(cachedProject));
             return;
         }
+        if (!!templateId && template !== null && !template?.data)
+            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
@@ -375457,6 +375457,8 @@ exports.IndexedDb = {
         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);
@@ -375693,7 +375695,8 @@ const validateComponentName = (value, type) => {
         }
         const validExtensions = Object.values(ProjectTypes_1.ProjectFileExtension);
         // Disallow unsupported file extensions
-        if (extension && !validExtensions?.includes(extension.toLowerCase())) {
+        if (extension &&
+            !validExtensions?.includes(extension.toLowerCase())) {
             return {
                 isValid: false,
                 error: NameError.UNSUPPORTED_EXTENSION,
@@ -375708,7 +375711,7 @@ exports.ErrorToMsgMap = {
     [NameError.CHARACTERS_LIMIT]: `Name cannot be longer than ${exports.COMPONENT_NAME_LIMIT} characters.`,
     [NameError.DOTFILE]: "Dotfiles are not allowed.",
     [NameError.SLASH_SYMBOL]: "Name cannot contain slashes.",
-    [NameError.INVALID_CHARACTERS]: "Use only A–Z, a–z, 0–9, dot (.), underscore (_), hyphen (-), parentheses (()), and spaces.",
+    [NameError.INVALID_CHARACTERS]: "Use only A–Z, a–z, 0–9, dot '.', underscore '_', hyphen '-', parentheses '()', and spaces.",
     [NameError.TRAILING_DOT]: "Name cannot end with a dot.",
     [NameError.WINDOWS_RESERVED]: "This name is reserved on Windows.",
     [NameError.NO_EXTENSION]: "File must have an extension.",

package/package.json

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