@elasticias/screens 1.0.40 → 1.0.42

package/fesm2022/elasticias-screens.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { Input, Component, signal, InjectionToken, inject, ChangeDetectorRef, ViewChild, Injector, computed, DestroyRef } from '@angular/core';
 import { PersistedState, StorageUtils, AppUtils, CsvUtils } from '@elasticias/utils';
-import { Subject, combineLatest, take } from 'rxjs';
+import { Subject, combineLatest, take, merge, map, distinctUntilChanged } from 'rxjs';
 import { Permissions } from '@elasticias/types';
 import { Router, ActivatedRoute } from '@angular/router';
 import { CacheService, ToastService, ConfirmDialogService, EfShortcutService } from '@elasticias/core';
@@ -458,6 +458,13 @@ class AbstractScreenComponent extends AbstractComponent {
         const v = raw;
         if (!v || typeof v !== 'object' || !v.presetKey)
             return null;
+        // An open range stores null bounds. `new Date(null)` is 1970, not
+        // NaN, so it must be handled before parsing, not after.
+        if (v.start == null && v.end == null) {
+            return { start: null, end: null, presetKey: v.presetKey, label: v.label ?? '', labelKey: v.labelKey };
+        }
+        if (v.start == null || v.end == null)
+            return null;
         const start = new Date(v.start);
         const end = new Date(v.end);
         if (isNaN(start.getTime()) || isNaN(end.getTime()))
@@ -1075,14 +1082,27 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
     criteria = signal(new SearchEntity({}), ...(ngDevMode ? [{ debugName: "criteria" }] : /* istanbul ignore next */ []));
     /**
      * Active date-range filter shown in `ef-datepicker-advanced`'s
-     * trigger. Display-only at construction time — actually filters
-     * the search once `onDateRangeChange()` fires (or a screen wires
-     * one in `ngOnInit`).
+     * trigger, and the single source of the criteria's `start`/`end`.
+     * The first search, `clear()` and a picked range all send exactly
+     * what this holds, and a cache restore rebuilds it from the restored
+     * dates, so the chip never reads one period while the list shows
+     * another.
      *
-     * Override `buildDefaultDateRange()` per screen to ship a
-     * different starting preset.
+     * Defaults to `'all_time'` (no dates sent). Override
+     * `buildDefaultDateRange()` per screen to open on a window instead.
      */
     dateRange = signal(this.buildDefaultDateRange(), ...(ngDevMode ? [{ debugName: "dateRange" }] : /* istanbul ignore next */ []));
+    /**
+     * Whether this screen offers the date chip at all. Set it to `false`
+     * (`override readonly showDateFilter = false;`) on a screen whose
+     * backend query has no date field, and guard the template's
+     * `<ef-datepicker-advanced>` with `@if (showDateFilter)` (or drop it).
+     * The base then never sends `start`/`end`: not on first load, not
+     * after `clear()`, not from criteria cached by an older session, and
+     * not from `onDateRangeChange()` / `setDateRange()`, which become
+     * no-ops, so a picker left in the template cannot filter either.
+     */
+    showDateFilter = true;
     /* ── Filter-bar UI state (DRY) ──────────────────────────────────
          Identical across every list screen — lifted up so subclasses
          don't re-declare. `clear()` resets all four signals. */
@@ -1196,14 +1216,16 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
     }
     /* ── Date-range filter (DRY) ────────────────────────────────────
          Wired to ef-datepicker-advanced. The default range is
-         `last_30_days` — override `buildDefaultDateRange()` per screen
-         if a different starting preset is needed. */
+         `all_time`, which sends no dates. Override
+         `buildDefaultDateRange()` per screen if a window is needed. */
     /**
      * Wired to `<ef-datepicker-advanced (rangeChange)>` — stores the
      * range for trigger display and pushes it into the search criteria
      * so the next `search()` filters by it.
      */
     onDateRangeChange(range) {
+        if (!this.showDateFilter)
+            return;
         this.dateRange.set(range);
         this.setDateRange(range.start, range.end);
     }
