@zeniai/client-epic-state 5.2.72 → 5.2.74

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewSelector.js

@@ -86,6 +86,27 @@ export const getInvoicingItemsAllowedForPlan = (products, plan) => {
     }
     return products.filter((product) => product.itemID != null && allowedItemIDs.includes(product.itemID));
 };
+// Years count as months so they compare; any other unit only meets itself.
+const billingPeriodInCommonUnit = (pricePoint) => {
+    const { period, periodUnit } = pricePoint;
+    if (period == null || periodUnit == null || periodUnit === '') {
+        return undefined;
+    }
+    return periodUnit === 'year'
+        ? { count: period * 12, unit: 'month' }
+        : { count: period, unit: periodUnit };
+};
+// The add-on's period must divide the plan's (create 422s otherwise); fails open when they cannot be compared.
+export const isInvoicingAddonPeriodCompatible = (addon, plan) => {
+    const addonPeriod = billingPeriodInCommonUnit(addon);
+    const planPeriod = plan != null ? billingPeriodInCommonUnit(plan) : undefined;
+    if (addonPeriod == null ||
+        planPeriod == null ||
+        addonPeriod.unit !== planPeriod.unit) {
+        return true;
+    }
+    return addonPeriod.count > 0 && planPeriod.count % addonPeriod.count === 0;
+};
 /**
  * A price row can only be subscribed by its price code, so one without a code
  * is not an option the form can offer.
@@ -174,7 +195,12 @@ export const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID)
     // pickers offer only those: subscription create rejects the rest with a 422,
     // and an option that can only fail is not a choice. The applicability rides
     // on the price rows already in the store, so this is a join, not a refetch.
-    const allowedCatalogPrices = getInvoicingItemsAllowedForPlan(getInvoicingCatalogPrices(catalogListView.products), planPrices.find((plan) => plan.priceCode === localData.planPriceCode)).filter(hasInvoicingPriceCode);
+    const selectedPlanPrice = planPrices.find((plan) => plan.priceCode === localData.planPriceCode);
+    // Add-ons also have to bill on the plan's cadence; charges are one-time.
+    const allowedCatalogPrices = getInvoicingItemsAllowedForPlan(getInvoicingCatalogPrices(catalogListView.products), selectedPlanPrice)
+        .filter(hasInvoicingPriceCode)
+        .filter((product) => product.itemType !== 'addon' ||
+        isInvoicingAddonPeriodCompatible(product, selectedPlanPrice));
     const catalogItemOptionsOfType = (itemType) => allowedCatalogPrices
         .filter((product) => product.itemType === itemType)
         .map(toInvoicingCatalogItemOption);

package/lib/esm/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewEpic.js

@@ -90,8 +90,8 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 save: 'onboarding_customer_business_verification_save',
             },
             setup_billing: {
-                save: 'billing_address_view',
-                sendForVerification: 'billing_address_view',
+                save: 'common',
+                sendForVerification: 'common',
             },
         };
         let messageSection;

package/lib/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewSelector.d.ts

@@ -108,6 +108,7 @@ export declare const getEditInvoicingSubscriptionDetailViewState: (state: RootSt
  * page's inline edit narrow their pickers by the same rule.
  */
 export declare const getInvoicingItemsAllowedForPlan: (products: InvoicingCatalogPricePoint[], plan: InvoicingCatalogPricePoint | undefined) => InvoicingCatalogPricePoint[];
