tinacms 0.67.3 → 0.67.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # tinacms
 
+## 0.67.4
+
+### Patch Changes
+
+- 168f6cc6e: Update delete modal header
+- 2a6060138: Fix url parsing issue when a branch name contained a `/`
+- 3af3d6787: Fix issues with finding the template for multitemplate collections
+- Updated dependencies [bf5fe0074]
+  - @tinacms/toolkit@0.56.22
+
 ## 0.67.3
 
 ### Patch Changes

package/dist/index.es.js

@@ -3133,6 +3133,30 @@ function useTina({
     isLoading
   };
 }
+const TINA_HOST = "content.tinajs.io";
+const parseURL = (url) => {
+  if (url.includes("localhost")) {
+    return { branch: null, isLocalClient: true, clientId: null };
+  }
+  const params = new URL(url);
+  const pattern = new UrlPattern("/content/:clientId/github/*", {
+    escapeChar: " "
+  });
+  const result = pattern.match(params.pathname);
+  const branch = result == null ? void 0 : result._;
+  const clientId = result == null ? void 0 : result.clientId;
+  if (!branch || !clientId) {
+    throw new Error(`Invalid URL format provided. Expected: https://content.tinajs.io/content/<ClientID>/github/<Branch> but but received ${url}`);
+  }
+  if (params.host !== TINA_HOST) {
+    throw new Error(`The only supported hosts are ${TINA_HOST} or localhost, but received ${params.host}.`);
+  }
+  return {
+    branch,
+    clientId,
+    isLocalClient: false
+  };
+};
 const errorButtonStyles = {
   background: "#eb6337",
   padding: "12px 18px",
@@ -3212,21 +3236,6 @@ class ErrorBoundary extends React.Component {
     return this.props.children;
   }
 }
