@africanies/angular-web-sdk 0.1.5 → 0.1.7

package/.nx/cache/{13524438527920092277 → 13466509747676776487}/dist/libs/africanies-core/fesm2022/africanies-africanies-core.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, signal, Injectable, makeEnvironmentProviders, provideAppInitializer } from '@angular/core';
 import { SessionStorageService, AFRICANIES_SHIPPING_MODE_KEY, STORAGE_TOKEN, AFRICANIES_MODE_CONFIG_KEY, provideLocalStorage, AFRICANIES_ACCESS_TOKEN_KEY } from '@africanies/africanies-storage';
-import { of, retry, throwError, timer, timeout, map as map$1, tap as tap$1, catchError, finalize, firstValueFrom, forkJoin } from 'rxjs';
+import { of, timeout, throwError, map as map$1, tap as tap$1, catchError, finalize, firstValueFrom, forkJoin } from 'rxjs';
 import { HttpErrorResponse, HttpContextToken, HttpContext, HttpClient, HttpHeaders, HttpParams, provideHttpClient, withInterceptors } from '@angular/common/http';
 import { DEFAULT_PAGE_SIZE, NOTIFICATION_PAGE_SIZE } from '@africanies/africanies-models';
 import { take, tap, map } from 'rxjs/operators';
@@ -687,31 +687,6 @@ class HttpResponseCache {
     }
 }
 
