tinacms 0.69.3 → 0.69.6

package/dist/hooks/use-graphql-forms.d.ts

@@ -33,7 +33,10 @@ export declare const transformDocumentIntoMutationRequestPayload: (document: {
     includeCollection?: boolean;
     includeTemplate?: boolean;
 }) => any;
-export declare const generateFormCreators: (cms: TinaCMS, showInSidebar?: boolean) => {
+export declare const generateFormCreators: (cms: TinaCMS, showInSidebar?: boolean, global?: boolean | {
+    icon?: any;
+    layout: 'fullscreen' | 'popup';
+}) => {
     createForm: (formConfig: any) => Form<any, import("@tinacms/toolkit").AnyField>;
     createGlobalForm: GlobalFormCreator;
 };

package/dist/index.es.js

@@ -436,11 +436,16 @@ const transformParams = (data) => {
     }
   }
 };
-const generateFormCreators = (cms, showInSidebar) => {
+const generateFormCreators = (cms, showInSidebar, global) => {
   const createForm = (formConfig) => {
     const form = new Form(formConfig);
     if (showInSidebar) {
-      cms.forms.add(form);
+      if (global) {
+        const options = typeof global === "boolean" ? [null, "fullscreen"] : [global.icon, global.layout];
+        cms.plugins.add(new GlobalFormPlugin(form, ...options));
+      } else {
+        cms.forms.add(form);
+      }
     }
     return form;
   };
@@ -520,7 +525,11 @@ const getPathToChange = (documentBlueprint, formNode, event) => {
   return accum.join(".");
 };
 const buildForm = (doc, cms, formify2, showInSidebar = false, onSubmit) => {
-  const { createForm, createGlobalForm } = generateFormCreators(cms, showInSidebar);
+  var _a;
+  const id = doc._internalSys.path;
+  const enrichedSchema = cms.api.tina.schema;
+  const collection = enrichedSchema.getCollection(doc._internalSys.collection.name);
+  const { createForm, createGlobalForm } = generateFormCreators(cms, showInSidebar, (_a = collection.ui) == null ? void 0 : _a.global);
   const SKIPPED = "SKIPPED";
   let form;
   let skipped;
@@ -529,9 +538,6 @@ const buildForm = (doc, cms, formify2, showInSidebar = false, onSubmit) => {
   };
   if (skipped)
     return;
-  const id = doc._internalSys.path;
-  const enrichedSchema = cms.api.tina.schema;
-  const collection = enrichedSchema.getCollection(doc._internalSys.collection.name);
   const template = enrichedSchema.getTemplateForData({
     collection,
     data: doc._values
@@ -964,14 +970,16 @@ function buildPath({
 }
 const node = G.parse(`
  query Sample {
-   _internalSys: _sys {
-     path
-     relativePath
-     collection {
-       name
-     }
-   }
-   _values
+  ...on Document {
+    _internalSys: _sys {
+      path
+      relativePath
+      collection {
+        name
+      }
+    }
+    _values
+  }
  }`);
 const metaFields = node.definitions[0].selectionSet.selections;
 const getRelativeBlueprint = (path) => {
@@ -2286,6 +2294,15 @@ mutation addPendingDocumentMutation(
     const jsonRes = await res.json();
     return jsonRes;
   }
+  async fetchEvents(limit, cursor) {
+    if (this.isLocalMode) {
+      return {
+        events: []
+      };
+    } else {
+      return (await this.fetchWithToken(`${this.contentApiBase}/events/${this.clientId}/${this.branch}?limit=${limit || 1}${cursor ? `&cursor=${cursor}` : ""}`, { method: "GET" })).json();
+    }
+  }
   parseJwt(token) {
     const base64Url = token.split(".")[1];
     const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
@@ -4818,10 +4835,14 @@ const TemplateMenu = ({ templates }) => {
     className: `w-full text-md px-4 py-2 tracking-wide flex items-center opacity-80 text-gray-600 ${active && "text-gray-800 opacity-100"}`
   }, template.label))))))));
 };
