@arsedizioni/ars-utils 18.1.182 → 18.1.184

package/fesm2022/arsedizioni-ars-utils-clipper.ui.mjs

@@ -32,7 +32,7 @@ import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatTabsModule } from '@angular/material/tabs';
 import * as i3$1 from '@angular/material/tooltip';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import { ClipperSearchFacetsSnapshot, ClipperFacet, ClipperService, ClipperMessages, ClipperModel, ClipperQueryReferencesMode, ClipperModule, ClipperSearchResult, ClipperSearchParams, ClipperSort, ClipperChannels, ClipperSectors, ClipperRegions, ClipperAuthors, ClipperSectorTypes, ClipperSearchUtils, ClipperModels, ClipperSources, ClipperDocumentChangeReason } from '@arsedizioni/ars-utils/clipper.common';
+import { ClipperSearchFacetsSnapshot, ClipperFacet, ClipperService, ClipperMessages, ClipperModel, ClipperQueryReferencesMode, ClipperModule, ClipperSearchResult, ClipperSearchParams, ClipperSort, ClipperSectors, ClipperRegions, ClipperChannels, ClipperAuthors, ClipperSectorTypes, ClipperSearchUtils, ClipperModels, ClipperSources, ClipperDocumentChangeReason } from '@arsedizioni/ars-utils/clipper.common';
 import { SystemUtils, BroadcastService, DateInterval, ScreenService, DateFormat, FormatPipe, SelectableModel, SafeUrlPipe, DateIntervalChangeDirective, SafeHtmlPipe } from '@arsedizioni/ars-utils/core';
 import * as i6$2 from '@ngbracket/ngx-layout/extended';
 import { ExtendedModule } from '@ngbracket/ngx-layout/extended';
@@ -1376,20 +1376,17 @@ class ClipperReferencesComponent extends ClipperSearchResultManager {
                 this.title += " - " + this.dialogData.anchorTitle;
             }
             // Use service snapshot
-            this.snapshot = this.clipperService.referencesSnapshot ?? { searchParams: {}, interval: "-1" };
+            this.snapshot = this.clipperService.referencesSnapshot ?? { searchParams: new ClipperSearchParams(), interval: "-1" };
             if (this.filterParams.mode !== this.dialogData.mode ||
                 this.filterParams.id !== this.dialogData.id ||
                 this.filterParams.anchor !== this.dialogData.anchor) {
-                this.filterParams = {
-                    mode: this.dialogData.mode,
-                    model: this.dialogData.model,
-                    anchor: this.dialogData.anchor,
-                    id: this.dialogData.id,
-                    useModifierInfo: this.dialogData.mode === ClipperQueryReferencesMode.ChangesOut,
-                    returnModifierInfo: this.dialogData.mode !== ClipperQueryReferencesMode.ChangesOut,
-                    first: 0,
-                    count: 15,
-                };
+                this.filterParams = new ClipperSearchParams();
+                this.filterParams.mode = this.dialogData.mode;
+                this.filterParams.model = this.dialogData.model;
+                this.filterParams.anchor = this.dialogData.anchor;
+                this.filterParams.id = this.dialogData.id;
+                this.filterParams.useModifierInfo = this.dialogData.mode === ClipperQueryReferencesMode.ChangesOut;
+                this.filterParams.returnModifierInfo = this.dialogData.mode !== ClipperQueryReferencesMode.ChangesOut;
                 this.clipperService.referencesSnapshot = this.snapshot;
             }
         }
@@ -1538,7 +1535,7 @@ class ClipperReferencesComponent extends ClipperSearchResultManager {
         this.filterParams.returnModifierInfo =
             this.filterParams.mode !== ClipperQueryReferencesMode.ChangesOut;
         this.dialogService.busy('Ricerca in corso...');
-        this.clipperService.references(this.filterParams)
+        this.clipperService.references(this.filterParams.toReferencesSearchParams())
             .subscribe({
             next: (r) => {
                 if (!r.success)
@@ -1865,18 +1862,13 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
      */
     resize() {
         setTimeout(() => {
-            let e = document.getElementsByClassName('clipper-document-fixed');
-            if (e) {
-                console.log("height 1: " + (window.innerHeight - e[0].clientHeight));
-            }
             let elem = document.getElementById('clipper-document-scrollable');
             if (elem) {
-                const height = this.dialogService.getCurrentDialogScrollableHeight(['clipper-document-fixed'], window.innerHeight);
-                console.log("height 2:" + height);
+                const height = this.dialogService.getCurrentDialogScrollableHeight(['clipper-document-fixed'], window.innerHeight) - 10;
                 if (height != this.height) {
                     elem.setAttribute('style', 'padding:0;height:' + height + 'px !important;max-height:' + height + 'px !important');
                     let elem2 = document.getElementById('clipper-document-iframe');
-                    elem2?.setAttribute('style', 'height:' + (height - 10) + 'px !important;max-height:' + (height - 10) + 'px !important');
+                    elem2?.setAttribute('style', 'height:' + (height - 20) + 'px !important;max-height:' + (height - 20) + 'px !important');
                     this.height = height;
                     this.resize();
                 }
@@ -2178,12 +2170,12 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
             this.handleRelevantsPaneVisibility();
         }
         else {
+            let params = new ClipperSearchParams();
+            params.id = this.lastDocument.documentId ?? this.lastDocument.id;
+            params.text = this.lastQuery;
+            params.count = 1;
             this.clipperService
-                .query({
-                id: this.lastDocument.documentId ?? this.lastDocument.id,
-                text: this.lastQuery,
-                count: 1,
-            })
+                .query(params)
                 .subscribe((r) => {
                 if (!r.success)
                     this.dialogService.error(r.message);
@@ -2600,10 +2592,7 @@ class ClipperSearchDialogComponent {
         this.clipperService = inject(ClipperService);
         this.dialogService = inject(DialogService);
         this.dialogData = inject(MAT_DIALOG_DATA) ?? { displayMode: 'simple' };
-        this.params = {
-            channels: [...ClipperChannels],
-            count: 15
-        };
+        this.params = new ClipperSearchParams();
         this.modulesEnum = ClipperModule;
         this.sectors = ClipperSectors.filter((n) => n.group === 'S').map((n) => {
             return { name: n.shortName ?? n.name, value: n.value };
@@ -2901,10 +2890,7 @@ class ClipperBrowserDialogComponent extends ClipperSearchResultManager {
         this.title = 'Ricerca in Clipper';
         this.snapshot = {
             searchInfo: null,
-            searchParams: {
-                first: 0,
-                count: 25
-            },
+            searchParams: new ClipperSearchParams()
         };
         this.currentModel = 'Tutto';
         this.currentSort = 'Rilevanza';
@@ -2917,11 +2903,8 @@ class ClipperBrowserDialogComponent extends ClipperSearchResultManager {
                 searchInfo: null,
                 searchParams: null,
             };
-        if (this.filterParams == null) {
-            this.filterParams = {
-                first: 0,
-                count: 15,
-            };
+        if (!this.filterParams) {
+            this.filterParams = new ClipperSearchParams();
             // Store snapshot
             this.clipperService.snapshot = this.snapshot;
         }
@@ -3441,10 +3424,7 @@ class ClipperBrowserDialogComponent extends ClipperSearchResultManager {
         this.snapshot.total = 0;
         this.snapshot.facets = null;
         this.facets.reset();
-        this.filterParams = {
-            first: 0,
-            count: 15,
-        };
+        this.filterParams = new ClipperSearchParams();
         this.filterPane.close();
         this.updateSearchInfo();
     }