@mis-wis/common 0.2.0 → 0.3.0

package/fesm2020/mis-wis-common.mjs

@@ -15,9 +15,10 @@ import { LoaderModule } from 'mis-crystal-design-system/loader';
 import { map, forkJoin, ReplaySubject } from 'rxjs';
 import * as i2$2 from '@angular/forms';
 import { Validators, ReactiveFormsModule } from '@angular/forms';
-import { parseZone } from 'moment';
-import * as i1$3 from 'mis-design-system/mis-modal';
-import { MODAL_DATA_VAR } from 'mis-design-system/mis-modal';
+import dayjs from 'dayjs';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+import * as i1$3 from 'mis-crystal-design-system/modal';
+import { MODAL_DATA_VAR } from 'mis-crystal-design-system/modal';
 import * as i6 from 'mis-crystal-design-system/dropdown';
 import { DropdownModule } from 'mis-crystal-design-system/dropdown';
 import * as i7 from 'mis-crystal-design-system/datepicker_v2';
@@ -229,19 +230,22 @@ const CONSTANTS_LOGGER = {
 };
 
 const envMap = {
-    dev: "https://bff.devcl.moveinsync.com",
-    qa: "https://bff.stage.moveinsync.com",
-    production: "https://bff.moveinsync.com",
-    uat: "https://wisbff-uat.moveinsync.com",
-    "production-green": "https://wisempweb-green.moveinsync.com",
-    "production-beta": "https://bff-beta.moveinsync.com",
-    "production-eu": "https://bff.eu.moveinsync.com",
-    "production-eu-green": "https://bff-green.eu.moveinsync.com",
-    "production-mu": "https://bff.moveinsync.in"
+    dev: "https://ui-logger.stage.moveinsync.com",
+    qa: "https://ui-logger.stage.moveinsync.com",
+    production: "https://ui-logger.moveinsync.com",
+    uat: "https://ui-logger-uat.moveinsync.com",
+    "production-green": "https://ui-logger-green.moveinsync.com",
+    "production-beta": "https://ui-logger-beta.moveinsync.com",
+    "production-eu": "https://ui-logger.eu.moveinsync.com",
+    "production-eu-green": "https://ui-logger-green.eu.moveinsync.com",
+    "production-eu-beta": "https://ui-logger-beta.eu.moveinsync.com",
+    "production-mu": "https://ui-logger.moveinsync.in",
+    "production-mu-green": "https://ui-logger-green.moveinsync.in",
+    "production-mu-beta": "https://ui-logger-beta.moveinsync.in",
 };
 function environmentHandler(env) {
     if (!env) {
-        return "/bff";
+        return "/logger";
     }
     return envMap[env];
 }
@@ -395,7 +399,10 @@ const CONSTANTS_ASSETS_WIS_COMMON = {
     ICONS: {}
 };
 
+dayjs.extend(customParseFormat);
 const PROPERTIES = ["NON_SHIFT_TRIPS_CATEGORIES", "USE_VALID_OFFICE_FOR_IRREGULAR_TRIPS"];