@@ -1216,19 +1238,52 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
         this.dateRange.set(this.buildDefaultDateRange());
     }
     /**
-     * Build the default `EfDateRange`. Override per screen to ship a
-     * different default — e.g., a 90-day window for low-velocity
-     * catalogues. Default: last 30 days.
+     * Build the default `EfDateRange`. Default: `all_time`, no bounds,
+     * so a typed search finds an old record instead of silently missing
+     * it behind a window nobody chose. Override per screen to open on a
+     * window (e.g. `daysAgo(89)` to `startOfToday()` for `last_90_days`);
+     * the first search and `clear()` then send that window.
      */
     buildDefaultDateRange() {
         return {
-            start: this.daysAgo(29),
-            end: this.startOfToday(),
-            presetKey: 'last_30_days',
-            labelKey: 'date_preset_last_30_days',
-            label: '30 derniers jours',
+            start: null,
+            end: null,
+            presetKey: 'all_time',
+            labelKey: 'date_preset_all_time',
+            label: '',
         };
     }
+    /** Copy the chip's range onto fresh criteria, so what is shown is
+     *  what is sent. Sends nothing when the screen has no date chip. */
+    seedDateCriteria(criteria) {
+        const range = this.showDateFilter ? this.dateRange() : null;
+        criteria.start = range?.start ?? null;
+        criteria.end = range?.end ?? null;
+    }
+    /** Rebuild the chip from restored criteria: both dates are shown as
+     *  the custom range they filter on; anything less is `all_time`, and
+     *  `bootstrapInitialSearch()` drops a lone bound so nothing is sent.
+     *  No literal label: the picker formats a custom range itself. */
+    dateRangeFromCriteria(startRaw, endRaw) {
+        const start = this.toDateOrNull(startRaw);
+        const end = this.toDateOrNull(endRaw);
+        if (!start || !end) {
+            return {
+                start: null,
+                end: null,
+                presetKey: 'all_time',
+                labelKey: 'date_preset_all_time',
+                label: '',
+            };
+        }
+        return { start, end, presetKey: 'custom', label: '' };
+    }
+    toDateOrNull(raw) {
+        if (raw == null || raw === '')
+            return null;
+        const d = raw instanceof Date ? raw : new Date(raw);
+        return isNaN(d.getTime()) ? null : d;
+    }
     /** Today at 00:00 local time. */
     startOfToday() {
         const d = new Date();
@@ -1430,7 +1485,17 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
     bootstrapInitialSearch() {
         const cached = this.cacheService.getCache(this.screenStateKey);
         if (cached) {
-            this.criteria.set(new SearchEntity(cached));
+            const restored = new SearchEntity(cached);
+            const bothBounds = this.toDateOrNull(cached['start']) && this.toDateOrNull(cached['end']);
+            if (!this.showDateFilter || !bothBounds) {
+                // Criteria cached while this screen still had a chip may carry
+                // dates its backend ignores at best; and a lone bound would be
+                // sent under a chip reading "all time". Drop them.
+                restored.start = null;
+                restored.end = null;
+                restored.startEndDateRanges = null;
+            }
+            this.criteria.set(restored);
             this.restoreFilterUiFromCriteria(cached);
         }
         else {
@@ -1448,6 +1513,7 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
                 pageNumber: PaginationEnum.DEFAULT_PAGE,
                 pageSize: PaginationEnum.DEFAULT_PAGE_SIZE,
             };
+            this.seedDateCriteria(fresh);
             this.criteria.set(fresh);
         }
         this.search();
@@ -1458,11 +1524,15 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
      * what the drawer / search box displays matches what the search will
      * actually send (otherwise a stale criteria filter keeps applying
      * while every control reads "Tous"). Base handles the free-text
-     * input and the declared advanced filters; override (calling super)
-     * to sync screen-specific state — status pill, custom switches, ….
+     * input, the date chip and the declared advanced filters; override
+     * (calling super) to sync screen-specific state, such as a status pill
+     * or custom switches.
      */
     restoreFilterUiFromCriteria(cached) {
         this.searchQuery.set(cached['searchText'] ?? '');
+        if (this.showDateFilter) {
+            this.dateRange.set(this.dateRangeFromCriteria(cached['start'], cached['end']));
+        }
         const next = {};
         for (const f of this.advancedFilters) {
             const value = cached[f.key];
@@ -1508,7 +1578,13 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
     }
     /* ── Convenience criteria mutators ───────────────────────────── */
     setSearchText(text) {
-        this.criteria.update((c) => this.cloneCriteria(c, { searchText: text || undefined, page: 1 }));
+        // Templates bind this to ef-smart-bar's (search), and that binding has
+        // received the native DOM 'search' Event, which reached the API as
+        // {"isTrusted":true} and failed. ef-smart-bar now stops the event, but
+        // whatever arrives that is not text, the field's own value is the
+        // search the user meant.
+        const value = typeof text === 'string' ? text : this.searchQuery();
+        this.criteria.update((c) => this.cloneCriteria(c, { searchText: value || undefined, page: 1 }));
         this.search();
     }
     setPage(pageNumber, pageSize) {
@@ -1529,6 +1605,8 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
         this.search();
     }
     setDateRange(start, end) {
+        if (!this.showDateFilter)
+            return;
         this.criteria.update((c) => this.cloneCriteria(c, { start, end, page: 1 }));
         this.search();
     }
@@ -1551,6 +1629,8 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
                 },
             ];
         }
