tinacms 2.2.2 → 2.2.4

package/dist/index.js

@@ -4627,6 +4627,8 @@ var __publicField = (obj, key, value) => {
     React__namespace.useEffect(() => {
       if (field.experimental___filter && optionSets.length > 0) {
         setFilteredOptionsList(field.experimental___filter(optionSets, void 0));
+      } else {
+        setFilteredOptionsList(optionSets);
       }
     }, [optionSets, field.experimental___filter]);
     if (loading === true) {
@@ -4647,7 +4649,7 @@ var __publicField = (obj, key, value) => {
       {
         shouldFilter: !field.experimental___filter,
         filter: (value2, search) => {
-          if (value2.toLowerCase().replace(/\//g, "").includes(search.toLowerCase()))
+          if (value2.toLowerCase().includes(search.toLowerCase()))
             return 1;
           return 0;
         }
@@ -8524,7 +8526,7 @@ var __publicField = (obj, key, value) => {
             const { message = "Unexpected error generating upload url" } = await res.json();
             throw new Error(message);
           }
-          const { signedUrl } = await res.json();
+          const { signedUrl, requestId } = await res.json();
           if (!signedUrl) {
             throw new Error("Unexpected error generating upload url");
           }
@@ -8546,6 +8548,21 @@ var __publicField = (obj, key, value) => {
               throw new Error(`Upload error: '${matches[2]}'`);
             }
           }
+          const updateStartTime = Date.now();
+          while (true) {
+            await new Promise((resolve) => setTimeout(resolve, 1e3));
+            const { error, message } = await this.api.getRequestStatus(requestId);
+            if (error !== void 0) {
+              if (error) {
+                throw new Error(message);
+              } else {
+                break;
+              }
+            }
+            if (Date.now() - updateStartTime > 3e4) {
+              throw new Error("Time out waiting for upload to complete");
+            }
+          }
           const src = `https://assets.tina.io/${this.api.clientId}/${path}`;
           newFiles.push({
             directory: item.directory,
@@ -8731,9 +8748,34 @@ var __publicField = (obj, key, value) => {
       const path = `${media.directory ? `${media.directory}/${media.filename}` : media.filename}`;
       if (!this.isLocal) {
         if (await this.isAuthenticated()) {
-          await this.api.authProvider.fetchWithToken(`${this.url}/${path}`, {
-            method: "DELETE"
-          });
+          const res = await this.api.authProvider.fetchWithToken(
+            `${this.url}/${path}`,
+            {
+              method: "DELETE"
+            }
+          );
+          if (res.status == 200) {
+            const { requestId } = await res.json();
+            const deleteStartTime = Date.now();
+            while (true) {
+              await new Promise((resolve) => setTimeout(resolve, 1e3));
+              const { error, message } = await this.api.getRequestStatus(
+                requestId
+              );
+              if (error !== void 0) {
+                if (error) {
+                  throw new Error(message);
+                } else {
+                  break;
+                }
+              }
+              if (Date.now() - deleteStartTime > 3e4) {
+                throw new Error("Time out waiting for delete to complete");
+              }
+            }
+          } else {
+            throw new Error("Unexpected error deleting media asset");
+          }
         } else {
           throw E_UNAUTHORIZED;
         }
@@ -10514,8 +10556,13 @@ var __publicField = (obj, key, value) => {
         variant: "danger",
         onClick: async () => {
           setProcessing(true);
-          await deleteFunc();
-          close2();
+          try {
+            await deleteFunc();
+          } catch (e) {
+            console.error(e);
+          } finally {
+            close2();
+          }
         }
       },
       /* @__PURE__ */ React.createElement("span", { className: "mr-1" }, "Delete"),
@@ -28466,6 +28513,16 @@ mutation addPendingDocumentMutation(
       const val = await res.json();
       return val;
     }
+    async getRequestStatus(requestId) {
+      const res = await this.authProvider.fetchWithToken(
+        `${this.contentApiBase}/request-status/${this.clientId}/${requestId}`,
+        {
+          method: "GET"
+        }
+      );
+      const val = await res.json();
+      return val;
+    }
     async createPullRequest({
       baseBranch,
       branch,

package/dist/index.mjs

@@ -4650,6 +4650,8 @@ const ComboboxDemo = ({
   React.useEffect(() => {
     if (field.experimental___filter && optionSets.length > 0) {
       setFilteredOptionsList(field.experimental___filter(optionSets, void 0));
+    } else {
+      setFilteredOptionsList(optionSets);
     }
   }, [optionSets, field.experimental___filter]);
   if (loading === true) {
@@ -4670,7 +4672,7 @@ const ComboboxDemo = ({
     {
       shouldFilter: !field.experimental___filter,
       filter: (value2, search) => {
-        if (value2.toLowerCase().replace(/\//g, "").includes(search.toLowerCase()))
+        if (value2.toLowerCase().includes(search.toLowerCase()))
           return 1;
         return 0;
       }
@@ -8547,7 +8549,7 @@ class TinaMediaStore {
           const { message = "Unexpected error generating upload url" } = await res.json();
           throw new Error(message);
         }
-        const { signedUrl } = await res.json();
+        const { signedUrl, requestId } = await res.json();
         if (!signedUrl) {
           throw new Error("Unexpected error generating upload url");
         }
@@ -8569,6 +8571,21 @@ class TinaMediaStore {
             throw new Error(`Upload error: '${matches[2]}'`);
           }
         }
+        const updateStartTime = Date.now();
+        while (true) {
+          await new Promise((resolve) => setTimeout(resolve, 1e3));
+          const { error, message } = await this.api.getRequestStatus(requestId);
+          if (error !== void 0) {
+            if (error) {
+              throw new Error(message);
+            } else {
+              break;
+            }
+          }
+          if (Date.now() - updateStartTime > 3e4) {
+            throw new Error("Time out waiting for upload to complete");
+          }
+        }
         const src = `https://assets.tina.io/${this.api.clientId}/${path}`;
         newFiles.push({
           directory: item.directory,
@@ -8754,9 +8771,34 @@ class TinaMediaStore {
     const path = `${media.directory ? `${media.directory}/${media.filename}` : media.filename}`;
     if (!this.isLocal) {
       if (await this.isAuthenticated()) {
-        await this.api.authProvider.fetchWithToken(`${this.url}/${path}`, {
-          method: "DELETE"
-        });
+        const res = await this.api.authProvider.fetchWithToken(
+          `${this.url}/${path}`,
+          {
+            method: "DELETE"
+          }
+        );
+        if (res.status == 200) {
+          const { requestId } = await res.json();
+          const deleteStartTime = Date.now();
+          while (true) {
+            await new Promise((resolve) => setTimeout(resolve, 1e3));
+            const { error, message } = await this.api.getRequestStatus(
+              requestId
+            );
+            if (error !== void 0) {
+              if (error) {
+                throw new Error(message);
+              } else {
+                break;
+              }
+            }
+            if (Date.now() - deleteStartTime > 3e4) {
+              throw new Error("Time out waiting for delete to complete");
+            }
+          }
+        } else {
+          throw new Error("Unexpected error deleting media asset");
+        }
       } else {
         throw E_UNAUTHORIZED;
       }
@@ -10537,8 +10579,13 @@ const DeleteModal$1 = ({
       variant: "danger",
       onClick: async () => {
         setProcessing(true);
-        await deleteFunc();
-        close2();
+        try {
+          await deleteFunc();
+        } catch (e) {
+          console.error(e);
+        } finally {
+          close2();
+        }
       }
     },
     /* @__PURE__ */ React__default.createElement("span", { className: "mr-1" }, "Delete"),
@@ -28489,6 +28536,16 @@ mutation addPendingDocumentMutation(
     const val = await res.json();
     return val;
   }
+  async getRequestStatus(requestId) {
+    const res = await this.authProvider.fetchWithToken(
+      `${this.contentApiBase}/request-status/${this.clientId}/${requestId}`,
+      {
+        method: "GET"
+      }
+    );
+    const val = await res.json();
+    return val;
+  }
   async createPullRequest({
     baseBranch,
     branch,

package/dist/internalClient/index.d.ts

@@ -87,6 +87,10 @@ export declare class Client {
         assetsSyncing: string[];
     }>;
     getProject(): Promise<TinaCloudProject>;
+    getRequestStatus(requestId: string): Promise<{
+        error: boolean;
+        message?: string;
+    }>;
     createPullRequest({ baseBranch, branch, title, }: {
         baseBranch: string;
         branch: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -124,8 +124,8 @@
     "yup": "^1.4.0",
     "zod": "^3.23.8",
     "@tinacms/mdx": "1.4.2",
-    "@tinacms/schema-tools": "1.6.2",
-    "@tinacms/search": "1.0.28"
+    "@tinacms/search": "1.0.28",
+    "@tinacms/schema-tools": "1.6.2"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.3.3",