tinacms 1.5.2 → 1.5.4

package/dist/admin/pages/CollectionListPage.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 /// <reference types="react" />
 import { NavigateFunction } from 'react-router-dom';
 import { TinaCMS } from '@tinacms/toolkit';

package/dist/index.es.js

@@ -3164,13 +3164,13 @@ const GetCollection = ({
   const navigate = useNavigate();
   const { collection, loading, error, reFetchCollection, collectionExtra } = useGetCollection(cms, collectionName, includeDocuments, folder, startCursor || "", sortKey, filterArgs) || {};
   useEffect(() => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     if (loading)
       return;
     const collectionDefinition = cms.api.tina.schema.getCollection(collection.name);
     const allowCreate = (_c = (_b = (_a = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _a.allowedActions) == null ? void 0 : _b.create) != null ? _c : true;
     const allowDelete = (_f = (_e = (_d = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _d.allowedActions) == null ? void 0 : _e.delete) != null ? _f : true;
-    if (!allowCreate && !allowDelete && ((_h = (_g = collection.documents) == null ? void 0 : _g.edges) == null ? void 0 : _h.length) === 1) {
+    if (!allowCreate && !allowDelete && ((_h = (_g = collection.documents) == null ? void 0 : _g.edges) == null ? void 0 : _h.length) === 1 && ((_k = (_j = (_i = collection.documents) == null ? void 0 : _i.edges[0]) == null ? void 0 : _j.node) == null ? void 0 : _k.__typename) !== "Folder") {
       const doc = collection.documents.edges[0].node;
       handleNavigate(navigate, cms, collection, collectionDefinition, doc);
     }
@@ -3221,7 +3221,11 @@ const useCollectionFolder = () => {
 };
 const LOCAL_STORAGE_KEY = "tinacms.admin.collection.list.page";
 const isSSR = typeof window === "undefined";
-const TemplateMenu = ({ templates }) => {
+const TemplateMenu = ({
+  templates,
+  folder,
+  collectionName
+}) => {
   return /* @__PURE__ */ React.createElement(Menu, {
     as: "div",
     className: "relative inline-block text-left"
@@ -3244,7 +3248,19 @@ const TemplateMenu = ({ templates }) => {
   }, templates.map((template) => /* @__PURE__ */ React.createElement(Menu.Item, {
     key: `${template.label}-${template.name}`
   }, ({ active }) => /* @__PURE__ */ React.createElement(Link, {
-    to: `${template.name}/new`,
+    to: `/${folder.fullyQualifiedName ? [
+      "collections",
+      "new",
+      collectionName,
+      template.name,
+      "~",
+      folder.name
+    ].join("/") : [
+      "collections",
+      "new",
+      collectionName,
+      template.name
+    ].join("/")}`,
     className: `w-full text-md px-4 py-2 tracking-wide flex items-center transition ease-out duration-100 ${active ? "text-blue-600 opacity-100 bg-gray-50" : "opacity-80 text-gray-600"}`
   }, template.label))))))));
 };
@@ -3608,7 +3624,9 @@ const CollectionListPage = () => {
       }, "Create New", " ", /* @__PURE__ */ React.createElement(BiPlus, {
         className: "w-5 h-full ml-1 opacity-70"
       })), collection.templates && allowCreate && /* @__PURE__ */ React.createElement(TemplateMenu, {
-        templates: collection.templates
+        collectionName,
+        templates: collection.templates,
+        folder
       })))), /* @__PURE__ */ React.createElement(PageBody, null, /* @__PURE__ */ React.createElement("div", {
         className: "w-full mx-auto max-w-screen-xl"
       }, sortField && !sortField.required && /* @__PURE__ */ React.createElement("p", {

package/dist/index.js

@@ -3179,13 +3179,13 @@ This will work when developing locally but NOT when deployed to production.
     const navigate = reactRouterDom.useNavigate();
     const { collection, loading, error, reFetchCollection, collectionExtra } = useGetCollection(cms, collectionName, includeDocuments, folder, startCursor || "", sortKey, filterArgs) || {};
     React.useEffect(() => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
       if (loading)
         return;
       const collectionDefinition = cms.api.tina.schema.getCollection(collection.name);
       const allowCreate = (_c = (_b = (_a = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _a.allowedActions) == null ? void 0 : _b.create) != null ? _c : true;
       const allowDelete = (_f = (_e = (_d = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _d.allowedActions) == null ? void 0 : _e.delete) != null ? _f : true;
-      if (!allowCreate && !allowDelete && ((_h = (_g = collection.documents) == null ? void 0 : _g.edges) == null ? void 0 : _h.length) === 1) {
+      if (!allowCreate && !allowDelete && ((_h = (_g = collection.documents) == null ? void 0 : _g.edges) == null ? void 0 : _h.length) === 1 && ((_k = (_j = (_i = collection.documents) == null ? void 0 : _i.edges[0]) == null ? void 0 : _j.node) == null ? void 0 : _k.__typename) !== "Folder") {
         const doc = collection.documents.edges[0].node;
         handleNavigate(navigate, cms, collection, collectionDefinition, doc);
       }
@@ -3236,7 +3236,11 @@ This will work when developing locally but NOT when deployed to production.
   };
   const LOCAL_STORAGE_KEY = "tinacms.admin.collection.list.page";
   const isSSR = typeof window === "undefined";
-  const TemplateMenu = ({ templates }) => {
+  const TemplateMenu = ({
+    templates,
+    folder,
+    collectionName
+  }) => {
     return /* @__PURE__ */ React__default["default"].createElement(react.Menu, {
       as: "div",
       className: "relative inline-block text-left"
@@ -3259,7 +3263,19 @@ This will work when developing locally but NOT when deployed to production.
     }, templates.map((template) => /* @__PURE__ */ React__default["default"].createElement(react.Menu.Item, {
       key: `${template.label}-${template.name}`
     }, ({ active }) => /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Link, {
-      to: `${template.name}/new`,
+      to: `/${folder.fullyQualifiedName ? [
+        "collections",
+        "new",
+        collectionName,
+        template.name,
+        "~",
+        folder.name
+      ].join("/") : [
+        "collections",
+        "new",
+        collectionName,
+        template.name
+      ].join("/")}`,
       className: `w-full text-md px-4 py-2 tracking-wide flex items-center transition ease-out duration-100 ${active ? "text-blue-600 opacity-100 bg-gray-50" : "opacity-80 text-gray-600"}`
     }, template.label))))))));
   };
@@ -3623,7 +3639,9 @@ This will work when developing locally but NOT when deployed to production.
         }, "Create New", " ", /* @__PURE__ */ React__default["default"].createElement(BiPlus, {
           className: "w-5 h-full ml-1 opacity-70"
         })), collection.templates && allowCreate && /* @__PURE__ */ React__default["default"].createElement(TemplateMenu, {
-          templates: collection.templates
+          collectionName,
+          templates: collection.templates,
+          folder
         })))), /* @__PURE__ */ React__default["default"].createElement(PageBody, null, /* @__PURE__ */ React__default["default"].createElement("div", {
           className: "w-full mx-auto max-w-screen-xl"
         }, sortField && !sortField.required && /* @__PURE__ */ React__default["default"].createElement("p", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {