tinacms 0.69.0 → 0.69.3

package/dist/index.es.js

@@ -577,13 +577,13 @@ const buildForm = (doc, cms, formify2, showInSidebar = false, onSubmit) => {
             });
             cms.alerts.success("Document saved!");
           } catch (e) {
-            cms.alerts.error("There was a problem saving your document");
+            cms.alerts.error("There was a problem saving your document.");
             console.error(e);
           }
         }
       } catch (e) {
         console.error(e);
-        cms.alerts.error("There was a problem saving your document");
+        cms.alerts.error("There was a problem saving your document.");
       }
     }
   };
@@ -1175,7 +1175,8 @@ const formify = async ({
                 return formifyInlineFragmentNode({
                   inlineFragmentNode: selectionNode,
                   parentType: type,
-                  path
+                  path,
+                  showInSidebar: true
                 });
               }
               case "Field": {
@@ -1245,7 +1246,8 @@ const formify = async ({
                 return formifyInlineFragmentNode({
                   inlineFragmentNode: selectionNode,
                   parentType: field.type,
-                  path: fieldPath
+                  path: fieldPath,
+                  showInSidebar: false
                 });
               }
               default:
@@ -1259,7 +1261,8 @@ const formify = async ({
   const formifyInlineFragmentNode = ({
     inlineFragmentNode,
     parentType,
-    path
+    path,
+    showInSidebar
   }) => {
     const type = getSelectedUnionType(parentType, inlineFragmentNode);
     if (!type) {
@@ -1270,7 +1273,7 @@ const formify = async ({
         inlineFragmentNode,
         type,
         path,
-        showInSidebar: false
+        showInSidebar
       });
     }
     return {
@@ -1903,7 +1906,7 @@ const useFormify = ({
                 }
               });
             }).catch((e) => {
-              cms.alerts.error(`Unexpected error fetching reference`);
+              cms.alerts.error(`Unexpected error fetching reference.`);
               console.log(e);
             });
           }
@@ -3854,9 +3857,9 @@ const useDocumentCreatorPlugin = (args) => {
                 }
                 return true;
               }
-              const isValid = /^[_a-zA-Z][-,_a-zA-Z0-9]*$/.test(value);
+              const isValid = /^[_a-zA-Z0-9][\-_a-zA-Z0-9]*$/.test(value);
               if (value && !isValid) {
-                return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, - or _";
+                return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, - or _";
               }
             }
           }
