@provoly/dashboard 0.21.3 → 0.21.5

package/toolbox/components/share/share.component.d.ts

@@ -0,0 +1,26 @@
+import { TemplateRef, ViewContainerRef } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { GlobalManifest, ManifestDescription, PryVisibility, ViewMode } from '@provoly/dashboard';
+import { ToolboxActionComponent } from '../toolbox-action/toolbox-action.component';
+import { Overlay, OverlayRef } from '@angular/cdk/overlay';
+import * as i0 from "@angular/core";
+export declare class ShareComponent extends ToolboxActionComponent {
+    private overlay;
+    private viewContainerRef;
+    presentation: {
+        current: ManifestDescription | undefined;
+        viewMode?: ViewMode;
+        initial: GlobalManifest | undefined;
+    } | undefined;
+    modalOpened: boolean;
+    overlayRef?: OverlayRef;
+    accessGroups: string[];
+    visibility: PryVisibility;
+    template: TemplateRef<any>;
+    constructor(store: Store, overlay: Overlay, viewContainerRef: ViewContainerRef);
+    trigger(): void;
+    toggleModal(): void;
+    changeVisibility(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ShareComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ShareComponent, "pry-share-pres", never, {}, {}, never, never, false, never>;
+}

package/toolbox/components/switch-to-edit-content/switch-to-edit-content.component.d.ts

@@ -0,0 +1,15 @@
+import { Store } from '@ngrx/store';
+import { GlobalManifest, ManifestDescription, ViewMode } from '@provoly/dashboard';
+import { ToolboxActionComponent } from '../toolbox-action/toolbox-action.component';
+import * as i0 from "@angular/core";
+export declare class SwitchToEditContentComponent extends ToolboxActionComponent {
+    presentation: {
+        current: ManifestDescription | undefined;
+        viewMode?: ViewMode;
+        initial: GlobalManifest | undefined;
+    } | undefined;
+    constructor(store: Store);
+    trigger(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SwitchToEditContentComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SwitchToEditContentComponent, "pry-switch-to-edit", never, {}, {}, never, never, false, never>;
+}

package/toolbox/public-api.d.ts

@@ -12,5 +12,8 @@ export * from './components/toolbox-action/toolbox-action.component';
 export * from './components/toolbox-action-instanciator/toolbox-action-instanciator.component';
 export * from './components/refresh-datasets/refresh-datasets.component';
 export * from './components/automate-refresh/automate-refresh.component';
+export * from './components/delete/delete.component';
+export * from './components/share/share.component';
+export * from './components/switch-to-edit-content/switch-to-edit-content.component';
 export * from './style/css.component';
 export * from './toolbox.model';

package/toolbox/toolbox.module.d.ts

@@ -13,16 +13,19 @@ import * as i11 from "./style/css.component";
 import * as i12 from "./components/filter-settings/filter-settings.component";
 import * as i13 from "./components/refresh-datasets/refresh-datasets.component";
 import * as i14 from "./components/automate-refresh/automate-refresh.component";
-import * as i15 from "@angular/common";
-import * as i16 from "@angular/forms";
-import * as i17 from "@angular/cdk/overlay";
-import * as i18 from "@provoly/dashboard";
-import * as i19 from "@provoly/dashboard/components/checkbox";
-import * as i20 from "@provoly/dashboard/components/stepper";
-import * as i21 from "@angular/cdk/drag-drop";
-import * as i22 from "@angular/cdk/a11y";
+import * as i15 from "./components/switch-to-edit-content/switch-to-edit-content.component";
+import * as i16 from "./components/share/share.component";
+import * as i17 from "./components/delete/delete.component";
+import * as i18 from "@angular/common";
+import * as i19 from "@angular/forms";
+import * as i20 from "@angular/cdk/overlay";
+import * as i21 from "@provoly/dashboard";
+import * as i22 from "@provoly/dashboard/components/checkbox";
+import * as i23 from "@provoly/dashboard/components/stepper";
+import * as i24 from "@angular/cdk/drag-drop";
+import * as i25 from "@angular/cdk/a11y";
 export declare class PryToolboxModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<PryToolboxModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<PryToolboxModule, [typeof i1.ToolboxActionComponent, typeof i2.ToolboxActionInstanciatorComponent, typeof i3.ClearViewComponent, typeof i4.DragWidgetsComponent, typeof i5.EditModeToggleComponent, typeof i6.LaunchTabComponent, typeof i7.NamedQueryComponent, typeof i8.SaveViewComponent, typeof i9.SelectGridLayoutComponent, typeof i10.ToolboxComponent, typeof i11.PrySelectGridLayoutCssComponent, typeof i12.PryFilterSettingsComponent, typeof i13.RefreshDatasetsComponent, typeof i14.AutomateRefreshComponent], [typeof i15.CommonModule, typeof i16.FormsModule, typeof i17.OverlayModule, typeof i18.PryOverlayModule, typeof i18.PryCoreModule, typeof i18.PryDashboardModule, typeof i18.PrySelectModule, typeof i18.PryIconModule, typeof i19.PryCheckboxModule, typeof i18.PryToggleModule, typeof i20.PryStepperModule, typeof i18.PryShareModule, typeof i18.PryI18nModule, typeof i21.CdkDropList, typeof i21.CdkDrag, typeof i21.CdkDragHandle, typeof i22.A11yModule], [typeof i1.ToolboxActionComponent, typeof i2.ToolboxActionInstanciatorComponent, typeof i3.ClearViewComponent, typeof i4.DragWidgetsComponent, typeof i5.EditModeToggleComponent, typeof i6.LaunchTabComponent, typeof i7.NamedQueryComponent, typeof i8.SaveViewComponent, typeof i9.SelectGridLayoutComponent, typeof i10.ToolboxComponent, typeof i11.PrySelectGridLayoutCssComponent, typeof i12.PryFilterSettingsComponent, typeof i13.RefreshDatasetsComponent, typeof i14.AutomateRefreshComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<PryToolboxModule, [typeof i1.ToolboxActionComponent, typeof i2.ToolboxActionInstanciatorComponent, typeof i3.ClearViewComponent, typeof i4.DragWidgetsComponent, typeof i5.EditModeToggleComponent, typeof i6.LaunchTabComponent, typeof i7.NamedQueryComponent, typeof i8.SaveViewComponent, typeof i9.SelectGridLayoutComponent, typeof i10.ToolboxComponent, typeof i11.PrySelectGridLayoutCssComponent, typeof i12.PryFilterSettingsComponent, typeof i13.RefreshDatasetsComponent, typeof i14.AutomateRefreshComponent, typeof i15.SwitchToEditContentComponent, typeof i16.ShareComponent, typeof i17.DeleteComponent], [typeof i18.CommonModule, typeof i19.FormsModule, typeof i20.OverlayModule, typeof i21.PryOverlayModule, typeof i21.PryCoreModule, typeof i21.PryDashboardModule, typeof i21.PrySelectModule, typeof i21.PryIconModule, typeof i22.PryCheckboxModule, typeof i21.PryToggleModule, typeof i23.PryStepperModule, typeof i21.PryShareModule, typeof i21.PryI18nModule, typeof i24.CdkDropList, typeof i24.CdkDrag, typeof i24.CdkDragHandle, typeof i25.A11yModule], [typeof i1.ToolboxActionComponent, typeof i2.ToolboxActionInstanciatorComponent, typeof i3.ClearViewComponent, typeof i4.DragWidgetsComponent, typeof i5.EditModeToggleComponent, typeof i6.LaunchTabComponent, typeof i7.NamedQueryComponent, typeof i8.SaveViewComponent, typeof i9.SelectGridLayoutComponent, typeof i10.ToolboxComponent, typeof i11.PrySelectGridLayoutCssComponent, typeof i12.PryFilterSettingsComponent, typeof i13.RefreshDatasetsComponent, typeof i14.AutomateRefreshComponent, typeof i15.SwitchToEditContentComponent, typeof i16.ShareComponent, typeof i17.DeleteComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<PryToolboxModule>;
 }

package/widgets/widget-chart/component/widget-chart.component.d.ts

@@ -93,7 +93,7 @@ export declare class WidgetChartComponent extends DataWidgetComponent implements
             field: string;
             title: string;
             type: any;
-            aggregate: string;
+            aggregate: Aggregation;
         };
         color: {
             field: string;

package/widgets/widget-map/component/widget-map-layer.service.d.ts

@@ -5,8 +5,9 @@ import { Tile } from 'ol/layer';
 import BaseLayer from 'ol/layer/Base';
 import VectorLayer from 'ol/layer/Vector';
 import VectorTileLayer from 'ol/layer/VectorTile';
-import { TileWMS, Vector, WMTS, XYZ } from 'ol/source';
+import { ImageWMS, TileWMS, Vector, WMTS, XYZ } from 'ol/source';
 import { Style } from 'ol/style';
+import ImageLayer from 'ol/layer/Image';
 import * as i0 from "@angular/core";
 export type AttributesForClass = {
     [key: string]: {
@@ -75,7 +76,7 @@ export declare class WidgetMapLayerService {
         wms: (layer: MapWMSLayerLayerOptions, attributesForClass: AttributesForClass, layerClassesId: string[], resultSet: ResultSet, range: {
             min: number;
             max: number;
-        }, itemStyles: ItemStyles, map: Map) => Tile<TileWMS>;
+        }, itemStyles: ItemStyles, map: Map) => Tile<TileWMS> | ImageLayer<ImageWMS>;
         wmts: (layer: MapWMTSLayerLayerOptions, attributesForClass: AttributesForClass, layerClassesId: string[], resultSet: ResultSet, range: {
             min: number;
             max: number;
@@ -83,7 +84,7 @@ export declare class WidgetMapLayerService {
         geoserver: (layer: MapGeoServerLayerOptions, attributesForClass: AttributesForClass, layerClassesId: string[], resultSet: ResultSet, range: {
             min: number;
             max: number;
-        }, itemStyles: ItemStyles, map: Map) => Tile<TileWMS>;
+        }, itemStyles: ItemStyles, map: Map) => Tile<TileWMS> | ImageLayer<ImageWMS>;
         featurelayer: (layer: MapFeatureLayerOptions, attributesForClass: AttributesForClass, layerClassesId: string[], resultSet: ResultSet, range: {
             min: number;
             max: number;

package/widgets/widget-map/component/widget-map.component.d.ts

@@ -1,6 +1,6 @@
 import { AfterViewInit, ComponentRef, ElementRef, Injector, OnDestroy, TemplateRef, ViewContainerRef } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { BaseTooltipComponent, BaseWidgetMapLayerOptions, Class, DataWidgetComponent, Field, FilterContext, GetCapabilitiesResponse, MapAutoLayerOptions, MapFeatureLayerOptions, MapGeoServerLayerOptions, MapRasterTileLayerOptions, MapVectorTileLayerOptions, MapWidgetBubbleLayerOptions, MapWidgetHeatMapLayerOptions, MapWidgetLayerOptions, MapWidgetMarkerLayerOptions, MapWidgetOptions, MapWMSLayerLayerOptions, MapWMTSLayerLayerOptions, PryAggregationService, PryGeoAuthService, PryI18nService, SymbolService, TooltipFactoryService } from '@provoly/dashboard';
+import { BaseTooltipComponent, BaseWidgetMapLayerOptions, Class, DataWidgetComponent, Field, GetCapabilitiesResponse, MapAutoLayerOptions, MapFeatureLayerOptions, MapGeoServerLayerOptions, MapRasterTileLayerOptions, MapVectorTileLayerOptions, MapWidgetBubbleLayerOptions, MapWidgetHeatMapLayerOptions, MapWidgetLayerOptions, MapWidgetMarkerLayerOptions, MapWidgetOptions, MapWMSLayerLayerOptions, MapWMTSLayerLayerOptions, PryAggregationService, PryGeoAuthService, PryI18nService, SymbolService, TooltipFactoryService } from '@provoly/dashboard';
 import { Map } from 'ol';
 import { Coordinate } from 'ol/coordinate';
 import { Geometry } from 'ol/geom';
@@ -10,7 +10,7 @@ import VectorLayer from 'ol/layer/Vector';
 import { Pixel } from 'ol/pixel';
 import VectorSource from 'ol/source/Vector';
 import { Style } from 'ol/style';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { InteractionManager } from '../interaction/interaction-manager.class';
 import { WidgetMapLayerService } from './widget-map-layer.service';
 import { LayerSlider } from '../interaction/layer-slider.class';
@@ -120,6 +120,9 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     actionMenuOpen$: BehaviorSubject<boolean>;
     attributions$: Observable<boolean>;
     olZoomElement$: BehaviorSubject<HTMLDivElement | null>;
+    previousLayers: BaseLayer[];
+    previousTooltip?: ComponentRef<BaseTooltipComponent>;
+    previousTooltipSub?: Subscription;
     constructor(store: Store<any>, translateService: PryI18nService, tooltipFactoryService: TooltipFactoryService, symbolService: SymbolService, injector: Injector, widgetMapLayerService: WidgetMapLayerService, pryAggregationService: PryAggregationService, el: ElementRef, geoAuthService: PryGeoAuthService);
     initInteractionManager(): InteractionManager;
     ngAfterViewInit(): void;
@@ -136,9 +139,7 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     fitMapForObjects(selectedIds?: string[], extents?: {
         datasource: string;
         extent: Coordinate[];
-    }[], filters?: {
-        [p: string]: FilterContext[];
-    }): void;
+    }[]): void;
     private getAttributesForDrawing;
     private getIntensityAttribute;
     private getLocationAttribute;
@@ -160,7 +161,7 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     changeUrl($event: Event, layer: MapWMSLayerLayerOptions | MapFeatureLayerOptions | MapVectorTileLayerOptions | MapRasterTileLayerOptions | MapWMTSLayerLayerOptions | MapGeoServerLayerOptions): void;
     changeAttribution($event: Event, layer: BaseWidgetMapLayerOptions): void;
     changeParamLayer($event: Event, layer: MapWMSLayerLayerOptions | MapWMTSLayerLayerOptions): void;
-    changeParamTiled($event: boolean, layer: MapWMSLayerLayerOptions): void;
+    changeParamTiled($event: boolean, layer: MapWMSLayerLayerOptions | MapGeoServerLayerOptions): void;
     changeMatrixSet($event: Event, layer: MapWMTSLayerLayerOptions): void;
     changeParamStyle($event: Event, layer: MapWMTSLayerLayerOptions): void;
     export(): void;
@@ -199,6 +200,7 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     toggleMenu(): void;
     private getOlZoomElement;
     changeSelection(action: 'click' | 'lasso' | 'rectangle' | 'zoom' | 'move' | 'export' | 'upload'): void;
+    private clearLayers;
     static ɵfac: i0.ɵɵFactoryDeclaration<WidgetMapComponent, [null, null, null, null, null, null, null, null, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<WidgetMapComponent, "pry-widget-map", never, {}, {}, never, never, false, never>;
 }

package/widgets/widget-map/i18n/en.translations.d.ts

@@ -72,7 +72,9 @@ export declare const enTranslations: {
                 export: string;
                 legend: string;
                 legendNotProvided: string;
+                layersTitle: string;
                 selectLayers: string;
+                legendsTitle: string;
                 legends: string;
                 singleLayer: string;
                 autoLayer: string;
@@ -87,6 +89,7 @@ export declare const enTranslations: {
                 zoomIn: string;
                 zoomOut: string;
                 slideTitle: string;
+                layerLoadError: string;
             };
         };
     };

package/widgets/widget-map/i18n/fr.translations.d.ts

@@ -70,8 +70,10 @@ export declare const frTranslations: {
                 click: string;
                 zoom: string;
                 export: string;
+                legendsTitle: string;
                 legend: string;
                 legendNotProvided: string;
+                layersTitle: string;
                 selectLayers: string;
                 legends: string;
                 singleLayer: string;
@@ -87,6 +89,7 @@ export declare const frTranslations: {
                 zoomIn: string;
                 zoomOut: string;
                 slideTitle: string;
+                layerLoadError: string;
             };
         };
     };

package/widgets/widget-map/style/_o-layer-legend.scss

@@ -1,21 +1,14 @@
 @use '../../../styles/abstracts/index' as *;
 
-.m-layer-legend {
+.m-map-layer-action {
+  display: flex;
+  gap: toRem(6);
   z-index: 2;
   right: toRem(8);
 
   &.ol-control {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-
     border: none;
-    background: white;
-  }
-
-  button {
-    background-color: #fafafa !important;
-    color: black;
+    background-color: transparent;
   }
 
   .-hidden {
@@ -23,17 +16,45 @@
   }
 
   &__toggle {
-    align-self: flex-end;
+    order: 2;
     width: toRem(30);
     height: toRem(30);
   }
 
+  button {
+    background-color: #fafafa !important;
+    color: #113b6e;
+  }
+
   &__title {
     display: flex;
     flex-direction: row;
     align-items: center;
+    font-size: 12px;
+
+    &:hover {
+      cursor: pointer;
+      background-color: #fafafa !important;
+    }
+  }
+
+  &__container {
+    color: #113b6e;
     background-color: white;
-    justify-content: space-between;
+    border-radius: toRem(2);
+    padding: toRem(5) toRem(8);
+
+    .a-h4 {
+      font-size: 12px;
+    }
+
+    button.m-map-layer-action__toggle {
+      border-radius: 50%;
+
+      &:hover {
+        outline: none;
+      }
+    }
   }
 
   &__image {
@@ -47,53 +68,21 @@
   }
 }
 
-.m-layer-switcher {
-  z-index: 2;
-  right: toRem(8);
-  display: flex;
-  flex-direction: column;
-  align-items: normal;
-
-  &.ol-control {
-    border: none;
-    background: white;
-    align-self: flex-end;
-  }
-
-  button {
-    background-color: #fafafa !important;
-    color: black;
-  }
-
-  .-hidden {
-    display: none;
-  }
-
-  &__toggle {
-    width: toRem(30);
-    height: toRem(30);
-    align-self: flex-end;
-  }
-
+.m-layer-legend {
   &__title {
-    display: flex;
-    flex-direction: row;
-    background-color: white;
-    justify-content: space-between;
-    gap: toRem(10);
-    padding: 5px;
+    align-items: flex-start;
+    gap: toRem(5);
   }
 
-  &__image {
-    background: white;
-    overflow: scroll;
+  &__dropdown-icon {
+    margin-top: toRem(2);
   }
+}
 
-  &__error {
-    font-style: italic;
-    color: #c74646;
+.m-layer-switcher {
+  &__title {
+    align-items: flex-start;
   }
-
 }
 
 .m-map-slide-legend {

package/widgets/widget-map/utils/cql-utils.class.d.ts

@@ -1,6 +1,6 @@
-import { Class, FilterContext } from '@provoly/dashboard';
+import { Class, Field, FilterContext } from '@provoly/dashboard';
 export declare class CqlUtils {
     static getCQLParamsFor(datasourceId: string, filters: {
         [p: string]: FilterContext[];
-    }, classes: Class[]): string | null;
+    }, classes: Class[], fields: Field[]): string | null;
 }

package/widgets/widget-map/utils/widget-map.utils.d.ts

@@ -4,7 +4,9 @@ import { Circle, LineString, Point } from 'ol/geom';
 import { Style } from 'ol/style';
 import { ProjectionLike } from 'ol/proj';
 import Geometry from 'ol/geom/Geometry';
+import { GeoJSON } from 'ol/format';
 export declare class WidgetMapUtils {
+    static geoJSON: GeoJSON;
     static populateLocationAttribute(layer: MapWidgetLayerOptions, resultSet: ResultSet, classesNotFiltered: Class[], fields: Field[]): void;
     static populateIntensityAttribute(layer: MapWidgetLayerOptions, resultSet: ResultSet, classesNotFiltered: Class[], fields: Field[]): void;
     static getFeatureFromItem(projection: ProjectionLike, item: Item, type: string, locationAttribute: Attribute, iconStyle?: Style, selectedIconStyle?: Style): Feature<Geometry>;