Merge pull request #867 from gisaia/feature/newSearchContrib

Feat: use new search contributor
gisaia · Sep 3, 2024 · 3853714 · 3853714
2 parents 98e1b7c + 34c20f0
commit 3853714
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html
@@ -2,9 +2,9 @@
   <arlas-top-menu [wuiName]="'ARLAS WUI'" [version]="version">
     <div left-menu class="top-left-menu">
       <img src="assets/logo-only.png" [matTooltip]="appName | translate" class="img" alt="'ARLAS-wui logo' | translate">
-      <arlas-search *ngIf="chipsSearchContributor" #search id="search" class="arlas-search"
-        [searchContributor]="chipsSearchContributor" [dialogPositionLeft]="42" [dialogPositionTop]="-2"></arlas-search>
-      <mat-divider *ngIf="chipsSearchContributor" vertical class="vertical-divider" id="menuDivider"></mat-divider>
+      <arlas-search *ngIf="searchContributors" #search id="search" class="arlas-search"
+        [searchContributors]="searchContributors" [dialogPositionLeft]="42" [dialogPositionTop]="-2"></arlas-search>
+      <mat-divider *ngIf="searchContributors" vertical class="vertical-divider" id="menuDivider"></mat-divider>
       <arlas-filter class="arlas-filters-chips-top" [showZoomToData]="showZoomToData" [zoomToStrategy]="zoomToStrategy"
         [collectionToDescription]="collectionToDescription" (zoomEvent)="zoomToData($event)" [availableSpace]="availableSpaceCounts" [spacing]="spacing">
       </arlas-filter>

diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts
@@ -60,11 +60,11 @@ import {
 } from 'arlas-web-components';
 import {
   AnalyticsContributor,
-  ChipsSearchContributor,
   ElementIdentifier,
   FeatureRenderMode,
   MapContributor,
-  ResultListContributor
+  ResultListContributor,
+  SearchContributor
 } from 'arlas-web-contributors';
 import { LegendData } from 'arlas-web-contributors/contributors/MapContributor';
 import {
@@ -116,7 +116,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy {
   public coordinatesHaveSpace = true;
   public modeEnum = ModeEnum;
   public mapglContributors: Array<MapContributor> = new Array();
-  public chipsSearchContributor: ChipsSearchContributor;
+  public searchContributors: SearchContributor[];
   public resultlistContributors: Array<ResultListContributor> = new Array();
   public analyticsContributor: AnalyticsContributor;
 
@@ -429,7 +429,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy {
         };
       }));
 
-      this.chipsSearchContributor = this.contributorService.getChipSearchContributor();
+      this.searchContributors = this.contributorService.getSearchContributors();
       const ids = new Set(this.resultListsConfig.map(c => c.contributorId));
       this.arlasStartUpService.contributorRegistry.forEach((v, k) => {
         if (v instanceof ResultListContributor) {

diff --git a/src/app/services/contributors.service.ts b/src/app/services/contributors.service.ts
@@ -18,7 +18,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { ChipsSearchContributor, MapContributor } from 'arlas-web-contributors';
+import { SearchContributor, MapContributor } from 'arlas-web-contributors';
 import { Contributor } from 'arlas-web-core';
 import {
   ArlasCollaborativesearchService,
@@ -36,7 +36,7 @@ export class ContributorService {
   public ID_PATH = 'arlas-wui.web.app.idFieldName';
   public DEFAULT_CHART_HEIGHT = 70;
   public MAPCONTRIBUTOR_ID = 'mapbox';
-  public CHIPSSEARCH_ID = 'chipssearch';
+  public SEARCH_TYPE = 'search';
 
   public constructor(
     private configService: ArlasConfigService,
@@ -72,15 +72,20 @@ export class ContributorService {
     return mapcontributors;
   }
 
-  public getChipSearchContributor(): ChipsSearchContributor {
-    const chipssearchContributorConfig = this.getContributorConfig(this.CHIPSSEARCH_ID);
-    let chipsSearchContributor: ChipsSearchContributor;
-    if (chipssearchContributorConfig !== undefined) {
-      chipsSearchContributor = this.arlasStartupService.contributorRegistry.get(this.CHIPSSEARCH_ID) as ChipsSearchContributor;
-      this.arlasContributors.set(this.CHIPSSEARCH_ID, chipsSearchContributor);
-      this.contributorsIcons.set(this.CHIPSSEARCH_ID, chipssearchContributorConfig.icon);
+  public getSearchContributors(): Array<SearchContributor> {
+    const searchContributorsConfig = this.getSearchContributorsConfigs();
+    const searchContributors = new Array<SearchContributor>();
+    if (searchContributorsConfig !== undefined) {
+      searchContributorsConfig
+        .forEach((config: { identifier: string; icon: string; }) => {
+          const contrib = this.arlasStartupService.contributorRegistry.get(config.identifier) as SearchContributor;
+
+          this.arlasContributors.set(config.identifier, contrib);
+          this.contributorsIcons.set(config.identifier, config.icon);
+          searchContributors.push(contrib);
+        });
     }
-    return chipsSearchContributor;
+    return searchContributors;
   }
 
   public getArlasContributors(): Map<string, Contributor> {
@@ -114,4 +119,10 @@ export class ContributorService {
       contrib => (contrib.type === 'map')
     );
   }
+
+  private getSearchContributorsConfigs() {
+    return this.arlasStartupService.emptyMode ? undefined : !!this.configService.getValue('arlas') ?
+      this.configService.getValue('arlas')['web']['contributors'].filter(
+        (contrib: { type: string; }) => (contrib.type === this.SEARCH_TYPE || contrib.type === 'chipssearch')) : undefined;
+  }
 }