-/**
- * Whether a failed GET should be retried by {@link ApiClient}.
- *
- * Retries transient failures only (network blips, timeouts, 408/429, 5xx).
- * Auth and other 4xx errors fail fast — retrying 401 does not help and causes
- * duplicate requests + toasts.
- * @param err
- */
-function isRetryableGetError(err) {
-    if (err instanceof HttpErrorResponse) {
-        if (err.status === 0) {
-            return true;
-        }
-        if (err.status === 408 || err.status === 429) {
-            return true;
-        }
-        if (err.status >= 500) {
-            return true;
-        }
-        return false;
-    }
-    // Non-HTTP failures (e.g. timeout operator) may still be transient.
-    return true;
-}
-
 /**
  * Per-request shipping-mode override for {@link shipmentModeInterceptor}.
  *
@@ -979,7 +954,8 @@ function mapResourcePayload(id, raw, mapOne, mapMany) {
  * - HTTP failures rethrown as `Error` whose `.message` is already
  *   user-facing ({@link formatApiErrorMessage}) — consumers do not need to
  *   parse `HttpErrorResponse` bodies
- * - Exponential-backoff retry (max 1) for **GET only**
+ * - **No automatic retry** — fail fast so UIs can show Select / table /
+ *   error-state Retry instead of a stuck loading spinner
  * - Optional per-GET TTL cache via `cacheTtlMs`
  *
  * @example
@@ -1121,18 +1097,8 @@ class ApiClient {
                 req$ = this.http.delete(url, hasBody ? { ...httpOpts, body } : httpOpts);
                 break;
         }
-        // Retry only idempotent GETs on transient failures — never replay 401/404 etc.
-        if (method === 'GET') {
-            req$ = req$.pipe(retry({
-                count: 1,
-                delay: (err, retryCount) => {
-                    if (!isRetryableGetError(err)) {
-                        return throwError(() => err);
-                    }
-                    return timer(2 ** (retryCount - 1) * 1000);
-                },
-            }));
-        }
+        // No automatic GET retry — admin shells own Retry via UI
+        // (`africanies-select` showRetry, table error→refreshClick, error-state).
         if (this.config.timeout != null) {
             req$ = req$.pipe(timeout({
                 each: this.config.timeout,
@@ -1808,8 +1774,8 @@ function listFetchKind(options) {
  * (no caret/tilde): TanStack marks the Angular adapter experimental and
  * breaking changes land without major bumps.
  *
- * Retry/backoff here mirrors {@link ApiClient}'s GET retry (max 3,
- * exponential) so HTTP-layer and query-layer behavior stay aligned.
+ * Query retries default to **0** to match {@link ApiClient} (fail fast;
+ * screens use manual Retry). Apps can override per `QueryClient` if needed.
  */
 /**
  * Factory for TanStack `QueryClient` `defaultOptions`.
@@ -1859,8 +1825,7 @@ function createAfricaniesQueryClientDefaults() {
         queries: {
             staleTime: 60_000,
             gcTime: 5 * 60_000,
-            retry: 3,
-            // attemptIndex is 0-based in TanStack; match 1s, 2s, 4s style backoff.
+            retry: 0,
             retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30_000),
         },
         mutations: {
@@ -2725,7 +2690,7 @@ function mapPaymentMethod(raw) {
         deleted_at: asNullableString(record['deleted_at'] ?? record['deletedAt']),
         created_at: asNullableString(record['created_at'] ?? record['createdAt']),
         updated_at: asNullableString(record['updated_at'] ?? record['updatedAt']),
-        currencies: mapArray(record['currencies'], mapPaymentMethodCurrency),
+        currencies: mapList(record['currencies'], mapPaymentMethodCurrency),
     };
 }
 /**
@@ -3800,22 +3765,58 @@ const SHIPMENT_APP_BY_MODE = {
     stn: 'shiptonaija',
     sfn: 'shipfromnaija',
 };
+const QUERY_SHIPMENT_APP = 'shipment_app';
+const LEGACY_PORTAL_HOST = /^(?:test-)?(?:admin|customer)-(?:export|import)\.africaniestest\.com$/i;
+/** Signed export downloads and other hosts that must not be rewritten in-app. */
+function isNotificationExternalLink(link) {
+    const trimmed = decodeNotificationLink(link).trim();
+    if (!trimmed) {
+        return false;
+    }
+    try {
+        const url = new URL(trimmed);
+        if (/\.(xlsx|xls|csv)(\?|$)/i.test(url.pathname)) {
+            return true;
+        }
+        if (/\.amazonaws\.com$/i.test(url.hostname)) {
+            return true;
+        }
+        return !isLegacyPortalHost(url.hostname);
+    }
+    catch {
+        return false;
+    }
+}
 /**
- * Rewrite a notification portal URL for the active {@link ShippingMode}.
+ * Rewrite a notification href for the active {@link ShippingMode}.
  *
- * Swaps `-export` / `-import` host segments and sets `shipment_app` to
- * `shipfromnaija` (SFN) or `shiptonaija` (STN).
- * @param link
- * @param mode
+ * - Export / download URLs (S3, spreadsheets) pass through unchanged (no `shipment_app`).
+ * - Legacy portal hosts become relative `/portal/...` paths with query preserved.
+ * - When the notification already includes `shipment_app`, it is kept as-is.
+ * - Otherwise classic host / `shipment_app` rewriting applies for portal URLs.
  */
 function resolveNotificationLinkForMode(link, mode) {
-    const trimmed = asString(link).trim();
+    const trimmed = decodeNotificationLink(asString(link)).trim();
     if (!trimmed) {
         return trimmed;
     }
+    if (isNotificationExternalLink(trimmed)) {
+        return stripShipmentAppFromLink(trimmed);
+    }
+    const relativePortal = toRelativePortalNotificationLink(trimmed);
+    if (relativePortal && hasShipmentAppQuery(relativePortal)) {
+        return relativePortal;
+    }
+    const relative = normalizeRelativePortalLink(trimmed);
+    if (relative && hasShipmentAppQuery(relative)) {
+        return relative;
+    }
     try {
         const url = new URL(trimmed);
-        url.searchParams.set('shipment_app', SHIPMENT_APP_BY_MODE[mode]);
+        if (url.searchParams.has(QUERY_SHIPMENT_APP)) {
+            return trimmed;
+        }
+        url.searchParams.set(QUERY_SHIPMENT_APP, SHIPMENT_APP_BY_MODE[mode]);
         url.hostname = rewriteNotificationHostForMode(url.hostname, mode);
         return url.toString();
     }
@@ -3830,6 +3831,9 @@ function rewriteNotificationHostForMode(hostname, mode) {
     return hostname.replace(/-import/i, '-export');
 }
 function rewriteNotificationLinkFallback(link, mode) {
+    if (hasShipmentAppQuery(link)) {
+        return link;
+    }
     let out = link.replace(/shipment_app=(?:shipfromnaija|shiptonaija)/gi, `shipment_app=${SHIPMENT_APP_BY_MODE[mode]}`);
     if (!/shipment_app=/i.test(out)) {
         const joiner = out.includes('?') ? '&' : '?';
@@ -3840,6 +3844,90 @@ function rewriteNotificationLinkFallback(link, mode) {
     }
     return out.replace(/-import/gi, '-export');
 }
+function toRelativePortalNotificationLink(link) {
+    try {
+        const url = new URL(link);
+        if (!isLegacyPortalHost(url.hostname)) {
+            return null;
+        }
+        let path = url.pathname.replace(/^\/+/, '');
+        if (path.startsWith('ng/portal/')) {
+            path = path.slice('ng/'.length);
+        }
+        if (!path.startsWith('portal/') && path !== 'portal') {
+            return null;
+        }
+        const query = url.searchParams.toString();
+        return `/${path}${query ? `?${query}` : ''}`;
+    }
+    catch {
+        return null;
+    }
+}
+function normalizeRelativePortalLink(link) {
+    let path = link.split('?')[0]?.split('#')[0] ?? '';
+    const query = link.includes('?') ? link.slice(link.indexOf('?')) : '';
+    path = path.replace(/^\/+/, '');
+    if (path.startsWith('ng/portal/')) {
+        path = path.slice('ng/'.length);
+    }
+    if (!path.startsWith('portal/') && path !== 'portal') {
+        return null;
+    }
+    return `/${path}${query}`;
+}
+function stripShipmentAppFromLink(link) {
+    const trimmed = link.trim();
+    if (!trimmed) {
+        return trimmed;
+    }
+    try {
+        const url = new URL(trimmed);
+        if (!url.searchParams.has(QUERY_SHIPMENT_APP)) {
+            return trimmed;
+        }
+        url.searchParams.delete(QUERY_SHIPMENT_APP);
+        return url.toString();
+    }
+    catch {
+        const params = new URLSearchParams(trimmed.includes('?') ? trimmed.slice(trimmed.indexOf('?') + 1) : '');
+        if (!params.has(QUERY_SHIPMENT_APP)) {
+            return trimmed;
+        }
+        params.delete(QUERY_SHIPMENT_APP);
+        const query = params.toString();
+        const base = trimmed.split('?')[0] ?? trimmed;
+        return query ? `${base}?${query}` : base;
+    }
+}
+function hasShipmentAppQuery(link) {
+    try {
+        const query = link.includes('?') ? link.slice(link.indexOf('?') + 1) : '';
+        return new URLSearchParams(query).has(QUERY_SHIPMENT_APP);
+    }
+    catch {
+        return /(?:^|[?&])shipment_app=/i.test(link);
+    }
+}
+function decodeNotificationLink(link) {
+    let value = (link ?? '').trim();
+    if (!value.includes('%')) {
+        return value;
+    }
+    try {
+        const decoded = decodeURIComponent(value);
+        if (decoded !== value) {
+            value = decoded;
+        }
+    }
+    catch {
+        // Keep original when not valid URI encoding.
+    }
+    return value;
+}
+function isLegacyPortalHost(hostname) {
+    return LEGACY_PORTAL_HOST.test(hostname);
+}
 
 /**
  * File utility reads (`POST /file/read`).
@@ -4542,5 +4630,5 @@ function downloadCsv(options) {
  * Generated bundle index. Do not edit.
  */
 
-export { AFRICANIES_HTTP_TOAST, AFRICANIES_SDK_CONFIG, AUTH_FORGOT_PASSWORD_PATH, ApiClient, AuthService, AuthTokenService, COUNTRY_FLAG_CDN_BASE, COUNTRY_READ_PATH, CURRENCY_CREATE_PATH, CURRENCY_DELETE_PATH, CURRENCY_READ_PATH, CURRENCY_UPDATE_PATH, CountryService, CurrencyService, DOCUMENT_READ_PATH, DRAWER_SERVICE, DocumentService, FILE_READ_MULTIPLE_PARAM, FILE_READ_PATH, FileService, FilterOptionsResolver, HttpResponseCache, MODAL_SERVICE, MODE_CONFIG_PATH, ModeConfigService, NOTIFICATION_READ_PATH, NOTIFICATION_UPDATE_PATH, NotificationService, OVERLAY_ROUTE_CONFIGS, PAYMENT_METHOD_READ_PATH, PAYMENT_METHOD_UPDATE_PATH, PLAN_READ_PATH, PRODUCT_READ_PATH, PaymentMethodService, PlanService, ProductService, RouteOverlayService, SERVICE_READ_PATH, SHIPMENT_METHOD_READ_PATH, SHIPPING_MODE_OVERRIDE, ServiceService, ShipmentMethodService, ShippingModeService, TOAST_HTTP_OPTIONS, USER_CHANGE_PASSWORD_PATH, USER_LOGOUT_FROM_ALL_SESSIONS_PATH, USER_PATH, UserService, WAREHOUSE_READ_PATH, WarehouseService, ZONE_READ_PATH, ZoneService, asArray, asBoolean, asNullableBoolean, asNullableFlag01, asNullableNumber, asNullableString, asNumber, asRecord, asShippingMode$1 as asShippingMode, asString, authInterceptor, buildResourcePath, buildResourceQueryParams, collectFilterOptionsSources, collectResolvableSelectFields, copyToClipboard, countryFlagUrl, createAfricaniesQueryClientDefaults, csvCell, downloadCsv, fieldErrorsMap, formatApiErrorMessage, httpToastInterceptor, isLaravelValidationBag, isValidEmail, joinApiErrorMessages, listFetchKind, mapApiJsonList, mapApiJsonValue, mapArray, mapCountry, mapCountryList, mapCountrySelectOptions, mapCountryState, mapCurrency, mapCurrencyList, mapCurrencyPaymentMethod, mapCurrencyPaymentMethodPivot, mapDocument, mapDocumentList, mapFileRead, mapFileReadList, mapLaravelValidationBag, mapList, mapModeConfigData, mapNotification, mapNotificationInboxItem, mapNotificationList, mapNotificationPayload, mapPaymentMethod, mapPaymentMethodCurrency, mapPaymentMethodList, mapPlan, mapPlanList, mapPlanPackage, mapProduct, mapProductList, mapResourcePayload, mapService, mapServiceList, mapShipmentMethod, mapShipmentMethodFilterOptions, mapShipmentMethodList, mapShipmentMethodZoneLink, mapShipmentMethodZonePage, mapShipmentZone, mapUser, mapUserAccountManager, mapUserBusinessAccount, mapUserCountry, mapUserCountryState, mapUserGatewayPayload, mapUserPaymentPayload, mapUserPlan, mapUserPlanPackage, mapUserStateLabel, mapUserSubscription, mapWarehouse, mapWarehouseCountry, mapWarehouseFilterOptions, mapWarehouseList, mapWarehouseState, mapZone, mapZoneList, mergeFilterOptionLists, normalize, normalizePagination, provideAfricaniesHttpClient, provideAfricaniesQueryDefaults, provideAfricaniesSdk, provideModeConfig, provideOverlayRoutes, resolveModeRegionConfig, resolveNotificationLinkForMode, resourceCacheTtlMs, shipmentModeInterceptor, toCsvString, toCurrencyCreateBody, toCurrencyDeleteBody, toCurrencyFlag01, toCurrencyUpdateBody, toFlag01, toPaymentMethodFlag01, toPaymentMethodUpdateBody, unwrapLaravelPaginator, withShippingMode, withToast };
+export { AFRICANIES_HTTP_TOAST, AFRICANIES_SDK_CONFIG, AUTH_FORGOT_PASSWORD_PATH, ApiClient, AuthService, AuthTokenService, COUNTRY_FLAG_CDN_BASE, COUNTRY_READ_PATH, CURRENCY_CREATE_PATH, CURRENCY_DELETE_PATH, CURRENCY_READ_PATH, CURRENCY_UPDATE_PATH, CountryService, CurrencyService, DOCUMENT_READ_PATH, DRAWER_SERVICE, DocumentService, FILE_READ_MULTIPLE_PARAM, FILE_READ_PATH, FileService, FilterOptionsResolver, HttpResponseCache, MODAL_SERVICE, MODE_CONFIG_PATH, ModeConfigService, NOTIFICATION_READ_PATH, NOTIFICATION_UPDATE_PATH, NotificationService, OVERLAY_ROUTE_CONFIGS, PAYMENT_METHOD_READ_PATH, PAYMENT_METHOD_UPDATE_PATH, PLAN_READ_PATH, PRODUCT_READ_PATH, PaymentMethodService, PlanService, ProductService, RouteOverlayService, SERVICE_READ_PATH, SHIPMENT_METHOD_READ_PATH, SHIPPING_MODE_OVERRIDE, ServiceService, ShipmentMethodService, ShippingModeService, TOAST_HTTP_OPTIONS, USER_CHANGE_PASSWORD_PATH, USER_LOGOUT_FROM_ALL_SESSIONS_PATH, USER_PATH, UserService, WAREHOUSE_READ_PATH, WarehouseService, ZONE_READ_PATH, ZoneService, asArray, asBoolean, asNullableBoolean, asNullableFlag01, asNullableNumber, asNullableString, asNumber, asRecord, asShippingMode$1 as asShippingMode, asString, authInterceptor, buildResourcePath, buildResourceQueryParams, collectFilterOptionsSources, collectResolvableSelectFields, copyToClipboard, countryFlagUrl, createAfricaniesQueryClientDefaults, csvCell, downloadCsv, fieldErrorsMap, formatApiErrorMessage, httpToastInterceptor, isLaravelValidationBag, isNotificationExternalLink, isValidEmail, joinApiErrorMessages, listFetchKind, mapApiJsonList, mapApiJsonValue, mapArray, mapCountry, mapCountryList, mapCountrySelectOptions, mapCountryState, mapCurrency, mapCurrencyList, mapCurrencyPaymentMethod, mapCurrencyPaymentMethodPivot, mapDocument, mapDocumentList, mapFileRead, mapFileReadList, mapLaravelValidationBag, mapList, mapModeConfigData, mapNotification, mapNotificationInboxItem, mapNotificationList, mapNotificationPayload, mapPaymentMethod, mapPaymentMethodCurrency, mapPaymentMethodList, mapPlan, mapPlanList, mapPlanPackage, mapProduct, mapProductList, mapResourcePayload, mapService, mapServiceList, mapShipmentMethod, mapShipmentMethodFilterOptions, mapShipmentMethodList, mapShipmentMethodZoneLink, mapShipmentMethodZonePage, mapShipmentZone, mapUser, mapUserAccountManager, mapUserBusinessAccount, mapUserCountry, mapUserCountryState, mapUserGatewayPayload, mapUserPaymentPayload, mapUserPlan, mapUserPlanPackage, mapUserStateLabel, mapUserSubscription, mapWarehouse, mapWarehouseCountry, mapWarehouseFilterOptions, mapWarehouseList, mapWarehouseState, mapZone, mapZoneList, mergeFilterOptionLists, normalize, normalizePagination, provideAfricaniesHttpClient, provideAfricaniesQueryDefaults, provideAfricaniesSdk, provideModeConfig, provideOverlayRoutes, resolveModeRegionConfig, resolveNotificationLinkForMode, resourceCacheTtlMs, shipmentModeInterceptor, toCsvString, toCurrencyCreateBody, toCurrencyDeleteBody, toCurrencyFlag01, toCurrencyUpdateBody, toFlag01, toPaymentMethodFlag01, toPaymentMethodUpdateBody, unwrapLaravelPaginator, withShippingMode, withToast };
 //# sourceMappingURL=africanies-africanies-core.mjs.map