+        this.resetDateRange();
+        this.seedDateCriteria(fresh);
         this.criteria.set(fresh);
         // Reset all the shared filter-bar / selection signals so
         // subclasses don't have to track each one individually.
@@ -1560,7 +1640,6 @@ class AbstractSearchScreenV2 extends AbstractScreenComponent {
         this.activeFilters.set([]);
         this.advancedValues.set({});
         this.selected.set(new Set());
-        this.resetDateRange();
         this.cacheService.setCache(this.screenStateKey, fresh);
         this.search();
     }
@@ -1847,6 +1926,12 @@ class AbstractDetailScreenV2 extends AbstractScreenComponent {
     destroyRef = inject(DestroyRef);
     auditHistoryService = inject(AUDIT_HISTORY_SERVICE, { optional: true });
     shortcuts = inject(EfShortcutService);
+    /** The in-flight entity / history requests. A newer load drops the
+     *  older one, so a slow response for an id the screen has moved off
+     *  can never overwrite the record it now shows, and destroying the
+     *  screen drops both. */
+    loadSub;
+    auditSub;
     /** Distinguishes this instance's registration from any other detail
      *  screen alive at once (the outgoing and incoming routed component
      *  can briefly coexist), the same convention ef-row-actions uses:
@@ -1857,6 +1942,12 @@ class AbstractDetailScreenV2 extends AbstractScreenComponent {
     serviceInstance;
     constructor() {
         super();
+        // A response landing after the screen is gone would still run
+        // afterLoad() and start a history request for a screen nobody sees.
+        this.destroyRef.onDestroy(() => {
+            this.loadSub?.unsubscribe();
+            this.auditSub?.unsubscribe();
+        });
         // Every detail screen inherits mod+s with no per-screen wiring, and
         // it doubles as the fix for the browser's own Save Page dialog
         // otherwise popping up on top of it.
@@ -1980,11 +2071,21 @@ class AbstractDetailScreenV2 extends AbstractScreenComponent {
                 this.loadReferenceData(cfg.REF_DATA_OPTIONS);
         }
         // Wire route params → load (or reset to empty on /details).
-        combineLatest([this.route.paramMap, this.route.queryParamMap])
-            .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe(([params, queryParams]) => {
-            const id = params.get('id');
-            const isDuplicate = queryParams.get('mode') === 'duplicate';
+        //
+        // One navigation can emit on both maps: the router pushes
+        // queryParams first, then params. Combining the two emissions saw
+        // a half-updated route on details/SRC?mode=duplicate → details/NEW
+        // (the old id without the mode) and loaded SRC on a screen that
+        // was moving to NEW. The router sets `snapshot` to the next one
+        // before either emits, so each emission reads id and mode together
+        // from it, and the second emission of the same navigation (same
+        // snapshot object) is dropped. Any navigation that changes params
+        // or query still gets a new snapshot, so it still reloads once.
+        merge(this.route.paramMap, this.route.queryParamMap)
+            .pipe(map(() => this.route.snapshot), distinctUntilChanged(), takeUntilDestroyed(this.destroyRef))
+            .subscribe(snapshot => {
+            const id = snapshot.paramMap.get('id');
+            const isDuplicate = snapshot.queryParamMap.get('mode') === 'duplicate';
             this.entityId.set(id);
             this.duplicateMode.set(isDuplicate);
             this.context.duplicateMode = isDuplicate;
@@ -1994,6 +2095,12 @@ class AbstractDetailScreenV2 extends AbstractScreenComponent {
             }
             else {
                 // New mode — reset to a fresh empty entity, no history yet.
+                // A load still in flight for the previous id is dropped.
+                if (this.loadSub && !this.loadSub.closed) {
+                    this.loadSub.unsubscribe();
+                    this.loading.set(false);
+                }
+                this.auditSub?.unsubscribe();
                 this.entity.set({});
                 this.auditEntries.set([]);
                 this.afterLoad();
@@ -2035,7 +2142,15 @@ class AbstractDetailScreenV2 extends AbstractScreenComponent {
             return;
         this.loading.set(true);
         this.errorMsg.set(null);
-        this.serviceInstance.get(id).subscribe({
+        // Moving to another record: the previous one's history must not
+        // land under it while this load is in flight.
+        const showsAnotherRecord = this.entity()?.id !== id;
+        if (showsAnotherRecord) {
+            this.auditSub?.unsubscribe();
+            this.auditEntries.set([]);
+        }
+        this.loadSub?.unsubscribe();
+        this.loadSub = this.serviceInstance.get(id).subscribe({
             next: (result) => {
                 const vm = new ViewModelEntity(result);
                 vm.id = id;
@@ -2048,6 +2163,13 @@ class AbstractDetailScreenV2 extends AbstractScreenComponent {
                 console.error('AbstractDetailScreenV2.loadData failed', err);
                 this.errorMsg.set(err?.message ?? 'Erreur de chargement');
                 this.loading.set(false);
+                // Save and the status actions target entityId(). Leaving the
+                // previous record on screen would have them act on a record
+                // other than the one shown. A failed reload of the same
+                // record keeps it: what is shown is still what is targeted.
+                if (showsAnotherRecord) {
+                    this.entity.set({});
+                }
             },
         });
     }
@@ -2201,6 +2323,7 @@ class AbstractDetailScreenV2 extends AbstractScreenComponent {
      * an empty history rather than blocking the screen.
      */
     loadAuditHistory() {
+        this.auditSub?.unsubscribe();
         this.auditEntries.set([]);
         const entityType = this.getConfig()?.AUDIT_ENTITY_TYPE;
         const id = this.entityId();
@@ -2216,7 +2339,7 @@ class AbstractDetailScreenV2 extends AbstractScreenComponent {
             if (!result$ || typeof result$.subscribe !== 'function') {
                 return;
             }
-            result$.subscribe({
+            this.auditSub = result$.subscribe({
                 next: (entries) => this.auditEntries.set(entries ?? []),
                 error: () => this.auditEntries.set([]),
             });
@@ -2351,7 +2474,7 @@ class AbstractReportScreenV2 extends AbstractScreenComponent {
         this.reportsService = this.injector.get(this.getConfig().SERVICE);
         // Reinstate the period the user last chose before anything loads, so the
         // widgets fetch it once instead of fetching the default and refetching.
-        this.dateRange.set(this.restorePersistedDateRange(this.dateRange(), key => this.rangeFromPreset(key)));
+        this.dateRange.set(this.boundedOrDefault(this.restorePersistedDateRange(this.dateRange(), key => this.rangeFromPreset(key))));
         const lists = this.getConfig()?.REPORT_STATIC_LISTS ?? [];
         if (lists.length > 0) {
             this.initializeStaticLists(lists);
@@ -2365,10 +2488,22 @@ class AbstractReportScreenV2 extends AbstractScreenComponent {
     /* ── Period ─────────────────────────────────────────────────── */
     /** Wired to `<ef-datepicker-advanced (rangeChange)>`. */
     onDateRangeChange(range) {
-        this.dateRange.set(range);
-        this.persistDateRange(range);
+        const bounded = this.boundedOrDefault(range);
+        this.dateRange.set(bounded);
+        this.persistDateRange(bounded);
         this.loadAll();
     }
+    /**
+     * Every widget query is a period, so an open range (`all_time`) has no
+     * meaning here. The picker only offers it with `allowAllTime`, which a
+     * report should not set; if one arrives anyway, fall back to the
+     * default period rather than send a null bound.
+     */
+    boundedOrDefault(range) {
+        return range.start && range.end
+            ? range
+            : this.buildDefaultDateRange();
+    }
     /** Default period from the config's `DEFAULT_PERIOD` preset. */
     buildDefaultDateRange() {
         return this.rangeFromPreset(this.getConfig()?.DEFAULT_PERIOD ?? 'last_30_days');