@@ -4747,14 +4750,15 @@ const useGetCollection = (cms, collectionName, includeDocuments = true, after =
   const [resetState, setResetSate] = useState(0);
   useEffect(() => {
     const fetchCollection = async () => {
+      var _a;
       if (await api.isAuthenticated()) {
         const { name, order } = JSON.parse(sortKey || "{}");
-        const validSortKey = collectionExtra.fields.map((x) => x.name).includes(name) ? name : void 0;
+        const validSortKey = ((_a = collectionExtra.fields) == null ? void 0 : _a.map((x) => x.name).includes(name)) ? name : void 0;
         try {
           const collection2 = await api.fetchCollection(collectionName, includeDocuments, after, validSortKey, order);
           setCollection(collection2);
         } catch (error2) {
-          cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`, 30 * 1e3);
+          cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`);
           console.error(error2);
           setCollection(void 0);
           setError(error2);
@@ -4857,12 +4861,12 @@ const CollectionListPage = () => {
       startCursor: endCursor,
       sortKey
     }, (collection, _loading, reFetchCollection, collectionExtra) => {
-      var _a, _b;
+      var _a, _b, _c;
       const totalCount = collection.documents.totalCount;
       const documents = collection.documents.edges;
       const admin = cms.api.admin;
       const pageInfo = collection.documents.pageInfo;
-      const fields = collectionExtra.fields.filter((x) => ["string", "number", "datetime"].includes(x.type));
+      const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime"].includes(x.type));
       return /* @__PURE__ */ React.createElement(PageWrapper, null, /* @__PURE__ */ React.createElement(React.Fragment, null, open && /* @__PURE__ */ React.createElement(DeleteModal, {
         filename: vars.relativePath,
         deleteFunc: async () => {
@@ -4878,12 +4882,12 @@ const CollectionListPage = () => {
         },
         close: () => setOpen(false)
       }), /* @__PURE__ */ React.createElement(PageHeader, {
-        isLocalMode: (_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode
+        isLocalMode: (_c = (_b = cms == null ? void 0 : cms.api) == null ? void 0 : _b.tina) == null ? void 0 : _c.isLocalMode
       }, /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", {
         className: "flex flex-col gap-4"
       }, /* @__PURE__ */ React.createElement("h3", {
         className: "font-sans text-2xl text-gray-700"
-      }, collection.label ? collection.label : collection.name), fields.length > 0 && /* @__PURE__ */ React.createElement("div", {
+      }, collection.label ? collection.label : collection.name), (fields == null ? void 0 : fields.length) > 0 && /* @__PURE__ */ React.createElement("div", {
         className: "flex gap-2 items-center"
       }, /* @__PURE__ */ React.createElement("label", {
         htmlFor: "sort",
@@ -5071,8 +5075,8 @@ const createDocument = async (cms, collection, template, mutationInfo, values) =
   if (await api.isAuthenticated()) {
     await api.createDocument(collection.name, relativePath, params);
   } else {
-    const authMessage = `[Error] CreateDocument failed: User is no longer authenticated; please login and try again.`;
-    cms.alerts.error(authMessage, 30 * 1e3);
+    const authMessage = `CreateDocument failed: User is no longer authenticated; please login and try again.`;
+    cms.alerts.error(authMessage);
     console.error(authMessage);
     return false;
   }
@@ -5130,9 +5134,9 @@ const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
               }
               return true;
             }
-            const isValid = /^[_a-zA-Z][\.\-_\/a-zA-Z0-9]*$/.test(value);
+            const isValid = /^[_a-zA-Z0-9][\.\-_\/a-zA-Z0-9]*$/.test(value);
             if (value && !isValid) {
-              return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
+              return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
             }
           }
         },
@@ -5188,7 +5192,7 @@ const useGetDocument = (cms, collectionName, relativePath) => {
           const response = await api.fetchDocument(collectionName, relativePath);
           setDocument(response.document);
         } catch (error2) {
-          cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`, 30 * 1e3);
+          cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`);
           console.error(error2);
           setDocument(void 0);
           setError(error2);
@@ -5226,8 +5230,8 @@ const updateDocument = async (cms, relativePath, collection, mutationInfo, value
   if (await api.isAuthenticated()) {
     await api.updateDocument(collection.name, relativePath, params);
   } else {
-    const authMessage = `[Error] UpdateDocument failed: User is no longer authenticated; please login and try again.`;
-    cms.alerts.error(authMessage, 30 * 1e3);
+    const authMessage = `UpdateDocument failed: User is no longer authenticated; please login and try again.`;
+    cms.alerts.error(authMessage);
     console.error(authMessage);
     return false;
   }

package/dist/index.js

@@ -595,13 +595,13 @@
               });
               cms.alerts.success("Document saved!");
             } catch (e) {
-              cms.alerts.error("There was a problem saving your document");
+              cms.alerts.error("There was a problem saving your document.");
               console.error(e);
             }
           }
         } catch (e) {
           console.error(e);
-          cms.alerts.error("There was a problem saving your document");
+          cms.alerts.error("There was a problem saving your document.");
         }
       }
     };
@@ -1193,7 +1193,8 @@
                   return formifyInlineFragmentNode({
                     inlineFragmentNode: selectionNode,
                     parentType: type,
-                    path
+                    path,
+                    showInSidebar: true
                   });
                 }
                 case "Field": {
@@ -1263,7 +1264,8 @@
                   return formifyInlineFragmentNode({
                     inlineFragmentNode: selectionNode,
                     parentType: field.type,
-                    path: fieldPath
+                    path: fieldPath,
+                    showInSidebar: false
                   });
                 }
                 default:
@@ -1277,7 +1279,8 @@
     const formifyInlineFragmentNode = ({
       inlineFragmentNode,
       parentType,
-      path
+      path,
+      showInSidebar
     }) => {
       const type = getSelectedUnionType(parentType, inlineFragmentNode);
       if (!type) {
@@ -1288,7 +1291,7 @@
           inlineFragmentNode,
           type,
           path,
-          showInSidebar: false
+          showInSidebar
         });
       }
       return {
@@ -1921,7 +1924,7 @@
                   }
                 });
               }).catch((e) => {
-                cms.alerts.error(`Unexpected error fetching reference`);
+                cms.alerts.error(`Unexpected error fetching reference.`);
                 console.log(e);
               });
             }
@@ -3872,9 +3875,9 @@ mutation addPendingDocumentMutation(
                   }
                   return true;
                 }
-                const isValid = /^[_a-zA-Z][-,_a-zA-Z0-9]*$/.test(value);
+                const isValid = /^[_a-zA-Z0-9][\-_a-zA-Z0-9]*$/.test(value);
                 if (value && !isValid) {
-                  return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, - or _";
+                  return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, - or _";
                 }
               }
             }