+export declare const isInvoicingAddonPeriodCompatible: (addon: InvoicingCatalogPricePoint, plan: InvoicingCatalogPricePoint | undefined) => boolean;
 /**
  * One entry in a subscription-form picker, ready for the screen to render.
  *

package/lib/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewSelector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingSubscriptionFormView = exports.getInvoicingItemsAllowedForPlan = exports.getEditInvoicingSubscriptionDetailViewState = void 0;
+exports.getInvoicingSubscriptionFormView = exports.isInvoicingAddonPeriodCompatible = exports.getInvoicingItemsAllowedForPlan = exports.getEditInvoicingSubscriptionDetailViewState = void 0;
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const addressSelector_1 = require("../../../entity/address/addressSelector");
 const invoicingSubscriptionSelector_1 = require("../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionSelector");
@@ -91,6 +91,28 @@ const getInvoicingItemsAllowedForPlan = (products, plan) => {
     return products.filter((product) => product.itemID != null && allowedItemIDs.includes(product.itemID));
 };
 exports.getInvoicingItemsAllowedForPlan = getInvoicingItemsAllowedForPlan;
+// Years count as months so they compare; any other unit only meets itself.
+const billingPeriodInCommonUnit = (pricePoint) => {
+    const { period, periodUnit } = pricePoint;
+    if (period == null || periodUnit == null || periodUnit === '') {
+        return undefined;
+    }
+    return periodUnit === 'year'
+        ? { count: period * 12, unit: 'month' }
+        : { count: period, unit: periodUnit };
+};
+// The add-on's period must divide the plan's (create 422s otherwise); fails open when they cannot be compared.
+const isInvoicingAddonPeriodCompatible = (addon, plan) => {
+    const addonPeriod = billingPeriodInCommonUnit(addon);
+    const planPeriod = plan != null ? billingPeriodInCommonUnit(plan) : undefined;
+    if (addonPeriod == null ||
+        planPeriod == null ||
+        addonPeriod.unit !== planPeriod.unit) {
+        return true;
+    }
+    return addonPeriod.count > 0 && planPeriod.count % addonPeriod.count === 0;
+};
+exports.isInvoicingAddonPeriodCompatible = isInvoicingAddonPeriodCompatible;
 /**
  * A price row can only be subscribed by its price code, so one without a code
  * is not an option the form can offer.
@@ -179,7 +201,12 @@ const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID) => {
     // pickers offer only those: subscription create rejects the rest with a 422,
     // and an option that can only fail is not a choice. The applicability rides
     // on the price rows already in the store, so this is a join, not a refetch.
-    const allowedCatalogPrices = (0, exports.getInvoicingItemsAllowedForPlan)((0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.products), planPrices.find((plan) => plan.priceCode === localData.planPriceCode)).filter(hasInvoicingPriceCode);
+    const selectedPlanPrice = planPrices.find((plan) => plan.priceCode === localData.planPriceCode);
+    // Add-ons also have to bill on the plan's cadence; charges are one-time.
+    const allowedCatalogPrices = (0, exports.getInvoicingItemsAllowedForPlan)((0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.products), selectedPlanPrice)
+        .filter(hasInvoicingPriceCode)
+        .filter((product) => product.itemType !== 'addon' ||
+        (0, exports.isInvoicingAddonPeriodCompatible)(product, selectedPlanPrice));
     const catalogItemOptionsOfType = (itemType) => allowedCatalogPrices
         .filter((product) => product.itemType === itemType)
         .map(toInvoicingCatalogItemOption);

package/lib/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewEpic.js

@@ -93,8 +93,8 @@ const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$
                 save: 'onboarding_customer_business_verification_save',
             },
             setup_billing: {
-                save: 'billing_address_view',
-                sendForVerification: 'billing_address_view',
+                save: 'common',
+                sendForVerification: 'common',
             },
         };
         let messageSection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.72",
+  "version": "5.2.74",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -53,31 +53,6 @@
     "url": "https://github.com/zeni-ai/client-epic-state/issues"
   },
   "homepage": "https://github.com/zeni-ai/client-epic-state#readme",
-  "devDependencies": {
-    "@eslint/js": "^9.24.0",
-    "@liveblocks/client": "^2.23.0",
-    "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-    "@types/big.js": "^6.2.2",
-    "@types/lodash": "^4.17.23",
-    "@types/node": "^20.19.0",
-    "@types/url-parse": "^1.4.11",
-    "@typescript-eslint/eslint-plugin": "^8.56.0",
-    "@typescript-eslint/parser": "^8.56.0",
-    "concurrently": "^9.1.2",
-    "eslint": "^9.24.0",
-    "eslint-config-prettier": "^10.0.2",
-    "eslint-plugin-perfectionist": "^4.15.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
-    "globals": "^16.0.0",
-    "knip": "^6.21.0",
-    "madge": "^8.0.0",
-    "prettier": "^3.5.3",
-    "rimraf": "^6.0.1",
-    "semver": "^7.7.1",
-    "typescript": "^5.7.3",
-    "vite": "^7.3.5",
-    "vitest": "^4.1.11"
-  },
   "dependencies": {
     "@redux-devtools/extension": "^3.3.0",
     "@reduxjs/toolkit": "^1.6.2",