tinacms 3.3.2 → 3.4.1

package/dist/index.js

@@ -46532,7 +46532,7 @@ const NavProvider = ({
   };
   return /* @__PURE__ */ React__default.createElement(NavContext.Provider, { value }, children);
 };
-const version$1 = "3.3.2";
+const version$1 = "3.4.1";
 const VersionInfo = () => {
   var _a2, _b, _c, _d, _e, _f;
   const cms = useCMS();
@@ -48661,6 +48661,11 @@ const EDITORIAL_WORKFLOW_STATUS = {
   ERROR: "error",
   TIMEOUT: "timeout"
 };
+const EDITORIAL_WORKFLOW_ERROR = {
+  BRANCH_EXISTS: "BRANCH_EXISTS",
+  BRANCH_HIERARCHY_CONFLICT: "BRANCH_HIERARCHY_CONFLICT",
+  VALIDATION_FAILED: "VALIDATION_FAILED"
+};
 const num123 = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
 const numFas = ["۱", "۲", "۳", "۴", "۵", "۶", "۷", "۸", "۹", "۰"];
 const numKor = ["０", "１", "２", "３", "４", "５", "６", "７", "８", "９"];
@@ -64237,7 +64242,27 @@ const CreateBranchModal = ({
       close2();
     } catch (e3) {
       console.error(e3);
-      const errorMessage2 = e3.message && e3.message.includes("Branch already exists") ? "Branch already exists" : "Branch operation failed, please try again. If the problem persists please contact support.";
+      let errorMessage2 = "Branch operation failed, please try again. If the problem persists please contact support.";
+      const err = e3;
+      if (err.errorCode) {
+        switch (err.errorCode) {
+          case EDITORIAL_WORKFLOW_ERROR.BRANCH_EXISTS:
+            errorMessage2 = "A branch with this name already exists";
+            break;
+          case EDITORIAL_WORKFLOW_ERROR.BRANCH_HIERARCHY_CONFLICT:
+            errorMessage2 = err.message || "Branch name conflicts with an existing branch";
+            break;
+          case EDITORIAL_WORKFLOW_ERROR.VALIDATION_FAILED:
+            errorMessage2 = err.message || "Invalid branch name";
+            break;
+        }
+      } else if (err.message) {
+        if (err.message.toLowerCase().includes("already exists")) {
+          errorMessage2 = "A branch with this name already exists";
+        } else if (err.message.toLowerCase().includes("conflict")) {
+          errorMessage2 = err.message;
+        }
+      }
       setErrorMessage(errorMessage2);
       setDisabled(false);
       setIsExecuting(false);
@@ -119749,9 +119774,16 @@ mutation addPendingDocumentMutation(
       const responseBody = await res.json();
       if (!res.ok) {
         console.error("There was an error starting editorial workflow.");
-        throw new Error(
+        const error2 = new Error(
           (responseBody == null ? void 0 : responseBody.message) || "Failed to start editorial workflow"
         );
+        if (responseBody == null ? void 0 : responseBody.errorCode) {
+          error2.errorCode = responseBody.errorCode;
+        }
+        if (responseBody == null ? void 0 : responseBody.conflictingBranch) {
+          error2.conflictingBranch = responseBody.conflictingBranch;
+        }
+        throw error2;
       }
       const requestId = responseBody.requestId;
       if (!requestId) {
@@ -121341,7 +121373,7 @@ const CollectionListPage = () => {
         search
       },
       (collection, _loading, reFetchCollection, collectionExtra) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
         const documents = collection.documents.edges;
         const admin = cms.api.admin;
         const pageInfo = collection.documents.pageInfo;
@@ -121358,10 +121390,11 @@ const CollectionListPage = () => {
         const collectionDefinition = cms.api.tina.schema.getCollection(
           collection.name
         );
-        const allowCreate = ((_f = (_e = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _e.allowedActions) == null ? void 0 : _f.create) ?? true;
-        const allowDelete = ((_h = (_g = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _g.allowedActions) == null ? void 0 : _h.delete) ?? true;
-        const allowCreateFolder = ((_j = (_i = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _i.allowedActions) == null ? void 0 : _j.createFolder) ?? true;
-        const allowCreateNestedFolder = ((_l = (_k = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _k.allowedActions) == null ? void 0 : _l.createNestedFolder) ?? true;
+        const parse2 = (_f = (_e = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _e.filename) == null ? void 0 : _f.parse;
+        const allowCreate = ((_h = (_g = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _g.allowedActions) == null ? void 0 : _h.create) ?? true;
+        const allowDelete = ((_j = (_i = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _i.allowedActions) == null ? void 0 : _j.delete) ?? true;
+        const allowCreateFolder = ((_l = (_k = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _k.allowedActions) == null ? void 0 : _l.createFolder) ?? true;
+        const allowCreateNestedFolder = ((_n = (_m = collectionDefinition == null ? void 0 : collectionDefinition.ui) == null ? void 0 : _m.allowedActions) == null ? void 0 : _n.createNestedFolder) ?? true;
         const folderView = folder.fullyQualifiedName !== "";
         return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, deleteModalOpen && !cms.api.tina.usingProtectedBranch() && /* @__PURE__ */ React__default.createElement(
           DeleteModal,
@@ -121433,6 +121466,7 @@ const CollectionListPage = () => {
         ), renameModalOpen && /* @__PURE__ */ React__default.createElement(
           RenameModal,
           {
+            parser: parse2,
             filename: vars.relativePathWithoutExtension,
             newRelativePath: vars.newRelativePath,
             setNewRelativePath: (newRelativePath) => {
@@ -121477,7 +121511,7 @@ const CollectionListPage = () => {
                 return { ...vars2, folderName };
               });
             },
-            validationRegex: (_o = (_n = (_m = cms.api.tina) == null ? void 0 : _m.schema.config.config.ui) == null ? void 0 : _n.regexValidation) == null ? void 0 : _o.folderNameRegex,
+            validationRegex: (_q = (_p = (_o = cms.api.tina) == null ? void 0 : _o.schema.config.config.ui) == null ? void 0 : _p.regexValidation) == null ? void 0 : _q.folderNameRegex,
             createFunc: async () => {
               try {
                 admin.createFolder(
@@ -122100,6 +122134,7 @@ const FolderModal = ({
   ))));
 };
 const RenameModal = ({
+  parser,
   close: close2,
   renameFunc,
   filename,
@@ -122111,7 +122146,13 @@ const RenameModal = ({
     {
       placeholder: "Enter a new name for the document's file",
       value: newRelativePath,
-      onChange: (event) => setNewRelativePath(event.target.value)
+      onChange: (event) => {
+        let value = event.target.value;
+        if (parser) {
+          value = parser(value);
+        }
+        setNewRelativePath(value);
+      }
     }
   ))), /* @__PURE__ */ React__default.createElement(ModalActions, null, /* @__PURE__ */ React__default.createElement(Button$2, { style: { flexGrow: 2 }, onClick: close2 }, "Cancel"), /* @__PURE__ */ React__default.createElement(
     Button$2,
@@ -122450,7 +122491,7 @@ const RenderForm$1 = ({
   mutationInfo,
   customDefaults
 }) => {
-  var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const navigate = useNavigate();
   const [formIsPristine, setFormIsPristine] = useState(true);
   const schema = cms.api.tina.schema;
@@ -122481,9 +122522,11 @@ const RenderForm$1 = ({
   ((_d = template.ui) == null ? void 0 : _d.defaultItem) || // @ts-ignore
   (template == null ? void 0 : template.defaultItem) || {};
   const fileReadOnly = (_f = (_e = schemaCollection == null ? void 0 : schemaCollection.ui) == null ? void 0 : _e.filename) == null ? void 0 : _f.readonly;
+  const parse2 = (_h = (_g = schemaCollection == null ? void 0 : schemaCollection.ui) == null ? void 0 : _g.filename) == null ? void 0 : _h.parse;
   const filenameField = {
     name: "filename",
     label: "Filename",
+    parse: parse2,
     component: slugFunction && !fileReadOnly ? wrapFieldsWithMeta(({ field, input, meta }) => {
       var _a3, _b2;
       return /* @__PURE__ */ React__default.createElement(
@@ -122494,8 +122537,8 @@ const RenderForm$1 = ({
         }
       );
     }) : "text",
-    disabled: (_h = (_g = schemaCollection == null ? void 0 : schemaCollection.ui) == null ? void 0 : _g.filename) == null ? void 0 : _h.readonly,
-    description: ((_j = (_i = collection.ui) == null ? void 0 : _i.filename) == null ? void 0 : _j.description) ? /* @__PURE__ */ React__default.createElement(
+    disabled: (_j = (_i = schemaCollection == null ? void 0 : schemaCollection.ui) == null ? void 0 : _i.filename) == null ? void 0 : _j.readonly,
+    description: ((_l = (_k = collection.ui) == null ? void 0 : _k.filename) == null ? void 0 : _l.description) ? /* @__PURE__ */ React__default.createElement(
       "span",
       {
         dangerouslySetInnerHTML: { __html: collection.ui.filename.description }

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

@@ -15,3 +15,20 @@ export declare const EDITORIAL_WORKFLOW_STATUS: {
     readonly TIMEOUT: "timeout";
 };
 export type EditorialWorkflowStatus = (typeof EDITORIAL_WORKFLOW_STATUS)[keyof typeof EDITORIAL_WORKFLOW_STATUS];
+/**
+ * Editorial Workflow Error Codes
+ * These match the server-side constants in tinacloud/common/src/editorial-workflow-constants.ts
+ */
+export declare const EDITORIAL_WORKFLOW_ERROR: {
+    readonly BRANCH_EXISTS: "BRANCH_EXISTS";
+    readonly BRANCH_HIERARCHY_CONFLICT: "BRANCH_HIERARCHY_CONFLICT";
+    readonly VALIDATION_FAILED: "VALIDATION_FAILED";
+};
+export type EditorialWorkflowError = (typeof EDITORIAL_WORKFLOW_ERROR)[keyof typeof EDITORIAL_WORKFLOW_ERROR];
+/**
+ * Error type for editorial workflow operations with additional error details
+ */
+export type EditorialWorkflowErrorDetails = Error & {
+    errorCode?: string;
+    conflictingBranch?: string;
+};

package/package.json

@@ -2,7 +2,7 @@
   "name": "tinacms",
   "type": "module",
   "typings": "dist/index.d.ts",
-  "version": "3.3.2",
+  "version": "3.4.1",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "exports": {
@@ -110,9 +110,9 @@
     "webfontloader": "1.6.28",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/mdx": "2.0.4",
-    "@tinacms/search": "1.2.1",
-    "@tinacms/schema-tools": "2.4.0"
+    "@tinacms/mdx": "2.0.5",
+    "@tinacms/schema-tools": "2.5.0",
+    "@tinacms/search": "1.2.2"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.8.1",