@@ -4765,14 +4768,15 @@ This will work when developing locally but NOT when deployed to production.
     const [resetState, setResetSate] = React.useState(0);
     React.useEffect(() => {
       const fetchCollection = async () => {
+        var _a;
         if (await api.isAuthenticated()) {
           const { name, order } = JSON.parse(sortKey || "{}");
-          const validSortKey = collectionExtra.fields.map((x) => x.name).includes(name) ? name : void 0;
+          const validSortKey = ((_a = collectionExtra.fields) == null ? void 0 : _a.map((x) => x.name).includes(name)) ? name : void 0;
           try {
             const collection2 = await api.fetchCollection(collectionName, includeDocuments, after, validSortKey, order);
             setCollection(collection2);
           } catch (error2) {
-            cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`, 30 * 1e3);
+            cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`);
             console.error(error2);
             setCollection(void 0);
             setError(error2);
@@ -4875,12 +4879,12 @@ This will work when developing locally but NOT when deployed to production.
         startCursor: endCursor,
         sortKey
       }, (collection, _loading, reFetchCollection, collectionExtra) => {
-        var _a, _b;
+        var _a, _b, _c;
         const totalCount = collection.documents.totalCount;
         const documents = collection.documents.edges;
         const admin = cms.api.admin;
         const pageInfo = collection.documents.pageInfo;
-        const fields = collectionExtra.fields.filter((x) => ["string", "number", "datetime"].includes(x.type));
+        const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime"].includes(x.type));
         return /* @__PURE__ */ React__default["default"].createElement(PageWrapper, null, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, open && /* @__PURE__ */ React__default["default"].createElement(DeleteModal, {
           filename: vars.relativePath,
           deleteFunc: async () => {
@@ -4896,12 +4900,12 @@ This will work when developing locally but NOT when deployed to production.
           },
           close: () => setOpen(false)
         }), /* @__PURE__ */ React__default["default"].createElement(PageHeader, {
-          isLocalMode: (_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode
+          isLocalMode: (_c = (_b = cms == null ? void 0 : cms.api) == null ? void 0 : _b.tina) == null ? void 0 : _c.isLocalMode
         }, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, /* @__PURE__ */ React__default["default"].createElement("div", {
           className: "flex flex-col gap-4"
         }, /* @__PURE__ */ React__default["default"].createElement("h3", {
           className: "font-sans text-2xl text-gray-700"
-        }, collection.label ? collection.label : collection.name), fields.length > 0 && /* @__PURE__ */ React__default["default"].createElement("div", {
+        }, collection.label ? collection.label : collection.name), (fields == null ? void 0 : fields.length) > 0 && /* @__PURE__ */ React__default["default"].createElement("div", {
           className: "flex gap-2 items-center"
         }, /* @__PURE__ */ React__default["default"].createElement("label", {
           htmlFor: "sort",
@@ -5089,8 +5093,8 @@ This will work when developing locally but NOT when deployed to production.
     if (await api.isAuthenticated()) {
       await api.createDocument(collection.name, relativePath, params);
     } else {
-      const authMessage = `[Error] CreateDocument failed: User is no longer authenticated; please login and try again.`;
-      cms.alerts.error(authMessage, 30 * 1e3);
+      const authMessage = `CreateDocument failed: User is no longer authenticated; please login and try again.`;
+      cms.alerts.error(authMessage);
       console.error(authMessage);
       return false;
     }
@@ -5148,9 +5152,9 @@ This will work when developing locally but NOT when deployed to production.
                 }
                 return true;
               }
-              const isValid = /^[_a-zA-Z][\.\-_\/a-zA-Z0-9]*$/.test(value);
+              const isValid = /^[_a-zA-Z0-9][\.\-_\/a-zA-Z0-9]*$/.test(value);
               if (value && !isValid) {
-                return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
+                return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
               }
             }
           },
@@ -5206,7 +5210,7 @@ This will work when developing locally but NOT when deployed to production.
             const response = await api.fetchDocument(collectionName, relativePath);
             setDocument(response.document);
           } catch (error2) {
-            cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`, 30 * 1e3);
+            cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`);
             console.error(error2);
             setDocument(void 0);
             setError(error2);
@@ -5244,8 +5248,8 @@ This will work when developing locally but NOT when deployed to production.
     if (await api.isAuthenticated()) {
       await api.updateDocument(collection.name, relativePath, params);
     } else {
-      const authMessage = `[Error] UpdateDocument failed: User is no longer authenticated; please login and try again.`;
-      cms.alerts.error(authMessage, 30 * 1e3);
+      const authMessage = `UpdateDocument failed: User is no longer authenticated; please login and try again.`;
+      cms.alerts.error(authMessage);
       console.error(authMessage);
       return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.69.0",
+  "version": "0.69.3",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -50,7 +50,7 @@
     "@react-hook/window-size": "^3.0.7",
     "@tinacms/schema-tools": "0.1.0",
     "@tinacms/sharedctx": "0.1.2",
-    "@tinacms/toolkit": "0.57.0",
+    "@tinacms/toolkit": "0.57.2",
     "crypto-js": "^4.0.0",
     "fetch-ponyfill": "^7.1.0",
     "final-form": "4.20.1",
@@ -70,7 +70,7 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.2",
     "@testing-library/user-event": "^12.7.0",
-    "@tinacms/scripts": "0.51.0",
+    "@tinacms/scripts": "0.51.1",
     "@types/jest": "^27.0.1",
     "@types/lodash": "^4.14.169",
     "@types/node": "^14.0.13",
@@ -80,7 +80,7 @@
     "isomorphic-fetch": "^3.0.0",
     "jest": "^27.0.6",
     "jest-file-snapshot": "^0.5.0",
-    "next": "9.4.2",
+    "next": "12.2.4",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-is": "^17.0.2",