-const parseURL = (url) => {
-  if (url.includes("localhost")) {
-    return { branch: null, isLocalClient: true, clientId: null };
-  }
-  const tinaHost = "content.tinajs.io";
-  const params = new URL(url);
-  const pattern = new UrlPattern("/content/:clientId/github/:branch");
-  const result = pattern.match(params.pathname);
-  if (params.host !== tinaHost) {
-    throw new Error(`The only supported hosts are ${tinaHost} or localhost, but received ${params.host}.`);
-  }
-  return __spreadProps(__spreadValues({}, result), {
-    isLocalClient: false
-  });
-};
 const TinaCMSProvider2 = (_c) => {
   var _d = _c, {
     query,
@@ -4111,7 +4120,7 @@ const CollectionListPage = () => {
 const DeleteModal = ({ close: close2, deleteFunc, filename }) => {
   return /* @__PURE__ */ React.createElement(Modal, null, /* @__PURE__ */ React.createElement(ModalPopup, null, /* @__PURE__ */ React.createElement(ModalHeader, {
     close: close2
-  }, "Reset"), /* @__PURE__ */ React.createElement(ModalBody, {
+  }, "Delete ", filename), /* @__PURE__ */ React.createElement(ModalBody, {
     padded: true
   }, /* @__PURE__ */ React.createElement("p", null, `Are you sure you want to delete ${filename}?`)), /* @__PURE__ */ React.createElement(ModalActions, null, /* @__PURE__ */ React.createElement(Button, {
     style: { flexGrow: 2 },
@@ -4236,15 +4245,11 @@ const RenderForm$1 = ({ cms, collection, template, fields, mutationInfo }) => {
   let schemaFields = fields;
   if (schema) {
     const schemaCollection = schema.getCollection(collection.name);
-    const template2 = schema.getTemplateForData({
-      collection: schemaCollection,
-      data: {}
-    });
     const formInfo = resolveForm({
       collection: schemaCollection,
       basename: schemaCollection.name,
       schema,
-      template: template2
+      template
     });
     schemaFields = formInfo.fields;
   }
@@ -4402,7 +4407,7 @@ const RenderForm = ({
     const schemaCollection = schema.getCollection(collection.name);
     const template = schema.getTemplateForData({
       collection: schemaCollection,
-      data: document.value
+      data: document.values
     });
     const formInfo = resolveForm({
       collection: schemaCollection,

package/dist/index.js

@@ -3152,6 +3152,30 @@ mutation addPendingDocumentMutation(
       isLoading
     };
   }
+  const TINA_HOST = "content.tinajs.io";
+  const parseURL = (url) => {
+    if (url.includes("localhost")) {
+      return { branch: null, isLocalClient: true, clientId: null };
+    }
+    const params = new URL(url);
+    const pattern = new UrlPattern__default["default"]("/content/:clientId/github/*", {
+      escapeChar: " "
+    });
+    const result = pattern.match(params.pathname);
+    const branch = result == null ? void 0 : result._;
+    const clientId = result == null ? void 0 : result.clientId;
+    if (!branch || !clientId) {
+      throw new Error(`Invalid URL format provided. Expected: https://content.tinajs.io/content/<ClientID>/github/<Branch> but but received ${url}`);
+    }
+    if (params.host !== TINA_HOST) {
+      throw new Error(`The only supported hosts are ${TINA_HOST} or localhost, but received ${params.host}.`);
+    }
+    return {
+      branch,
+      clientId,
+      isLocalClient: false
+    };
+  };
   const errorButtonStyles = {
     background: "#eb6337",
     padding: "12px 18px",
@@ -3231,21 +3255,6 @@ mutation addPendingDocumentMutation(
       return this.props.children;
     }
   }
-  const parseURL = (url) => {
-    if (url.includes("localhost")) {
-      return { branch: null, isLocalClient: true, clientId: null };
-    }
-    const tinaHost = "content.tinajs.io";
-    const params = new URL(url);
-    const pattern = new UrlPattern__default["default"]("/content/:clientId/github/:branch");
-    const result = pattern.match(params.pathname);
-    if (params.host !== tinaHost) {
-      throw new Error(`The only supported hosts are ${tinaHost} or localhost, but received ${params.host}.`);
-    }
-    return __spreadProps(__spreadValues({}, result), {
-      isLocalClient: false
-    });
-  };
   const TinaCMSProvider2 = (_c) => {
     var _d = _c, {
       query,
@@ -4130,7 +4139,7 @@ This will work when developing locally but NOT when deployed to production.
   const DeleteModal = ({ close: close2, deleteFunc, filename }) => {
     return /* @__PURE__ */ React__default["default"].createElement(toolkit.Modal, null, /* @__PURE__ */ React__default["default"].createElement(toolkit.ModalPopup, null, /* @__PURE__ */ React__default["default"].createElement(toolkit.ModalHeader, {
       close: close2
-    }, "Reset"), /* @__PURE__ */ React__default["default"].createElement(toolkit.ModalBody, {
+    }, "Delete ", filename), /* @__PURE__ */ React__default["default"].createElement(toolkit.ModalBody, {
       padded: true
     }, /* @__PURE__ */ React__default["default"].createElement("p", null, `Are you sure you want to delete ${filename}?`)), /* @__PURE__ */ React__default["default"].createElement(toolkit.ModalActions, null, /* @__PURE__ */ React__default["default"].createElement(toolkit.Button, {
       style: { flexGrow: 2 },
@@ -4255,15 +4264,11 @@ This will work when developing locally but NOT when deployed to production.
     let schemaFields = fields;
     if (schema) {
       const schemaCollection = schema.getCollection(collection.name);
-      const template2 = schema.getTemplateForData({
-        collection: schemaCollection,
-        data: {}
-      });
       const formInfo = schemaTools.resolveForm({
         collection: schemaCollection,
         basename: schemaCollection.name,
         schema,
-        template: template2
+        template
       });
       schemaFields = formInfo.fields;
     }
@@ -4421,7 +4426,7 @@ This will work when developing locally but NOT when deployed to production.
       const schemaCollection = schema.getCollection(collection.name);
       const template = schema.getTemplateForData({
         collection: schemaCollection,
-        data: document.value
+        data: document.values
       });
       const formInfo = schemaTools.resolveForm({
         collection: schemaCollection,

package/dist/utils/parseUrl.d.ts

@@ -0,0 +1,18 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+export declare const TINA_HOST = "content.tinajs.io";
+export declare const parseURL: (url: string) => {
+    branch: any;
+    isLocalClient: any;
+    clientId: any;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.67.3",
+  "version": "0.67.4",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -26,7 +26,7 @@
     "@heroicons/react": "^1.0.4",
     "@tinacms/schema-tools": "0.0.3",
     "@tinacms/sharedctx": "0.1.1",
-    "@tinacms/toolkit": "0.56.21",
+    "@tinacms/toolkit": "0.56.22",
     "crypto-js": "^4.0.0",
     "final-form": "4.20.1",
     "graphql": "^15.1.0",