sag_components 2.0.0-beta150 → 2.0.0-beta152

package/dist/index.js

@@ -52066,6 +52066,15 @@ const ItemManagerPanel = _ref => {
     });
     setScreen("subitem");
   };
+  const hasValidStatus = pkg => pkg.hasOwnProperty('status') && pkg.status != null && pkg.status !== undefined && pkg.status !== '';
+  const hasInvalidStatus = pkg => !hasValidStatus(pkg);
+  const draftPackages = pkg => pkg.status === 1;
+  const unsentPackages = () => {
+    return itemAndPackage.filter(item => item.packages !== null).map(item => ({
+      ...item,
+      packages: item.packages.filter(pkg => hasInvalidStatus(pkg) || draftPackages(pkg))
+    })).filter(item => item.packages.length > 0);
+  };
   const updateExistingPackage = (vendorName, originalPackage, updatedPackageName, updatedComponent) => {
     setItemAndPackage(prev => {
       return prev.map(vendor => {
@@ -52102,7 +52111,7 @@ const ItemManagerPanel = _ref => {
       if (vendor.packages === null || !Array.isArray(vendor.packages)) {
         return false;
       }
-      return vendor.packages.some(pkg => !pkg.hasOwnProperty('status') || pkg.status == null || pkg.status === undefined || pkg.status === '');
+      return vendor.packages.some(hasInvalidStatus);
     });
   }, [itemAndPackage]);
   const actuallyAllFormsSent = AllFormsSent && !hasUnisentPackages;
@@ -52156,7 +52165,7 @@ const ItemManagerPanel = _ref => {
       onCancel: () => setScreen("initial"),
       onConfirm: () => setScreen("success"),
       linkColor: linkColor,
-      vendors: itemAndPackage.filter(item => item.packages !== null).map(item => {
+      vendors: unsentPackages().map(item => {
         return {
           name: item.name,
           newPackages: item.packages.map(pkg => pkg.brands)
@@ -52168,9 +52177,9 @@ const ItemManagerPanel = _ref => {
     return /*#__PURE__*/React__default["default"].createElement(SuccessScreen, {
       width: width,
       height: height,
-      packagesCount: itemAndPackage.filter(item => item.packages !== null).reduce((acc, item) => acc + (item.packages ? item.packages.length : 0), 0),
-      vendorsCount: itemAndPackage.filter(item => item.packages !== null).length.toString(),
-      vendors: itemAndPackage.filter(item => item.packages !== null).map(item => item.name),
+      packagesCount: unsentPackages().reduce((acc, item) => acc + item.packages?.length, 0),
+      vendorsCount: unsentPackages().length.toString(),
+      vendors: unsentPackages().map(item => item.name),
       maxVisibleVendors: maxVisibleVendors
     });
   }
@@ -52229,7 +52238,7 @@ const ItemManagerPanel = _ref => {
       hoverBorderColor: linkColor
     })), /*#__PURE__*/React__default["default"].createElement(Subtitle$1, {
       color: actuallyAllFormsSent ? "#90CE9C" : "#8b8989"
-    }, actuallyAllFormsSent ? '✔ All Forms Sent' : itemAndPackage.filter(item => item.packages !== null).length > 0 ? `${itemAndPackage.filter(item => item.packages !== null).length.toString()} New Forms` : ''))), /*#__PURE__*/React__default["default"].createElement(AddButtonContainer$1, null, /*#__PURE__*/React__default["default"].createElement(LinkButton, {
+    }, actuallyAllFormsSent ? '✔ All Forms Sent' : itemAndPackage.filter(item => item.packages !== null).length > 0 ? `${unsentPackages().reduce((acc, item) => acc + item.packages?.length, 0)} New Forms` : ''))), /*#__PURE__*/React__default["default"].createElement(AddButtonContainer$1, null, /*#__PURE__*/React__default["default"].createElement(LinkButton, {
       leftIcon: "Plus",
       onClick: () => setScreen("list"),
       rightIcon: "none",
@@ -52241,38 +52250,37 @@ const ItemManagerPanel = _ref => {
     }))), /*#__PURE__*/React__default["default"].createElement(VendorListWrapper$2, {
       disabled: disableSection,
       headerHeight: headerHeight
-    }, /*#__PURE__*/React__default["default"].createElement(VendorList$2, null, itemAndPackage.filter(item => item.packages !== null).map((item, idx) => /*#__PURE__*/React__default["default"].createElement(VendorItem$1, {
-      key: idx
-    }, /*#__PURE__*/React__default["default"].createElement(DotContainer, null, item.packages.length === 0 && /*#__PURE__*/React__default["default"].createElement(RedDot, null)), /*#__PURE__*/React__default["default"].createElement(LineContainer, {
-      onClick: e => {
-        handleVendorClick(item);
-      }
-    }, /*#__PURE__*/React__default["default"].createElement(VendorNameAndPackagesContainer$1, null, /*#__PURE__*/React__default["default"].createElement(VendorName$2, null, item.name), console.log('item.name', item.name), item.packages.length === 0 && /*#__PURE__*/React__default["default"].createElement(Subtitle$1, null, "No Packages"), item.packages.length > 0 && /*#__PURE__*/React__default["default"].createElement(Subtitle$1, null, (() => {
-      const packagesWithStatus = item.packages.filter(pkg => pkg.hasOwnProperty('status') && pkg.status != null && pkg.status !== undefined && pkg.status !== '');
-      const allHaveStatus = packagesWithStatus.length === item.packages.length;
-      const noneHaveStatus = packagesWithStatus.length === 0;
-      console.log('noneHaveStatus', noneHaveStatus);
-      if (noneHaveStatus) {
-        return `0/${item.packages.length} sent`;
-      } else if (allHaveStatus) {
-        return `${item.packages.length}/${item.packages.length} sent`;
-      } else {
-        return `${packagesWithStatus.length}/${item.packages.length} sent`;
-      }
-    })())), /*#__PURE__*/React__default["default"].createElement(VendorChevron$1, null, /*#__PURE__*/React__default["default"].createElement(ArrowRightFullIcon, null))), /*#__PURE__*/React__default["default"].createElement(Trash$1, {
-      className: "trash-icon",
-      onClick: () => {
-        onDeleteVendor(item);
-      }
-    }, /*#__PURE__*/React__default["default"].createElement("svg", {
-      width: "14",
-      height: "18",
-      viewBox: "0 0 14 18",
-      fill: "none",
-      xmlns: "http://www.w3.org/2000/svg"
-    }, /*#__PURE__*/React__default["default"].createElement("path", {
-      d: "M1 16C1 17.1 1.9 18 3 18H11C12.1 18 13 17.1 13 16V4H1V16ZM14 1H10.5L9.5 0H4.5L3.5 1H0V3H14V1Z"
-    }))))))));
+    }, /*#__PURE__*/React__default["default"].createElement(VendorList$2, null, itemAndPackage.filter(item => item.packages !== null).map((item, idx) => {
+      const packagesLength = item.packages.length;
+      return /*#__PURE__*/React__default["default"].createElement(VendorItem$1, {
+        key: idx
+      }, /*#__PURE__*/React__default["default"].createElement(DotContainer, null, packagesLength === 0 && /*#__PURE__*/React__default["default"].createElement(RedDot, null)), /*#__PURE__*/React__default["default"].createElement(LineContainer, {
+        onClick: e => {
+          handleVendorClick(item);
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(VendorNameAndPackagesContainer$1, null, /*#__PURE__*/React__default["default"].createElement(VendorName$2, null, item.name), packagesLength === 0 && /*#__PURE__*/React__default["default"].createElement(Subtitle$1, null, "No Packages"), packagesLength > 0 && /*#__PURE__*/React__default["default"].createElement(Subtitle$1, null, (() => {
+        const sentPackagesLength = item.packages.filter(pkg => hasValidStatus(pkg) && !draftPackages(pkg)).length;
+        const noPackagesSent = sentPackagesLength === 0;
+        if (noPackagesSent) {
+          return `0/${packagesLength} sent`;
+        } else {
+          return `${sentPackagesLength}/${packagesLength} sent`;
+        }
+      })())), /*#__PURE__*/React__default["default"].createElement(VendorChevron$1, null, /*#__PURE__*/React__default["default"].createElement(ArrowRightFullIcon, null))), /*#__PURE__*/React__default["default"].createElement(Trash$1, {
+        className: "trash-icon",
+        onClick: () => {
+          onDeleteVendor(item);
+        }
+      }, /*#__PURE__*/React__default["default"].createElement("svg", {
+        width: "14",
+        height: "18",
+        viewBox: "0 0 14 18",
+        fill: "none",
+        xmlns: "http://www.w3.org/2000/svg"
+      }, /*#__PURE__*/React__default["default"].createElement("path", {
+        d: "M1 16C1 17.1 1.9 18 3 18H11C12.1 18 13 17.1 13 16V4H1V16ZM14 1H10.5L9.5 0H4.5L3.5 1H0V3H14V1Z"
+      }))));
+    }))));
   }
 };