sanity-plugin-workflow 1.0.0-beta.4 → 1.0.0-beta.6

package/lib/index.js

@@ -49,8 +49,8 @@ const DEFAULT_CONFIG = {
     title: "Approved",
     color: "success",
     roles: ["administrator"],
-    requireAssignment: true,
-    transitions: ["changesRequested"]
+    transitions: ["changesRequested"],
+    requireAssignment: true
   }])
 };
 function UserAssignment(props) {
@@ -304,11 +304,6 @@ function UpdateWorkflow(props, allStates, actionState) {
     id,
     type
   } = props;
-  const {
-    validation,
-    isValidating
-  } = sanity.useValidationStatus(id, type);
-  const hasValidationErrors = !isValidating && (validation == null ? void 0 : validation.length) > 0 && validation.find(v => v.level === "error");
   const user = sanity.useCurrentUser();
   const client = sanity.useClient({
     apiVersion: API_VERSION
@@ -326,6 +321,11 @@ function UpdateWorkflow(props, allStates, actionState) {
   const {
     assignees = []
   } = (_a = data == null ? void 0 : data.metadata) != null ? _a : {};
+  const {
+    validation,
+    isValidating
+  } = sanity.useValidationStatus(id, type);
+  const hasValidationErrors = (currentState == null ? void 0 : currentState.requireValidation) && !isValidating && (validation == null ? void 0 : validation.length) > 0 && validation.find(v => v.level === "error");
   if (error) {
     console.error(error);
   }
@@ -355,40 +355,39 @@ function UpdateWorkflow(props, allStates, actionState) {
   const direction = actionStateIndex > currentStateIndex ? "promote" : "demote";
   const DirectionIcon = direction === "promote" ? icons.ArrowRightIcon : icons.ArrowLeftIcon;
   const directionLabel = direction === "promote" ? "Promote" : "Demote";
-  let title = "".concat(directionLabel, " State to \"").concat(actionState.title, "\"");
   const userRoleCanUpdateState = ((_b = user == null ? void 0 : user.roles) == null ? void 0 : _b.length) && ((_c = actionState == null ? void 0 : actionState.roles) == null ? void 0 : _c.length) ?
   // If the Action state is limited to specific roles
   // check that the current user has one of those roles
   arraysContainMatchingString(user.roles.map(r => r.name), actionState.roles) :
   // No roles specified on the next state, so anyone can update
   ((_d = actionState == null ? void 0 : actionState.roles) == null ? void 0 : _d.length) !== 0;
-  if (!userRoleCanUpdateState) {
-    title = "Your User role cannot ".concat(directionLabel, " State to \"").concat(actionState.title, "\"");
-  }
   const actionStateIsAValidTransition = (currentState == null ? void 0 : currentState.id) && currentState.transitions.length ?
   // If the Current State limits transitions to specific States
   // Check that the Action State is in Current State's transitions array
   currentState.transitions.includes(actionState.id) :
   // Otherwise this isn't a problem
   true;
-  if (!actionStateIsAValidTransition) {
-    title = "You cannot ".concat(directionLabel, " State to \"").concat(actionState.title, "\" from \"").concat(currentState == null ? void 0 : currentState.title, "\"");
-  }
   const userAssignmentCanUpdateState = actionState.requireAssignment ?
   // If the Action State requires assigned users
   // Check the current user ID is in the assignees array
   currentUser && assignees.length && assignees.includes(currentUser.id) :
   // Otherwise this isn't a problem
   true;
-  if (!userAssignmentCanUpdateState) {
+  let title = "".concat(directionLabel, " State to \"").concat(actionState.title, "\"");
+  if (!userRoleCanUpdateState) {
+    title = "Your User role cannot ".concat(directionLabel, " State to \"").concat(actionState.title, "\"");
+  } else if (!actionStateIsAValidTransition) {
+    title = "You cannot ".concat(directionLabel, " State to \"").concat(actionState.title, "\" from \"").concat(currentState == null ? void 0 : currentState.title, "\"");
+  } else if (!userAssignmentCanUpdateState) {
     title = "You must be assigned to the document to ".concat(directionLabel, " State to \"").concat(actionState.title, "\"");
-  }
-  if (hasValidationErrors) {
+  } else if ((currentState == null ? void 0 : currentState.requireValidation) && isValidating) {
+    title = "Document is validating, cannot ".concat(directionLabel, " State to \"").concat(actionState.title, "\"");
+  } else if (hasValidationErrors) {
     title = "Document has validation errors, cannot ".concat(directionLabel, " State to \"").concat(actionState.title, "\"");
   }
   return {
     icon: DirectionIcon,
-    disabled: loading || error || isValidating || hasValidationErrors || !currentState || !userRoleCanUpdateState || !actionStateIsAValidTransition || !userAssignmentCanUpdateState,
+    disabled: loading || error || (currentState == null ? void 0 : currentState.requireValidation) && isValidating || hasValidationErrors || !currentState || !userRoleCanUpdateState || !actionStateIsAValidTransition || !userAssignmentCanUpdateState,
     title,
     label: actionState.title,
     onHandle: () => onHandle(id, actionState)
@@ -647,7 +646,7 @@ function useWorkflowDocuments(schemaTypes) {
       setLocalDocuments(data);
     }
   }, [data]);
-  const move = React__default.default.useCallback((draggedId, destination, states, newOrder) => {
+  const move = React__default.default.useCallback(async (draggedId, destination, states, newOrder) => {
     const currentLocalData = localDocuments;
     const newLocalDocuments = localDocuments.map(item => {
       var _a;
@@ -694,10 +693,9 @@ function useWorkflowDocuments(schemaTypes) {
       _type
     } = document;
     const {
-      _rev,
       documentId
     } = document._metadata || {};
-    client.patch("workflow-metadata.".concat(documentId)).ifRevisionId(_rev).set({
+    await client.patch("workflow-metadata.".concat(documentId)).set({
       state: newStateId,
       orderRank: newOrder
     }).commit().then(() => {
@@ -706,11 +704,12 @@ function useWorkflowDocuments(schemaTypes) {
         title: "Moved to \"".concat((_a = newState == null ? void 0 : newState.title) != null ? _a : newStateId, "\""),
         status: "success"
       });
-    }).catch(() => {
+    }).catch(err => {
       var _a;
       setLocalDocuments(currentLocalData);
       return toast.push({
         title: "Failed to move to \"".concat((_a = newState == null ? void 0 : newState.title) != null ? _a : newStateId, "\""),
+        description: err.message,
         status: "error"
       });
     });
@@ -921,6 +920,24 @@ function PublishedStatus(props) {
     })
   });
 }
+function Validate(props) {
+  const {
+    documentId,
+    type,
+    onChange
+  } = props;
+  const {
+    isValidating,
+    validation = []
+  } = sanity.useValidationStatus(documentId, type);
+  React.useEffect(() => {
+    onChange({
+      isValidating,
+      validation
+    });
+  }, [onChange, isValidating, validation]);
+  return null;
+}
 function ValidationStatus(props) {
   const {
     validation = []
@@ -946,7 +963,7 @@ function ValidationStatus(props) {
   });
 }
 function DocumentCard(props) {
-  var _a;
+  var _a, _b;
   const {
     isDragDisabled,
     userRoleCanDrop,
@@ -961,18 +978,29 @@ function DocumentCard(props) {
     documentId
   } = (_a = item._metadata) != null ? _a : {};
   const schema = sanity.useSchema();
+  const state = states.find(s => {
+    var _a2;
+    return s.id === ((_a2 = item._metadata) == null ? void 0 : _a2.state);
+  });
   const isDarkMode = ui.useTheme().sanity.color.dark;
   const defaultCardTone = isDarkMode ? "transparent" : "default";
+  const [optimisticValidation, setOptimisticValidation] = React.useState({
+    isValidating: (_b = state == null ? void 0 : state.requireValidation) != null ? _b : false,
+    validation: []
+  });
   const {
-    validation = [],
-    isValidating
-  } = sanity.useValidationStatus(documentId != null ? documentId : "", item._type);
+    isValidating,
+    validation
+  } = optimisticValidation;
+  const handleValidation = React.useCallback(updates => {
+    setOptimisticValidation(updates);
+  }, []);
   const cardTone = React.useMemo(() => {
     let tone = defaultCardTone;
     if (!userRoleCanDrop) return isDarkMode ? "default" : "transparent";
     if (!documentId) return tone;
     if (isDragging) tone = "positive";
-    if (!isValidating && validation.length > 0) {
+    if ((state == null ? void 0 : state.requireValidation) && !isValidating && validation.length > 0) {
       if (validation.some(v => v.level === "error")) {
         tone = "critical";
       } else {
@@ -980,7 +1008,7 @@ function DocumentCard(props) {
       }
     }
     return tone;
-  }, [isDarkMode, userRoleCanDrop, defaultCardTone, documentId, isDragging, validation, isValidating]);
+  }, [defaultCardTone, userRoleCanDrop, isDarkMode, documentId, isDragging, isValidating, validation, state == null ? void 0 : state.requireValidation]);
   React.useEffect(() => {
     if (!isValidating && validation.length > 0) {
       if (validation.some(v => v.level === "error")) {
@@ -997,75 +1025,81 @@ function DocumentCard(props) {
     var _a2;
     return states[states.length - 1].id === ((_a2 = item._metadata) == null ? void 0 : _a2.state);
   }, [states, item._metadata.state]);
-  return /* @__PURE__ */jsxRuntime.jsx(ui.Box, {
-    paddingBottom: 3,
-    paddingX: 3,
-    children: /* @__PURE__ */jsxRuntime.jsx(ui.Card, {
-      radius: 2,
-      shadow: isDragging ? 3 : 1,
-      tone: cardTone,
-      children: /* @__PURE__ */jsxRuntime.jsxs(ui.Stack, {
-        children: [/* @__PURE__ */jsxRuntime.jsx(ui.Card, {
-          borderBottom: true,
-          radius: 2,
-          padding: 3,
-          paddingLeft: 2,
-          tone: cardTone,
-          style: {
-            pointerEvents: "none"
-          },
-          children: /* @__PURE__ */jsxRuntime.jsxs(ui.Flex, {
-            align: "center",
-            justify: "space-between",
-            gap: 1,
-            children: [/* @__PURE__ */jsxRuntime.jsx(ui.Box, {
-              flex: 1,
-              children: /* @__PURE__ */jsxRuntime.jsx(sanity.Preview, {
-                layout: "default",
-                value: item,
-                schemaType: schema.get(item._type)
-              })
-            }), /* @__PURE__ */jsxRuntime.jsx(ui.Box, {
-              style: {
-                flexShrink: 0
-              },
-              children: hasError || isDragDisabled ? null : /* @__PURE__ */jsxRuntime.jsx(icons.DragHandleIcon, {})
-            })]
-          })
-        }), /* @__PURE__ */jsxRuntime.jsx(ui.Card, {
-          padding: 2,
-          radius: 2,
-          tone: "inherit",
-          children: /* @__PURE__ */jsxRuntime.jsxs(ui.Flex, {
-            align: "center",
-            justify: "space-between",
-            gap: 3,
-            children: [/* @__PURE__ */jsxRuntime.jsx(ui.Box, {
-              flex: 1,
-              children: documentId && /* @__PURE__ */jsxRuntime.jsx(UserDisplay, {
-                userList,
-                assignees,
+  return /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [(state == null ? void 0 : state.requireValidation) ? /* @__PURE__ */jsxRuntime.jsx(Validate, {
+      documentId,
+      type: item._type,
+      onChange: handleValidation
+    }) : null, /* @__PURE__ */jsxRuntime.jsx(ui.Box, {
+      paddingBottom: 3,
+      paddingX: 3,
+      children: /* @__PURE__ */jsxRuntime.jsx(ui.Card, {
+        radius: 2,
+        shadow: isDragging ? 3 : 1,
+        tone: cardTone,
+        children: /* @__PURE__ */jsxRuntime.jsxs(ui.Stack, {
+          children: [/* @__PURE__ */jsxRuntime.jsx(ui.Card, {
+            borderBottom: true,
+            radius: 2,
+            padding: 3,
+            paddingLeft: 2,
+            tone: cardTone,
+            style: {
+              pointerEvents: "none"
+            },
+            children: /* @__PURE__ */jsxRuntime.jsxs(ui.Flex, {
+              align: "center",
+              justify: "space-between",
+              gap: 1,
+              children: [/* @__PURE__ */jsxRuntime.jsx(ui.Box, {
+                flex: 1,
+                children: /* @__PURE__ */jsxRuntime.jsx(sanity.Preview, {
+                  layout: "default",
+                  value: item,
+                  schemaType: schema.get(item._type)
+                })
+              }), /* @__PURE__ */jsxRuntime.jsx(ui.Box, {
+                style: {
+                  flexShrink: 0
+                },
+                children: hasError || isDragDisabled ? null : /* @__PURE__ */jsxRuntime.jsx(icons.DragHandleIcon, {})
+              })]
+            })
+          }), /* @__PURE__ */jsxRuntime.jsx(ui.Card, {
+            padding: 2,
+            radius: 2,
+            tone: "inherit",
+            children: /* @__PURE__ */jsxRuntime.jsxs(ui.Flex, {
+              align: "center",
+              justify: "space-between",
+              gap: 3,
+              children: [/* @__PURE__ */jsxRuntime.jsx(ui.Box, {
+                flex: 1,
+                children: documentId && /* @__PURE__ */jsxRuntime.jsx(UserDisplay, {
+                  userList,
+                  assignees,
+                  documentId,
+                  disabled: !userRoleCanDrop
+                })
+              }), validation.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ValidationStatus, {
+                validation
+              }) : null, /* @__PURE__ */jsxRuntime.jsx(DraftStatus, {
+                document: item
+              }), /* @__PURE__ */jsxRuntime.jsx(PublishedStatus, {
+                document: item
+              }), /* @__PURE__ */jsxRuntime.jsx(EditButton, {
+                id: item._id,
+                type: item._type,
+                disabled: !userRoleCanDrop
+              }), isLastState ? /* @__PURE__ */jsxRuntime.jsx(CompleteButton, {
                 documentId,
                 disabled: !userRoleCanDrop
-              })
-            }), validation.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ValidationStatus, {
-              validation
-            }) : null, /* @__PURE__ */jsxRuntime.jsx(DraftStatus, {
-              document: item
-            }), /* @__PURE__ */jsxRuntime.jsx(PublishedStatus, {
-              document: item
-            }), /* @__PURE__ */jsxRuntime.jsx(EditButton, {
-              id: item._id,
-              type: item._type,
-              disabled: !userRoleCanDrop
-            }), isLastState ? /* @__PURE__ */jsxRuntime.jsx(CompleteButton, {
-              documentId,
-              disabled: !userRoleCanDrop
-            }) : null]
-          })
-        })]
+              }) : null]
+            })
+          })]
+        })
       })
-    })
+    })]
   });
 }
 function DocumentList(props) {
@@ -1093,7 +1127,7 @@ function DocumentList(props) {
       return (_c = (_b = (_a = dataFiltered[index]) == null ? void 0 : _a._metadata) == null ? void 0 : _b.documentId) != null ? _c : index;
     },
     estimateSize: () => 113,
-    overscan: 5
+    overscan: 10
   });
   if (!data.length) {
     return null;
@@ -1305,7 +1339,8 @@ function StateTitle(props) {
     requireAssignment,
     userRoleCanDrop,
     isDropDisabled,
-    draggingFrom
+    draggingFrom,
+    documentCount
   } = props;
   let tone = "default";
   const isSource = draggingFrom === state.id;
@@ -1330,7 +1365,15 @@ function StateTitle(props) {
       }), requireAssignment ? /* @__PURE__ */jsxRuntime.jsx(Status, {
         text: "You must be assigned to the document to move documents to this State",
         icon: icons.UserIcon
-      }) : null]
+      }) : null, /* @__PURE__ */jsxRuntime.jsx(ui.Box, {
+        flex: 1,
+        children: documentCount > 0 ? /* @__PURE__ */jsxRuntime.jsx(ui.Text, {
+          weight: "semibold",
+          align: "right",
+          size: 1,
+          children: documentCount
+        }) : null
+      })]
     })
   });
 }
@@ -1364,12 +1407,12 @@ function FloatingCard(_ref3) {
     }, "floater") : null
   });
 }