+const DATE_FORMAT = "DD/MM/YYYY";
+const PICKUP_TIME_FORMAT = "DD/MM/YYYY HH/mm/ss";
 class CreateNonShiftModalComponent {
     constructor(modalData, modalRef, fb, http, toast) {
         this.modalData = modalData;
@@ -405,8 +412,8 @@ class CreateNonShiftModalComponent {
         this.toast = toast;
         this.CONSTANTS_ASSETS_WIS_COMMON = CONSTANTS_ASSETS_WIS_COMMON;
         this.dateConfig = {
-            minDate: parseZone().format("DD/MM/YYYY"),
-            format: "DD/MM/YYYY"
+            minDate: dayjs().format(DATE_FORMAT),
+            format: DATE_FORMAT
         };
         this.offices = [];
         this.locationDropdownData = [];
@@ -441,7 +448,7 @@ class CreateNonShiftModalComponent {
         });
     }
     initializeForm() {
-        const currentTime = this.modalData?.date ?? parseZone().format("DD/MM/YYYY");
+        const currentTime = this.modalData?.date ?? dayjs().format(DATE_FORMAT);
         this.createTripsheetForm = this.fb.group({
             direction: [this.modalData?.shiftType === "logout" ? "OUT" : "IN", Validators.required],
             location: [{ label: "", value: "" }],
@@ -512,7 +519,7 @@ class CreateNonShiftModalComponent {
         }
         const formValue = this.createTripsheetForm.value;
         const pickupTime = `${formValue.date} ${formValue.hours.value}/${formValue.mins.value}/00`;
-        const pickupTimeDate = parseZone(pickupTime).toDate();
+        const pickupTimeDate = dayjs(pickupTime, PICKUP_TIME_FORMAT).toDate();
         if (this.isDateAndTimeFromPast(pickupTimeDate)) {
             this.toast.displayMsg("Please select a future date and time.");
             return;
@@ -687,6 +694,23 @@ class SessionClaimNotFoundError extends SessionError {
         this.name = 'SessionClaimNotFoundError';
     }
 }
+/** Renders failures as `claim (reason), claim (reason)` for error messages. */
+function describeClaimFailures(failures) {
+    return failures.map(f => `${f.claim} (${f.reason})`).join(', ');
+}
+/**
+ * Every claim `run`'s `next` failed to read, reported once after the block has finished.
+ * Extends `SessionClaimNotFoundError` — and reports the first failure as `claim` — so handlers
+ * written against the single-claim error keep working.
+ */
+class SessionClaimsMissingError extends SessionClaimNotFoundError {
+    constructor(failures) {
+        super(failures[0].claim);
+        this.failures = failures;
+        this.name = 'SessionClaimsMissingError';
+        this.message = `Session claims not found: ${describeClaimFailures(failures)}.`;
+    }
+}
 
 const DEFAULT_SESSION_TOKEN_PREFIX = 'sso-wis-token';
 const DEFAULT_SESSION_TOKEN_FALLBACK_KEY = 'x-wis-token';
@@ -697,6 +721,7 @@ class SessionService {
         this.config = {};
         this.cachedToken = null;
         this.cachedState = null;
+        this.collecting = null;
     }
     init(config) {
         this.config = { ...config };
@@ -720,18 +745,50 @@ class SessionService {
     }
     /**
      * Statement-style variant of `read` for blocks of assignments/side effects with no return value.
+     *
+     * `next` always runs to completion: a claim that is absent or blank yields `undefined` instead of
+     * throwing, and every such failure is reported once afterwards via `handlers.error`, as a
+     * `SessionClaimsMissingError` listing all of them. An unusable token (missing, expired,
+     * undecodable) still aborts `next` immediately with the matching `SessionError`.
+     *
+     * Collecting covers the synchronous body of `next` only — claim reads deferred into a subscription,
+     * timeout or promise run after it has returned and throw as usual.
+     *
+     * An error `next` throws for any other reason propagates untouched, except that any claims missing
+     * at the time are appended to its message and attached as `sessionClaimFailures` — a collected
+     * `undefined` reaching the block is the usual cause, and that is the part worth knowing.
      */
     run(handlers) {
-        this.read({
-            next: s => { handlers.next(s); return undefined; },
-            error: err => { handlers.error(err); return undefined; }
-        });
+        const failures = [];
+        const previous = this.collecting;
+        this.collecting = failures;
+        try {
+            handlers.next(this);
+        }
+        catch (e) {
+            if (e instanceof SessionError) {
+                handlers.error(e);
+                return;
+            }
+            if (failures.length && e instanceof Error) {
+                e.sessionClaimFailures = failures;
+                e.message = `${e.message} — session claims missing during run(): ${describeClaimFailures(failures)}`;
+            }
+            throw e;
+        }
+        finally {
+            this.collecting = previous;
+        }
+        if (failures.length) {
+            handlers.error(new SessionClaimsMissingError(failures));
+        }
     }
     get isVET() {
         return this.state.isVET;
     }
     get sub() { return this.getClaim('sub'); }
     get empGuid() { return this.getClaim('employeeGUID'); }
+    get employeeId() { return this.getClaim('employeeId'); }
     get internalSsoRole() { return this.getClaim('internal_sso_role'); }
     get roles() { return this.getClaim('roles'); }
     get sessionId() { return this.getClaim('sessionId'); }
@@ -744,13 +801,22 @@ class SessionService {
     get vetUserId() { return this.getClaim('vetUserId'); }
     get source() { return this.getClaim('source'); }
     get roleId() {
-        const claims = this.getClaims();
-        const raw = claims.internal_sso_role?.trim() || claims.roles?.[0]?.trim();
-        if (!raw || !/^\d+$/.test(raw)) {
-            throw new SessionClaimNotFoundError('roleId');
+        const raw = this.resolveRole(this.getClaims());
+        if (!raw) {
+            return this.missingClaim('roleId', 'absent');
         }
         return Number(raw);
     }
+    /** First numeric role in `internal_sso_role` then `roles`, or `''` when the token carries none. */
+    resolveRole(claims) {
+        const candidates = [claims.internal_sso_role, ...(claims.roles ?? [])];
+        return candidates
+            .map(value => value?.trim())
+            .find(value => this.isDigitsOnly(value)) ?? '';
+    }
+    isDigitsOnly(value) {
+        return !!value && /^\d+$/.test(value);
+    }
     getClaims() {
         const state = this.state;
         if (state.status === 'ok') {
@@ -769,10 +835,18 @@ class SessionService {
         const value = claims[key];
         const isEmptyString = typeof value === 'string' && value.trim() === '';
         if (value === undefined || value === null || isEmptyString) {
-            throw new SessionClaimNotFoundError(key);
+            return this.missingClaim(key, isEmptyString ? 'blank' : 'absent');
         }
         return (typeof value === 'string' ? value.trim() : value);
     }
+    /** Records the failure and yields `undefined` while `run` is collecting; throws otherwise. */
+    missingClaim(claim, reason) {
+        if (this.collecting) {
+            this.collecting.push({ claim, reason });
+            return undefined;
+        }
+        throw new SessionClaimNotFoundError(claim);
+    }
     get state() {
         const { token, isVET } = this.findToken();
         if (!this.cachedState || token !== this.cachedToken) {
@@ -838,5 +912,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AuthInterceptor, AuthModule, AuthService, ConfigurationService, CreateNonShiftModalComponent, LoaderService, LoggerModule, LoggerService, MfeCommunicationService, SessionClaimNotFoundError, SessionError, SessionService, SessionTokenExpiredError, SessionTokenInvalidError, SessionTokenNotFoundError, SidenavComponent, WisCommonModule, filterNavList, getCookie, getQueryParam, removeCookie, setCookie };
+export { AuthInterceptor, AuthModule, AuthService, ConfigurationService, CreateNonShiftModalComponent, LoaderService, LoggerModule, LoggerService, MfeCommunicationService, SessionClaimNotFoundError, SessionClaimsMissingError, SessionError, SessionService, SessionTokenExpiredError, SessionTokenInvalidError, SessionTokenNotFoundError, SidenavComponent, WisCommonModule, describeClaimFailures, filterNavList, getCookie, getQueryParam, removeCookie, setCookie };
 //# sourceMappingURL=mis-wis-common.mjs.map