gt-sanity 2.0.8 → 2.0.9

package/dist/index.js

@@ -663,6 +663,28 @@ function createLocaleSuffix(localeId) {
   const normalized = localeId.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
   return normalized ? `-${normalized}` : "";
 }
+function getPublishedId(documentId) {
+  return documentId.startsWith("drafts.") ? documentId.slice(7) : documentId;
+}
+function getDocumentPublishedId(document2) {
+  return getPublishedId(document2._id);
+}
+function dedupeDocumentsPreferDraft(documents) {
+  const byPublishedId = /* @__PURE__ */ new Map();
+  for (const document2 of documents) {
+    const publishedId = getDocumentPublishedId(document2);
+    (!byPublishedId.get(publishedId) || document2._id.startsWith("drafts.")) && byPublishedId.set(publishedId, document2);
+  }
+  return Array.from(byPublishedId.values());
+}
+function createTranslationStatusKey(branchId, documentId, versionId, localeId) {
+  const publishedId = getPublishedId(documentId);
+  return branchId ? `${branchId}:${publishedId}:${versionId}:${localeId}` : `${publishedId}:${versionId}:${localeId}`;
+}
+function createStableTranslationKey(branchId, documentId, localeId) {
+  const publishedId = getPublishedId(documentId);
+  return branchId ? `${branchId}:${publishedId}:${localeId}` : `${publishedId}:${localeId}`;
+}
 function deserializeDocument(document2) {
   const deserializers = merge__default.default(
     { types: {} },
@@ -702,7 +724,7 @@ function stripIgnoredFields(document2, ignoreFields, dedupeFields) {
   if (fieldsToStrip.length === 0) return document2;
   const strippedDoc = JSON.parse(JSON.stringify(document2));
   return deleteMatchingFields(
-    document2._id.replace("drafts.", ""),
+    getPublishedId(document2._id),
     strippedDoc,
     fieldsToStrip
   ), strippedDoc;
@@ -783,9 +805,19 @@ async function downloadTranslations(files, secrets, maxRetries = 3, retryDelay =
 async function checkTranslationStatus(fileQueryData, downloadStatus, secrets) {
   overrideConfig(secrets);
   try {
-    const currentQueryData = fileQueryData.filter(
-      (item) => !downloadStatus.downloaded.has(`${item.fileId}:${item.locale}`) && !downloadStatus.failed.has(`${item.fileId}:${item.locale}`) && !downloadStatus.skipped.has(`${item.fileId}:${item.locale}`)
-    );
+    const currentQueryData = fileQueryData.filter((item) => {
+      const statusKey = createTranslationStatusKey(
+        item.branchId,
+        item.fileId,
+        item.versionId,
+        item.locale
+      ), stableKey = createStableTranslationKey(
+        item.branchId,
+        item.fileId,
+        item.locale
+      );
+      return !downloadStatus.downloaded.has(statusKey) && !downloadStatus.downloaded.has(stableKey) && !downloadStatus.failed.has(statusKey) && !downloadStatus.failed.has(stableKey) && !downloadStatus.skipped.has(statusKey) && !downloadStatus.skipped.has(stableKey);
+    });
     return currentQueryData.length === 0 ? !0 : ((await gt.queryFileData({
       translatedFiles: currentQueryData
     })).translatedFiles || []).filter(
@@ -796,7 +828,7 @@ async function checkTranslationStatus(fileQueryData, downloadStatus, secrets) {
   }
 }
 const findLatestDraft = (documentId, client) => {
-  const query = "*[_id == $id || _id == $draftId]", params = { id: documentId, draftId: `drafts.${documentId}` };
+  const publishedId = getPublishedId(documentId), query = "*[_id == $id || _id == $draftId]", params = { id: publishedId, draftId: `drafts.${publishedId}` };
   return client.fetch(query, params).then(
     (docs) => docs.find((doc) => doc._id.startsWith("drafts.")) ?? docs[0]
   );
@@ -808,21 +840,25 @@ function randomKey() {
   return Math.random().toString(36).slice(2, 10);
 }
 async function createI18nDocAndPatchMetadata(sourceDocument, translatedDoc, localeId, client, translationMetadata, sourceDocumentId, languageField = "language") {
+  const publishedSourceDocumentId = getPublishedId(sourceDocumentId);
   translatedDoc[languageField] = localeId;
   const existingLocaleKey = translationMetadata.translations.find(
     (translation) => translation.language === localeId
   ), operation = existingLocaleKey ? "replace" : "after", location = existingLocaleKey ? `translations[language == "${localeId}"]` : "translations[-1]", { _updatedAt, _createdAt, ...rest } = translatedDoc, appliedDocument = applyDocuments(
-    sourceDocumentId,
+    publishedSourceDocumentId,
     sourceDocument,
     rest,
     pluginConfig.getIgnoreFields(),
     pluginConfig.getSkipFields(),
     pluginConfig.getDedupeFields(),
     localeId
-  ), isSingleton = pluginConfig.getSingletons().includes(sourceDocumentId);
+  ), isSingleton = pluginConfig.getSingletons().includes(publishedSourceDocumentId);
   let createDocumentPromise;
   if (isSingleton) {
-    const translatedDocId = pluginConfig.getSingletonMapping()(sourceDocumentId, localeId);
+    const translatedDocId = pluginConfig.getSingletonMapping()(
+      publishedSourceDocumentId,
+      localeId
+    );
     createDocumentPromise = client.create({
       ...appliedDocument,
       _type: rest._type,
@@ -834,7 +870,7 @@ async function createI18nDocAndPatchMetadata(sourceDocument, translatedDoc, loca
       _type: rest._type,
       _id: "drafts."
     });
-  const doc = await createDocumentPromise, _ref = doc._id.replace("drafts.", "");
+  const doc = await createDocumentPromise, _ref = getPublishedId(doc._id);
   await client.transaction().patch(
     translationMetadata._id,
     (p) => p.insert(operation, location, [
@@ -855,12 +891,12 @@ async function createI18nDocAndPatchMetadata(sourceDocument, translatedDoc, loca
   ).commit();
 }
 const getOrCreateTranslationMetadata = async (documentId, baseDocument, client, baseLanguage) => {
-  const existingMetadata = await client.fetch(
+  const publishedId = getPublishedId(documentId), existingMetadata = await client.fetch(
     `*[
         _type == 'translation.metadata' &&
         translations[language == $baseLanguage][0].value._ref == $id
       ][0]`,
-    { baseLanguage, id: documentId.replace("drafts.", "") }
+    { baseLanguage, id: publishedId }
   );
   if (existingMetadata)
     return existingMetadata;
@@ -870,7 +906,7 @@ const getOrCreateTranslationMetadata = async (documentId, baseDocument, client,
     _type: "internationalizedArrayReferenceValue",
     value: {
       _type: "reference",
-      _ref: baseDocument._id.replace("drafts.", "")
+      _ref: getPublishedId(baseDocument._id)
     }
   };
   baseDocument._id.startsWith("drafts.") && (baseLangEntry.value = {
@@ -884,7 +920,7 @@ const getOrCreateTranslationMetadata = async (documentId, baseDocument, client,
   });
   try {
     return await client.createIfNotExists({
-      _id: `translation.metadata.${documentId.replace("drafts.", "")}`,
+      _id: `translation.metadata.${publishedId}`,
       _type: "translation.metadata",
       translations: [baseLangEntry]
     });
@@ -894,7 +930,7 @@ const getOrCreateTranslationMetadata = async (documentId, baseDocument, client,
           _type == 'translation.metadata' &&
           translations[language == $baseLanguage][0].value._ref == $id
         ][0]`,
-      { baseLanguage, id: documentId.replace("drafts.", "") }
+      { baseLanguage, id: publishedId }
     );
     if (metadata)
       return metadata;
@@ -935,12 +971,12 @@ const documentLevelPatch = async (docInfo, translatedFields, localeId, client, l
     docInfo.versionId,
     client
   )), baseDoc || (baseDoc = await findLatestDraft(docInfo.documentId, client));
-  const translationMetadata = await getOrCreateTranslationMetadata(
+  const i18nDocId = (await getOrCreateTranslationMetadata(
     docInfo.documentId,
     baseDoc,
     client,
     baseLanguage
-  ), i18nDocId = translationMetadata.translations.find((translation) => translation.language === localeId)?.value?._ref;
+  )).translations.find((translation) => translation.language === localeId)?.value?._ref;
   i18nDocId && (i18nDoc = await findLatestDraft(i18nDocId, client)), mergeWithTargetLocale && i18nDoc ? baseDoc = i18nDoc : docInfo.documentId && docInfo.versionId && (baseDoc = await findDocumentAtRevision(
     docInfo.documentId,
     docInfo.versionId,
@@ -950,23 +986,46 @@ const documentLevelPatch = async (docInfo, translatedFields, localeId, client, l
     translatedFields,
     baseDoc
   );
-  i18nDoc ? await patchI18nDoc(
-    docInfo.documentId,
-    i18nDoc._id,
-    baseDoc,
-    merged,
-    translatedFields,
-    client,
-    i18nDoc
-  ) : await createI18nDocAndPatchMetadata(
-    baseDoc,
-    merged,
-    localeId,
-    client,
-    translationMetadata,
-    docInfo.documentId,
-    languageField
-  );
+  if (i18nDoc)
+    await patchI18nDoc(
+      docInfo.documentId,
+      i18nDoc._id,
+      baseDoc,
+      merged,
+      translatedFields,
+      client,
+      i18nDoc
+    );
+  else {
+    const freshTranslationMetadata = await getOrCreateTranslationMetadata(
+      docInfo.documentId,
+      baseDoc,
+      client,
+      baseLanguage
+    ), freshI18nDocId = freshTranslationMetadata.translations.find((translation) => translation.language === localeId)?.value?._ref;
+    if (freshI18nDocId) {
+      const freshI18nDoc = await findLatestDraft(freshI18nDocId, client);
+      await patchI18nDoc(
+        docInfo.documentId,
+        freshI18nDoc._id,
+        baseDoc,
+        merged,
+        translatedFields,
+        client,
+        freshI18nDoc
+      );
+      return;
+    }
+    await createI18nDocAndPatchMetadata(
+      baseDoc,
+      merged,
+      localeId,
+      client,
+      freshTranslationMetadata,
+      docInfo.documentId,
+      languageField
+    );
+  }
 };
 async function importDocument(docInfo, localeId, document2, context, mergeWithTargetLocale = !1) {
   const { client } = context, deserialized = deserializeDocument(document2);
@@ -1007,10 +1066,12 @@ async function resolveTranslatedReferences(references, locale, client) {
     return translatedRefs;
   const sourceLocale = pluginConfig.getSourceLocale(), translationPairs = await client.fetch(`*[_type == "translation.metadata" && count(translations[language == $sourceLocale && value._ref in $refIds]) > 0] {
     "originalRef": translations[language == $sourceLocale][0].value._ref,
-    "translatedRef": translations[language == $locale][0].value._ref
-  }[defined(originalRef) && defined(translatedRef)]`, { refIds, sourceLocale, locale });
-  for (const { originalRef, translatedRef } of translationPairs)
+    "translatedRefs": translations[language == $locale].value._ref
+  }[defined(originalRef) && count(translatedRefs) > 0]`, { refIds, sourceLocale, locale });
+  for (const { originalRef, translatedRefs: localeRefs } of translationPairs) {
+    const translatedRef = localeRefs[localeRefs.length - 1];
     translatedRefs.set(originalRef, translatedRef);
+  }
   return translatedRefs;
 }
 function updateDocumentReferences(doc, translatedRefs) {
@@ -1032,34 +1093,50 @@ function updateReferencesRecursive(obj, translatedRefs) {
   }), updated;
 }
 async function findTranslatedDocumentForLocale(sourceDocumentId, localeId, client) {
-  const cleanDocId = sourceDocumentId.replace("drafts.", "");
-  return await client.fetch(`*[
+  const cleanDocId = getPublishedId(sourceDocumentId), translatedDocIds = await client.fetch(`*[
     _type == "translation.metadata" &&
     (
       translations[language == $sourceLocale][0].value._ref == $cleanDocId
     ) &&
     defined(translations[language == $localeId])
-  ][0].translations[language == $localeId][0].value->`, {
+  ][0].translations[language == $localeId].value._ref`, {
     sourceLocale: pluginConfig.getSourceLocale(),
     cleanDocId,
     localeId
-  }) || null;
+  }), translatedDocId = translatedDocIds?.[translatedDocIds.length - 1];
+  return translatedDocId && await findLatestDraft(translatedDocId, client) || null;
 }
 async function findDocument(documentId, client) {
   const query = "*[_id == $id]", params = { id: documentId };
   return (await client.fetch(query, params))[0] || null;
 }
 async function processBatch(items, processor, options = {}) {
-  const { batchSize = 20, onProgress, onItemSuccess, onItemFailure } = options;
+  const {
+    batchSize = 20,
+    getConcurrencyKey,
+    onProgress,
+    onItemSuccess,
+    onItemFailure
+  } = options;
   let successCount = 0, failureCount = 0;
   const successfulItems = [], failedItems = [];
   for (let i = 0; i < items.length; i += batchSize) {
-    const batch = items.slice(i, i + batchSize), batchPromises = batch.map(async (item) => {
+    const batch = items.slice(i, i + batchSize), pendingByKey = /* @__PURE__ */ new Map(), batchPromises = batch.map(async (item) => {
+      const concurrencyKey = getConcurrencyKey?.(item), pending = concurrencyKey ? pendingByKey.get(concurrencyKey) : void 0;
+      let release = () => {
+      };
+      const current = new Promise((resolve) => {
+        release = resolve;
+      });
+      concurrencyKey && pendingByKey.set(concurrencyKey, current);
       try {
+        pending && await pending;
         const result = await processor(item);
         return onItemSuccess?.(item, result), { success: !0, item, result };
       } catch (error) {
         return onItemFailure?.(item, error), { success: !1, item, error };
+      } finally {
+        release(), concurrencyKey && pendingByKey.get(concurrencyKey) === current && pendingByKey.delete(concurrencyKey);
       }
     });
     (await Promise.all(batchPromises)).forEach((result) => {
@@ -1082,6 +1159,11 @@ async function processImportBatch(items, options = {}) {
       ), item.key),
       {
         ...options,
+        getConcurrencyKey: (item) => createStableTranslationKey(
+          void 0,
+          item.docInfo.documentId,
+          item.locale
+        ),
         onItemSuccess: (item, key) => {
           successfulImports.push(key), options.onItemSuccess?.(item, key);
         },
@@ -1097,15 +1179,25 @@ async function processImportBatch(items, options = {}) {
   };
 }
 async function getReadyFilesForImport(translationStatuses, options = {}) {
-  const { filterReadyFiles = () => !0 } = options, readyFiles = [];
+  const { filterReadyFiles = () => !0 } = options, readyFilesByDocumentLocale = /* @__PURE__ */ new Map();
   for (const [key, status] of translationStatuses.entries())
-    status.isReady && filterReadyFiles(key, status) && readyFiles.push({
-      fileId: status.fileData.fileId,
-      versionId: status.fileData.versionId,
-      branchId: status.fileData.branchId,
-      locale: status.fileData.locale
-    });
-  return readyFiles;
+    if (status.isReady && status.fileData && filterReadyFiles(key, status)) {
+      const fileData = {
+        fileId: getPublishedId(status.fileData.fileId),
+        versionId: status.fileData.versionId,
+        branchId: status.fileData.branchId,
+        locale: status.fileData.locale
+      };
+      readyFilesByDocumentLocale.set(
+        createStableTranslationKey(
+          fileData.branchId,
+          fileData.fileId,
+          fileData.locale
+        ),
+        fileData
+      );
+    }
+  return Array.from(readyFilesByDocumentLocale.values());
 }
 async function importTranslations(readyFiles, secrets, translationContext, options = {}) {
   if (readyFiles.length === 0)
@@ -1137,7 +1229,7 @@ async function publishDocument(documentId, client) {
       {
         actionType: "sanity.action.document.publish",
         draftId: documentId,
-        publishedId: documentId.replace("drafts.", "")
+        publishedId: getPublishedId(documentId)
       },
       {}
     );
@@ -1185,9 +1277,13 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
     downloaded: /* @__PURE__ */ new Set(),
     failed: /* @__PURE__ */ new Set(),
     skipped: /* @__PURE__ */ new Set()
-  }), [translationStatuses, setTranslationStatuses] = o.useState(/* @__PURE__ */ new Map()), [isRefreshing, setIsRefreshing] = o.useState(!1), client = useClient(), schema2 = sanity.useSchema(), translationContext = { client, schema: schema2 }, toast = ui.useToast(), { loading: loadingSecrets, secrets } = useSecrets(
+  }), downloadStatusRef = o.useRef(downloadStatus), [translationStatuses, setTranslationStatuses] = o.useState(/* @__PURE__ */ new Map()), [isRefreshing, setIsRefreshing] = o.useState(!1), client = useClient(), schema2 = sanity.useSchema(), translationContext = { client, schema: schema2 }, toast = ui.useToast(), { loading: loadingSecrets, secrets } = useSecrets(
     pluginConfig.getSecretsNamespace()
-  ), [branchId, setBranchId] = o.useState(void 0), fetchDocuments = o.useCallback(async () => {
+  ), [branchId, setBranchId] = o.useState(void 0);
+  o.useEffect(() => {
+    downloadStatusRef.current = downloadStatus;
+  }, [downloadStatus]);
+  const fetchDocuments = o.useCallback(async () => {
     setLoadingDocuments(!0);
     try {
       if (singleDocument) {
@@ -1198,7 +1294,7 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
       let query;
       filterConditions.length === 0 ? query = `*[!(_type in ["system.group"]) && !(_id in path("_.**")) && ${languageFilter}]` : query = `*[!(_type in ["system.group"]) && !(_id in path("_.**")) && (${filterConditions.join(" || ")}) && ${languageFilter}]`;
       const docs = await client.fetch(query);
-      setDocuments(docs);
+      setDocuments(dedupeDocumentsPreferDraft(docs));
     } catch {
       toast.push({
         title: "Error fetching documents",
@@ -1223,9 +1319,7 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
   }, [secrets]), fetchExistingTranslations = o.useCallback(async () => {
     if (!(!documents.length || !locales.length))
       try {
-        const sourceLocale = pluginConfig.getSourceLocale(), availableLocaleIds = locales.filter((locale) => locale.enabled !== !1).map((locale) => locale.localeId), documentIds = documents.map(
-          (doc) => doc._id?.replace("drafts.", "") || doc._id
-        ), existingMetadata = await client.fetch(`*[
+        const sourceLocale = pluginConfig.getSourceLocale(), availableLocaleIds = locales.filter((locale) => locale.enabled !== !1).map((locale) => locale.localeId), documentIds = documents.map(getDocumentPublishedId), existingMetadata = await client.fetch(`*[
         _type == 'translation.metadata' &&
         translations[language == $sourceLocale][0].value._ref in $documentIds
       ] {
@@ -1238,7 +1332,13 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
         }), existing = /* @__PURE__ */ new Set();
         existingMetadata.forEach((metadata) => {
           metadata.existingTranslations?.forEach((localeId) => {
-            localeId !== sourceLocale && existing.add(`${metadata.sourceDocId}:${localeId}`);
+            localeId !== sourceLocale && existing.add(
+              createStableTranslationKey(
+                void 0,
+                metadata.sourceDocId,
+                localeId
+              )
+            );
           });
         }), setExistingTranslations(existing);
       } catch (error) {
@@ -1262,7 +1362,7 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
             );
             return {
               info: {
-                documentId: doc._id?.replace("drafts.", "") || doc._id,
+                documentId: getDocumentPublishedId(doc),
                 versionId: doc._rev
               },
               serializedDocument: serialized
@@ -1367,7 +1467,11 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
       return existingMetadata.forEach((metadata) => {
         metadata.existingTranslations?.forEach((localeId) => {
           localeId !== sourceLocale && existing.add(
-            `${branchId2}:${metadata.sourceDocId}:${metadata._rev}:${localeId}`
+            createStableTranslationKey(
+              branchId2,
+              metadata.sourceDocId,
+              localeId
+            )
           );
         });
       }), existing;
@@ -1377,14 +1481,18 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
     if (!(!secrets || documents.length === 0 || !branchId)) {
       setIsBusy(!0);
       try {
-        const availableLocaleIds = locales.filter((locale) => locale.enabled !== !1).map((locale) => locale.localeId), documentIds = documents.map(
-          (doc) => doc._id?.replace("drafts.", "") || doc._id
-        ), existingTranslations2 = await getExistingTranslations(
+        const availableLocaleIds = locales.filter((locale) => locale.enabled !== !1).map((locale) => locale.localeId), documentIds = documents.map(getDocumentPublishedId), existingTranslations2 = await getExistingTranslations(
           documentIds,
           availableLocaleIds,
           branchId
         ), readyFiles = await getReadyFilesForImport(translationStatuses, {
-          filterReadyFiles: (key) => !existingTranslations2.has(key)
+          filterReadyFiles: (_key, status) => !existingTranslations2.has(
+            createStableTranslationKey(
+              branchId,
+              status.fileData.fileId,
+              status.fileData.locale
+            )
+          )
         });
         if (readyFiles.length === 0) {
           toast.push({
@@ -1463,7 +1571,7 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
         const availableLocaleIds = locales.filter((locale) => locale.enabled !== !1).map((locale) => locale.localeId), fileQueryData = [];
         for (const doc of documents)
           for (const localeId of availableLocaleIds) {
-            const documentId = doc._id?.replace("drafts.", "") || doc._id;
+            const documentId = getDocumentPublishedId(doc);
             fileQueryData.push({
               versionId: doc._rev,
               fileId: documentId,
@@ -1473,19 +1581,29 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
           }
         const readyTranslations = await checkTranslationStatus(
           fileQueryData,
-          downloadStatus,
+          downloadStatusRef.current,
           secrets
         );
         setTranslationStatuses((prevStatuses) => {
           const newStatuses = /* @__PURE__ */ new Map();
           for (const doc of documents)
             for (const localeId of availableLocaleIds) {
-              const documentId = doc._id?.replace("drafts.", "") || doc._id, versionId = doc._rev, key = `${branchId}:${documentId}:${versionId}:${localeId}`;
+              const documentId = getDocumentPublishedId(doc), versionId = doc._rev, key = createTranslationStatusKey(
+                branchId,
+                documentId,
+                versionId,
+                localeId
+              );
               newStatuses.set(key, { progress: 0, isReady: !1 });
             }
           if (Array.isArray(readyTranslations))
             for (const translation of readyTranslations) {
-              const key = `${branchId}:${translation.fileId}:${translation.versionId}:${translation.locale}`;
+              const key = createTranslationStatusKey(
+                branchId,
+                translation.fileId,
+                translation.versionId,
+                translation.locale
+              );
               newStatuses.set(key, {
                 progress: 100,
                 isReady: !0,
@@ -1516,7 +1634,12 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
   }, [secrets, documents, locales, branchId]), handleImportDocument = o.useCallback(
     async (documentId, versionId, localeId) => {
       if (!secrets) return;
-      const key = `${branchId}:${documentId}:${versionId}:${localeId}`, status = translationStatuses.get(key);
+      const key = createTranslationStatusKey(
+        branchId,
+        documentId,
+        versionId,
+        localeId
+      ), status = translationStatuses.get(key);
       if (!status?.isReady || !status.fileData) {
         toast.push({
           title: `Translation not ready for ${documentId} (${localeId})`,
@@ -1526,7 +1649,7 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
         return;
       }
       const document2 = documents.find(
-        (doc) => (doc._id?.replace("drafts.", "") || doc._id) === documentId
+        (doc) => getDocumentPublishedId(doc) === getPublishedId(documentId)
       );
       if (!document2) {
         toast.push({
@@ -1551,7 +1674,7 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
         if (downloadedFiles.length > 0)
           try {
             const docInfo = {
-              documentId,
+              documentId: getPublishedId(documentId),
               versionId: document2._rev
             };
             await importDocument(
@@ -1563,7 +1686,12 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
             ), setDownloadStatus((prev2) => ({
               ...prev2,
               downloaded: /* @__PURE__ */ new Set([...prev2.downloaded, key])
-            })), setImportedTranslations((prev2) => /* @__PURE__ */ new Set([...prev2, key])), toast.push({
+            })), setImportedTranslations((prev2) => /* @__PURE__ */ new Set([...prev2, key])), setExistingTranslations(
+              (prev2) => /* @__PURE__ */ new Set([
+                ...prev2,
+                createStableTranslationKey(branchId, documentId, localeId)
+              ])
+            ), toast.push({
               title: `Successfully imported translation for ${documentId} (${localeId})`,
               status: "success",
               closable: !0
@@ -1668,7 +1796,10 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
     if (!secrets || documents.length === 0) return 0;
     setIsBusy(!0);
     try {
-      const sourceLocale = pluginConfig.getSourceLocale(), publishedDocumentIds = documents.filter((doc) => !doc._id.startsWith("drafts.")).map((doc) => doc._id);
+      const sourceLocale = pluginConfig.getSourceLocale(), sourceDocumentIds = documents.map(getDocumentPublishedId), publishedDocumentIds = await client.fetch(
+        "*[_id in $sourceDocumentIds]._id",
+        { sourceDocumentIds }
+      );
       if (publishedDocumentIds.length === 0)
         return toast.push({
           title: "No published source documents found to publish translations for",
@@ -1687,19 +1818,19 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
       }`, {
         sourceLocale,
         publishedDocumentIds
-      }), translationDocIds = [];
+      }), translationDocIds = /* @__PURE__ */ new Set();
       if (translationMetadata.forEach((metadata) => {
         metadata.translationDocs?.forEach((translation) => {
-          translation.docId && translationDocIds.push(translation.docId);
+          translation.docId && translationDocIds.add(translation.docId);
         });
-      }), translationDocIds.length === 0)
+      }), translationDocIds.size === 0)
         return toast.push({
           title: "No translation documents found to publish",
           status: "warning",
           closable: !0
         }), 0;
       const translatedDocumentIds = await publishTranslations(
-        translationDocIds,
+        Array.from(translationDocIds),
         client
       );
       return toast.push({
@@ -1724,8 +1855,15 @@ const getLocales = async (secrets) => pluginConfig.getLocales().map((locale) =>
   }, [fetchLocales, secrets]), o.useEffect(() => {
     documents.length > 0 && locales.length > 0 && fetchExistingTranslations();
   }, [fetchExistingTranslations]), o.useEffect(() => {
-    documents.length > 0 && locales.length > 0 && secrets && !loadingDocuments && handleRefreshAll();
-  }, [documents]), o.useEffect(() => {
+    documents.length > 0 && locales.length > 0 && secrets && !loadingDocuments && branchId && handleRefreshAll();
+  }, [
+    documents,
+    locales,
+    secrets,
+    loadingDocuments,
+    branchId,
+    handleRefreshAll
+  ]), o.useEffect(() => {
     if (!autoRefresh || documents.length === 0 || !secrets) return;
     const interval = setInterval(async () => {
       await handleRefreshAll();
@@ -1814,7 +1952,7 @@ const LanguageStatus = ({
   importFile,
   isImported = !1
 }) => {
-  const [isBusy, setIsBusy] = o.useState(!1), handleImport = o.useCallback(async () => {
+  const [isBusy, setIsBusy] = o.useState(!1), displayedProgress = isImported && progress < 100 ? 100 : progress, handleImport = o.useCallback(async () => {
     setIsBusy(!0);
     try {
       await importFile();
@@ -1824,7 +1962,7 @@ const LanguageStatus = ({
   }, [importFile, setIsBusy]);
   return /* @__PURE__ */ jsxRuntime.jsx(ui.Card, { shadow: 1, children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Grid, { columns: 5, gap: 3, padding: 3, children: [
     /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { columnStart: 1, columnEnd: 3, align: "center", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "bold", size: 1, children: title }) }),
-    typeof progress == "number" ? /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { columnStart: 3, columnEnd: 5, align: "center", children: /* @__PURE__ */ jsxRuntime.jsx(ProgressBar, { progress }) }) : null,
+    typeof displayedProgress == "number" ? /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { columnStart: 3, columnEnd: 5, align: "center", children: /* @__PURE__ */ jsxRuntime.jsx(ProgressBar, { progress: displayedProgress }) }) : null,
     /* @__PURE__ */ jsxRuntime.jsx(ui.Box, { columnStart: 5, columnEnd: 6, children: isImported ? /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { align: "center", justify: "center", style: { color: "green" }, children: [
       /* @__PURE__ */ jsxRuntime.jsx(icons.CheckmarkCircleIcon, {}),
       /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: 1, style: { marginLeft: "4px" }, children: "Imported" })
@@ -3051,12 +3189,17 @@ const WrapText = dt(ui.Box)`
     return locales.filter(
       (locale) => locale.enabled !== !1 && locale.localeId !== sourceLocale
     );
-  }, [locales]), documentId = o.useMemo(() => document2 ? document2._id?.replace("drafts.", "") || document2._id : null, [document2]), handleImportTranslations = o.useCallback(
+  }, [locales]), documentId = o.useMemo(() => document2 ? getDocumentPublishedId(document2) : null, [document2]), handleImportTranslations = o.useCallback(
     async (options = {}) => {
       const { autoOnly = !1 } = options;
       if (isImporting || !documentId || autoOnly && !autoImport) return;
       const readyTranslations = availableLocales.filter((locale) => {
-        const key = `${branchId}:${documentId}:${document2._rev}:${locale.localeId}`;
+        const key = createTranslationStatusKey(
+          branchId,
+          documentId,
+          document2._rev,
+          locale.localeId
+        );
         return translationStatuses.get(key)?.isReady && !importedTranslations.has(key);
       });
       if (readyTranslations.length !== 0) {
@@ -3177,7 +3320,12 @@ const WrapText = dt(ui.Box)`
         ] })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(ui.Box, { children: availableLocales.map((locale) => {
-        const key = `${branchId}:${documentId}:${document2._rev}:${locale.localeId}`, status = translationStatuses.get(key), progress = status?.progress || 0, isImported = importedTranslations.has(key);
+        const key = createTranslationStatusKey(
+          branchId,
+          documentId,
+          document2._rev,
+          locale.localeId
+        ), status = translationStatuses.get(key), progress = status?.progress || 0, isImported = importedTranslations.has(key);
         return /* @__PURE__ */ jsxRuntime.jsx(
           LanguageStatus,
           {
@@ -3207,7 +3355,12 @@ const WrapText = dt(ui.Box)`
                 text: isImporting ? "Importing..." : "Import All",
                 icon: icons.DownloadIcon,
                 disabled: isImporting || availableLocales.every((locale) => {
-                  const key = `${branchId}:${documentId}:${document2._rev}:${locale.localeId}`;
+                  const key = createTranslationStatusKey(
+                    branchId,
+                    documentId,
+                    document2._rev,
+                    locale.localeId
+                  );
                   return !translationStatuses.get(key)?.isReady || importedTranslations.has(key);
                 }),
                 style: { minWidth: "180px" }
@@ -3229,12 +3382,22 @@ const WrapText = dt(ui.Box)`
             "Imported",
             " ",
             availableLocales.filter((locale) => {
-              const key = `${branchId}:${documentId}:${document2._rev}:${locale.localeId}`;
+              const key = createTranslationStatusKey(
+                branchId,
+                documentId,
+                document2._rev,
+                locale.localeId
+              );
               return importedTranslations.has(key);
             }).length,
             "/",
             availableLocales.filter((locale) => {
-              const key = `${branchId}:${documentId}:${document2._rev}:${locale.localeId}`;
+              const key = createTranslationStatusKey(
+                branchId,
+                documentId,
+                document2._rev,
+                locale.localeId
+              );
               return translationStatuses.get(key)?.isReady;
             }).length
           ] })
@@ -3350,11 +3513,16 @@ const WrapText = dt(ui.Box)`
   } = useTranslations();
   return loadingDocuments ? /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { align: "center", justify: "center", padding: 4, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Spinner, {}) }) : /* @__PURE__ */ jsxRuntime.jsx(ui.Box, { style: { maxHeight: "60vh", overflowY: "auto" }, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Stack, { space: 2, children: documents.map((document2) => /* @__PURE__ */ jsxRuntime.jsx(ui.Card, { shadow: 1, padding: 3, children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Stack, { space: 3, children: [
     /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { justify: "space-between", align: "flex-start", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Box, { flex: 1, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "semibold", size: 1, children: document2._id?.replace("drafts.", "") || document2._id }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "semibold", size: 1, children: getDocumentPublishedId(document2) }),
       /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: 0, muted: !0, style: { marginTop: "2px" }, children: document2._type })
     ] }) }),
     /* @__PURE__ */ jsxRuntime.jsx(ui.Stack, { space: 2, children: locales.length > 0 ? locales.filter((locale) => locale.enabled !== !1).map((locale) => {
-      const documentId = document2._id?.replace("drafts.", "") || document2._id, key = `${branchId}:${documentId}:${document2._rev}:${locale.localeId}`, status = translationStatuses.get(key), isDownloaded = downloadStatus.downloaded.has(key), isImported = importedTranslations.has(key);
+      const documentId = getDocumentPublishedId(document2), key = createTranslationStatusKey(
+        branchId,
+        documentId,
+        document2._rev,
+        locale.localeId
+      ), status = translationStatuses.get(key), isDownloaded = downloadStatus.downloaded.has(key), isImported = importedTranslations.has(key);
       return /* @__PURE__ */ jsxRuntime.jsx(
         LanguageStatus,
         {