@arsedizioni/ars-utils 21.1.71 → 21.1.73

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

@@ -24,7 +24,7 @@ import * as i5 from '@angular/material/slide-toggle';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import * as i3 from '@angular/material/tooltip';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import { ClipperService, ClipperMessages, ClipperModel, ClipperQueryReferencesMode, ClipperModule, ClipperUtils, ClipperSearchUtils, ClipperSearchFacetsSnapshot, ClipperFacet, ClipperSelectionMode, ClipperSearchResult, ClipperSearchParams, ClipperSort, ClipperQueryDocumentFlags, ClipperSources, ClipperDocumentChangeReasons, ClipperChannel, ClipperSectors, ClipperRegions, ClipperAuthors, ClipperSectorTypes } from '@arsedizioni/ars-utils/clipper.common';
+import { ClipperService, ClipperMessages, ClipperModel, ClipperQueryReferencesMode, ClipperModule, ClipperUtils, ClipperSearchParams, ClipperSearchUtils, ClipperSearchFacetsSnapshot, ClipperFacet, ClipperSelectionMode, ClipperSearchResult, ClipperSort, ClipperQueryDocumentFlags, ClipperSources, ClipperDocumentChangeReasons, ClipperChannel, ClipperSectors, ClipperRegions, ClipperAuthors, ClipperSectorTypes } from '@arsedizioni/ars-utils/clipper.common';
 import * as i19 from '@arsedizioni/ars-utils/core';
 import { SystemUtils, BroadcastService, SafeUrlPipe, DateInterval, ThemeService, ScreenService, DateFormat, FormatPipe, SelectableModel, ArsCoreModule } from '@arsedizioni/ars-utils/core';
 import { FlexLayoutModule, FlexModule } from '@ngbracket/ngx-layout';
@@ -926,7 +926,9 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
                                 break;
                             case 'hits':
                                 this.relevants.hits = data.total;
-                                //this.updateRelevants2();
+                                if (data.update) {
+                                    this.updateRelevants();
+                                }
                                 break;
                             case 'hits2':
                                 this.relevants.chunks = data.total;
@@ -1055,6 +1057,7 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
             if (query.length > 0) {
                 // Type
                 if (query[0] === '$') {
+                    query = query.substring(1);
                     this.lastQueryType = 'semantic';
                 }
                 // Reset
@@ -1103,7 +1106,6 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
                 this.busy.set(url.indexOf('documents/render/item') === -1);
                 // Navigate
                 this.url.set(url);
-                console.log('Navigating to ' + url);
             });
         }
     }
@@ -1278,52 +1280,34 @@ class ClipperDocumentComponent extends ClipperDocumentManager {
      * Update relevant items
      * @param anchors: the optional anchor list
      */
-    /*
-    private updateRelevants(anchors?: ClipperDocumentRelevantChunkHit[]) {
-      if (anchors) {
-        let items: ClipperDocumentAnchorInfo[] = [];
-        anchors.forEach(a => {
-          items.push({
-            chunk: a.chunkId,
-            score: ClipperSearchUtils.getRankFromChar(a.chunkRank),
-            veryRelevant: a.chunkRank.toUpperCase() === 'A',
-            title: a.text,
-            uri: "__SEARCH_" + a.index
-          });
-        });
-        this.relevants.items = items;
-        this.hasRelevants.set(items.length > 0);
-        this.handleRelevantsPaneVisibility();
-        this.changeDetector.markForCheck();
-      } else {
+    updateRelevants() {
         const query = this.lastQuery;
-        if (
-          !query ||
-          query.length === 0 ||
-          query === ' ') {
-          this.handleRelevantsPaneVisibility();
-        } else {
-          let params = new ClipperSearchParams();
-          params.id = this.lastDocument.documentId ?? this.lastDocument.id;
-          params.text = query;
-          params.count = 1;
-          this.clipperService
-            .query(params)
-            .subscribe(r => {
-              if (!r.success) this.dialogService.error(r.message);
-              else {
-                if (r.value?.items && r.value?.items.length > 0) {
-                  this.relevants.items = r.value.items[0].chunks.length > 0 ? r.value.items[0].chunks : r.value.items[0].anchors;
-                  this.hasRelevants.set(this.relevants.items?.length > 0);
+        if (!query ||
+            query.length === 0 ||
+            query === ' ') {
+            this.handleRelevantsPaneVisibility();
+        }
+        else {
+            let params = new ClipperSearchParams();
+            params.id = this.lastDocument.documentId ?? this.lastDocument.id;
+            params.text = query;
+            params.count = 1;
+            this.clipperService
+                .query(params)
+                .subscribe(r => {
+                if (!r.success)
+                    this.dialogService.error(r.message);
+                else {
+                    if (r.value?.items && r.value?.items.length > 0) {
+                        this.relevants.items = r.value.items[0].chunks.length > 0 ? r.value.items[0].chunks : r.value.items[0].anchors;
+                        this.hasRelevants.set(this.relevants.items?.length > 0);
+                    }
+                    this.handleRelevantsPaneVisibility();
+                    this.changeDetector.markForCheck();
                 }
-                this.handleRelevantsPaneVisibility();
-                this.changeDetector.markForCheck();
-              }
             });
         }
-      }
     }
-    */
     /**
    * Update relevant items
    * @param anchors: the optional anchor list
@@ -3830,9 +3814,6 @@ class ClipperBrowserComponent extends ClipperSearchResultManager {
             this.filterParams.sourceFromDate = this.sourceInterval.fromAsDate;
             this.filterParams.sourceToDate = this.sourceInterval.toAsDate;
         }
-        if (newSearch) {
-            this.filterParams.first = 0;
-        }
         let newParams = new ClipperSearchParams();
         if ((this.filterParams.modules?.length ?? 0) > 0) {
             newParams.first = this.filterParams.first;
@@ -3909,6 +3890,11 @@ class ClipperBrowserComponent extends ClipperSearchResultManager {
                 newParams.types = [{ name: '?', value: this.filterParams.type }];
             }
         }
+        // New saerch reset pagination
+        if (newSearch) {
+            newParams.first = 0;
+            this.filterParams.first = 0;
+        }
         // Setup sort options
         this.sortOptions = ClipperUtils.getClipperAvailableSortOptions(this.filterParams.modules, newParams);
         if (newParams.text && newSearch) {