@bunnyapp/components 1.1.0 → 1.2.0-beta.2

package/dist/cjs/index.js

@@ -154,7 +154,7 @@ var BrandContext = react.createContext({
 });
 
 // This will be replaced at build time by rollup-plugin-replace
-var PACKAGE_VERSION = '1.1.0-beta.5';
+var PACKAGE_VERSION = '1.2.0-beta.1';
 var createRequestHeaders = function (token) {
     var headers = common.createClientDevHeaders(token);
     // Add the components version header
@@ -20438,13 +20438,42 @@ var useUpdateCoupons = function (_a) {
     };
 };
 
-var useCurrentUserData = function () {
-    var queryClient = reactQuery.useQueryClient();
-    var token = useToken();
-    var currentUser = queryClient.getQueryData(common.QueryKeyFactory.default.currentUserKey(token));
-    if (!currentUser)
-        return {};
-    return currentUser;
+var CURRENT_USER_DATA_QUERY = "{\n    company {\n      name\n    }\n    currentUser {\n      account {\n        billingCountry\n        currencyId\n      }\n      authObjectName\n      payload {\n        returnUrl\n      }\n      privacyUrl\n      termsUrl\n      entityId\n    }\n  }";
+var getCurrentUserData = function (_a) {
+    var token = _a.token, apiHost = _a.apiHost;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var response;
+        var _b, _c, _d, _e, _f, _g, _h, _j;
+        return __generator(this, function (_k) {
+            switch (_k.label) {
+                case 0: return [4 /*yield*/, common.gqlRequest({
+                        query: CURRENT_USER_DATA_QUERY,
+                        token: token,
+                        apiHost: apiHost,
+                    })];
+                case 1:
+                    response = _k.sent();
+                    return [2 /*return*/, {
+                            authObjectName: (_b = response === null || response === void 0 ? void 0 : response.currentUser) === null || _b === void 0 ? void 0 : _b.authObjectName,
+                            account: (_c = response === null || response === void 0 ? void 0 : response.currentUser) === null || _c === void 0 ? void 0 : _c.account,
+                            companyName: (_d = response === null || response === void 0 ? void 0 : response.company) === null || _d === void 0 ? void 0 : _d.name,
+                            returnUrl: (_f = (_e = response === null || response === void 0 ? void 0 : response.currentUser) === null || _e === void 0 ? void 0 : _e.payload) === null || _f === void 0 ? void 0 : _f.returnUrl,
+                            privacyUrl: (_g = response === null || response === void 0 ? void 0 : response.currentUser) === null || _g === void 0 ? void 0 : _g.privacyUrl,
+                            termsUrl: (_h = response === null || response === void 0 ? void 0 : response.currentUser) === null || _h === void 0 ? void 0 : _h.termsUrl,
+                            entityId: (_j = response === null || response === void 0 ? void 0 : response.currentUser) === null || _j === void 0 ? void 0 : _j.entityId,
+                        }];
+            }
+        });
+    });
+};
+
+var useCurrentUserData = function (token) {
+    var apiHost = react.useContext(BunnyContext).apiHost;
+    var currentUserData = reactQuery.useQuery({
+        queryKey: common.QueryKeyFactory.default.currentUserKey(token),
+        queryFn: function () { return getCurrentUserData({ token: token, apiHost: apiHost }); },
+    }).data;
+    return currentUserData || {};
 };
 
 var BunnyFooterIcon = function (_a) {
@@ -21727,7 +21756,7 @@ var PlanPickerCheckoutBar = function (_a) {
 // WARNING: There is a preview button on APP that will need to be changed if this query is changed
 var PRICE_LIST_CHANGE_OPTIONS_QUERY = "\n  query priceListChangeOptions($subscriptionId: ID, $productId: ID) {\n    priceListChangeOptions(subscriptionId: $subscriptionId, productId: $productId) {\n      products {\n        everythingInPlus\n        id\n        name\n        plansToDisplay\n        features(sort: \"position asc\") {\n          description\n          id\n          isVisible\n          kind\n          name\n          position\n        }\n      }\n      priceLists {\n        showPriceAsMonthly\n        basePrice\n        currencyId\n        id\n        monthlyBasePrice\n        periodMonths\n        plan {\n          code\n          contactUsLabel\n          contactUsUrl\n          description\n          id\n          name\n          position\n          pricingDescription\n          pricingStyle\n          planFeatures {\n            featureId\n            value\n            feature {\n              name\n            }\n          }\n        }\n        product {\n          id\n        }\n        charges {\n          featureAddon\n          basePrice\n          billingPeriod\n          chargeType\n          id\n          name\n          priceDecimals\n          pricingModel\n          quantityMax\n          quantityMin\n          selfServiceQuantity\n          priceList {\n            id\n          }\n          feature {\n            name\n            unitName\n          }\n        }\n      }\n    }\n  }";
 var getPriceListChangeOptions = function (_a) {
-    var apiHost = _a.apiHost, isInPreviewMode = _a.isInPreviewMode, productId = _a.productId, token = _a.token, upgradingSubscription = _a.upgradingSubscription;
+    var apiHost = _a.apiHost, isInPreviewMode = _a.isInPreviewMode, productId = _a.productId, token = _a.token, upgradingSubscription = _a.upgradingSubscription, accountCurrencyId = _a.accountCurrencyId;
     return __awaiter(void 0, void 0, void 0, function () {
         var response, priceListChangeOptions;
         return __generator(this, function (_b) {
@@ -21748,6 +21777,8 @@ var getPriceListChangeOptions = function (_a) {
                     if (priceListChangeOptions === null || priceListChangeOptions === void 0 ? void 0 : priceListChangeOptions.priceLists) {
                         priceListChangeOptions.priceLists.sort(function (a, b) { return a.plan.position - b.plan.position; });
                     }
+                    // Filter out price lists that don't have the same currency as the account
+                    priceListChangeOptions.priceLists = priceListChangeOptions.priceLists.filter(function (priceList) { return priceList.currencyId === accountCurrencyId; });
                     return [2 /*return*/, priceListChangeOptions];
             }
         });
@@ -22519,6 +22550,7 @@ var PlanPicker = function () {
     var apiHost = react.useContext(BunnyContext).apiHost;
     var _b = react.useContext(SubscriptionsContext), isInPreviewMode = _b.isInPreviewMode, productId = _b.productId, upgradingSubscription = _b.upgradingSubscription;
     var _c = react.useContext(QuotePreviewContext), quotePreviewData = _c.quotePreviewData, setQuotePreviewData = _c.setQuotePreviewData;
+    var account = useCurrentUserData(token).account;
     // Hooks
     var showInfoNotification = common.useInfoNotification();
     // Queries
@@ -22541,6 +22573,7 @@ var PlanPicker = function () {
                 productId: productId,
                 token: token,
                 upgradingSubscription: upgradingSubscription,
+                accountCurrencyId: account === null || account === void 0 ? void 0 : account.currencyId,
             });
         },
         enabled: !areSubscriptionsLoading,
@@ -23124,10 +23157,13 @@ var SubscriptionsListContainer = function (_a) {
     var apiHost = react.useContext(BunnyContext).apiHost;
     var gap = react.useContext(SubscriptionsContext).gap;
     var token = useToken();
+    var account = useCurrentUserData(token).account;
     // Queries
     var _c = reactQuery.useQuery({
         queryKey: common.QueryKeyFactory.default.planChangeOptionsKey({ token: token }),
-        queryFn: function () { return getPriceListChangeOptions({ apiHost: apiHost, token: token }); },
+        queryFn: function () {
+            return getPriceListChangeOptions({ apiHost: apiHost, token: token, accountCurrencyId: account === null || account === void 0 ? void 0 : account.currencyId });
+        },
         enabled: Boolean(onChangePlanClick),
     }), priceListChangeOptions = _c.data, arePriceListChangeOptionsLoading = _c.isLoading;
     if (subscriptionsAreLoading ||

package/dist/cjs/src/graphql/queries/getCurrentUserData.d.ts

@@ -0,0 +1,13 @@
+declare const getCurrentUserData: ({ token, apiHost }: {
+    token?: string | undefined;
+    apiHost: string;
+}) => Promise<{
+    authObjectName: any;
+    account: any;
+    companyName: any;
+    returnUrl: any;
+    privacyUrl: any;
+    termsUrl: any;
+    entityId: any;
+}>;
+export default getCurrentUserData;

package/dist/cjs/src/graphql/queries/getPriceListChangeOptions.d.ts

@@ -1,9 +1,10 @@
 import { Subscription } from '@bunnyapp/common';
-declare const getPriceListChangeOptions: ({ apiHost, isInPreviewMode, productId, token, upgradingSubscription, }: {
+declare const getPriceListChangeOptions: ({ apiHost, isInPreviewMode, productId, token, upgradingSubscription, accountCurrencyId, }: {
     apiHost: string;
     isInPreviewMode?: boolean | undefined;
     productId?: string | undefined;
     token?: string | undefined;
     upgradingSubscription?: Subscription | undefined;
+    accountCurrencyId: string;
 }) => Promise<any>;
 export default getPriceListChangeOptions;

package/dist/cjs/src/hooks/useCurrentUserData.d.ts

@@ -1,2 +1,11 @@
-declare const useCurrentUserData: () => any;
+import { currentUser as CurrentUser } from '@bunnyapp/common';
+declare const useCurrentUserData: (token?: string) => {
+    authObjectName: any;
+    account: any;
+    companyName: any;
+    returnUrl: any;
+    privacyUrl: any;
+    termsUrl: any;
+    entityId: any;
+} | CurrentUser;
 export default useCurrentUserData;

package/dist/esm/index.js

@@ -143,7 +143,7 @@ var BrandContext = createContext({
 });
 
 // This will be replaced at build time by rollup-plugin-replace
-var PACKAGE_VERSION = '1.1.0-beta.5';
+var PACKAGE_VERSION = '1.2.0-beta.1';
 var createRequestHeaders = function (token) {
     var headers = createClientDevHeaders(token);
     // Add the components version header
@@ -20427,13 +20427,42 @@ var useUpdateCoupons = function (_a) {
     };
 };
 
-var useCurrentUserData = function () {
-    var queryClient = useQueryClient();
-    var token = useToken();
-    var currentUser = queryClient.getQueryData(QueryKeyFactory.default.currentUserKey(token));
-    if (!currentUser)
-        return {};
-    return currentUser;
+var CURRENT_USER_DATA_QUERY = "{\n    company {\n      name\n    }\n    currentUser {\n      account {\n        billingCountry\n        currencyId\n      }\n      authObjectName\n      payload {\n        returnUrl\n      }\n      privacyUrl\n      termsUrl\n      entityId\n    }\n  }";
+var getCurrentUserData = function (_a) {
+    var token = _a.token, apiHost = _a.apiHost;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var response;
+        var _b, _c, _d, _e, _f, _g, _h, _j;
+        return __generator(this, function (_k) {
+            switch (_k.label) {
+                case 0: return [4 /*yield*/, gqlRequest$1({
+                        query: CURRENT_USER_DATA_QUERY,
+                        token: token,
+                        apiHost: apiHost,
+                    })];
+                case 1:
+                    response = _k.sent();
+                    return [2 /*return*/, {
+                            authObjectName: (_b = response === null || response === void 0 ? void 0 : response.currentUser) === null || _b === void 0 ? void 0 : _b.authObjectName,
+                            account: (_c = response === null || response === void 0 ? void 0 : response.currentUser) === null || _c === void 0 ? void 0 : _c.account,
+                            companyName: (_d = response === null || response === void 0 ? void 0 : response.company) === null || _d === void 0 ? void 0 : _d.name,
+                            returnUrl: (_f = (_e = response === null || response === void 0 ? void 0 : response.currentUser) === null || _e === void 0 ? void 0 : _e.payload) === null || _f === void 0 ? void 0 : _f.returnUrl,
+                            privacyUrl: (_g = response === null || response === void 0 ? void 0 : response.currentUser) === null || _g === void 0 ? void 0 : _g.privacyUrl,
+                            termsUrl: (_h = response === null || response === void 0 ? void 0 : response.currentUser) === null || _h === void 0 ? void 0 : _h.termsUrl,
+                            entityId: (_j = response === null || response === void 0 ? void 0 : response.currentUser) === null || _j === void 0 ? void 0 : _j.entityId,
+                        }];
+            }
+        });
+    });
+};
+
+var useCurrentUserData = function (token) {
+    var apiHost = useContext(BunnyContext).apiHost;
+    var currentUserData = useQuery({
+        queryKey: QueryKeyFactory.default.currentUserKey(token),
+        queryFn: function () { return getCurrentUserData({ token: token, apiHost: apiHost }); },
+    }).data;
+    return currentUserData || {};
 };
 
 var BunnyFooterIcon = function (_a) {
@@ -21716,7 +21745,7 @@ var PlanPickerCheckoutBar = function (_a) {
 // WARNING: There is a preview button on APP that will need to be changed if this query is changed
 var PRICE_LIST_CHANGE_OPTIONS_QUERY = "\n  query priceListChangeOptions($subscriptionId: ID, $productId: ID) {\n    priceListChangeOptions(subscriptionId: $subscriptionId, productId: $productId) {\n      products {\n        everythingInPlus\n        id\n        name\n        plansToDisplay\n        features(sort: \"position asc\") {\n          description\n          id\n          isVisible\n          kind\n          name\n          position\n        }\n      }\n      priceLists {\n        showPriceAsMonthly\n        basePrice\n        currencyId\n        id\n        monthlyBasePrice\n        periodMonths\n        plan {\n          code\n          contactUsLabel\n          contactUsUrl\n          description\n          id\n          name\n          position\n          pricingDescription\n          pricingStyle\n          planFeatures {\n            featureId\n            value\n            feature {\n              name\n            }\n          }\n        }\n        product {\n          id\n        }\n        charges {\n          featureAddon\n          basePrice\n          billingPeriod\n          chargeType\n          id\n          name\n          priceDecimals\n          pricingModel\n          quantityMax\n          quantityMin\n          selfServiceQuantity\n          priceList {\n            id\n          }\n          feature {\n            name\n            unitName\n          }\n        }\n      }\n    }\n  }";
 var getPriceListChangeOptions = function (_a) {
-    var apiHost = _a.apiHost, isInPreviewMode = _a.isInPreviewMode, productId = _a.productId, token = _a.token, upgradingSubscription = _a.upgradingSubscription;
+    var apiHost = _a.apiHost, isInPreviewMode = _a.isInPreviewMode, productId = _a.productId, token = _a.token, upgradingSubscription = _a.upgradingSubscription, accountCurrencyId = _a.accountCurrencyId;
     return __awaiter(void 0, void 0, void 0, function () {
         var response, priceListChangeOptions;
         return __generator(this, function (_b) {
@@ -21737,6 +21766,8 @@ var getPriceListChangeOptions = function (_a) {
                     if (priceListChangeOptions === null || priceListChangeOptions === void 0 ? void 0 : priceListChangeOptions.priceLists) {
                         priceListChangeOptions.priceLists.sort(function (a, b) { return a.plan.position - b.plan.position; });
                     }
+                    // Filter out price lists that don't have the same currency as the account
+                    priceListChangeOptions.priceLists = priceListChangeOptions.priceLists.filter(function (priceList) { return priceList.currencyId === accountCurrencyId; });
                     return [2 /*return*/, priceListChangeOptions];
             }
         });
@@ -22508,6 +22539,7 @@ var PlanPicker = function () {
     var apiHost = useContext(BunnyContext).apiHost;
     var _b = useContext(SubscriptionsContext), isInPreviewMode = _b.isInPreviewMode, productId = _b.productId, upgradingSubscription = _b.upgradingSubscription;
     var _c = useContext(QuotePreviewContext), quotePreviewData = _c.quotePreviewData, setQuotePreviewData = _c.setQuotePreviewData;
+    var account = useCurrentUserData(token).account;
     // Hooks
     var showInfoNotification = useInfoNotification();
     // Queries
@@ -22530,6 +22562,7 @@ var PlanPicker = function () {
                 productId: productId,
                 token: token,
                 upgradingSubscription: upgradingSubscription,
+                accountCurrencyId: account === null || account === void 0 ? void 0 : account.currencyId,
             });
         },
         enabled: !areSubscriptionsLoading,
@@ -23113,10 +23146,13 @@ var SubscriptionsListContainer = function (_a) {
     var apiHost = useContext(BunnyContext).apiHost;
     var gap = useContext(SubscriptionsContext).gap;
     var token = useToken();
+    var account = useCurrentUserData(token).account;
     // Queries
     var _c = useQuery({
         queryKey: QueryKeyFactory.default.planChangeOptionsKey({ token: token }),
-        queryFn: function () { return getPriceListChangeOptions({ apiHost: apiHost, token: token }); },
+        queryFn: function () {
+            return getPriceListChangeOptions({ apiHost: apiHost, token: token, accountCurrencyId: account === null || account === void 0 ? void 0 : account.currencyId });
+        },
         enabled: Boolean(onChangePlanClick),
     }), priceListChangeOptions = _c.data, arePriceListChangeOptionsLoading = _c.isLoading;
     if (subscriptionsAreLoading ||

package/dist/esm/src/graphql/queries/getCurrentUserData.d.ts

@@ -0,0 +1,13 @@
+declare const getCurrentUserData: ({ token, apiHost }: {
+    token?: string | undefined;
+    apiHost: string;
+}) => Promise<{
+    authObjectName: any;
+    account: any;
+    companyName: any;
+    returnUrl: any;
+    privacyUrl: any;
+    termsUrl: any;
+    entityId: any;
+}>;
+export default getCurrentUserData;

package/dist/esm/src/graphql/queries/getPriceListChangeOptions.d.ts

@@ -1,9 +1,10 @@
 import { Subscription } from '@bunnyapp/common';
-declare const getPriceListChangeOptions: ({ apiHost, isInPreviewMode, productId, token, upgradingSubscription, }: {
+declare const getPriceListChangeOptions: ({ apiHost, isInPreviewMode, productId, token, upgradingSubscription, accountCurrencyId, }: {
     apiHost: string;
     isInPreviewMode?: boolean | undefined;
     productId?: string | undefined;
     token?: string | undefined;
     upgradingSubscription?: Subscription | undefined;
+    accountCurrencyId: string;
 }) => Promise<any>;
 export default getPriceListChangeOptions;

package/dist/esm/src/hooks/useCurrentUserData.d.ts

@@ -1,2 +1,11 @@
-declare const useCurrentUserData: () => any;
+import { currentUser as CurrentUser } from '@bunnyapp/common';
+declare const useCurrentUserData: (token?: string) => {
+    authObjectName: any;
+    account: any;
+    companyName: any;
+    returnUrl: any;
+    privacyUrl: any;
+    termsUrl: any;
+    entityId: any;
+} | CurrentUser;
 export default useCurrentUserData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunnyapp/components",
-  "version": "1.1.0",
+  "version": "1.2.0-beta.2",
   "description": "Components from the Bunny portal to embed Bunny UI functionality into your application.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -64,7 +64,7 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^5.6.1",
-    "@bunnyapp/common": "^1.1.0",
+    "@bunnyapp/common": "^1.1.0-beta.4",
     "@fortawesome/fontawesome-svg-core": "^6.7.2",
     "@fortawesome/free-brands-svg-icons": "^6.7.2",
     "@fortawesome/free-regular-svg-icons": "^6.7.2",