@zeniai/client-epic-state 5.1.82 → 5.1.83

package/lib/view/invoicing/settingsView/settingsViewReducer.js

@@ -33,7 +33,7 @@ const settingsView = (0, toolkit_1.createSlice)({
         saveInvoicingSettings(draft, action) {
             draft.saveFetchState = { fetchState: 'In-Progress', error: undefined };
             if (draft.settings != null) {
-                draft.settings = { ...draft.settings, ...action.payload };
+                draft.settings = { ...draft.settings, ...action.payload.settings };
             }
         },
         saveInvoicingSettingsSuccess(draft, action) {

package/lib/view/invoicing/settingsView/settingsViewSelector.d.ts

@@ -1,5 +1,5 @@
 import { FetchState, FetchStateAndError } from '../../../commonStateTypes/common';
-import { InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
+import { InvoicingNamedOption, InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
 import { RootState } from '../../../reducer';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { InvoicingBrandingFormLocalData } from './invoicingBrandingFormConfig';
@@ -28,6 +28,7 @@ export interface InvoicingSettingsView {
  */
 export declare const getInvoicingSettingsView: (state: RootState) => InvoicingSettingsView;
 export interface InvoicingBrandingFormView {
+    dateFormatOptions: InvoicingNamedOption[];
     localData: InvoicingBrandingFormLocalData;
     saveState: FetchStateAndError;
     addressLabel?: string;
@@ -37,6 +38,7 @@ export interface InvoicingBrandingFormView {
  * Bundled view for the branding settings form: the draft `localData` (seeded
  * from the existing settings until the user edits), the business-address label
  * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview) and the save fetch state.
+ * settings (for the logo/preview), the backend date-format choices and the
+ * save fetch state.
  */
 export declare const getInvoicingBrandingFormView: (state: RootState) => InvoicingBrandingFormView;

package/lib/view/invoicing/settingsView/settingsViewSelector.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingBrandingFormView = exports.getInvoicingSettingsView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = void 0;
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
+const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingBrandingFormConfig_1 = require("./invoicingBrandingFormConfig");
 /**
  * Shared primitive: the raw invoicing settings. Consumed internally by other
@@ -39,7 +40,8 @@ exports.getInvoicingSettingsView = getInvoicingSettingsView;
  * Bundled view for the branding settings form: the draft `localData` (seeded
  * from the existing settings until the user edits), the business-address label
  * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview) and the save fetch state.
+ * settings (for the logo/preview), the backend date-format choices and the
+ * save fetch state.
  */
 const getInvoicingBrandingFormView = (state) => {
     const { brandingDraft, saveFetchState, settings } = state.invoicingSettingsViewState;
@@ -49,6 +51,7 @@ const getInvoicingBrandingFormView = (state) => {
         : undefined;
     return {
         addressLabel,
+        dateFormatOptions: (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).dateFormatOptions,
         localData: brandingDraft ?? (0, invoicingBrandingFormConfig_1.entityToInvoicingBrandingFormLocalData)(settings),
         saveState: saveFetchState,
         settings,

package/lib/view/invoicing/subscriptionAction/subscriptionActionEpic.d.ts

@@ -2,8 +2,9 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { updateAddresses } from '../../../entity/address/addressReducer';
 import { updateInvoicingSubscriptions } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionReducer';
+import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { RootState } from '../../../reducer';
 import { ZeniAPI } from '../../../zeniAPI';
 import { runInvoicingSubscriptionAction, runInvoicingSubscriptionActionFailure, runInvoicingSubscriptionActionSuccess } from './subscriptionActionReducer';
-export type ActionType = ReturnType<typeof runInvoicingSubscriptionAction> | ReturnType<typeof runInvoicingSubscriptionActionSuccess> | ReturnType<typeof runInvoicingSubscriptionActionFailure> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoicingSubscriptions>;
+export type ActionType = ReturnType<typeof runInvoicingSubscriptionAction> | ReturnType<typeof runInvoicingSubscriptionActionSuccess> | ReturnType<typeof runInvoicingSubscriptionActionFailure> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoicingSubscriptions> | ReturnType<typeof openSnackbar>;
 export declare const runInvoicingSubscriptionActionEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/invoicing/subscriptionAction/subscriptionActionEpic.js

@@ -6,11 +6,36 @@ const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../../entity/address/addressReducer");
 const invoicingSubscriptionPayload_1 = require("../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionPayload");
 const invoicingSubscriptionReducer_1 = require("../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionReducer");
+const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const subscriptionActionReducer_1 = require("./subscriptionActionReducer");
+/**
+ * Each lifecycle action reports with its own copy. Keyed loosely because the
+ * action payload carries a plain `string`; an unmapped kind stays silent.
+ */
+const SNACKBAR_SECTION_BY_ACTION = {
+    activate: 'invoicing_subscription_activated',
+    cancel: 'invoicing_subscription_cancelled',
+    change_term_end: 'invoicing_subscription_term_end_changed',
+    pause: 'invoicing_subscription_paused',
+    reactivate: 'invoicing_subscription_reactivated',
+    remove_scheduled_cancellation: 'invoicing_subscription_cancellation_removed',
+    resume: 'invoicing_subscription_resumed',
+    set_non_renewing: 'invoicing_subscription_non_renewing',
+};
 const runInvoicingSubscriptionActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(subscriptionActionReducer_1.runInvoicingSubscriptionAction.match), (0, operators_1.mergeMap)((action) => {
     const { action: kind, body, id } = action.payload;
     const requestBody = { action: kind, ...(body ?? {}) };
+    const snackbarSection = SNACKBAR_SECTION_BY_ACTION[kind];
+    const snackbar = (messageText) => snackbarSection == null
+        ? []
+        : [
+            (0, snackbarReducer_1.openSnackbar)({
+                messageSection: snackbarSection,
+                messageText,
+                type: messageText === 'success' ? 'success' : 'error',
+            }),
+        ];
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/subscriptions/${encodeURIComponent(id)}/actions`;
     return zeniAPI
         .postAndGetJSON(apiUrl, requestBody)
@@ -20,16 +45,23 @@ const runInvoicingSubscriptionActionEpic = (actions$, _state$, zeniAPI) => actio
                 (0, invoicingSubscriptionReducer_1.updateInvoicingSubscriptions)([response.data], 'merge'),
                 (0, addressReducer_1.updateAddresses)((0, invoicingSubscriptionPayload_1.extractInvoicingSubscriptionAddresses)([response.data])),
                 (0, subscriptionActionReducer_1.runInvoicingSubscriptionActionSuccess)({ id }),
+                ...snackbar('success'),
             ];
         }
-        return (0, rxjs_1.of)((0, subscriptionActionReducer_1.runInvoicingSubscriptionActionFailure)({
-            error: response.status,
+        return (0, rxjs_1.from)([
+            (0, subscriptionActionReducer_1.runInvoicingSubscriptionActionFailure)({
+                error: response.status,
+                id,
+            }),
+            ...snackbar('failed'),
+        ]);
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.from)([
+        (0, subscriptionActionReducer_1.runInvoicingSubscriptionActionFailure)({
+            error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Subscription action REST API call errored out ' +
+                JSON.stringify(error)),
             id,
-        }));
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, subscriptionActionReducer_1.runInvoicingSubscriptionActionFailure)({
-        error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Subscription action REST API call errored out ' +
-            JSON.stringify(error)),
-        id,
-    }))));
+        }),
+        ...snackbar('failed'),
+    ])));
 }));
 exports.runInvoicingSubscriptionActionEpic = runInvoicingSubscriptionActionEpic;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.1.82",
+  "version": "5.1.83",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",