@proveanything/smartlinks-utils-ui 1.13.18 → 1.14.0

package/dist/components/RecordsAdmin/index.js

@@ -1254,7 +1254,7 @@ var useProductBrowse = (args) => {
       if (search.trim()) body.query = { search: search.trim() };
       let res = null;
       if (SL?.products?.query) {
-        res = await SL.products.query(collectionId, body);
+        res = await SL.products.query(collectionId, body, admin);
       } else if (SL?.product?.query) {
         res = await SL.product.query(collectionId, body, admin);
       } else {
@@ -1468,7 +1468,7 @@ var useSingleProduct = (args) => {
           if (p) return toBrowseItem2(p, productId);
         }
         if (SL?.products?.get) {
-          const p = await SL.products.get(collectionId, productId);
+          const p = await SL.products.get(collectionId, productId, admin);
           if (p) return toBrowseItem2(p, productId);
         }
         const list = SL?.products?.list ? await SL.products.list(collectionId, admin) : SL?.product?.list ? await SL.product.list(collectionId, admin) : [];
@@ -9565,6 +9565,32 @@ function RecordsAdminShellInner(props) {
   } = selection;
   const [isReconcilingRecordSelection, setIsReconcilingRecordSelection] = useState(false);
   const { dismissed, dismiss, undismiss } = useIntroDismissed(SL, collectionId, appId, recordType);
+  const primeResolvedFromRow = useCallback((row) => {
+    if (!row?.id) return;
+    if (row.data === void 0) return;
+    const cacheKey = resolvedRecordQueryKey({
+      collectionId,
+      appId,
+      recordType,
+      productId: row.scope?.productId,
+      variantId: row.scope?.variantId,
+      batchId: row.scope?.batchId,
+      facetId: row.scope?.facetId,
+      facetValue: row.scope?.facetValue,
+      proofId: row.scope?.proofId,
+      recordId: row.id,
+      withParent: true
+    });
+    if (queryClient.getQueryData(cacheKey) !== void 0) return;
+    queryClient.setQueryData(cacheKey, {
+      data: row.data,
+      source: "self",
+      sourceRef: row.ref || void 0,
+      recordId: row.id,
+      facetRule: row.facetRule ?? null,
+      lifecycleStatus: row.lifecycleStatus
+    });
+  }, [queryClient, collectionId, appId, recordType]);
   const mintRuleWizardDraftKey = useCallback(
     () => `rule-wizard:${typeof crypto !== "undefined" && "randomUUID" in crypto ? crypto.randomUUID() : `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`}`,
     []
@@ -9706,10 +9732,12 @@ function RecordsAdminShellInner(props) {
     if (cardinality === "singleton") {
       const conflict = findConflictForRecord(first.id, singletonConflicts);
       if (conflict?.active.id) {
+        primeResolvedFromRow(recordList.items.find((it) => it.id === conflict.active.id) ?? null);
         setSelectedRecordId(conflict.active.id);
         return;
       }
     }
+    primeResolvedFromRow(first);
     setSelectedRecordId(first.id);
   }, [activeScope, selectedRecordId, recordList.items, cardinality, ruleWizardStep, draftKind, isReconcilingRecordSelection, singletonConflicts]);
   const editingScopes = useEditingScope({
@@ -10004,8 +10032,8 @@ function RecordsAdminShellInner(props) {
       if (savedFromRuleWizard && !isCollection && savedRecordId) {
         setSelectedRecordId(savedRecordId);
       }
-      if (!isCollection && isCreate && activeScope === "collection") {
-        setSelectedRecordId(savedRecordId ?? null);
+      if (!isCollection && isCreate && savedRecordId) {
+        setSelectedRecordId(savedRecordId);
       }
       setIsReconcilingRecordSelection(false);
     },
@@ -11064,6 +11092,7 @@ function RecordsAdminShellInner(props) {
         setSelectedBatchId(void 0);
         setDrillTab("product");
       } else {
+        primeResolvedFromRow(item);
         setSelectedRecordId(item.id ?? null);
         setDraftKind(null);
         if (ruleWizardStep !== null) {
@@ -11465,6 +11494,12 @@ function RecordsAdminShellInner(props) {
                         },
                         onArchiveDuplicates: enableArchiveDuplicates ? async () => {
                           const ids = singletonConflicts.flatMap((c) => c.duplicates.map((d) => d.id)).filter((id) => !!id);
+                          const survivorIfStrandedArchive = (() => {
+                            if (!selectedRecordId || selectedRecordId === DRAFT_ID3) return void 0;
+                            if (!ids.includes(selectedRecordId)) return void 0;
+                            const c = singletonConflicts.find((c2) => c2.duplicates.some((d) => d.id === selectedRecordId));
+                            return c?.active.id;
+                          })();
                           for (const id of ids) {
                             try {
                               const updated = await SL.app.records.update(collectionId, appId, id, { status: archivedStatusValue }, true);
@@ -11482,9 +11517,18 @@ function RecordsAdminShellInner(props) {
                             }
                           }
                           markScopeCountsStale(queryClient, ctx);
+                          if (survivorIfStrandedArchive) {
+                            setSelectedRecordId(survivorIfStrandedArchive);
+                          }
                         } : void 0,
                         onDeleteDuplicates: enableDeleteDuplicates ? async () => {
                           const ids = singletonConflicts.flatMap((c) => c.duplicates.map((d) => d.id)).filter((id) => !!id);
+                          const survivorIfStrandedDelete = (() => {
+                            if (!selectedRecordId || selectedRecordId === DRAFT_ID3) return void 0;
+                            if (!ids.includes(selectedRecordId)) return void 0;
+                            const c = singletonConflicts.find((c2) => c2.duplicates.some((d) => d.id === selectedRecordId));
+                            return c?.active.id;
+                          })();
                           for (const id of ids) {
                             try {
                               await SL.app.records.remove(collectionId, appId, id, true);
@@ -11500,6 +11544,11 @@ function RecordsAdminShellInner(props) {
                             }
                           }
                           markScopeCountsStale(queryClient, ctx);
+                          if (survivorIfStrandedDelete) {
+                            setSelectedRecordId(survivorIfStrandedDelete);
+                          } else if (selectedRecordId && ids.includes(selectedRecordId)) {
+                            setSelectedRecordId(null);
+                          }
                         } : void 0,
                         i18n: {
                           title: i18n.conflictBannerTitle,
@@ -12275,7 +12324,13 @@ function useRecordEditor(args) {
       source: "self",
       sourceRef: scope.raw,
       recordId: resolved.recordId,
-      parentValue: previousCache?.parentValue ?? resolved.parentValue
+      parentValue: previousCache?.parentValue ?? resolved.parentValue,
+      // Preserve the record's `facetRule` across the optimistic flip so
+      // rule-targeted rows don't briefly look like unanchored globals
+      // (which would cascade into the editor seeding an empty rule and
+      // the next save creating a duplicate global).
+      facetRule: facetRule ?? previousCache?.facetRule ?? null,
+      lifecycleStatus: previousCache?.lifecycleStatus
     });
     try {
       if (resolved.recordId && resolved.source === "self") {