-function Validators(_ref4) {
-  let {
+function Verify(props) {
+  const {
     data,
     userList,
     states
-  } = _ref4;
+  } = props;
   const client = sanity.useClient({
     apiVersion: API_VERSION
   });
@@ -1400,6 +1443,17 @@ function Validators(_ref4) {
     } = (_a = cur._metadata) != null ? _a : {};
     return !orderRank && documentId ? [...acc, documentId] : acc;
   }, []) : [];
+  const documentsWithDuplicatedOrderIds = (data == null ? void 0 : data.length) ? data.reduce((acc, cur) => {
+    var _a;
+    const {
+      documentId,
+      orderRank
+    } = (_a = cur._metadata) != null ? _a : {};
+    return orderRank && data.filter(d => {
+      var _a2;
+      return ((_a2 = d._metadata) == null ? void 0 : _a2.orderRank) === orderRank;
+    }).length > 1 && documentId ? [...acc, documentId] : acc;
+  }, []) : [];
   const correctDocuments = React__default.default.useCallback(async ids => {
     toast.push({
       title: "Correcting...",
@@ -1500,6 +1554,10 @@ function Validators(_ref4) {
       tone: "caution",
       onClick: () => addOrderToDocuments(documentsWithoutOrderIds),
       text: documentsWithoutOrderIds.length === 1 ? "Set Order for 1 Document" : "Set Order for ".concat(documentsWithoutOrderIds.length, " Documents")
+    }) : null, documentsWithDuplicatedOrderIds.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ui.Button, {
+      tone: "caution",
+      onClick: () => addOrderToDocuments(documentsWithDuplicatedOrderIds),
+      text: documentsWithDuplicatedOrderIds.length === 1 ? "Set Unique Order for 1 Document" : "Set Unique Order for ".concat(documentsWithDuplicatedOrderIds.length, " Documents")
     }) : null, orphanedMetadataDocumentIds.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ui.Button, {
       text: "Cleanup orphaned metadata",
       onClick: handleOrphans,
@@ -1571,7 +1629,7 @@ function WorkflowTool(props) {
       setUndroppableStates(undroppableExceptSelf);
     }
   }, [data, states, user]);
-  const handleDragEnd = React__default.default.useCallback(result => {
+  const handleDragEnd = React__default.default.useCallback(async result => {
     var _a2, _b2, _c2, _d, _e, _f;
     setUndroppableStates([]);
     setDraggingFrom("");
@@ -1600,10 +1658,10 @@ function WorkflowTool(props) {
     } else {
       const itemBefore = destinationStateItems[destination.index - 1];
       const itemBeforeRank = (_e = itemBefore == null ? void 0 : itemBefore._metadata) == null ? void 0 : _e.orderRank;
-      const itemBeforeRankParsed = itemBefore._metadata.orderRank ? lexorank.LexoRank.parse(itemBeforeRank) : lexorank.LexoRank.min();
+      const itemBeforeRankParsed = itemBeforeRank ? lexorank.LexoRank.parse(itemBeforeRank) : lexorank.LexoRank.min();
       const itemAfter = destinationStateItems[destination.index];
       const itemAfterRank = (_f = itemAfter == null ? void 0 : itemAfter._metadata) == null ? void 0 : _f.orderRank;
-      const itemAfterRankParsed = itemAfter._metadata.orderRank ? lexorank.LexoRank.parse(itemAfterRank) : lexorank.LexoRank.max();
+      const itemAfterRankParsed = itemAfterRank ? lexorank.LexoRank.parse(itemAfterRank) : lexorank.LexoRank.max();
       newOrder = itemBeforeRankParsed.between(itemAfterRankParsed).toString();
     }
     move(draggableId, destination, states, newOrder);
@@ -1659,7 +1717,7 @@ function WorkflowTool(props) {
     direction: "column",
     height: "fill",
     overflow: "hidden",
-    children: [/* @__PURE__ */jsxRuntime.jsx(Validators, {
+    children: [/* @__PURE__ */jsxRuntime.jsx(Verify, {
       data,
       userList,
       states
@@ -1692,7 +1750,8 @@ function WorkflowTool(props) {
                 requireAssignment: (_b2 = state.requireAssignment) != null ? _b2 : false,
                 userRoleCanDrop,
                 isDropDisabled,
-                draggingFrom
+                draggingFrom,
+                documentCount: filterItemsAndSort(data, state.id, selectedUserIds, selectedSchemaTypes).length
               }), /* @__PURE__ */jsxRuntime.jsx(ui.Box, {
                 flex: 1,
                 children: /* @__PURE__ */jsxRuntime.jsx(dnd.Droppable, {