tinacms 3.7.1 → 3.7.2

package/dist/index.js

@@ -34773,6 +34773,13 @@ const CollectionListPageSearchEvent = "collection-list-page-search";
 const CloudConfigNavComponentClickedEvent = "cloud-config-nav-component-clicked";
 const SlashCommandOpenedEvent = "slash-command-opened";
 const SlashCommandUsedEvent = "slash-command-used";
+const MediaUsageDashboardOpenedEvent = "media-dashboard-opened";
+const MediaUsageDashboardRefreshedEvent = "media-dashboard-refreshed";
+const MediaUsageDashboardTypeFilterEvent = "media-dashboard-type-filter-changed";
+const MediaUsageDashboardUsageFilterChangedEvent = "media-dashboard-usage-filter-changed";
+const MediaUsageDashboardRowExpandedEvent = "media-dashboard-row-expanded";
+const MediaUsageDashboardPreviewOpenedEvent = "media-dashboard-preview-opened";
+const MediaUsageDashboardDocumentLinkClickedEvent = "media-dashboard-document-link-clicked";
 let posthogClient = null;
 let isInitialized = false;
 let initializationPromise = null;
@@ -46047,7 +46054,7 @@ function ListMediaItem({ item, onClick, active }) {
   return /* @__PURE__ */ React__default.createElement(
     "li",
     {
-      className: `group relative flex shrink-0 items-center transition duration-150 ease-out cursor-pointer border-b border-gray-150 ${active ? "bg-gradient-to-r from-white to-gray-50/50 text-blue-500 hover:bg-gray-50" : "bg-white hover:bg-gray-50/50 hover:text-blue-500"}`,
+      className: `group relative flex shrink-0 items-center transition duration-150 ease-out cursor-pointer border-b border-gray-150 ${active ? "bg-gradient-to-r from-white to-gray-50/50 text-tina-orange hover:bg-gray-50" : "bg-white hover:bg-gray-50/50 hover:text-tina-orange"}`,
       onClick: () => {
         if (!active) {
           onClick(item);
@@ -46065,7 +46072,12 @@ function ListMediaItem({ item, onClick, active }) {
         src: thumbnail,
         alt: item.filename
       }
-    ) : /* @__PURE__ */ React__default.createElement(FileIcon, { className: "w-1/2 h-full fill-gray-300" })),
+    ) : /* @__PURE__ */ React__default.createElement(
+      FileIcon,
+      {
+        className: `w-1/2 h-full ${item.type === "dir" ? "fill-tina-orange" : "fill-gray-300"}`
+      }
+    )),
     /* @__PURE__ */ React__default.createElement(
       "span",
       {
@@ -46088,9 +46100,10 @@ function GridMediaItem({ item, active, onClick }) {
     "button",
     {
       className: cn(
-        "relative flex flex-col items-center justify-center w-full",
+        "relative flex flex-col items-center justify-center w-full outline-none",
         {
           "shadow hover:shadow-md hover:scale-103 hover:border-gray-150": !active,
+          "ring-2 ring-tina-orange": active,
           "cursor-pointer": item.type === "dir"
         }
       ),
@@ -46107,7 +46120,7 @@ function GridMediaItem({ item, active, onClick }) {
       {
         className: cn(
           "absolute bottom-0 left-0 w-full text-xs text-white px-2 py-1 truncate z-10",
-          active ? "bg-blue-500/60" : "bg-black/60"
+          active ? "bg-tina-orange/60" : "bg-black/60"
         ),
         style: { pointerEvents: "none" }
       },
@@ -46118,14 +46131,19 @@ function GridMediaItem({ item, active, onClick }) {
       "img",
       {
         className: cn(
-          "block overflow-hidden object-center object-contain max-w-full max-h-[16rem] m-auto shadow",
-          { "border border-blue-500": active }
+          "block overflow-hidden object-center object-contain max-w-full max-h-[16rem] m-auto shadow"
         ),
         style: checkerboardStyle,
         src: thumbnail,
         alt: item.filename
       }
-    )) : /* @__PURE__ */ React__default.createElement("div", { className: "p-4 w-full flex flex-col gap-4 items-center justify-center" }, /* @__PURE__ */ React__default.createElement(FileIcon, { className: "w-[40%] h-auto fill-gray-300", size: 40 })))
+    )) : /* @__PURE__ */ React__default.createElement("div", { className: "p-4 w-full flex flex-col gap-4 items-center justify-center" }, /* @__PURE__ */ React__default.createElement(
+      FileIcon,
+      {
+        className: `w-[40%] h-auto ${item.type === "dir" ? "fill-tina-orange" : "fill-gray-300"}`,
+        size: 40
+      }
+    )))
   ));
 }
 const DeleteModal$1 = ({
@@ -46530,7 +46548,7 @@ function MediaPicker({
       className: "whitespace-nowrap"
     },
     "New Folder",
-    /* @__PURE__ */ React__default.createElement(BiFolder, { className: "w-6 h-full ml-2 opacity-70 text-blue-500" })
+    /* @__PURE__ */ React__default.createElement(BiFolder, { className: "w-6 h-full ml-2 opacity-70 text-tina-orange" })
   ), /* @__PURE__ */ React__default.createElement(UploadButton, { onClick, uploading }))), /* @__PURE__ */ React__default.createElement("div", { className: "flex h-full overflow-hidden bg-white" }, /* @__PURE__ */ React__default.createElement("div", { className: "flex w-full flex-col h-full @container" }, /* @__PURE__ */ React__default.createElement(
     "ul",
     {
@@ -47207,6 +47225,9 @@ const MediaLightbox = ({
   const usageCount = item.usedIn.length;
   const mediaSrc = item.media.src;
   const directory = item.media.directory || "/";
+  useEffect(() => {
+    captureEvent(MediaUsageDashboardPreviewOpenedEvent);
+  }, []);
   return /* @__PURE__ */ React__default.createElement(Dialog, { open: true, onOpenChange: (isOpen) => !isOpen && onClose() }, /* @__PURE__ */ React__default.createElement(DialogContent, { className: "w-auto max-w-[95vw] border border-gray-200 bg-white px-4 pt-12 pb-4 shadow-xl sm:max-w-fit" }, /* @__PURE__ */ React__default.createElement(DialogTitle, { className: "sr-only" }, "Preview: ", item.media.filename), /* @__PURE__ */ React__default.createElement(DialogDescription, { className: "sr-only" }, usageCount > 0 ? `Used in ${usageCount} ${usageCount === 1 ? "document" : "documents"}` : "Unused media file"), /* @__PURE__ */ React__default.createElement("div", { className: "mx-auto w-fit max-w-full rounded-lg border border-gray-200 bg-gray-50 p-2 sm:p-3" }, item.type === "video" ? /* @__PURE__ */ React__default.createElement(
     VideoLightboxContent,
     {
@@ -47537,7 +47558,13 @@ const MediaUsageTable = ({
       TableRow,
       {
         style: { contentVisibility: "auto" },
-        onClick: getUsageCount(row.original) > 0 ? row.getToggleExpandedHandler() : void 0,
+        onClick: () => {
+          getUsageCount(row.original) > 0;
+          {
+            row.toggleExpanded();
+            captureEvent(MediaUsageDashboardRowExpandedEvent);
+          }
+        },
         className: getUsageCount(row.original) > 0 ? row.getIsExpanded() ? "cursor-pointer bg-[#FFF8F6] hover:bg-[#FFF8F6]" : "cursor-pointer" : ""
       },
       row.getVisibleCells().map((cell) => /* @__PURE__ */ React__default.createElement(
@@ -47578,7 +47605,12 @@ const MediaFilters = ({
   Select,
   {
     value: typeFilter,
-    onValueChange: (value) => setTypeFilter(value)
+    onValueChange: (value) => {
+      setTypeFilter(value);
+      captureEvent(MediaUsageDashboardTypeFilterEvent, {
+        type: value
+      });
+    }
   },
   /* @__PURE__ */ React__default.createElement(
     SelectTrigger,
@@ -47593,7 +47625,12 @@ const MediaFilters = ({
   Select,
   {
     value: usageFilter,
-    onValueChange: (value) => setUsageFilter(value)
+    onValueChange: (value) => {
+      setUsageFilter(value);
+      captureEvent(MediaUsageDashboardUsageFilterChangedEvent, {
+        usage: value
+      });
+    }
   },
   /* @__PURE__ */ React__default.createElement(
     SelectTrigger,
@@ -47625,7 +47662,10 @@ const ExpandedRowContent = ({
         "a",
         {
           href: `#/collections/${doc.collectionName}/~`,
-          onClick: () => onClose == null ? void 0 : onClose(),
+          onClick: () => {
+            onClose == null ? void 0 : onClose();
+            captureEvent(MediaUsageDashboardDocumentLinkClickedEvent);
+          },
           className: "underline hover:text-tina-orange-dark transition-colors"
         },
         doc.collectionLabel
@@ -47634,7 +47674,12 @@ const ExpandedRowContent = ({
         "a",
         {
           href: doc.editUrl,
-          onClick: () => onClose == null ? void 0 : onClose(),
+          onClick: () => {
+            onClose == null ? void 0 : onClose();
+            captureEvent(
+              MediaUsageDashboardDocumentLinkClickedEvent
+            );
+          },
           className: "underline hover:text-tina-orange-dark transition-colors break-all"
         },
         breadcrumb
@@ -47645,6 +47690,10 @@ const ExpandedRowContent = ({
 const MediaUsageDashboard = ({
   close: onClose
 }) => {
+  useEffect(() => {
+    console.log("MediaUsageDashboard");
+    captureEvent(MediaUsageDashboardOpenedEvent);
+  }, []);
   const { mediaItems, isLoading, errorOccurred, progress, refresh } = useMediaUsageScanner();
   const [lightboxImage, setLightboxImage] = useState(null);
   const stats = useMemo(() => {
@@ -47679,7 +47728,13 @@ const MediaUsageDashboard = ({
         Button,
         {
           variant: "outline",
-          onClick: refresh,
+          onClick: async () => {
+            await refresh();
+            const payload = {
+              errorOccured: errorOccurred
+            };
+            captureEvent(MediaUsageDashboardRefreshedEvent, payload);
+          },
           disabled: isLoading,
           className: "flex items-center gap-2 shadow-sm font-medium transition-colors"
         },
@@ -47949,7 +48004,7 @@ const NavProvider = ({
 const name = "tinacms";
 const type = "module";
 const typings = "dist/index.d.ts";
-const version$1 = "3.7.1";
+const version$1 = "3.7.2";
 const main = "dist/index.js";
 const module = "./dist/index.js";
 const exports = {
@@ -66117,6 +66172,12 @@ const CreateBranchModal = ({
         throw new Error("Branch creation failed.");
       }
       setCurrentBranch(result.branchName);
+      if (result.warning) {
+        cms.alerts.warn(
+          `${result.warning} Please reconnect GitHub authoring here: ${tinaApi.gitSettingsLink}`,
+          0
+        );
+      }
       cms.alerts.success(
         `Branch created successfully - Pull Request at ${result.pullRequestUrl}`,
         0
@@ -66128,7 +66189,7 @@ const CreateBranchModal = ({
       close2();
     } catch (e3) {
       console.error(e3);
-      let errorMessage2 = "Branch operation failed, please try again. If the problem persists please contact support.";
+      let errorMessage2 = "Branch operation failed. Talking to GitHub was unsuccessful, please try again. If the problem persists please contact support at https://tina.io/support 🦙";
       const err = e3;
       if (err.errorCode) {
         switch (err.errorCode) {
@@ -66141,6 +66202,9 @@ const CreateBranchModal = ({
           case EDITORIAL_WORKFLOW_ERROR.VALIDATION_FAILED:
             errorMessage2 = err.message || "Invalid branch name";
             break;
+          default:
+            errorMessage2 = err.message || errorMessage2;
+            break;
         }
       } else if (err.message) {
         if (err.message.toLowerCase().includes("already exists")) {
@@ -121593,6 +121657,9 @@ mutation addPendingDocumentMutation(
   get appDashboardLink() {
     return `${this.frontendUrl}/projects/${this.clientId}`;
   }
+  get gitSettingsLink() {
+    return `${this.frontendUrl}/account/git`;
+  }
   async checkSyncStatus({
     assetsSyncing
   }) {
@@ -121872,29 +121939,50 @@ mutation addPendingDocumentMutation(
       while (attempts < maxAttempts) {
         await new Promise((resolve) => setTimeout(resolve, pollInterval));
         attempts++;
-        const statusUrl = `${this.contentApiBase}/editorial-workflow/${this.clientId}/status/${requestId}`;
-        const statusResponse = await this.authProvider.fetchWithToken(statusUrl);
-        if (!statusResponse.ok) {
-          throw new Error(
-            `Failed to check workflow status: ${statusResponse.statusText}`
-          );
-        }
-        const statusResponseBody = await statusResponse.json();
-        if (options.onStatusUpdate) {
-          options.onStatusUpdate({
-            status: statusResponseBody.status,
-            message: statusResponseBody.message || `Status: ${statusResponseBody.status}`
-          });
-        }
-        if (statusResponse.status === 200) {
-          return {
-            branchName: statusResponseBody.branchName,
-            pullRequestUrl: statusResponseBody.pullRequestUrl
-          };
-        }
-        if (!statusResponse.ok) {
-          throw new Error(
-            statusResponseBody.message || "Editorial workflow failed"
+        try {
+          const statusUrl = `${this.contentApiBase}/editorial-workflow/${this.clientId}/status/${requestId}`;
+          const statusResponse = await this.authProvider.fetchWithToken(statusUrl);
+          const statusResponseBody = await statusResponse.json();
+          if (options.onStatusUpdate) {
+            options.onStatusUpdate({
+              status: statusResponseBody.status,
+              message: statusResponseBody.message || `Status: ${statusResponseBody.status}`
+            });
+          }
+          if (statusResponseBody.status === EDITORIAL_WORKFLOW_STATUS.ERROR || statusResponse.status === 500) {
+            if (statusResponseBody.pullRequestUrl) {
+              return {
+                branchName: statusResponseBody.branchName,
+                pullRequestUrl: statusResponseBody.pullRequestUrl,
+                warning: statusResponseBody.message
+              };
+            }
+            const error2 = new Error(
+              statusResponseBody.message || "Editorial workflow failed"
+            );
+            error2.errorCode = statusResponseBody.errorCode || "WORKFLOW_FAILED";
+            throw error2;
+          }
+          if (statusResponse.status === 200) {
+            return {
+              branchName: statusResponseBody.branchName,
+              pullRequestUrl: statusResponseBody.pullRequestUrl
+            };
+          }
+          if (statusResponse.status !== 202) {
+            const error2 = new Error(
+              statusResponseBody.message || `Failed to check workflow status: ${statusResponse.statusText}`
+            );
+            error2.errorCode = "WORKFLOW_STATUS_FAILED";
+            throw error2;
+          }
+        } catch (error2) {
+          if (error2.errorCode) {
+            throw error2;
+          }
+          console.warn(
+            `Editorial workflow status poll failed (attempt ${attempts}/${maxAttempts}), retrying...`,
+            error2
           );
         }
       }
@@ -122121,7 +122209,7 @@ const AuthWallInner = ({
   const loginScreen = client.authProvider.getLoginScreen();
   if (loginStrategy === "LoginScreen" && !loginScreen) {
     throw new Error(
-      "LoginScreen is set as the login strategy but no login screen component was provided"
+      "LoginScreen is set as the login strategy but no login screen component was provided."
     );
   }
   const [activeModal, setActiveModal] = useState(null);
@@ -122148,7 +122236,7 @@ const AuthWallInner = ({
           } else {
             setErrorMessage({
               title: "Access Denied:",
-              message: "Not Authorized To Edit"
+              message: "Not authorized to edit."
             });
             setActiveModal("error");
           }
@@ -122207,16 +122295,16 @@ const AuthWallInner = ({
       });
     }
   };
-  let modalTitle = "Let’s get you editing with TinaCMS...";
+  let modalTitle = "Let’s get you editing with TinaCMS!";
   if (activeModal === "authenticate" && loginStrategy === "Redirect" && !isTinaCloud) {
     modalTitle = "Enter into edit mode";
   } else if (activeModal === "authenticate" && loginStrategy === "UsernamePassword") {
-    modalTitle = "Let’s get you editing with TinaCMS...";
+    modalTitle = "Let’s get you editing with TinaCMS!";
   } else if (activeModal === "error") {
     if (loginStrategy === "Redirect" && !isTinaCloud) {
       modalTitle = "Enter into edit mode";
     } else if (loginStrategy === "UsernamePassword") {
-      modalTitle = "Let’s get you editing with TinaCMS...";
+      modalTitle = "Let’s get you editing with TinaCMS!";
     }
   }
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, activeModal === "authenticate" && loginStrategy === "Redirect" && /* @__PURE__ */ React__default.createElement(
@@ -122230,7 +122318,7 @@ const AuthWallInner = ({
           alt: "Tina the Llama playing a large orange key like a guitar.",
           width: 816,
           height: 816,
-          style: { maxWidth: "100%", margin: "0 auto", display: "block" }
+          style: { width: "16rem", margin: "0 auto", display: "block" }
         }
       ) : "When you save, changes will be saved to the local filesystem.",
       close,

package/dist/internalClient/index.d.ts

@@ -9,6 +9,7 @@ interface TinaSearchConfig {
     fuzzyOptions?: FuzzySearchOptions;
 }
 import gql from 'graphql-tag';
+import { EditorialWorkflowResult } from '../toolkit/form-builder/editorial-workflow-constants';
 import { TinaCloudProject } from './types';
 export * from './authProvider';
 export type OnLoginFunc = (args: {
@@ -86,6 +87,7 @@ export declare class Client {
         variables: object;
     }): Promise<ReturnType>;
     get appDashboardLink(): string;
+    get gitSettingsLink(): string;
     checkSyncStatus({ assetsSyncing, }: {
         assetsSyncing: string[];
     }): Promise<{
@@ -165,7 +167,7 @@ export declare class Client {
             status: string;
             message?: string;
         }) => void;
-    }): Promise<any>;
+    }): Promise<EditorialWorkflowResult>;
 }
 export declare const DEFAULT_LOCAL_TINA_GQL_SERVER_URL = "http://localhost:4001/graphql";
 export declare class LocalClient extends Client {

package/dist/lib/posthog/posthog.d.ts

@@ -72,3 +72,23 @@ export declare const SlashCommandUsedEvent: string;
 export type SlashCommandUsedPayload = {
     command: string;
 };
+export declare const MediaUsageDashboardOpenedEvent: string;
+export type MediaUsageDashboardOpenedPayload = Record<string, never>;
+export declare const MediaUsageDashboardRefreshedEvent: string;
+export type MediaUsageDashboardRefreshedPayload = {
+    errorOccured?: boolean;
+};
+export declare const MediaUsageDashboardTypeFilterEvent: string;
+export type MediaUsageDashboardTypeFilterPayload = {
+    type: 'all' | 'image' | 'video' | 'other';
+};
+export declare const MediaUsageDashboardUsageFilterChangedEvent: string;
+export type MediaUsageDashboardUsageFilterChangedPayload = {
+    usage: 'all' | 'used' | 'unused';
+};
+export declare const MediaUsageDashboardRowExpandedEvent: string;
+export type MediaUsageDashboardRowExpandedEvent = Record<string, never>;
+export declare const MediaUsageDashboardPreviewOpenedEvent: string;
+export type MediaUsageDashboardPreviewOpenedPayload = Record<string, never>;
+export declare const MediaUsageDashboardDocumentLinkClickedEvent: string;
+export type MediaUsageDashboardDocumentLinkClickedEvent = Record<string, never>;

package/dist/toolkit/fields/plugins/mdx-field-plugin/plate/toolbar/toolbar-overrides.d.ts

@@ -1,4 +1,5 @@
-export type ToolbarOverrideType = 'heading' | 'link' | 'image' | 'quote' | 'ul' | 'ol' | 'code' | 'codeBlock' | 'bold' | 'italic' | 'strikethrough' | 'highlight' | 'mermaid' | 'raw' | 'embed' | 'table' | 'hr';
+import type { ToolbarOverrideType } from '@tinacms/schema-tools';
+export type { ToolbarOverrideType };
 export declare const STANDARD_ICON_WIDTH = 32;
 export declare const HEADING_ICON_WITH_TEXT = 127;
 export declare const HEADING_ICON_ONLY = 58;

package/dist/toolkit/form-builder/editorial-workflow-constants.d.ts

@@ -32,3 +32,11 @@ export type EditorialWorkflowErrorDetails = Error & {
     errorCode?: string;
     conflictingBranch?: string;
 };
+/**
+ * Result from a completed editorial workflow operation
+ */
+export interface EditorialWorkflowResult {
+    branchName: string;
+    pullRequestUrl: string;
+    warning?: string;
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "tinacms",
   "type": "module",
   "typings": "dist/index.d.ts",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "exports": {
@@ -114,9 +114,9 @@
     "webfontloader": "1.6.28",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/mdx": "2.1.0",
-    "@tinacms/schema-tools": "2.7.0",
-    "@tinacms/search": "1.2.8"
+    "@tinacms/mdx": "2.1.1",
+    "@tinacms/schema-tools": "2.7.1",
+    "@tinacms/search": "1.2.9"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.8.1",