@provoly/dashboard 0.12.6 → 0.12.7

package/lib/core/store/data-source/data-source.effects.d.ts

@@ -96,6 +96,7 @@ export declare class DataSourceEffects {
     } & import("@ngrx/store/src/models").TypedAction<"[Dataset] Activate dataset version success">) | ({
         error: any;
     } & import("@ngrx/store/src/models").TypedAction<"[Dataset] Activate dataset version failure">)> & import("@ngrx/effects").CreateEffectMetadata;
+    activateOrDeactivateDatasetVersionSuccess$: import("rxjs").Observable<import("@ngrx/store/src/models").TypedAction<"[Dataset] Get Dataset versions">> & import("@ngrx/effects").CreateEffectMetadata;
     previewsGetById$: import("rxjs").Observable<({
         previews: import("../../model/dataset.interface").DatasetPreview[];
     } & import("@ngrx/store/src/models").TypedAction<"[Dataset/Previews] get by id Success">) | ({

package/lib/dashboard/components/widgets/datasource-selector/datasource-selector.component.d.ts

@@ -0,0 +1,34 @@
+import { ChangeDetectorRef, EventEmitter } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { Dataset } from '../../../../core/model/dataset.interface';
+import { WidgetManifest } from '../../../../core/model/manifest.interface';
+import { DataSource, NamedQuery } from '../../../../core/store/data-source/data-source.model';
+import { SubscriptionnerDirective } from '../../subscriptionner.directive';
+import * as i0 from "@angular/core";
+export declare class DatasourceSelectorComponent extends SubscriptionnerDirective {
+    private store;
+    private cdr;
+    set manifest(manifest: WidgetManifest | null);
+    set datasourceIds(datasourceIds: string[]);
+    cancel: EventEmitter<any>;
+    validated: EventEmitter<any>;
+    previousTab: EventEmitter<any>;
+    nextTab: EventEmitter<any>;
+    datasourcesChanged: EventEmitter<DataSource[]>;
+    manifest$: BehaviorSubject<WidgetManifest | null>;
+    usedDatasourceIds$: BehaviorSubject<string[]>;
+    usedDatasources$: Observable<DataSource[]>;
+    allDataSources$: Observable<DataSource[]>;
+    unusedDatasources$: Observable<any>;
+    search$: BehaviorSubject<string>;
+    idToNameDatasource: {
+        [id: string]: string | undefined;
+    };
+    constructor(store: Store, cdr: ChangeDetectorRef);
+    toogleDataSource(id: string): void;
+    isGeo(ds: NamedQuery | Dataset): boolean;
+    search($event: any): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DatasourceSelectorComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DatasourceSelectorComponent, "pry-datasource-selector", never, { "manifest": { "alias": "manifest"; "required": false; }; "datasourceIds": { "alias": "datasourceIds"; "required": false; }; }, { "cancel": "cancel"; "validated": "validated"; "previousTab": "previousTab"; "nextTab": "nextTab"; "datasourcesChanged": "datasourcesChanged"; }, never, never, false, never>;
+}

package/lib/dashboard/components/widgets/header/widget-header.component.d.ts

@@ -39,6 +39,7 @@ export declare class PryWidgetHeaderComponent extends SubscriptionnerDirective {
     subscription?: Subscription;
     places: WidgetManifest[];
     selectedItem?: Element | null;
+    usedDatasources$: Observable<DataSource[]>;
     set manifest(manifest: WidgetManifest | null);
     additionalOptions: HeaderAction[] | null;
     headerOptions: {
@@ -51,26 +52,14 @@ export declare class PryWidgetHeaderComponent extends SubscriptionnerDirective {
     }>;
     isEdit: boolean;
     catalogInfo: Widget;
-    get title(): string | undefined;
-    get manifest(): WidgetManifest | null;
-    set datasourceIds$(datasourceIds$: Observable<string[]>);
+    set datasourceIds(datasourceIds: string[]);
     set widgetIndex(widgetIndex: number);
-    search$: BehaviorSubject<string>;
     lockedView$: Observable<boolean>;
     targetIndexes$: Observable<number[]>;
-    usedDatasources$: Observable<DataSource[]>;
-    allDataSources$: Observable<DataSource[]>;
-    usedNameQueryIds: string[];
-    choiceUsed: {
-        [is: string]: boolean;
-    };
     _widgetIndex$: BehaviorSubject<number>;
     _widgetIndex: number;
     open: boolean;
-    selectedDataSource: string[];
-    idToNameDatasource: {
-        [id: string]: string;
-    };
+    selectedDataSourceIds$: BehaviorSubject<string[]>;
     windowManifest: DashboardManifest | null;
     private windowManifest$;
     private menuRef?;
@@ -86,7 +75,6 @@ export declare class PryWidgetHeaderComponent extends SubscriptionnerDirective {
     get currentLayout(): DashboardGridLayout;
     get hasGrid(): boolean;
     get currentPlacementIndex(): number;
-    toogleDataSource(id: string): void;
     menuOpen($event?: MouseEvent, forceOpen?: boolean): void;
     toggleCombo(): void;
     moveInNewWindow(widgetIndex: number, targetIndex: number): void;
@@ -110,6 +98,7 @@ export declare class PryWidgetHeaderComponent extends SubscriptionnerDirective {
     focusValidation(): void;
     focusInputCatalog(): void;
     disableValidation(): void;
+    datasourcesChanged($event: DataSource[]): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<PryWidgetHeaderComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<PryWidgetHeaderComponent, "pry-widget-header", never, { "manifest": { "alias": "manifest"; "required": false; }; "additionalOptions": { "alias": "additionalOptions"; "required": false; }; "headerOptions": { "alias": "headerOptions"; "required": false; }; "displayCount": { "alias": "displayCount"; "required": false; }; "datasourceIds$": { "alias": "datasourceIds$"; "required": false; }; "widgetIndex": { "alias": "widgetIndex"; "required": false; }; }, { "manifestModified": "manifestModified"; }, never, ["*"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<PryWidgetHeaderComponent, "pry-widget-header", never, { "manifest": { "alias": "manifest"; "required": false; }; "additionalOptions": { "alias": "additionalOptions"; "required": false; }; "headerOptions": { "alias": "headerOptions"; "required": false; }; "displayCount": { "alias": "displayCount"; "required": false; }; "datasourceIds": { "alias": "datasourceIds"; "required": false; }; "widgetIndex": { "alias": "widgetIndex"; "required": false; }; }, { "manifestModified": "manifestModified"; }, never, ["*"], false, never>;
 }

package/lib/dashboard/components/widgets/public-api.d.ts

@@ -1,6 +1,7 @@
 export * from './base-widget.component';
 export * from './data-widget.component';
 export * from './header/widget-header.component';
+export * from './datasource-selector/datasource-selector.component';
 export * from './header/resultset-size.pipe';
 export * from './widget-instanciator/widget-factory.service';
 export * from './widget-instanciator/widget-instanciator.component';

package/lib/dashboard/dashboard.module.d.ts

@@ -21,19 +21,20 @@ import * as i14 from "./tooltip/components/default/default.tooltip.component";
 import * as i15 from "./tooltip/base-tooltip.component";
 import * as i16 from "./filter/base-filter.component";
 import * as i17 from "./filter/components/filter-instanciator/filter-instanciator.component";
-import * as i18 from "@angular/common";
-import * as i19 from "@angular/forms";
-import * as i20 from "../core/components/select/select.module";
-import * as i21 from "../core/components/icon/icon.module";
-import * as i22 from "@angular/cdk/overlay";
-import * as i23 from "../core/core.module";
-import * as i24 from "@provoly/dashboard/components/checkbox";
-import * as i25 from "../core/components/toggle/toggle.module";
-import * as i26 from "../core/components/overlay/overlay.module";
-import * as i27 from "@ngrx/store";
-import * as i28 from "@ngrx/effects";
-import * as i29 from "../core/components/date-picker/date-picker.module";
-import * as i30 from "../core/i18n/i18n.module";
+import * as i18 from "./components/widgets/datasource-selector/datasource-selector.component";
+import * as i19 from "@angular/common";
+import * as i20 from "@angular/forms";
+import * as i21 from "../core/components/select/select.module";
+import * as i22 from "../core/components/icon/icon.module";
+import * as i23 from "@angular/cdk/overlay";
+import * as i24 from "../core/core.module";
+import * as i25 from "@provoly/dashboard/components/checkbox";
+import * as i26 from "../core/components/toggle/toggle.module";
+import * as i27 from "../core/components/overlay/overlay.module";
+import * as i28 from "@ngrx/store";
+import * as i29 from "@ngrx/effects";
+import * as i30 from "../core/components/date-picker/date-picker.module";
+import * as i31 from "../core/i18n/i18n.module";
 export declare class PryDashboardModule {
     static forRoot(widgetReference: {
         [key: string]: WidgetDefinition;
@@ -54,6 +55,6 @@ export declare class PryDashboardModule {
         image?: string;
     }[]): ModuleWithProviders<PryDashboardModule>;
     static ɵfac: i0.ɵɵFactoryDeclaration<PryDashboardModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<PryDashboardModule, [typeof i1.DashboardComponent, typeof i2.WidgetInstanciatorComponent, typeof i3.WidgetPlaceholderComponent, typeof i4.SettingsComponent, typeof i5.ManifestsComponent, typeof i6.MetadataComponent, typeof i7.ContextMenuComponent, typeof i8.DataWidgetComponent, typeof i9.BaseWidgetComponent, typeof i10.PryWidgetHeaderComponent, typeof i11.PryObjectEditionComponent, typeof i12.VizualizeRawComponent, typeof i13.ResultSetSizePipe, typeof i14.DefaultTooltipComponent, typeof i15.BaseTooltipComponent, typeof i16.BaseFilterComponent, typeof i17.FilterInstanciatorComponent], [typeof i18.CommonModule, typeof i19.FormsModule, typeof i20.PrySelectModule, typeof i21.PryIconModule, typeof i22.OverlayModule, typeof i23.PryCoreModule, typeof i24.PryCheckboxModule, typeof i25.PryToggleModule, typeof i26.PryOverlayModule, typeof i27.StoreFeatureModule, typeof i28.EffectsFeatureModule, typeof i29.PryDatePickerModule, typeof i30.PryI18nModule], [typeof i1.DashboardComponent, typeof i2.WidgetInstanciatorComponent, typeof i3.WidgetPlaceholderComponent, typeof i4.SettingsComponent, typeof i5.ManifestsComponent, typeof i6.MetadataComponent, typeof i7.ContextMenuComponent, typeof i8.DataWidgetComponent, typeof i9.BaseWidgetComponent, typeof i10.PryWidgetHeaderComponent, typeof i11.PryObjectEditionComponent, typeof i12.VizualizeRawComponent, typeof i13.ResultSetSizePipe, typeof i14.DefaultTooltipComponent, typeof i15.BaseTooltipComponent, typeof i16.BaseFilterComponent, typeof i17.FilterInstanciatorComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<PryDashboardModule, [typeof i1.DashboardComponent, typeof i2.WidgetInstanciatorComponent, typeof i3.WidgetPlaceholderComponent, typeof i4.SettingsComponent, typeof i5.ManifestsComponent, typeof i6.MetadataComponent, typeof i7.ContextMenuComponent, typeof i8.DataWidgetComponent, typeof i9.BaseWidgetComponent, typeof i10.PryWidgetHeaderComponent, typeof i11.PryObjectEditionComponent, typeof i12.VizualizeRawComponent, typeof i13.ResultSetSizePipe, typeof i14.DefaultTooltipComponent, typeof i15.BaseTooltipComponent, typeof i16.BaseFilterComponent, typeof i17.FilterInstanciatorComponent, typeof i18.DatasourceSelectorComponent], [typeof i19.CommonModule, typeof i20.FormsModule, typeof i21.PrySelectModule, typeof i22.PryIconModule, typeof i23.OverlayModule, typeof i24.PryCoreModule, typeof i25.PryCheckboxModule, typeof i26.PryToggleModule, typeof i27.PryOverlayModule, typeof i28.StoreFeatureModule, typeof i29.EffectsFeatureModule, typeof i30.PryDatePickerModule, typeof i31.PryI18nModule], [typeof i1.DashboardComponent, typeof i2.WidgetInstanciatorComponent, typeof i3.WidgetPlaceholderComponent, typeof i4.SettingsComponent, typeof i5.ManifestsComponent, typeof i6.MetadataComponent, typeof i7.ContextMenuComponent, typeof i8.DataWidgetComponent, typeof i9.BaseWidgetComponent, typeof i10.PryWidgetHeaderComponent, typeof i11.PryObjectEditionComponent, typeof i12.VizualizeRawComponent, typeof i13.ResultSetSizePipe, typeof i14.DefaultTooltipComponent, typeof i15.BaseTooltipComponent, typeof i16.BaseFilterComponent, typeof i17.FilterInstanciatorComponent, typeof i18.DatasourceSelectorComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<PryDashboardModule>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@provoly/dashboard",
-  "version": "0.12.6",
+  "version": "0.12.7",
   "type": "commonjs",
   "peerDependencies": {
     "@angular/common": "15.x || 16.x",

package/restitution/components/restitution/restitution.component.d.ts

@@ -1,16 +1,14 @@
 import { EventEmitter, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { CatalogEntry, Class, Dataset, DataSource, LibraryTypes, NamedQuery, PryVisibility, SubscriptionnerDirective, ToolboxManifestService, ToolboxMenuService, Widget, WidgetManifest } from '@provoly/dashboard';
+import { CatalogEntry, Class, DataSource, LibraryTypes, PryVisibility, SubscriptionnerDirective, ToolboxManifestService, ToolboxMenuService, Widget, WidgetManifest } from '@provoly/dashboard';
 import { PryStepperComponent } from '@provoly/dashboard/components/stepper';
-import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import { RestitutionForm } from '../../model/restitution.model';
 import * as i0 from "@angular/core";
 export declare class PryRestitutionComponent extends SubscriptionnerDirective implements OnInit {
     private toolboxManifestService;
     private store;
     private toolboxMenuService;
-    search$: BehaviorSubject<string>;
-    filteredDataSource$?: Observable<DataSource[]>;
     types$: Observable<{
         icon: string;
         label: string;
@@ -30,14 +28,11 @@ export declare class PryRestitutionComponent extends SubscriptionnerDirective im
     type: LibraryTypes;
     isDataSourceSelected: boolean;
     bindId: any;
-    idToNameDatasource: {
-        [id: string]: string;
-    };
     image: string;
     constructor(toolboxManifestService: ToolboxManifestService, store: Store, toolboxMenuService: ToolboxMenuService);
     ngOnInit(): void;
     cancel(stepper: PryStepperComponent): void;
-    toggleDatasource(id: string): void;
+    datasourcesChanged($event: DataSource[]): void;
     submit(stepper: PryStepperComponent): void;
     isSubmitDisabled(): boolean;
     noDataSourceSelected(): boolean;
@@ -48,7 +43,6 @@ export declare class PryRestitutionComponent extends SubscriptionnerDirective im
         manifest: WidgetManifest;
     }): void;
     lastStepCompleted(): void;
-    isGeo(ds: NamedQuery | Dataset): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<PryRestitutionComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<PryRestitutionComponent, "pry-restitution", never, { "selectedRestitution": { "alias": "selectedRestitution"; "required": false; }; "edit": { "alias": "edit"; "required": false; }; "isDataSourceSelected": { "alias": "isDataSourceSelected"; "required": false; }; "bindId": { "alias": "bindId"; "required": false; }; }, { "restitutionCreated": "restitutionCreated"; }, never, never, false, never>;
 }

package/restitution/style/_o-restitution.scss

@@ -22,10 +22,6 @@
     margin-bottom: toRem(0);
   }
 
-  h4 {
-    margin-top: 2rem;
-  }
-
   label {
     border-radius: 10%;
   }

package/schematics/ng-add/index.spec.js

@@ -23,7 +23,6 @@ describe(schematicName, () => {
     it('should add main dependencies', () => __awaiter(void 0, void 0, void 0, function* () {
         yield runner.runSchematic(schematicName, { widgets: [], pipeline: false, projectName: 'test-project' }, tree);
         const packageJson = JSON.parse((0, file_contents_function_1.getFileContent)(tree, '/package.json'));
-        expect(packageJson.dependencies['@provoly/dashboard']).toBe(packageJson.version);
         expect(packageJson.dependencies['uuid']).toBe('^9.0.0');
         expect(packageJson.devDependencies['@types/uuid']).toBe('^9.0.0');
         expect(packageJson.dependencies['ol']).toBe(undefined);
@@ -32,7 +31,6 @@ describe(schematicName, () => {
     it('should add specific dependencies', () => __awaiter(void 0, void 0, void 0, function* () {
         yield runner.runSchematic(schematicName, { widgets: ['widget-map'], pipeline: false, projectName: 'test-project' }, tree);
         const packageJson = JSON.parse((0, file_contents_function_1.getFileContent)(tree, '/package.json'));
-        expect(packageJson.dependencies['@provoly/dashboard']).toBe(packageJson.version);
         expect(packageJson.dependencies['uuid']).toBe('^9.0.0');
         expect(packageJson.devDependencies['@types/uuid']).toBe('^9.0.0');
         expect(packageJson.dependencies['ol']).toBe('^7.0.0');

package/schematics/ng-add/index.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../../../../projects/provoly/dashboard/schematics/ng-add/index.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../../../../projects/provoly/dashboard/schematics/ng-add/index.spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAuF;AACvF,6BAA6B;AAC7B,4EAAiE;AAIjE,MAAM,aAAa,GAAG,QAAQ,CAAC;AAC/B,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACjG,IAAI,IAAkB,CAAC;IAEvB,UAAU,CAAC,GAAS,EAAE;QACpB,IAAI,GAAG,MAAM,MAAM,CAAC,oBAAoB,CACtC,qBAAqB,EACrB,QAAQ,EACR,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,EAC1D,IAAI,sBAAY,CAAC,iBAAI,CAAC,KAAK,EAAE,CAAC,CAC/B,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAS,EAAE;QAC5C,MAAM,MAAM,CAAC,YAAY,CACvB,aAAa,EACb,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,cAAc,EAAyB,EACpF,IAAI,CACL,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,uCAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAgB,CAAC;QAErF,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/E,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAS,EAAE;QAChD,MAAM,MAAM,CAAC,YAAY,CACvB,aAAa,EACb,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,cAAc,EAAyB,EAChG,IAAI,CACL,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,uCAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAgB,CAAC;QAErF,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEtD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/E,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/styles/components/_o-datasources.scss

@@ -13,71 +13,32 @@
 .o-datasources {
   &__list {
     @extend %list-unstyled;
-    gap: toRem(25) toRem(30);
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(toRem(150), 1fr));
+    gap: toRem(15) toRem(30);
+    display: flex;
+    flex-wrap: wrap;
     margin: toRem(10) 0;
+  }
 
-    &--selected {
-      display: flex;
-      flex-wrap: wrap;
-      gap: toRem(15);
-      margin-bottom: toRem(40);
-
-      .a-btn--icon-text {
-        @include outlineOnFocus();
-        gap: toRem(11) toRem(15);
-        padding-left: toRem(15);
-        padding-right: toRem(15);
+  &__main {
+    flex: 1 1;
+    overflow: overlay;
+  }
 
-        pry-icon {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: toRem(25);
-          height: toRem(25);
-        }
-      }
-    }
+  &__bottom {
+    padding: toRem(5);
   }
 
   &__card,
   .o-pry-card {
+    border-radius: toRem(15);
+    padding: toRem(5) toRem(10);
     display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    gap: toRem(10);
-    height: 100%;
-    min-height: toRem(100);
-    padding: toRem(18) toRem(13) toRem(15) toRem(13);
-    cursor: pointer;
-
-    &__name {
-      display: flex;
-      flex-direction: row;
-      align-items: flex-start;
-      gap: toRem(4);
+    flex-direction: row;
+    align-items: center;
+    gap: 5px;
 
-      .a-p {
-        width: 100%;
-        margin-bottom: 0;
-        overflow-wrap: break-word;
-        transform: translateY(toRem(-1));
-      }
+    p {
+      margin-bottom: 0;
     }
-
-    /*.a-checkbox__checkmark{
-      width: 1.5rem;
-      height: 1.5rem;
-      border-radius: 0.75rem;
-
-      &:before{
-        left: 0.45rem;
-        top: 0.15rem;
-        width: 0.35rem;
-        height: 0.75rem;
-        border-width: 0 0.125rem 0.125rem 0;
-      }
-    }*/
   }
 }

package/styles/components/_o-widget.scss

@@ -118,41 +118,12 @@
   }
 
   // Resultset displayed in popup/panel
-  &__choose-resultset {
+  &__choose-resultset, .active-step {
     @extend %overlay-panel-fixed-right;
     width: toRem(560);
     padding: 0 0 toRem(10) 0;
-
-    .m-namedqueries-wrapper {
-      overflow: auto;
-      overflow-x: hidden;
-      height: auto;
-      padding: toRem(30) toRem(20) 0 toRem(20);
-
-      .o-widget__search {
-        margin-bottom: toRem(20);
-      }
-
-      .m-namedqueries {
-        @extend %list-unstyled;
-
-        &__item {
-          display: flex;
-          flex-direction: row;
-          justify-content: space-between;
-          align-items: center;
-          margin-bottom: toRem(15);
-
-          .a-checkbox {
-            margin-bottom: 0;
-          }
-
-          .a-checkbox__text {
-            padding-right: toRem(10);
-          }
-        }
-      }
-    }
+    top: toRem(12);
+    height: calc(100% - 24px);
 
     .m-btn-group {
       min-height: 65px;
@@ -206,3 +177,40 @@
     margin-top: toRem(12);
   }
 }
+
+.m-namedqueries-wrapper {
+  overflow: auto;
+  overflow-x: hidden;
+  padding: toRem(30) toRem(20) 0 toRem(20);
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+
+  .o-widget__search {
+    margin-bottom: toRem(20);
+  }
+
+  .m-namedqueries {
+    @extend %list-unstyled;
+
+    &__item {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: toRem(15);
+
+      .a-checkbox {
+        margin-bottom: 0;
+      }
+
+      .a-checkbox__text {
+        padding-right: toRem(10);
+      }
+    }
+  }
+}
+
+pry-datasource-selector {
+  height: 100%;
+}

package/styles-theme/components-theme/_o-datasources.theme.scss

@@ -28,11 +28,14 @@
   .o-pry-card {
     @extend %card-with-hover;
 
-    .a-p {
-      color: themed($theme-map, 'color', 'primary', 600);
-      font-size: toRem(14);
-      line-height: toRem(18);
-      font-weight: 700;
+    &.-selected {
+      color: themed($theme-map, 'color', 'accent', 'contrast', 600);
+      background-color: themed($theme-map, 'color', 'accent', 600);
+
+      .a-btn.a-btn--primary {
+        color: themed($theme-map, 'color', 'accent', 600);
+        background-color: themed($theme-map, 'color', 'accent', 'contrast', 600);
+      }
     }
   }
 }

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

@@ -2,7 +2,7 @@ import { Overlay as cdkOverlay } from '@angular/cdk/overlay';
 import { AfterViewInit, ComponentRef, ElementRef, Injector, TemplateRef, ViewContainerRef } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BaseTooltipComponent, BaseWidgetMapLayerOptions, Class, DataWidgetComponent, Field, GeocodingService, MapFeatureLayerOptions, MapGeoServerLayerOptions, MapRasterTileLayerOptions, MapVectorTileLayerOptions, MapWidgetBubbleLayerOptions, MapWidgetHeatMapLayerOptions, MapWidgetLayerOptions, MapWidgetMarkerLayerOptions, MapWidgetOptions, MapWMSLayerLayerOptions, MapWMTSLayerLayerOptions, PryI18nService, PrySnackbarService, SymbolService, TooltipFactoryService } from '@provoly/dashboard';
-import { Map } from 'ol';
+import { Map, MapBrowserEvent, Overlay } from 'ol';
 import LayerSwitcher from 'ol-layerswitcher';
 import { Geometry } from 'ol/geom';
 import BaseLayer from 'ol/layer/Base';
@@ -78,6 +78,9 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
         } | undefined;
         center?: number[] | undefined;
     }>;
+    interactionPopupOverlay?: Overlay;
+    interactionPopupListener?: (event: MapBrowserEvent<MouseEvent>) => void;
+    interactionPopupMode?: 'singleclick' | 'pointermove';
     constructor(store: Store<any>, snackBar: PrySnackbarService, translateService: PryI18nService, tooltipFactoryService: TooltipFactoryService, geocodingService: GeocodingService, overlay: cdkOverlay, viewContainerRef: ViewContainerRef, symbolService: SymbolService, injector: Injector, widgetMapLayerService: WidgetMapLayerService, el: ElementRef);
     ngAfterViewInit(): void;
     initResultSet$(): Observable<import("@provoly/dashboard").ResultSet>;
@@ -88,7 +91,7 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     }): Promise<ComponentRef<BaseTooltipComponent> | null>;
     setDefaultLayerTitle(layer: MapWidgetLayerOptions, idx: number): void;
     fitMapForObjects(options: MapWidgetOptions, selectedIds?: string[]): void;
-    private addOverlayOnHoverInteraction;
+    private addOverlayOnInteraction;
     private addContextMenuInteraction;
     private getAttributesForDrawing;
     private getIntensityAttribute;