fix: use contributor's collections to check for filter on collection

package.json

@@ -47,9 +47,9 @@
     "arlas-permissions-api": "27.0.0",
     "arlas-persistence-api": "27.0.0",
     "arlas-tagger-api": "27.0.0",
-    "arlas-web-components": "~27.0.4",
-    "arlas-web-contributors": "~27.0.0",
-    "arlas-map": "~27.0.4",
+    "arlas-web-components": "~27.0.5",
+    "arlas-web-contributors": "~27.0.1",
+    "arlas-map": "~27.0.5",
     "cli-color": "^1.2.0",
     "core-js": "~3.26.1",
     "fetch-intercept": "^2.3.1",

projects/arlas-toolkit/package.json

@@ -45,9 +45,9 @@
     "arlas-permissions-api": "27.0.0",
     "arlas-persistence-api": "27.0.0",
     "arlas-tagger-api": "27.0.0",
-    "arlas-web-components": "~27.0.4",
-    "arlas-web-contributors": "~27.0.0",
-    "arlas-map": "~27.0.4",
+    "arlas-web-components": "~27.0.5",
+    "arlas-web-contributors": "~27.0.1",
+    "arlas-map": "~27.0.5",
     "cli-color": "^1.2.0",
     "fetch-intercept": "^2.3.1",
     "hopscotch": "0.3.1",

projects/arlas-toolkit/src/lib/components/filter-shortcut/filter-shortcut.component.scss

@@ -90,8 +90,10 @@ $border-color: #a1a1a1;
         top: 90px;
 
         // POWERBARS