-const handleNavigate = (navigate, cms, collection, document) => {
+const handleNavigate = (navigate, cms, collection, collectionDefinition, document) => {
+  var _a, _b;
   const plugins = cms.plugins.all("tina-admin");
   const routeMapping = plugins.find(({ name }) => name === "route-mapping");
-  const routeOverride = routeMapping ? routeMapping.mapper(collection, document) : void 0;
+  const routeOverride = ((_a = collectionDefinition.ui) == null ? void 0 : _a.router) ? (_b = collectionDefinition.ui) == null ? void 0 : _b.router({
+    document,
+    collection: collectionDefinition
+  }) : routeMapping ? routeMapping.mapper(collection, document) : void 0;
   if (routeOverride) {
     window.location.href = routeOverride;
     return null;
@@ -4866,7 +4887,8 @@ const CollectionListPage = () => {
       const documents = collection.documents.edges;
       const admin = cms.api.admin;
       const pageInfo = collection.documents.pageInfo;
-      const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime"].includes(x.type));
+      const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime", "boolean"].includes(x.type));
+      const collectionDefinition = cms.api.tina.schema.getCollection(collection.name);
       return /* @__PURE__ */ React.createElement(PageWrapper, null, /* @__PURE__ */ React.createElement(React.Fragment, null, open && /* @__PURE__ */ React.createElement(DeleteModal, {
         filename: vars.relativePath,
         deleteFunc: async () => {
@@ -4957,7 +4979,7 @@ const CollectionListPage = () => {
         }, /* @__PURE__ */ React.createElement("a", {
           className: "text-blue-600 hover:text-blue-400 flex items-center gap-3 cursor-pointer",
           onClick: () => {
-            handleNavigate(navigate, cms, collection, document.node);
+            handleNavigate(navigate, cms, collection, collectionDefinition, document.node);
           }
         }, /* @__PURE__ */ React.createElement(BiEdit, {
           className: "inline-block h-6 w-auto opacity-70"

package/dist/index.js

@@ -454,11 +454,16 @@
       }
     }
   };
-  const generateFormCreators = (cms, showInSidebar) => {
+  const generateFormCreators = (cms, showInSidebar, global) => {
     const createForm = (formConfig) => {
       const form = new toolkit.Form(formConfig);
       if (showInSidebar) {
-        cms.forms.add(form);
+        if (global) {
+          const options = typeof global === "boolean" ? [null, "fullscreen"] : [global.icon, global.layout];
+          cms.plugins.add(new toolkit.GlobalFormPlugin(form, ...options));
+        } else {
+          cms.forms.add(form);
+        }
       }
       return form;
     };
@@ -538,7 +543,11 @@
     return accum.join(".");
   };
   const buildForm = (doc, cms, formify2, showInSidebar = false, onSubmit) => {
-    const { createForm, createGlobalForm } = generateFormCreators(cms, showInSidebar);
+    var _a;
+    const id = doc._internalSys.path;
+    const enrichedSchema = cms.api.tina.schema;
+    const collection = enrichedSchema.getCollection(doc._internalSys.collection.name);
+    const { createForm, createGlobalForm } = generateFormCreators(cms, showInSidebar, (_a = collection.ui) == null ? void 0 : _a.global);
     const SKIPPED = "SKIPPED";
     let form;
     let skipped;
@@ -547,9 +556,6 @@
     };
     if (skipped)
       return;
-    const id = doc._internalSys.path;
-    const enrichedSchema = cms.api.tina.schema;
-    const collection = enrichedSchema.getCollection(doc._internalSys.collection.name);
     const template = enrichedSchema.getTemplateForData({
       collection,
       data: doc._values
@@ -982,14 +988,16 @@
   }
   const node = G__namespace.parse(`
  query Sample {
-   _internalSys: _sys {
-     path
-     relativePath
-     collection {
-       name
-     }
-   }
-   _values
+  ...on Document {
+    _internalSys: _sys {
+      path
+      relativePath
+      collection {
+        name
+      }
+    }
+    _values
+  }
  }`);
   const metaFields = node.definitions[0].selectionSet.selections;
   const getRelativeBlueprint = (path) => {
@@ -2304,6 +2312,15 @@ mutation addPendingDocumentMutation(
       const jsonRes = await res.json();
       return jsonRes;
     }
+    async fetchEvents(limit, cursor) {
+      if (this.isLocalMode) {
+        return {
+          events: []
+        };
+      } else {
+        return (await this.fetchWithToken(`${this.contentApiBase}/events/${this.clientId}/${this.branch}?limit=${limit || 1}${cursor ? `&cursor=${cursor}` : ""}`, { method: "GET" })).json();
+      }
+    }
     parseJwt(token) {
       const base64Url = token.split(".")[1];
       const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
@@ -4836,10 +4853,14 @@ This will work when developing locally but NOT when deployed to production.
       className: `w-full text-md px-4 py-2 tracking-wide flex items-center opacity-80 text-gray-600 ${active && "text-gray-800 opacity-100"}`
     }, template.label))))))));
   };
-  const handleNavigate = (navigate, cms, collection, document) => {
+  const handleNavigate = (navigate, cms, collection, collectionDefinition, document) => {
+    var _a, _b;
     const plugins = cms.plugins.all("tina-admin");
     const routeMapping = plugins.find(({ name }) => name === "route-mapping");
-    const routeOverride = routeMapping ? routeMapping.mapper(collection, document) : void 0;
+    const routeOverride = ((_a = collectionDefinition.ui) == null ? void 0 : _a.router) ? (_b = collectionDefinition.ui) == null ? void 0 : _b.router({
+      document,
+      collection: collectionDefinition
+    }) : routeMapping ? routeMapping.mapper(collection, document) : void 0;
     if (routeOverride) {
       window.location.href = routeOverride;
       return null;
@@ -4884,7 +4905,8 @@ This will work when developing locally but NOT when deployed to production.
         const documents = collection.documents.edges;
         const admin = cms.api.admin;
         const pageInfo = collection.documents.pageInfo;
-        const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime"].includes(x.type));
+        const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime", "boolean"].includes(x.type));
+        const collectionDefinition = cms.api.tina.schema.getCollection(collection.name);
         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 () => {
@@ -4975,7 +4997,7 @@ This will work when developing locally but NOT when deployed to production.
           }, /* @__PURE__ */ React__default["default"].createElement("a", {
             className: "text-blue-600 hover:text-blue-400 flex items-center gap-3 cursor-pointer",
             onClick: () => {
-              handleNavigate(navigate, cms, collection, document.node);
+              handleNavigate(navigate, cms, collection, collectionDefinition, document.node);
             }
           }, /* @__PURE__ */ React__default["default"].createElement(BiEdit, {
             className: "inline-block h-6 w-auto opacity-70"

package/dist/internalClient/index.d.ts

@@ -93,6 +93,16 @@ export declare class Client {
     }): Promise<{
         assetsSyncing: string[];
     }>;
+    fetchEvents(limit?: number, cursor?: string): Promise<{
+        events: {
+            message: string;
+            timestamp: number;
+            id: string;
+            isError: boolean;
+            isGlobal: boolean;
+        }[];
+        cursor?: string;
+    }>;
     parseJwt(token: any): any;
     getRefreshedToken(tokens: string): Promise<TokenObject>;
     isAuthorized(): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.69.3",
+  "version": "0.69.6",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -48,9 +48,9 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "0.1.0",
+    "@tinacms/schema-tools": "0.1.2",
     "@tinacms/sharedctx": "0.1.2",
-    "@tinacms/toolkit": "0.57.2",
+    "@tinacms/toolkit": "0.57.3",
     "crypto-js": "^4.0.0",
     "fetch-ponyfill": "^7.1.0",
     "final-form": "4.20.1",