tinacms 0.66.1 → 0.66.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # tinacms
 
+## 0.66.2
+
+### Patch Changes
+
+- 102628c7f: Fixes admin page wrapper scrolling
+- 55cb0c5ec: Updates the relativePath field for clarity
+- 9e77273d2: use collection name as fallback for label
+- Updated dependencies [8c18edd5c]
+- Updated dependencies [0773f6486]
+- Updated dependencies [d8cd60f65]
+- Updated dependencies [9e77273d2]
+- Updated dependencies [63a74aece]
+  - @tinacms/toolkit@0.56.12
+
 ## 0.66.1
 
 ### Patch Changes

package/dist/index.es.js

@@ -2763,7 +2763,7 @@ class ErrorBoundary extends React.Component {
     return { hasError: true, message: error.message };
   }
   render() {
-    const branchData = window.localStorage.getItem("tinacms-current-branch");
+    const branchData = window.localStorage && window.localStorage.getItem("tinacms-current-branch");
     const hasBranchData = branchData && branchData.length > 0;
     if (this.state.hasError && !this.state.pageRefresh) {
       return /* @__PURE__ */ React.createElement("div", {
@@ -3204,7 +3204,7 @@ const Sidebar = ({ cms }) => {
       Icon: view.Icon ? view.Icon : ImFilesEmpty
     }),
     RenderNavCollection: ({ collection }) => /* @__PURE__ */ React.createElement(SidebarLink, {
-      label: collection.label,
+      label: collection.label ? collection.label : collection.name,
       to: `collections/${collection.name}`,
       Icon: ImFilesEmpty
     })
@@ -3316,7 +3316,7 @@ const PageWrapper = ({
   children
 }) => {
   return /* @__PURE__ */ React.createElement("div", {
-    className: "relative left-0 w-full h-full bg-gray-50 shadow-2xl overflow-hidden transition-opacity duration-300 ease-out flex flex-col opacity-100"
+    className: "relative left-0 w-full h-full bg-gray-50 shadow-2xl overflow-y-auto transition-opacity duration-300 ease-out flex flex-col opacity-100"
   }, children);
 };
 const PageHeader = ({
@@ -3423,7 +3423,7 @@ const CollectionListPage = () => {
         isLocalMode: (_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode
       }, /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("h3", {
         className: "text-2xl text-gray-700"
-      }, collection.label), !collection.templates && /* @__PURE__ */ React.createElement(Link, {
+      }, collection.label ? collection.label : collection.name), !collection.templates && /* @__PURE__ */ React.createElement(Link, {
         to: `new`,
         className: "icon-parent inline-flex items-center font-medium focus:outline-none focus:ring-2 focus:shadow-outline text-center rounded-full justify-center transition-all duration-150 ease-out  shadow text-white bg-blue-500 hover:bg-blue-600 focus:ring-blue-500 text-sm h-10 px-6"
       }, "Create New", " ", /* @__PURE__ */ React.createElement(BiPlus, {
@@ -3572,8 +3572,9 @@ const GetDocumentFields = ({
 };
 const createDocument = async (cms, collection, template, mutationInfo, values) => {
   const api = new TinaAdminApi(cms);
-  const _a = values, { relativePath } = _a, leftover = __objRest(_a, ["relativePath"]);
+  const _a = values, { filename } = _a, leftover = __objRest(_a, ["filename"]);
   const { includeCollection, includeTemplate } = mutationInfo;
+  const relativePath = `${filename}.${collection.format}`;
   const params = transformDocumentIntoMutationRequestPayload(__spreadValues(__spreadValues({
     _collection: collection.name
   }, template && { _template: template.name }), leftover), {
@@ -3606,11 +3607,23 @@ const RenderForm$1 = ({ cms, collection, template, fields, mutationInfo }) => {
       label: "form",
       fields: [
         {
-          name: "relativePath",
-          label: "Relative Path",
+          name: "filename",
+          label: "Filename",
           component: "text",
-          required: true,
-          defaultValue: `${collection.name}${Date.now()}.${collection.format}`
+          description: `A unique filename for the content.  Example: My_Document`,
+          placeholder: `My_Document`,
+          validate: (value, allValues, meta) => {
+            if (!value) {
+              if (meta.dirty) {
+                return "Required";
+              }
+              return true;
+            }
+            const isValid = /^[_a-zA-Z][-,_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 _";
+            }
+          }
         },
         ...fields
       ],
@@ -3631,7 +3644,7 @@ const RenderForm$1 = ({ cms, collection, template, fields, mutationInfo }) => {
   }, /* @__PURE__ */ React.createElement(Link, {
     to: `/collections/${collection.name}`,
     className: "inline-block text-current hover:text-blue-400 focus:underline focus:outline-none focus:text-blue-400 font-medium transition-colors duration-150 ease-out"
-  }, collection.label), /* @__PURE__ */ React.createElement(HiChevronRight, {
+  }, collection.label ? collection.label : collection.name), /* @__PURE__ */ React.createElement(HiChevronRight, {
     className: "inline-block -mt-0.5 opacity-50"
   })), /* @__PURE__ */ React.createElement("span", {
     className: "text-xl text-gray-700 font-medium leading-tight"
@@ -3730,7 +3743,7 @@ const RenderForm = ({
   }, /* @__PURE__ */ React.createElement(Link, {
     to: `/collections/${collection.name}`,
     className: "inline-block text-current hover:text-blue-400 focus:underline focus:outline-none focus:text-blue-400 font-medium transition-colors duration-150 ease-out"
-  }, collection.label), /* @__PURE__ */ React.createElement(HiChevronRight, {
+  }, collection.label ? collection.label : collection.name), /* @__PURE__ */ React.createElement(HiChevronRight, {
     className: "inline-block -mt-0.5 opacity-50"
   })), /* @__PURE__ */ React.createElement("span", {
     className: "text-xl text-gray-700 font-medium leading-tight"

package/dist/index.js

@@ -2783,7 +2783,7 @@ Document
       return { hasError: true, message: error.message };
     }
     render() {
-      const branchData = window.localStorage.getItem("tinacms-current-branch");
+      const branchData = window.localStorage && window.localStorage.getItem("tinacms-current-branch");
       const hasBranchData = branchData && branchData.length > 0;
       if (this.state.hasError && !this.state.pageRefresh) {
         return /* @__PURE__ */ React__default["default"].createElement("div", {
@@ -3224,7 +3224,7 @@ This will work when developing locally but NOT when deployed to production.
         Icon: view.Icon ? view.Icon : ImFilesEmpty
       }),
       RenderNavCollection: ({ collection }) => /* @__PURE__ */ React__default["default"].createElement(SidebarLink, {
-        label: collection.label,
+        label: collection.label ? collection.label : collection.name,
         to: `collections/${collection.name}`,
         Icon: ImFilesEmpty
       })
@@ -3336,7 +3336,7 @@ This will work when developing locally but NOT when deployed to production.
     children
   }) => {
     return /* @__PURE__ */ React__default["default"].createElement("div", {
-      className: "relative left-0 w-full h-full bg-gray-50 shadow-2xl overflow-hidden transition-opacity duration-300 ease-out flex flex-col opacity-100"
+      className: "relative left-0 w-full h-full bg-gray-50 shadow-2xl overflow-y-auto transition-opacity duration-300 ease-out flex flex-col opacity-100"
     }, children);
   };
   const PageHeader = ({
@@ -3443,7 +3443,7 @@ This will work when developing locally but NOT when deployed to production.
           isLocalMode: (_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode
         }, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, /* @__PURE__ */ React__default["default"].createElement("h3", {
           className: "text-2xl text-gray-700"
-        }, collection.label), !collection.templates && /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Link, {
+        }, collection.label ? collection.label : collection.name), !collection.templates && /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Link, {
           to: `new`,
           className: "icon-parent inline-flex items-center font-medium focus:outline-none focus:ring-2 focus:shadow-outline text-center rounded-full justify-center transition-all duration-150 ease-out  shadow text-white bg-blue-500 hover:bg-blue-600 focus:ring-blue-500 text-sm h-10 px-6"
         }, "Create New", " ", /* @__PURE__ */ React__default["default"].createElement(BiPlus, {
@@ -3592,8 +3592,9 @@ This will work when developing locally but NOT when deployed to production.
   };
   const createDocument = async (cms, collection, template, mutationInfo, values) => {
     const api = new TinaAdminApi(cms);
-    const _a = values, { relativePath } = _a, leftover = __objRest(_a, ["relativePath"]);
+    const _a = values, { filename } = _a, leftover = __objRest(_a, ["filename"]);
     const { includeCollection, includeTemplate } = mutationInfo;
+    const relativePath = `${filename}.${collection.format}`;
     const params = transformDocumentIntoMutationRequestPayload(__spreadValues(__spreadValues({
       _collection: collection.name
     }, template && { _template: template.name }), leftover), {
@@ -3626,11 +3627,23 @@ This will work when developing locally but NOT when deployed to production.
         label: "form",
         fields: [
           {
-            name: "relativePath",
-            label: "Relative Path",
+            name: "filename",
+            label: "Filename",
             component: "text",
-            required: true,
-            defaultValue: `${collection.name}${Date.now()}.${collection.format}`
+            description: `A unique filename for the content.  Example: My_Document`,
+            placeholder: `My_Document`,
+            validate: (value, allValues, meta) => {
+              if (!value) {
+                if (meta.dirty) {
+                  return "Required";
+                }
+                return true;
+              }
+              const isValid = /^[_a-zA-Z][-,_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 _";
+              }
+            }
           },
           ...fields
         ],
@@ -3651,7 +3664,7 @@ This will work when developing locally but NOT when deployed to production.
     }, /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Link, {
       to: `/collections/${collection.name}`,
       className: "inline-block text-current hover:text-blue-400 focus:underline focus:outline-none focus:text-blue-400 font-medium transition-colors duration-150 ease-out"
-    }, collection.label), /* @__PURE__ */ React__default["default"].createElement(HiChevronRight, {
+    }, collection.label ? collection.label : collection.name), /* @__PURE__ */ React__default["default"].createElement(HiChevronRight, {
       className: "inline-block -mt-0.5 opacity-50"
     })), /* @__PURE__ */ React__default["default"].createElement("span", {
       className: "text-xl text-gray-700 font-medium leading-tight"
@@ -3750,7 +3763,7 @@ This will work when developing locally but NOT when deployed to production.
     }, /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Link, {
       to: `/collections/${collection.name}`,
       className: "inline-block text-current hover:text-blue-400 focus:underline focus:outline-none focus:text-blue-400 font-medium transition-colors duration-150 ease-out"
-    }, collection.label), /* @__PURE__ */ React__default["default"].createElement(HiChevronRight, {
+    }, collection.label ? collection.label : collection.name), /* @__PURE__ */ React__default["default"].createElement(HiChevronRight, {
       className: "inline-block -mt-0.5 opacity-50"
     })), /* @__PURE__ */ React__default["default"].createElement("span", {
       className: "text-xl text-gray-700 font-medium leading-tight"

package/dist/rich-text.d.ts

@@ -70,6 +70,9 @@ declare type BaseComponents = {
         alt?: string;
     };
     hr?: {};
+    maybe_mdx?: {
+        children: JSX.Element;
+    };
     component_missing?: {
         name: string;
     };

package/dist/rich-text.es.js

@@ -113,7 +113,8 @@ const TinaMarkdown = ({
         }));
       case "code_block":
         const value = child.children.map((item) => {
-          return item.children[0].text;
+          var _a2;
+          return ((_a2 = item.children[0]) == null ? void 0 : _a2.text) || "";
         }).join("\n");
         if (components[child.type]) {
           const Component2 = components[child.type];
@@ -160,6 +161,8 @@ const TinaMarkdown = ({
             throw new Error(`No component provided for ${child.name}`);
           }
         }
+      case "maybe_mdx":
+        return null;
       default:
         if (typeof child.text === "string") {
           return /* @__PURE__ */ React.createElement(Leaf, __spreadValues({

package/dist/rich-text.js

@@ -120,7 +120,8 @@ var __objRest = (source, exclude) => {
           }));
         case "code_block":
           const value = child.children.map((item) => {
-            return item.children[0].text;
+            var _a2;
+            return ((_a2 = item.children[0]) == null ? void 0 : _a2.text) || "";
           }).join("\n");
           if (components[child.type]) {
             const Component2 = components[child.type];
@@ -167,6 +168,8 @@ var __objRest = (source, exclude) => {
               throw new Error(`No component provided for ${child.name}`);
             }
           }
+        case "maybe_mdx":
+          return null;
         default:
           if (typeof child.text === "string") {
             return /* @__PURE__ */ React__default["default"].createElement(Leaf, __spreadValues({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.66.1",
+  "version": "0.66.2",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -24,7 +24,7 @@
     "@headlessui/react": "^1.4.1",
     "@heroicons/react": "^1.0.4",
     "@tinacms/sharedctx": "0.1.0",
-    "@tinacms/toolkit": "0.56.11",
+    "@tinacms/toolkit": "0.56.12",
     "crypto-js": "^4.0.0",
     "final-form": "4.20.1",
     "graphql": "^15.1.0",