-        ::ng-deep.powerbar__powerbar--top-group {
-            height: 20px;
+        ::ng-deep.powerbars__powerbar--top-group,
+        ::ng-deep.powerbars__powerbar--term,
+        ::ng-deep.powerbars__powerbar--count {
+            line-height: 20px;
         }
         ::ng-deep .powerbars--title {
             display: none;

projects/arlas-toolkit/src/lib/components/filters/filters.component.html

@@ -20,7 +20,7 @@
         </div>
         <ng-container *ngFor="let contributorId of collaborations; let index = index">
           <mat-basic-chip id="filter-chip-{{contributorId}}" class="filter-chip"
-            *ngIf="c.collection === contributors.get(contributorId).collection && contributorId !== 'timeline'"
+            *ngIf="contributorId | isCollabOnCollection:c.collection:contributors"
             [style.color]="contributorId | getGlobalColorFilter:'color':colorFilter:backgroundColorFilter:collaborationsMap "
             [style.background-color]="contributorId | getGlobalColorFilter:'background':colorFilter:backgroundColorFilter:collaborationsMap "
             (click)="changeCollaborationState(contributorId)"
@@ -70,7 +70,7 @@
             </div>
             <ng-container *ngFor="let contributorId of collaborations; let index = index">
               <mat-basic-chip id="filter-chip-{{contributorId}}" class="filter-chip"
-                *ngIf="c.collection === contributors.get(contributorId).collection && contributorId !== 'timeline'"
+                *ngIf="contributorId | isCollabOnCollection:c.collection:contributors"
                 [style.color]="contributorId | getGlobalColorFilter:'color':colorFilter:backgroundColorFilter:collaborationsMap "
                 [style.background-color]="contributorId | getGlobalColorFilter:'background':colorFilter:backgroundColorFilter:collaborationsMap "
                 (click)="changeCollaborationState(contributorId)"

projects/arlas-toolkit/src/lib/components/filters/filters.component.spec.ts

@@ -34,7 +34,6 @@ import {
 } from '../../services/startup/startup.service';
 import { ArlasWalkthroughService } from '../../services/walkthrough/walkthrough.service';
 import {
-  ConcatCollectionPipe,
   FiltersComponent,
   GetCollaborationIconPipe,
   GetColorFilterPipe,
@@ -48,7 +47,7 @@ describe('FiltersChipsComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [FiltersComponent, GetColorFilterPipe, GetCollaborationIconPipe, ConcatCollectionPipe, GetContributorLabelPipe],
+      declarations: [FiltersComponent, GetColorFilterPipe, GetCollaborationIconPipe, GetContributorLabelPipe],
       imports: [MatChipsModule, MatIconModule, MatTooltipModule, MatMenuModule,
         TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
         FormatNumberModule],

projects/arlas-toolkit/src/lib/components/filters/filters.component.ts

@@ -47,15 +47,6 @@ export class GetContributorLabelPipe implements PipeTransform {
   }
 }
 
-@Pipe({ name: 'concatCollection' })
-export class ConcatCollectionPipe implements PipeTransform {
-  public transform(value: string, id: string, registry?: Map<string, Contributor>): string {
-    const collection = registry.get(id).collection;
-    return value.concat(' : ').concat(collection);
-
-  }
-}
-
 @Pipe({ name: 'getColorFilter' })
 export class GetColorFilterPipe implements PipeTransform {
   public transform(value: string, type: string, collaborationsMap: Map<string, Collaboration>): string {
@@ -88,6 +79,14 @@ export class GetCollaborationIconPipe implements PipeTransform {
   }
 }
 
+@Pipe({ name: 'isCollabOnCollection' })
+export class IsCollabOnCollectionPipe implements PipeTransform {
+  public transform(value: string, collection: string, contributors: Map<string, Contributor>) {
+    const contributor = contributors.get(value);
+    return contributor.collections.map(c => c.collectionName).indexOf(collection) >= 0 && value !== 'timeline';
+  }
+}
+
 @Component({
   selector: 'arlas-filter',
   templateUrl: './filters.component.html',

projects/arlas-toolkit/src/lib/services/interceptor/fetch-interceptor.service.spec.ts

@@ -2,14 +2,17 @@ import { TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { ArlasSettingsService } from '../settings/arlas.settings.service';
 import { FetchInterceptorService } from './fetch-interceptor.service';
+import { TranslateModule, TranslateLoader, TranslateFakeLoader } from '@ngx-translate/core';
 
 describe('FetchInterceptorService', () => {
   beforeEach(() => TestBed.configureTestingModule({
     providers: [
       ArlasSettingsService
     ],
     imports: [
-      MatDialogModule
+      MatDialogModule,
+      TranslateModule.forRoot(
+        { loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } })
     ]
   }));
 

projects/arlas-toolkit/src/lib/services/startup/contributorBuilder.ts

@@ -46,7 +46,7 @@ export class ContributorBuilder {
     const config = configService.getValue('arlas.web.contributors').find(contrib =>
       contrib.type === contributorType && contrib.identifier === identifier
     );
-    const collection = !!config['collection'] ? config['collection'] : collaborativesearchService.defaultCollection;
+    let collection = !!config['collection'] ? config['collection'] : collaborativesearchService.defaultCollection;
     let contributor;
     let isOneDimension: boolean;
     let additionalCollections: Array<any>;
@@ -113,7 +113,11 @@ export class ContributorBuilder {
         );
         break;
       case 'metricstable':
-        contributor = new MetricsTableContributor(identifier, collaborativesearchService, configService);
+        // For the MetricsTable, choose the collection of the first MetricsVector as the main collection
+        if (config['configuration']?.[0]?.collection) {
+          collection = config['configuration'][0].collection;
+        }
+        contributor = new MetricsTableContributor(identifier, collaborativesearchService, configService, collection);
         break;
     }
     contributor.updateData = false;

projects/arlas-toolkit/src/lib/shared.module.ts

@@ -96,12 +96,12 @@ import {
   ShortcutFiltersHandlerComponent
 } from './components/filter-shortcut/filters-handler/filters-handler.component';
 import {
-  ConcatCollectionPipe,
   FiltersComponent,
   GetCollaborationIconPipe,
   GetColorFilterPipe,
   GetContributorLabelPipe,
-  GetGlobalColorFilterPipe
+  GetGlobalColorFilterPipe,
+  IsCollabOnCollectionPipe
 } from './components/filters/filters.component';
 import { HistogramTooltipOverlayComponent } from './components/histogram-tooltip-overlay/histogram-tooltip-overlay.component';
 import { HistogramWidgetComponent } from './components/histogram-widget/histogram-widget.component';
@@ -200,7 +200,7 @@ import { CustomTranslateLoader } from './tools/Translation/custom-translate-load
     GetColorFilterPipe,
     GetGlobalColorFilterPipe,
     GetCollaborationIconPipe,
-    ConcatCollectionPipe,
+    IsCollabOnCollectionPipe,
     GetContributorLabelPipe,
     LinkComponent,
     LanguageSwitcherComponent,

projects/arlas-toolkit/src/public-api.ts

@@ -56,7 +56,7 @@ export { ExtendPersistenceDatabase } from './lib/services/extend/extendPersisten
 export { Extend } from './lib/services/extend/model';
 export { ExtendLocalDatabase } from './lib/services/extend/extendLocalDatabase';
 export {
-  ConcatCollectionPipe, FiltersComponent, GetCollaborationIconPipe, GetColorFilterPipe,
+  FiltersComponent, GetCollaborationIconPipe, GetColorFilterPipe,
   GetContributorLabelPipe, GetGlobalColorFilterPipe
 } from './lib/components/filters/filters.component';
 export { PermissionsCreatorComponent } from './lib/components/permissions-creator/permissions-creator.component';