From 79edd870af9a507ef6c8a11bb3fc766bebc44281 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Thu, 27 Jun 2024 11:04:07 +0200 Subject: [PATCH 01/12] wire component with contributor --- .../src/lib/components/widget/widget.component.html | 2 +- .../src/lib/components/widget/widget.component.ts | 1 + .../configuration-updater/configurationUpdater.service.ts | 6 ------ projects/arlas-toolkit/src/lib/shared.module.ts | 3 ++- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/projects/arlas-toolkit/src/lib/components/widget/widget.component.html b/projects/arlas-toolkit/src/lib/components/widget/widget.component.html index 2e78f82d..d7341595 100644 --- a/projects/arlas-toolkit/src/lib/components/widget/widget.component.html +++ b/projects/arlas-toolkit/src/lib/components/widget/widget.component.html @@ -81,5 +81,5 @@
- +
diff --git a/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts b/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts index e9b0d46e..ae2709ee 100644 --- a/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts +++ b/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts @@ -148,6 +148,7 @@ export class WidgetComponent implements OnInit { public ngOnInit() { this.contributorType = this.getContirbutorType(); this.contributor = this.arlasStartupService.contributorRegistry.get(this.contributorId); + console.log(this.contributor); if (this.componentType === 'swimlane') { this.swimlanes = this.contributor.getConfigValue('swimlanes'); if (this.swimlanes) { diff --git a/projects/arlas-toolkit/src/lib/services/configuration-updater/configurationUpdater.service.ts b/projects/arlas-toolkit/src/lib/services/configuration-updater/configurationUpdater.service.ts index 30f131e0..8e615a25 100644 --- a/projects/arlas-toolkit/src/lib/services/configuration-updater/configurationUpdater.service.ts +++ b/projects/arlas-toolkit/src/lib/services/configuration-updater/configurationUpdater.service.ts @@ -130,18 +130,12 @@ export class ArlasConfigurationUpdaterService { contributorsToRemove.add(contributor.identifier); } }); -<<<<<<< HEAD /** remove shortcuts contributors */ data.arlas.web.contributors.filter(contributor => contributor.linkedContributorId).forEach(contributor => { if (contributorsToRemove.has(contributor.linkedContributorId)) { contributorsToRemove.add(contributor.identifier); } }); -======= - - /** remove metrics table contributors */ - ->>>>>>> f25072e (Integrate MetricsTable component) } return contributorsToRemove; } diff --git a/projects/arlas-toolkit/src/lib/shared.module.ts b/projects/arlas-toolkit/src/lib/shared.module.ts index 3792f77b..7ccf3ae4 100644 --- a/projects/arlas-toolkit/src/lib/shared.module.ts +++ b/projects/arlas-toolkit/src/lib/shared.module.ts @@ -53,7 +53,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { CalendarTimelineModule, ColorGeneratorLoader, ColorGeneratorModule, DonutModule, FormatNumberModule, - HistogramModule, MapglLegendModule, MetricModule, PowerbarsModule, ResultsModule + HistogramModule, MapglLegendModule, MetricModule, MetricsTableComponent, MetricsTableModule, PowerbarsModule, ResultsModule } from 'arlas-web-components'; import en from 'arlas-web-components/assets/i18n/en.json'; import fr from 'arlas-web-components/assets/i18n/fr.json'; @@ -171,6 +171,7 @@ export class CustomTranslateLoader implements TranslateLoader { MatProgressBarModule, MatProgressSpinnerModule, MatSelectModule, + MetricsTableModule, MatSnackBarModule, MatStepperModule, MatTableModule, From 4011695e39e0bcbb5de0983ce3656a88883e8c82 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Tue, 2 Jul 2024 15:35:55 +0200 Subject: [PATCH 02/12] Add inputs to metric table component --- .../components/widget/widget.component.html | 10 +++++++- .../lib/components/widget/widget.component.ts | 24 +++++++++++++++--- .../lib/services/startup/startup.service.ts | 11 ++++++++ src/assets/i18n/en.json | 4 ++- src/assets/i18n/es.json | 3 ++- src/assets/i18n/fr.json | 5 +++- src/config.json | 25 ++++++++++++++++++- 7 files changed, 73 insertions(+), 9 deletions(-) diff --git a/projects/arlas-toolkit/src/lib/components/widget/widget.component.html b/projects/arlas-toolkit/src/lib/components/widget/widget.component.html index d7341595..4fa8c4e3 100644 --- a/projects/arlas-toolkit/src/lib/components/widget/widget.component.html +++ b/projects/arlas-toolkit/src/lib/components/widget/widget.component.html @@ -81,5 +81,13 @@
- +
diff --git a/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts b/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts index ae2709ee..3b8b52cc 100644 --- a/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts +++ b/projects/arlas-toolkit/src/lib/components/widget/widget.component.ts @@ -28,7 +28,7 @@ import { ArlasExportCsvService } from '../../services/export-csv/export-csv.serv import { SpinnerOptions, ArlasOverlayRef } from '../../tools/utils'; import { ARLASDonutTooltip } from 'arlas-d3'; import { ArlasOverlayService } from '../../services/overlays/overlay.service'; -import { ComputeConfig, TreeContributor } from 'arlas-web-contributors'; +import { ComputeConfig, MetricsTableContributor, TreeContributor } from 'arlas-web-contributors'; import { Expression } from 'arlas-api'; /** @@ -162,9 +162,15 @@ export class WidgetComponent implements OnInit { this.setComponentInput(this.graphParam); /** Init filter operator (include/exclude) of powerbars */ if (this.contributor instanceof TreeContributor) { - this.setPowerbarsFilterOperator((this.contributor as TreeContributor).getFilterOperator()); + this.setFilterOperator((this.contributor as TreeContributor).getFilterOperator()); this.contributor.operatorChangedEvent.subscribe(op => { - this.setPowerbarsFilterOperator(op); + this.setFilterOperator(op); + }); + } + if (this.contributor instanceof MetricsTableContributor) { + this.setFilterOperator((this.contributor as MetricsTableContributor).getFilterOperator()); + this.contributor.operatorChanged$.subscribe(op => { + this.setFilterOperator(op); }); } } @@ -226,6 +232,16 @@ export class WidgetComponent implements OnInit { (this.contributor as TreeContributor).selectedNodesListChanged((this.contributor as TreeContributor).selectedNodesPathsList); } + public changeMetricsTableOperator(op: 'Neq' | 'Eq'): void { + if (op === 'Neq') { + (this.contributor as MetricsTableContributor).setFilterOperator(Expression.OpEnum.Ne, /** emit */ true); + } else { + (this.contributor as MetricsTableContributor).setFilterOperator(Expression.OpEnum.Eq, /** emit */ true); + } + (this.contributor as MetricsTableContributor) + .onRowSelect(new Set((this.contributor as MetricsTableContributor).selectedTerms)); + } + private getContirbutorType() { const contributor = this.arlasStartupService.contributorRegistry.get(this.contributorId); @@ -266,7 +282,7 @@ export class WidgetComponent implements OnInit { } } - private setPowerbarsFilterOperator(filterOperatorEnum: Expression.OpEnum) { + private setFilterOperator(filterOperatorEnum: Expression.OpEnum) { if (filterOperatorEnum === Expression.OpEnum.Ne) { if (!!this.graphParam.filterOperator) { this.graphParam.filterOperator.value = 'Neq'; diff --git a/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts b/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts index 7a3a3b12..0945242a 100644 --- a/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts +++ b/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts @@ -214,6 +214,17 @@ export class ArlasCollaborativesearchService extends CollaborativesearchService } }); } + if (contributor && contributor instanceof MetricsTableContributor && changeOperator) { + collab.filters.forEach((filters: any[], collection: string) => { + const exp = filters[0].f[0][0]; + const op = exp.op; + const metrictablecontributor = contributor as MetricsTableContributor; + if (op !== metrictablecontributor.getFilterOperator()) { + metrictablecontributor.setFilterOperator(op, true); + + } + }); + } }); return dataModel; } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 875fd116..d208b401 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -187,6 +187,8 @@ "years": "years", "year": "year", "You are about to create a new permission on data, based on the current filters applied to": "You are about to create a new permission on data, based on the current filters applied to ", - "Add permission description": "Add a description to the permission:" + "Add permission description": "Add a description to the permission:", + "course.distance.gps.travelled_m": "Distance" + } diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 173e3d87..51d113cf 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -274,5 +274,6 @@ "successful": "completado", "failed": "fallido", "dissmissed": "cancelado", - "You are about to create a new permission on data, based on the current filters applied to": "Está a punto de crear un nuevo permiso sobre los datos, basado en los filtros actuales aplicados a" + "You are about to create a new permission on data, based on the current filters applied to": "Está a punto de crear un nuevo permiso sobre los datos, basado en los filtros actuales aplicados a", + "course.distance.gps.travelled_m": "Distancia" } diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 6713b7b9..bbd22b1e 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -197,5 +197,8 @@ "days (~ 5 years)": "jours (~ 5 ans)", "days (~ 10 years)": "jours (~ 10 ans)", "You are about to create a new permission on data, based on the current filters applied to": "Vous êtes sur le point de créer une nouvelle permission sur les données, basée sur les filtres actuels appliqués à", - "Add permission description": "Ajouter une description pour spécifer la permission :" + "Add permission description": "Ajouter une description pour spécifer la permission :", + "course.distance.gps.travelled_m": "Distance" + + } diff --git a/src/config.json b/src/config.json index 61ed4a39..5be46988 100755 --- a/src/config.json +++ b/src/config.json @@ -181,6 +181,14 @@ { "collectionName": "demo_sea_phys_bcg", "field": "timestamp" + }, + { + "collectionName": "demo_ais_course", + "field": "track.timestamps.center" + }, + { + "collectionName": "demo_ais_flow", + "field": "track.timestamps.center" } ] }, @@ -296,6 +304,14 @@ { "collectionName": "demo_sea_phys_bcg", "field": "timestamp" + }, + { + "collectionName": "demo_ais_course", + "field": "track.timestamps.center" + }, + { + "collectionName": "demo_ais_flow", + "field": "track.timestamps.center" } ] }, @@ -813,7 +829,14 @@ "diameter": 170, "containerWidth": 223, "multiselectable": true, - "opacity": 0.4 + "opacity": 0.4, + "filterOperator": { + "value": "Eq", + "display": true + }, + "useColorService": true, + "applyColorTo": "row" + }, "contributorId": "metricstable-1", "usage": "analytics" From 8b49ed5ec757f4566284327b610fbadcb8db14e8 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 15 Jul 2024 08:46:11 +0200 Subject: [PATCH 03/12] Configurate a metric table by also specifying termfield add to shortcuts --- .../filter-shortcut.component.html | 2 +- .../components/widget/widget.component.html | 2 + src/config.json | 37 ++++++++++--------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/projects/arlas-toolkit/src/lib/components/filter-shortcut/filter-shortcut.component.html b/projects/arlas-toolkit/src/lib/components/filter-shortcut/filter-shortcut.component.html index c40d2d94..0757701d 100644 --- a/projects/arlas-toolkit/src/lib/components/filter-shortcut/filter-shortcut.component.html +++ b/projects/arlas-toolkit/src/lib/components/filter-shortcut/filter-shortcut.component.html @@ -17,7 +17,7 @@
- diff --git a/src/config.json b/src/config.json index 5be46988..a044ad51 100755 --- a/src/config.json +++ b/src/config.json @@ -132,28 +132,23 @@ "nbterms": 3, "sort": { "collection": "demo_ais_flow", - "order": "asc", - "on": "metric", - "metric": { - "metric": "sum", - "field": "course.distance.gps.travelled_m" - } + "termfield": "course.arrival.address.country", + "order": "desc", + "on": "count" }, "configuration": { - "demo_ais_flow": { + "demo_ais_flowcourse.arrival.address.country": { "termfield": "course.arrival.address.country", + "collection": "demo_ais_flow", "metrics": [ { "metric": "count" - }, - { - "metric": "sum", - "field": "course.distance.gps.travelled_m" } ] }, - "demo_ais_course": { + "demo_ais_coursearrival.address.country": { "termfield": "arrival.address.country", + "collection": "demo_ais_course", "metrics": [ { "metric": "count" @@ -835,11 +830,14 @@ "display": true }, "useColorService": true, - "applyColorTo": "row" + "applyColorTo": "row", + "headerDisplayMode": "full", + "normaliseBy": "column" }, "contributorId": "metricstable-1", - "usage": "analytics" + "uuid": "85fc2576-10cd-4a90-9691-d26b60d9b770", + "usage": "both" }, { "showExportCsv": true, @@ -1179,20 +1177,25 @@ } ], "filters_shortcuts": [ + { + "uuid": "85fc2576-10cd-4a90-9691-d26b60d9b770", + "title": "Table metrics", + "order": 1 + }, { "uuid": "85fc2576-10cd-4a90-9691-d26b60d9b774", "title": "Type de bien", - "order": 1 + "order": 2 }, { "uuid": "d0fc0203-e56c-4c36-a330-dda760344196", "title": "Valeur moyenne à travers le temps", - "order": 2 + "order": 3 }, { "uuid": "40cf9f83-aea3-47f2-a6aa-0d9f9e2375c0", "title": "Distribution de la valeur", - "order": 3 + "order": 4 } ], "colorGenerator": { From 49eeb114503711a6943095b2b3ce93ee6d7c401c Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 15 Jul 2024 12:38:55 +0200 Subject: [PATCH 04/12] Bump to comp and cont --- package-lock.json | 139 ++++++++++++------ package.json | 4 +- projects/arlas-toolkit/package.json | 4 +- .../filters-handler.component.ts | 4 +- src/config.json | 12 +- 5 files changed, 110 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8d5704b..0b27ce88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,8 +32,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "~25.0.2", - "arlas-web-contributors": "~25.0.2", + "arlas-web-components": "26.0.0-beta.1", + "arlas-web-contributors": "26.0.0-beta.1", "cli-color": "^1.2.0", "core-js": "~3.26.1", "fetch-intercept": "^2.3.1", @@ -3905,6 +3905,43 @@ "url": "https://opencollective.com/turf" } }, + "node_modules/@turf/clean-coords": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-7.0.0.tgz", + "integrity": "sha512-kaKR4/NnhZpgC+hWY3MfPqV2KwzG4Vr66WH59GbT5B2tvAOJqAYUmq+rgyMsG6xA3fTBL3neDW0bY1DHFVcvHQ==", + "dependencies": { + "@turf/helpers": "^7.0.0", + "@turf/invariant": "^7.0.0", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/clean-coords/node_modules/@turf/helpers": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", + "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "dependencies": { + "deep-equal": "^2.2.3", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/clean-coords/node_modules/@turf/invariant": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.0.0.tgz", + "integrity": "sha512-Kayszfz3W8yJ1/cIA3/aNSzAuw7QgSp+IwsSmhLAfp4DbjV0o6sjxRZXRY2gRstZHqkNHSSEeir8V/icdO8sjA==", + "dependencies": { + "@turf/helpers": "^7.0.0", + "tslib": "^2.6.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, "node_modules/@turf/clone": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/clone/-/clone-6.5.0.tgz", @@ -5383,9 +5420,9 @@ } }, "node_modules/arlas-d3": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.1.0.tgz", - "integrity": "sha512-9ygtgTZifr8Rp9in2Fm8JffO7U4xJ0nWmxYniGL+pcc6CkwiaxWvZRLec8bp+VL6czR6XC2IPvahhNi4phVdAA==", + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.2.tgz", + "integrity": "sha512-Q9lo1L4tqzkp5dyujzUtMYpB8QVPlDG47Y7yyKYFcrSzT7rxHz8ZuMadIN9T+JsFOgMomtxAgTLXlnmIbpZUtA==", "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -5453,9 +5490,9 @@ } }, "node_modules/arlas-web-components": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-25.0.2.tgz", - "integrity": "sha512-+XBPvftKKHvB3P8qVPFhTtLMxe1nRy0KrcD6QrIpyBGF5Ir6YtPRb63FgCp3GV8iugWOqm10EXVT7jlxG2cI5g==", + "version": "26.0.0-beta.1", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-beta.1.tgz", + "integrity": "sha512-VSpGoRJx7/lv9CbVdZwxcyzi1rOetp9tpJAclKd+zPUS9SjaYlGd9kd3KIf+HTtR9W/Hgq2oE9vILm9ico///Q==", "dependencies": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -5465,6 +5502,7 @@ "@turf/center": "^6.5.0", "@turf/centroid": "^6.5.0", "@turf/circle": "^6.5.0", + "@turf/clean-coords": "^7.0.0", "@turf/helpers": "^6.5.0", "@turf/length": "^6.5.0", "@turf/midpoint": "^6.5.0", @@ -5472,7 +5510,7 @@ "@turf/rhumb-destination": "^6.5.0", "@turf/transform-rotate": "^6.5.0", "@types/mapbox-gl": "^1.6.3", - "arlas-d3": "~11.1.0", + "arlas-d3": "~11.2.2", "geojson-polygon-self-intersections": "1.2.1", "geojson-validation": "0.2.1", "iv-viewer": "~2.0.1", @@ -5510,9 +5548,9 @@ } }, "node_modules/arlas-web-contributors": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-25.0.2.tgz", - "integrity": "sha512-gD9rhlL68xp236FvHjgPkA9b2wSFeRV29tqtnoZqXNB4XiO7GdvcWjBETqUmdqdRtUOypdQeCUG1bEZBHPT+EA==", + "version": "26.0.0-beta.1", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-beta.1.tgz", + "integrity": "sha512-Vz+tfUDaFQ1asbvRkz7+ZCA4Q2h6CaQReuuHvIK7B9l2PA4vvc/+j+0VPJD/6NiRbXiEK1Tho0xZIaJ2nMmSZA==", "dependencies": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -7862,7 +7900,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", - "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.5", @@ -8523,7 +8560,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", @@ -11242,7 +11278,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -11453,7 +11488,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -11590,7 +11624,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -11688,7 +11721,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -11711,7 +11743,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, "dependencies": { "call-bind": "^1.0.7", "get-intrinsic": "^1.2.4" @@ -14194,7 +14225,6 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", - "dev": true, "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1" @@ -17812,7 +17842,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", - "dev": true, "dependencies": { "internal-slot": "^1.0.4" }, @@ -19725,7 +19754,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, "dependencies": { "is-map": "^2.0.3", "is-set": "^2.0.3", @@ -22736,6 +22764,36 @@ "@turf/helpers": "^6.5.0" } }, + "@turf/clean-coords": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-7.0.0.tgz", + "integrity": "sha512-kaKR4/NnhZpgC+hWY3MfPqV2KwzG4Vr66WH59GbT5B2tvAOJqAYUmq+rgyMsG6xA3fTBL3neDW0bY1DHFVcvHQ==", + "requires": { + "@turf/helpers": "^7.0.0", + "@turf/invariant": "^7.0.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "@turf/helpers": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.0.0.tgz", + "integrity": "sha512-vwZvxRuyjGpGXvhXSbT9mX6FK92dBMLWbMbDJ/MXQUPx17ReVPFc+6N6IcxAzZfkiCnqy7vpuq0c+/TTrQxIiA==", + "requires": { + "deep-equal": "^2.2.3", + "tslib": "^2.6.2" + } + }, + "@turf/invariant": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.0.0.tgz", + "integrity": "sha512-Kayszfz3W8yJ1/cIA3/aNSzAuw7QgSp+IwsSmhLAfp4DbjV0o6sjxRZXRY2gRstZHqkNHSSEeir8V/icdO8sjA==", + "requires": { + "@turf/helpers": "^7.0.0", + "tslib": "^2.6.2" + } + } + } + }, "@turf/clone": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@turf/clone/-/clone-6.5.0.tgz", @@ -23915,9 +23973,9 @@ } }, "arlas-d3": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.1.0.tgz", - "integrity": "sha512-9ygtgTZifr8Rp9in2Fm8JffO7U4xJ0nWmxYniGL+pcc6CkwiaxWvZRLec8bp+VL6czR6XC2IPvahhNi4phVdAA==", + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.2.tgz", + "integrity": "sha512-Q9lo1L4tqzkp5dyujzUtMYpB8QVPlDG47Y7yyKYFcrSzT7rxHz8ZuMadIN9T+JsFOgMomtxAgTLXlnmIbpZUtA==", "requires": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -23985,9 +24043,9 @@ } }, "arlas-web-components": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-25.0.2.tgz", - "integrity": "sha512-+XBPvftKKHvB3P8qVPFhTtLMxe1nRy0KrcD6QrIpyBGF5Ir6YtPRb63FgCp3GV8iugWOqm10EXVT7jlxG2cI5g==", + "version": "26.0.0-beta.1", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-beta.1.tgz", + "integrity": "sha512-VSpGoRJx7/lv9CbVdZwxcyzi1rOetp9tpJAclKd+zPUS9SjaYlGd9kd3KIf+HTtR9W/Hgq2oE9vILm9ico///Q==", "requires": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -23997,6 +24055,7 @@ "@turf/center": "^6.5.0", "@turf/centroid": "^6.5.0", "@turf/circle": "^6.5.0", + "@turf/clean-coords": "^7.0.0", "@turf/helpers": "^6.5.0", "@turf/length": "^6.5.0", "@turf/midpoint": "^6.5.0", @@ -24004,7 +24063,7 @@ "@turf/rhumb-destination": "^6.5.0", "@turf/transform-rotate": "^6.5.0", "@types/mapbox-gl": "^1.6.3", - "arlas-d3": "~11.1.0", + "arlas-d3": "~11.2.2", "geojson-polygon-self-intersections": "1.2.1", "geojson-validation": "0.2.1", "iv-viewer": "~2.0.1", @@ -24023,9 +24082,9 @@ } }, "arlas-web-contributors": { - "version": "25.0.2", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-25.0.2.tgz", - "integrity": "sha512-gD9rhlL68xp236FvHjgPkA9b2wSFeRV29tqtnoZqXNB4XiO7GdvcWjBETqUmdqdRtUOypdQeCUG1bEZBHPT+EA==", + "version": "26.0.0-beta.1", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-beta.1.tgz", + "integrity": "sha512-Vz+tfUDaFQ1asbvRkz7+ZCA4Q2h6CaQReuuHvIK7B9l2PA4vvc/+j+0VPJD/6NiRbXiEK1Tho0xZIaJ2nMmSZA==", "requires": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -25754,7 +25813,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", - "dev": true, "requires": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.5", @@ -26286,7 +26344,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", - "dev": true, "requires": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", @@ -28256,7 +28313,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -28391,8 +28447,7 @@ "is-map": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", - "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==" }, "is-module": { "version": "1.0.0", @@ -28482,8 +28537,7 @@ "is-set": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", - "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==" }, "is-shared-array-buffer": { "version": "1.0.3", @@ -28538,8 +28592,7 @@ "is-weakmap": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", - "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==" }, "is-weakref": { "version": "1.0.2", @@ -28553,7 +28606,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, "requires": { "call-bind": "^1.0.7", "get-intrinsic": "^1.2.4" @@ -30485,7 +30537,6 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", - "dev": true, "requires": { "call-bind": "^1.0.7", "define-properties": "^1.2.1" @@ -33148,7 +33199,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", - "dev": true, "requires": { "internal-slot": "^1.0.4" } @@ -34555,7 +34605,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, "requires": { "is-map": "^2.0.3", "is-set": "^2.0.3", diff --git a/package.json b/package.json index d4d420ad..82e371a4 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "~25.0.2", - "arlas-web-contributors": "~25.0.2", + "arlas-web-components": "26.0.0-beta.1", + "arlas-web-contributors": "26.0.0-beta.1", "cli-color": "^1.2.0", "core-js": "~3.26.1", "fetch-intercept": "^2.3.1", diff --git a/projects/arlas-toolkit/package.json b/projects/arlas-toolkit/package.json index c3277982..476a6058 100644 --- a/projects/arlas-toolkit/package.json +++ b/projects/arlas-toolkit/package.json @@ -40,8 +40,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "~25.0.2", - "arlas-web-contributors": "~25.0.2", + "arlas-web-components": "26.0.0-beta.1", + "arlas-web-contributors": "26.0.0-beta.1", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", diff --git a/projects/arlas-toolkit/src/lib/components/filter-shortcut/filters-handler/filters-handler.component.ts b/projects/arlas-toolkit/src/lib/components/filter-shortcut/filters-handler/filters-handler.component.ts index fdc1d866..ae305f18 100644 --- a/projects/arlas-toolkit/src/lib/components/filter-shortcut/filters-handler/filters-handler.component.ts +++ b/projects/arlas-toolkit/src/lib/components/filter-shortcut/filters-handler/filters-handler.component.ts @@ -130,7 +130,7 @@ export class ShortcutFiltersHandlerComponent implements OnInit, OnDestroy { if (this.labels.length > 0) { this.firstLabel = this.labels[0]; - if (this.widgetType === 'powerbars') { + if (this.widgetType === 'powerbars' || this.widgetType === 'metricstable') { this.showMore = !this.displayFilterFirstValue || this.labels.length > 1; /** hide list when there is one label left */ if (this.displayFilterFirstValue && this.labels.length <= 1) { @@ -181,7 +181,7 @@ export class ShortcutFiltersHandlerComponent implements OnInit, OnDestroy { private setLabels(widgetType: string, expression: Expression) { this.rawLabels = expression.value.split(','); - if (widgetType === 'powerbars') { + if (widgetType === 'powerbars' || this.widgetType === 'metricstable') { this.labels = expression.value.split(','); if (expression.op === Expression.OpEnum.Ne) { this.labels = this.labels.map(l => '≠' + l); diff --git a/src/config.json b/src/config.json index a044ad51..a2c509a7 100755 --- a/src/config.json +++ b/src/config.json @@ -133,8 +133,12 @@ "sort": { "collection": "demo_ais_flow", "termfield": "course.arrival.address.country", - "order": "desc", - "on": "count" + "order": "asc", + "on": "metric", + "metric": { + "metric": "sum", + "field": "course.distance.gps.travelled_m" + } }, "configuration": { "demo_ais_flowcourse.arrival.address.country": { @@ -143,6 +147,10 @@ "metrics": [ { "metric": "count" + }, + { + "metric": "sum", + "field": "course.distance.gps.travelled_m" } ] }, From 054e8a5f72ef6217d9d4c0de984bbabab18e806d Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 15 Jul 2024 13:06:16 +0200 Subject: [PATCH 05/12] Release prod version 26.0.0-beta.1 --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- projects/arlas-toolkit/package.json | 2 +- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 104dc7e1..c65f8fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,38 @@ # Change Log +## [v26.0.0-beta.1](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v26.0.0-beta.1) (2024-07-15) + +[Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v25.1.1...v26.0.0-beta.1) + +## [v25.1.1](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v25.1.1) (2024-07-12) + +[Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v25.1.0...v25.1.1) + +## [v25.1.0](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v25.1.0) (2024-07-09) + +[Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v24.3.18...v25.1.0) + +**New stuff:** + +- Update layout of X and Y labels in histogram tooltip [\#781](https://github.com/gisaia/ARLAS-wui-toolkit/issues/781) +- Disable add bookmark button while waiting for server answer [\#728](https://github.com/gisaia/ARLAS-wui-toolkit/issues/728) + +**Fixed bugs:** + +- Retrocompatibility with stored bookmarks with collection attribute bug [\#802](https://github.com/gisaia/ARLAS-wui-toolkit/issues/802) + +## [v24.3.18](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v24.3.18) (2024-07-01) + +[Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v23.3.18...v24.3.18) + +## [v23.3.18](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v23.3.18) (2024-07-01) + +[Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v25.0.3...v23.3.18) + +**Fixed bugs:** + +- FGA fields to be hidden should be listed by collection [\#803](https://github.com/gisaia/ARLAS-wui-toolkit/issues/803) + ## [v25.0.3](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v25.0.3) (2024-06-18) [Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v25.0.2...v25.0.3) diff --git a/package-lock.json b/package-lock.json index 0b27ce88..a382803c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "arlas-wui-toolkit", - "version": "25.1.0-dev0", + "version": "26.0.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "arlas-wui-toolkit", - "version": "25.1.0-dev0", + "version": "26.0.0-beta.1", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 82e371a4..cead0489 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui-toolkit", - "version": "25.1.0-dev0", + "version": "26.0.0-beta.1", "description": "Tool Kit Library for ARLAS wui web App", "author": "gisaia", "license": "Apache-2.0", diff --git a/projects/arlas-toolkit/package.json b/projects/arlas-toolkit/package.json index 476a6058..8967a87f 100644 --- a/projects/arlas-toolkit/package.json +++ b/projects/arlas-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui-toolkit", - "version": "25.0.3", + "version": "26.0.0-beta.1", "description": "Tool Kit Library for ARLAS wui web App", "author": "gisaia", "license": "Apache-2.0", From c3c6b96f0e587c040c15f72b68cee7ea2a2f18e8 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Mon, 15 Jul 2024 13:06:28 +0200 Subject: [PATCH 06/12] update package.json to-26.1.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a382803c..0ed1185c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "arlas-wui-toolkit", - "version": "26.0.0-beta.1", + "version": "26.1.0-dev0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "arlas-wui-toolkit", - "version": "26.0.0-beta.1", + "version": "26.1.0-dev0", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index cead0489..7c707f6d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui-toolkit", - "version": "26.0.0-beta.1", + "version": "26.1.0-dev0", "description": "Tool Kit Library for ARLAS wui web App", "author": "gisaia", "license": "Apache-2.0", From 3bda8313bccc1db18937545d728eb612bb9e4448 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Thu, 18 Jul 2024 17:05:44 +0200 Subject: [PATCH 07/12] bump to 26.0.0-beta.2 --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- projects/arlas-toolkit/package.json | 4 ++-- src/config.json | 29 ++++++++++++++++++++--------- 4 files changed, 38 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ed1185c..d312b41d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,8 +32,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "26.0.0-beta.1", - "arlas-web-contributors": "26.0.0-beta.1", + "arlas-web-components": "26.0.0-beta.2", + "arlas-web-contributors": "26.0.0-beta.2", "cli-color": "^1.2.0", "core-js": "~3.26.1", "fetch-intercept": "^2.3.1", @@ -5490,9 +5490,9 @@ } }, "node_modules/arlas-web-components": { - "version": "26.0.0-beta.1", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-beta.1.tgz", - "integrity": "sha512-VSpGoRJx7/lv9CbVdZwxcyzi1rOetp9tpJAclKd+zPUS9SjaYlGd9kd3KIf+HTtR9W/Hgq2oE9vILm9ico///Q==", + "version": "26.0.0-beta.2", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-beta.2.tgz", + "integrity": "sha512-gfpvz/8eO2QrySBlJtkKW1ozFvMS32qaxTIK4qyKhTz0thi9rkI/YdmbCo/a1NdVjh9vQay8D61SmVsXspkXog==", "dependencies": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -5548,9 +5548,9 @@ } }, "node_modules/arlas-web-contributors": { - "version": "26.0.0-beta.1", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-beta.1.tgz", - "integrity": "sha512-Vz+tfUDaFQ1asbvRkz7+ZCA4Q2h6CaQReuuHvIK7B9l2PA4vvc/+j+0VPJD/6NiRbXiEK1Tho0xZIaJ2nMmSZA==", + "version": "26.0.0-beta.2", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-beta.2.tgz", + "integrity": "sha512-2BQQ3xKBn/qlJJYbiExIo28QaUMeqXMyR5rfGlJX4VoSVad7tpMTD65CcJ92yjYVN+d5KEd//MUt9yc9ZEkpcg==", "dependencies": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -24043,9 +24043,9 @@ } }, "arlas-web-components": { - "version": "26.0.0-beta.1", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-beta.1.tgz", - "integrity": "sha512-VSpGoRJx7/lv9CbVdZwxcyzi1rOetp9tpJAclKd+zPUS9SjaYlGd9kd3KIf+HTtR9W/Hgq2oE9vILm9ico///Q==", + "version": "26.0.0-beta.2", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-beta.2.tgz", + "integrity": "sha512-gfpvz/8eO2QrySBlJtkKW1ozFvMS32qaxTIK4qyKhTz0thi9rkI/YdmbCo/a1NdVjh9vQay8D61SmVsXspkXog==", "requires": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -24082,9 +24082,9 @@ } }, "arlas-web-contributors": { - "version": "26.0.0-beta.1", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-beta.1.tgz", - "integrity": "sha512-Vz+tfUDaFQ1asbvRkz7+ZCA4Q2h6CaQReuuHvIK7B9l2PA4vvc/+j+0VPJD/6NiRbXiEK1Tho0xZIaJ2nMmSZA==", + "version": "26.0.0-beta.2", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-beta.2.tgz", + "integrity": "sha512-2BQQ3xKBn/qlJJYbiExIo28QaUMeqXMyR5rfGlJX4VoSVad7tpMTD65CcJ92yjYVN+d5KEd//MUt9yc9ZEkpcg==", "requires": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", diff --git a/package.json b/package.json index 7c707f6d..ca15efa6 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "26.0.0-beta.1", - "arlas-web-contributors": "26.0.0-beta.1", + "arlas-web-components": "26.0.0-beta.2", + "arlas-web-contributors": "26.0.0-beta.2", "cli-color": "^1.2.0", "core-js": "~3.26.1", "fetch-intercept": "^2.3.1", diff --git a/projects/arlas-toolkit/package.json b/projects/arlas-toolkit/package.json index 8967a87f..07a40a4c 100644 --- a/projects/arlas-toolkit/package.json +++ b/projects/arlas-toolkit/package.json @@ -40,8 +40,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "26.0.0-beta.1", - "arlas-web-contributors": "26.0.0-beta.1", + "arlas-web-components": "26.0.0-beta.2", + "arlas-web-contributors": "26.0.0-beta.2", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", diff --git a/src/config.json b/src/config.json index a2c509a7..bf404bea 100755 --- a/src/config.json +++ b/src/config.json @@ -129,41 +129,52 @@ "type": "metricstable", "identifier": "metricstable-1", "name": "Metrics table", - "nbterms": 3, + "numberOfBuckets": 3, "sort": { "collection": "demo_ais_flow", "termfield": "course.arrival.address.country", - "order": "asc", + "order": "desc", "on": "metric", "metric": { "metric": "sum", "field": "course.distance.gps.travelled_m" } }, - "configuration": { - "demo_ais_flowcourse.arrival.address.country": { + "configuration": [ + { "termfield": "course.arrival.address.country", "collection": "demo_ais_flow", "metrics": [ - { - "metric": "count" - }, { "metric": "sum", "field": "course.distance.gps.travelled_m" + }, + { + "metric": "count" } ] }, - "demo_ais_coursearrival.address.country": { + { "termfield": "arrival.address.country", "collection": "demo_ais_course", "metrics": [ + { + "metric": "count" + } + ] + }, + + { + "termfield": "course.arrival.address.country", + "collection": "demo_ais_flow", + "metrics": [ + { "metric": "count" } ] } - } + ] }, { "type": "histogram", From 1f1f88fc346f77e2d744ea200ff240e42d2ea9b5 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Thu, 18 Jul 2024 17:11:31 +0200 Subject: [PATCH 08/12] Release prod version 26.0.0-beta.2 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- projects/arlas-toolkit/package.json | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c65f8fe0..e4f1c7b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [v26.0.0-beta.2](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v26.0.0-beta.2) (2024-07-18) + +[Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v25.1.2...v26.0.0-beta.2) + +## [v25.1.2](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v25.1.2) (2024-07-18) + +[Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v26.0.0-beta.1...v25.1.2) + ## [v26.0.0-beta.1](https://github.com/gisaia/ARLAS-wui-toolkit/tree/v26.0.0-beta.1) (2024-07-15) [Full Changelog](https://github.com/gisaia/ARLAS-wui-toolkit/compare/v25.1.1...v26.0.0-beta.1) diff --git a/package-lock.json b/package-lock.json index d312b41d..8fdf27b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "arlas-wui-toolkit", - "version": "26.1.0-dev0", + "version": "26.0.0-beta.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "arlas-wui-toolkit", - "version": "26.1.0-dev0", + "version": "26.0.0-beta.2", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index ca15efa6..fd527de3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui-toolkit", - "version": "26.1.0-dev0", + "version": "26.0.0-beta.2", "description": "Tool Kit Library for ARLAS wui web App", "author": "gisaia", "license": "Apache-2.0", diff --git a/projects/arlas-toolkit/package.json b/projects/arlas-toolkit/package.json index 07a40a4c..c837ef79 100644 --- a/projects/arlas-toolkit/package.json +++ b/projects/arlas-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui-toolkit", - "version": "26.0.0-beta.1", + "version": "26.0.0-beta.2", "description": "Tool Kit Library for ARLAS wui web App", "author": "gisaia", "license": "Apache-2.0", From bc6c92c65cf7d18dee9e2dd4359678b32ceb2d86 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Thu, 18 Jul 2024 17:11:44 +0200 Subject: [PATCH 09/12] update package.json to-26.1.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fdf27b9..d312b41d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "arlas-wui-toolkit", - "version": "26.0.0-beta.2", + "version": "26.1.0-dev0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "arlas-wui-toolkit", - "version": "26.0.0-beta.2", + "version": "26.1.0-dev0", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index fd527de3..ca15efa6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arlas-wui-toolkit", - "version": "26.0.0-beta.2", + "version": "26.1.0-dev0", "description": "Tool Kit Library for ARLAS wui web App", "author": "gisaia", "license": "Apache-2.0", From d1cd04ac3e16c0b23fda2c7c7e3802b3cabeae73 Mon Sep 17 00:00:00 2001 From: MatthieuBarbet Date: Fri, 26 Jul 2024 17:48:47 +0200 Subject: [PATCH 10/12] Feat:add missing inputs for metricstable --- .../src/lib/components/widget/widget.component.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/arlas-toolkit/src/lib/components/widget/widget.component.html b/projects/arlas-toolkit/src/lib/components/widget/widget.component.html index 2ad4cf1c..03c922ee 100644 --- a/projects/arlas-toolkit/src/lib/components/widget/widget.component.html +++ b/projects/arlas-toolkit/src/lib/components/widget/widget.component.html @@ -87,6 +87,8 @@ [filterOperator]="graphParam?.filterOperator" [useColorService]="graphParam?.useColorService" [applyColorTo]="graphParam?.applyColorTo" + [showRowField]="graphParam?.showRowField" + [selectWithCheckbox]="graphParam?.selectWithCheckbox" [headerDisplayMode]="graphParam?.headerDisplayMode" [normaliseBy]="graphParam?.normaliseBy" (onSelect)="contributor?.onRowSelect($event)" From 2220144cb04d2d6d4be88ba5bceb47241381a6fe Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Wed, 21 Aug 2024 19:13:27 +0200 Subject: [PATCH 11/12] Fix merge --- projects/arlas-toolkit/package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/arlas-toolkit/package.json b/projects/arlas-toolkit/package.json index 858b5a46..aa7b3276 100644 --- a/projects/arlas-toolkit/package.json +++ b/projects/arlas-toolkit/package.json @@ -45,13 +45,8 @@ "arlas-permissions-api": "25.0.0", "arlas-persistence-api": "25.0.0", "arlas-tagger-api": "25.0.0-beta.2", -<<<<<<< HEAD "arlas-web-components": "26.0.0-beta.2", "arlas-web-contributors": "26.0.0-beta.2", -======= - "arlas-web-components": "26.0.0-rc.2", - "arlas-web-contributors": "26.0.0-rc.1", ->>>>>>> develop "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1", From 1b81d39852943f9e017d62693108ee0678f2fd66 Mon Sep 17 00:00:00 2001 From: Mohamed Hamou Date: Thu, 22 Aug 2024 09:22:14 +0200 Subject: [PATCH 12/12] Bump to 26 rc version --- package-lock.json | 70 ++++++++++++++--------------- package.json | 10 ++--- projects/arlas-toolkit/package.json | 10 ++--- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index 25ae6ed3..68d1c1b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,12 +31,12 @@ "ajv-keywords": "5.1.0", "angular-oauth2-oidc": "~14.0.1", "angular-oauth2-oidc-jwks": "~14.0.1", - "arlas-iam-api": "25.0.0", - "arlas-permissions-api": "25.0.0", - "arlas-persistence-api": "25.0.0", + "arlas-iam-api": "26.0.0-rc.1", + "arlas-permissions-api": "26.0.0-rc.1", + "arlas-persistence-api": "26.0.0-rc.1", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "26.0.0-beta.2", - "arlas-web-contributors": "26.0.0-beta.2", + "arlas-web-components": "26.0.0-rc.2", + "arlas-web-contributors": "26.0.0-rc.1", "cli-color": "^1.2.0", "core-js": "~3.26.1", "fetch-intercept": "^2.3.1", @@ -5651,9 +5651,9 @@ } }, "node_modules/arlas-iam-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-25.0.0.tgz", - "integrity": "sha512-N01YAyfS/mB0Qbh9txUfcYWjjLUC89p80f4Hw6lFguCs2fbMlxE1HhX18HfLzlfwkDYc5OSrZlJRgt1moS+FWQ==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-26.0.0-rc.1.tgz", + "integrity": "sha512-8G7I2qfuw9t94aqKLe8AReQX2Jht7muGlLhpcmsd+3F5BooOo1fKDKPrDzqkhnFx+o0mGoAJTIj16l2DSyHRIw==", "dependencies": { "es6-promise": "4.2.4", "isomorphic-fetch": "3.0.0", @@ -5661,18 +5661,18 @@ } }, "node_modules/arlas-permissions-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-25.0.0.tgz", - "integrity": "sha512-4IXW1ttu4m0hHOJfaap91hG6/bQXbJHZZBfXRJo63KQ5pBbuT2LQQ33t4UY2dP+M99TkoD1CCXmgh/vBnndLWg==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-26.0.0-rc.1.tgz", + "integrity": "sha512-quEgU/2xhTYQbGpPY73LiS1tXmZkwi0JsbaLT+OrlSj8Vj6C5jjUOM2AkhYd5clATO/9l7dNK891rVdICVjnfg==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "node_modules/arlas-persistence-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-25.0.0.tgz", - "integrity": "sha512-Q8dI0hDSqSfpvg2pMG+ViDUSWY1NF69yvjbIVb4q7hxt6t04NPO91o4BnoARQ+Znhe2XMGD/5RRvfEQ6Amc7gQ==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-26.0.0-rc.1.tgz", + "integrity": "sha512-ULDEBA1SZeQvGqcS1Jv135UvjnGjRpqI2dBr+ExC+osPw2FmkHL0UvNM0BcK5H4jFf2eeLqfUYHwcuiET0NLMg==", "dependencies": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" @@ -5688,9 +5688,9 @@ } }, "node_modules/arlas-web-components": { - "version": "26.0.0-beta.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-beta.2.tgz", - "integrity": "sha512-gfpvz/8eO2QrySBlJtkKW1ozFvMS32qaxTIK4qyKhTz0thi9rkI/YdmbCo/a1NdVjh9vQay8D61SmVsXspkXog==", + "version": "26.0.0-rc.2", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-rc.2.tgz", + "integrity": "sha512-dXWR+QQsvFKNKU7peXAcL5jcBbsibhQxmzw1+UhcnYMwkuy219HBB0ET8XmXKFmzedhqGYQjmAiTEpQTUb4i/Q==", "dependencies": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -5746,9 +5746,9 @@ } }, "node_modules/arlas-web-contributors": { - "version": "26.0.0-beta.2", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-beta.2.tgz", - "integrity": "sha512-2BQQ3xKBn/qlJJYbiExIo28QaUMeqXMyR5rfGlJX4VoSVad7tpMTD65CcJ92yjYVN+d5KEd//MUt9yc9ZEkpcg==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.1.tgz", + "integrity": "sha512-Eq66yVLLNnJdyHNBwyTcwe39nRlWeSQYm6Mrq7VNifKBH3L4WklP8o5S4bpDTZymZVM9MPjRy5gxnGtQS2O6dA==", "dependencies": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", @@ -24663,9 +24663,9 @@ } }, "arlas-iam-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-25.0.0.tgz", - "integrity": "sha512-N01YAyfS/mB0Qbh9txUfcYWjjLUC89p80f4Hw6lFguCs2fbMlxE1HhX18HfLzlfwkDYc5OSrZlJRgt1moS+FWQ==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-iam-api/-/arlas-iam-api-26.0.0-rc.1.tgz", + "integrity": "sha512-8G7I2qfuw9t94aqKLe8AReQX2Jht7muGlLhpcmsd+3F5BooOo1fKDKPrDzqkhnFx+o0mGoAJTIj16l2DSyHRIw==", "requires": { "es6-promise": "4.2.4", "isomorphic-fetch": "3.0.0", @@ -24673,18 +24673,18 @@ } }, "arlas-permissions-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-25.0.0.tgz", - "integrity": "sha512-4IXW1ttu4m0hHOJfaap91hG6/bQXbJHZZBfXRJo63KQ5pBbuT2LQQ33t4UY2dP+M99TkoD1CCXmgh/vBnndLWg==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-permissions-api/-/arlas-permissions-api-26.0.0-rc.1.tgz", + "integrity": "sha512-quEgU/2xhTYQbGpPY73LiS1tXmZkwi0JsbaLT+OrlSj8Vj6C5jjUOM2AkhYd5clATO/9l7dNK891rVdICVjnfg==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" } }, "arlas-persistence-api": { - "version": "25.0.0", - "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-25.0.0.tgz", - "integrity": "sha512-Q8dI0hDSqSfpvg2pMG+ViDUSWY1NF69yvjbIVb4q7hxt6t04NPO91o4BnoARQ+Znhe2XMGD/5RRvfEQ6Amc7gQ==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-persistence-api/-/arlas-persistence-api-26.0.0-rc.1.tgz", + "integrity": "sha512-ULDEBA1SZeQvGqcS1Jv135UvjnGjRpqI2dBr+ExC+osPw2FmkHL0UvNM0BcK5H4jFf2eeLqfUYHwcuiET0NLMg==", "requires": { "isomorphic-fetch": "3.0.0", "url": "0.11.0" @@ -24700,9 +24700,9 @@ } }, "arlas-web-components": { - "version": "26.0.0-beta.2", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-beta.2.tgz", - "integrity": "sha512-gfpvz/8eO2QrySBlJtkKW1ozFvMS32qaxTIK4qyKhTz0thi9rkI/YdmbCo/a1NdVjh9vQay8D61SmVsXspkXog==", + "version": "26.0.0-rc.2", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.0-rc.2.tgz", + "integrity": "sha512-dXWR+QQsvFKNKU7peXAcL5jcBbsibhQxmzw1+UhcnYMwkuy219HBB0ET8XmXKFmzedhqGYQjmAiTEpQTUb4i/Q==", "requires": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -24739,9 +24739,9 @@ } }, "arlas-web-contributors": { - "version": "26.0.0-beta.2", - "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-beta.2.tgz", - "integrity": "sha512-2BQQ3xKBn/qlJJYbiExIo28QaUMeqXMyR5rfGlJX4VoSVad7tpMTD65CcJ92yjYVN+d5KEd//MUt9yc9ZEkpcg==", + "version": "26.0.0-rc.1", + "resolved": "https://registry.npmjs.org/arlas-web-contributors/-/arlas-web-contributors-26.0.0-rc.1.tgz", + "integrity": "sha512-Eq66yVLLNnJdyHNBwyTcwe39nRlWeSQYm6Mrq7VNifKBH3L4WklP8o5S4bpDTZymZVM9MPjRy5gxnGtQS2O6dA==", "requires": { "@turf/bbox": "^6.0.1", "@turf/bbox-polygon": "^6.0.1", diff --git a/package.json b/package.json index 3d9f4367..f4066842 100644 --- a/package.json +++ b/package.json @@ -43,12 +43,12 @@ "ajv-keywords": "5.1.0", "angular-oauth2-oidc": "~14.0.1", "angular-oauth2-oidc-jwks": "~14.0.1", - "arlas-iam-api": "25.0.0", - "arlas-permissions-api": "25.0.0", - "arlas-persistence-api": "25.0.0", + "arlas-iam-api": "26.0.0-rc.1", + "arlas-permissions-api": "26.0.0-rc.1", + "arlas-persistence-api": "26.0.0-rc.1", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "26.0.0-beta.2", - "arlas-web-contributors": "26.0.0-beta.2", + "arlas-web-components": "26.0.0-rc.2", + "arlas-web-contributors": "26.0.0-rc.1", "cli-color": "^1.2.0", "core-js": "~3.26.1", "fetch-intercept": "^2.3.1", diff --git a/projects/arlas-toolkit/package.json b/projects/arlas-toolkit/package.json index aa7b3276..301f1461 100644 --- a/projects/arlas-toolkit/package.json +++ b/projects/arlas-toolkit/package.json @@ -41,12 +41,12 @@ "ajv-keywords": "5.1.0", "angular-oauth2-oidc": "~14.0.1", "angular-oauth2-oidc-jwks": "~14.0.1", - "arlas-iam-api": "25.0.0", - "arlas-permissions-api": "25.0.0", - "arlas-persistence-api": "25.0.0", + "arlas-iam-api": "26.0.0-rc.1", + "arlas-permissions-api": "26.0.0-rc.1", + "arlas-persistence-api": "26.0.0-rc.1", "arlas-tagger-api": "25.0.0-beta.2", - "arlas-web-components": "26.0.0-beta.2", - "arlas-web-contributors": "26.0.0-beta.2", + "arlas-web-components": "26.0.0-rc.2", + "arlas-web-contributors": "26.0.0-rc.1", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", "hopscotch": "0.3.1",