@provoly/dashboard 0.23.0 → 0.23.2

package/lib/core/components/chips-selector/chips-selector.component.d.ts

@@ -11,6 +11,7 @@ export declare class ChipsSelectorComponent extends SubscriptionnerDirective {
     translationStringBase: string;
     itemTranslationStringBase: string;
     showActionButtons: boolean;
+    showSearchbar: boolean;
     set items(items: any[]);
     set usedItems(items: any[]);
     cancel: EventEmitter<any>;
@@ -34,5 +35,5 @@ export declare class ChipsSelectorComponent extends SubscriptionnerDirective {
     areItemsEqual(item1: any, item2: any): boolean;
     isItemUsed(item: any, usedItems?: any[]): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<ChipsSelectorComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ChipsSelectorComponent, "pry-chips-selector", never, { "bindValue": { "alias": "bindValue"; "required": false; }; "bindLabel": { "alias": "bindLabel"; "required": false; }; "translationStringBase": { "alias": "translationStringBase"; "required": false; }; "itemTranslationStringBase": { "alias": "itemTranslationStringBase"; "required": false; }; "showActionButtons": { "alias": "showActionButtons"; "required": false; }; "items": { "alias": "items"; "required": false; }; "usedItems": { "alias": "usedItems"; "required": false; }; }, { "cancel": "cancel"; "validated": "validated"; "previousTab": "previousTab"; "nextTab": "nextTab"; "itemsChanged": "itemsChanged"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ChipsSelectorComponent, "pry-chips-selector", never, { "bindValue": { "alias": "bindValue"; "required": false; }; "bindLabel": { "alias": "bindLabel"; "required": false; }; "translationStringBase": { "alias": "translationStringBase"; "required": false; }; "itemTranslationStringBase": { "alias": "itemTranslationStringBase"; "required": false; }; "showActionButtons": { "alias": "showActionButtons"; "required": false; }; "showSearchbar": { "alias": "showSearchbar"; "required": false; }; "items": { "alias": "items"; "required": false; }; "usedItems": { "alias": "usedItems"; "required": false; }; }, { "cancel": "cancel"; "validated": "validated"; "previousTab": "previousTab"; "nextTab": "nextTab"; "itemsChanged": "itemsChanged"; }, never, never, false, never>;
 }

package/lib/core/components/share/group-share/group-share.component.d.ts

@@ -20,6 +20,10 @@ export declare class PryGroupShareComponent extends SubscriptionnerDirective imp
         label: string;
         value: PryVisibilityType;
     }[];
+    templateData$: Observable<{
+        groups: Group[];
+        assignedGroups: Group[];
+    }>;
     constructor(store: Store, _cd: ChangeDetectorRef);
     writeValue(value: string[] | undefined): void;
     registerOnChange(fn: any): void;

package/lib/core/components/share/share.model.d.ts

@@ -8,6 +8,12 @@ export interface Group {
     name: string;
     system: boolean;
 }
+export interface ConflictGroupsByEntity {
+    [key: string]: string[];
+}
+export interface ShareConflict {
+    conflictGroupsByEntity: ConflictGroupsByEntity;
+}
 export interface PryVisibility {
     type: PryVisibilityType;
     users?: any[];

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

@@ -1,4 +1,4 @@
-import { PryVisibility } from '../../components/share/share.model';
+import { ConflictGroupsByEntity, PryVisibility } from '../../components/share/share.model';
 import { DatasetPreview } from '../../model/dataset.interface';
 import { MonoClassSearchPayload } from '../../model/search-mono-class.model';
 import { FullTextSearchPayload, MultiClassSearchPayload } from '../../model/search-multi-class.model';
@@ -115,11 +115,16 @@ export declare const DataSourceActions: {
         } & import("@ngrx/store/src/models").TypedAction<"[Dataset] Datadef is created call to admin">>;
         update: import("@ngrx/store").ActionCreator<"[Dataset] update Dataset", (props: {
             dataset: Dataset;
-            route: string;
+            route?: string | undefined;
         }) => {
             dataset: Dataset;
-            route: string;
+            route?: string | undefined;
         } & import("@ngrx/store/src/models").TypedAction<"[Dataset] update Dataset">>;
+        setConflictGroups: import("@ngrx/store").ActionCreator<"[Dataset] set conflict groups", (props: {
+            conflictGroups?: ConflictGroupsByEntity | undefined;
+        }) => {
+            conflictGroups?: ConflictGroupsByEntity | undefined;
+        } & import("@ngrx/store/src/models").TypedAction<"[Dataset] set conflict groups">>;
         updated: import("@ngrx/store").ActionCreator<"[Dataset] Dataset is updated call to admin", (props: {
             path: string;
             params?: {

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

@@ -59,14 +59,9 @@ export declare class DataSourceEffects {
             [p: string]: string;
         } | undefined;
     } & import("@ngrx/store/src/models").TypedAction<"[Dataset] Datadef is created call to admin">)> & import("@ngrx/effects").CreateEffectMetadata;
-    updateDataset$: import("rxjs").Observable<import("@ngrx/store/src/models").TypedAction<"[Dataset] load datasets"> | import("@ngrx/store/src/models").TypedAction<"[Dataset] unselect Dataset"> | ({
-        error: any;
-    } & import("@ngrx/store/src/models").TypedAction<"[Dataset] failure effect Dataset">) | ({
-        path: string;
-        params?: {
-            [p: string]: string;
-        } | undefined;
-    } & import("@ngrx/store/src/models").TypedAction<"[Dataset] Dataset is updated call to admin">)> & import("@ngrx/effects").CreateEffectMetadata;
+    unsetConflictGroupsOnDatasetSelection$: import("rxjs").Observable<{
+        conflictGroups?: import("@provoly/dashboard").ConflictGroupsByEntity | undefined;
+    } & import("@ngrx/store/src/models").TypedAction<"[Dataset] set conflict groups">> & import("@ngrx/effects").CreateEffectMetadata;
     deleteDataset$: import("rxjs").Observable<import("@ngrx/store/src/models").TypedAction<"[Dataset] load datasets"> | import("@ngrx/store/src/models").TypedAction<"[Dataset] unselect Dataset"> | ({
         error: any;
     } & import("@ngrx/store/src/models").TypedAction<"[Dataset] failure effect Dataset">) | ({

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

@@ -24,6 +24,8 @@ export interface Dataset extends DescriptionQuery {
     id: string;
     oClass: string;
     type: PryDatasetType;
+    owner?: boolean;
+    groups?: string[];
 }
 export interface DatasetVersion {
     id: string;

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

@@ -1,5 +1,6 @@
 import { DatasetPreview } from '../../model/dataset.interface';
 import { Dataset, DatasetVersion, NamedQuery } from './data-source.model';
+import { ConflictGroupsByEntity } from '../../components/share/share.model';
 export declare const dataSourceFeatureKey = "@pry/datasources";
 export interface DataSourceState {
     isLoading: boolean;
@@ -16,6 +17,7 @@ export interface DataSourceState {
     datasetVersions: DatasetVersion[];
     selectedDatasetVersion: DatasetVersion | null;
     previews: DatasetPreview[];
+    conflictGroups?: ConflictGroupsByEntity;
 }
 export declare const initialDataSourceState: DataSourceState;
 export declare const dataSourceReducer: import("@ngrx/store").ActionReducer<DataSourceState, import("@ngrx/store").Action>;

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

@@ -24,6 +24,7 @@ export declare const DataSourceSelectors: {
     getDataSourcesSorted: MemoizedSelector<object, DataSource[], (s1: import("./data-source.model").NamedQuery[], s2: import("./data-source.model").Dataset[]) => DataSource[]>;
     selectedDataset: MemoizedSelector<object, import("./data-source.model").Dataset | null, (s1: DataSourceState) => import("./data-source.model").Dataset | null>;
     selectedDatasetMetadata: MemoizedSelector<object, import("@provoly/dashboard").MetadataValue[], (s1: DataSourceState) => import("@provoly/dashboard").MetadataValue[]>;
+    selectedDatasetConflictGroups: MemoizedSelector<object, import("@provoly/dashboard").ConflictGroupsByEntity | undefined, (s1: DataSourceState) => import("@provoly/dashboard").ConflictGroupsByEntity | undefined>;
     datasetVersions: MemoizedSelector<object, DatasetVersion[], (s1: DataSourceState) => DatasetVersion[]>;
     selectedDatasetId: MemoizedSelector<object, string | undefined, (s1: DataSourceState) => string | undefined>;
     matchingDatasetVersions: (datasetId: string) => MemoizedSelector<any, DatasetVersion[], import("@ngrx/store").DefaultProjectorFn<DatasetVersion[]>>;

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

@@ -7,6 +7,7 @@ import { DatasetPreview } from '../../model/dataset.interface';
 import { ConfigState } from '../config/config.reducer';
 import { Dataset, DatasetVersion, NamedQuery } from './data-source.model';
 import { DataSourceState } from './data-source.reducer';
+import { ShareConflict } from '../../components/share/share.model';
 import * as i0 from "@angular/core";
 export interface ResponseRequest {
     data: {
@@ -25,7 +26,7 @@ export declare class DataSourceService {
     deleteFavorite(id: string): Observable<ResponseRequest>;
     getDatasets(): Observable<Dataset[]>;
     addDataset(dataset: Dataset): Observable<void>;
-    updateDataset(dataset: Dataset): Observable<void>;
+    updateDataset(dataset: Dataset): Observable<undefined | ShareConflict>;
     deleteDataset(id: string): Observable<void>;
     getDatasetById(id: string): Observable<Dataset>;
     getDatasetMetadata(id: string): Observable<MetadataValue[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@provoly/dashboard",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "type": "commonjs",
   "peerDependencies": {
     "@angular/cdk": "16.x || 17.x",
@@ -96,18 +96,18 @@
       "esm": "./esm2022/import/provoly-dashboard-import.mjs",
       "default": "./fesm2022/provoly-dashboard-import.mjs"
     },
-    "./notification": {
-      "types": "./notification/index.d.ts",
-      "esm2022": "./esm2022/notification/provoly-dashboard-notification.mjs",
-      "esm": "./esm2022/notification/provoly-dashboard-notification.mjs",
-      "default": "./fesm2022/provoly-dashboard-notification.mjs"
-    },
     "./pipeline": {
       "types": "./pipeline/index.d.ts",
       "esm2022": "./esm2022/pipeline/provoly-dashboard-pipeline.mjs",
       "esm": "./esm2022/pipeline/provoly-dashboard-pipeline.mjs",
       "default": "./fesm2022/provoly-dashboard-pipeline.mjs"
     },
+    "./notification": {
+      "types": "./notification/index.d.ts",
+      "esm2022": "./esm2022/notification/provoly-dashboard-notification.mjs",
+      "esm": "./esm2022/notification/provoly-dashboard-notification.mjs",
+      "default": "./fesm2022/provoly-dashboard-notification.mjs"
+    },
     "./presentation": {
       "types": "./presentation/index.d.ts",
       "esm2022": "./esm2022/presentation/provoly-dashboard-presentation.mjs",
@@ -132,36 +132,6 @@
       "esm": "./esm2022/toolbox/provoly-dashboard-toolbox.mjs",
       "default": "./fesm2022/provoly-dashboard-toolbox.mjs"
     },
-    "./filters/autocomplete": {
-      "types": "./filters/autocomplete/index.d.ts",
-      "esm2022": "./esm2022/filters/autocomplete/provoly-dashboard-filters-autocomplete.mjs",
-      "esm": "./esm2022/filters/autocomplete/provoly-dashboard-filters-autocomplete.mjs",
-      "default": "./fesm2022/provoly-dashboard-filters-autocomplete.mjs"
-    },
-    "./filters/date": {
-      "types": "./filters/date/index.d.ts",
-      "esm2022": "./esm2022/filters/date/provoly-dashboard-filters-date.mjs",
-      "esm": "./esm2022/filters/date/provoly-dashboard-filters-date.mjs",
-      "default": "./fesm2022/provoly-dashboard-filters-date.mjs"
-    },
-    "./filters/list": {
-      "types": "./filters/list/index.d.ts",
-      "esm2022": "./esm2022/filters/list/provoly-dashboard-filters-list.mjs",
-      "esm": "./esm2022/filters/list/provoly-dashboard-filters-list.mjs",
-      "default": "./fesm2022/provoly-dashboard-filters-list.mjs"
-    },
-    "./filters/number": {
-      "types": "./filters/number/index.d.ts",
-      "esm2022": "./esm2022/filters/number/provoly-dashboard-filters-number.mjs",
-      "esm": "./esm2022/filters/number/provoly-dashboard-filters-number.mjs",
-      "default": "./fesm2022/provoly-dashboard-filters-number.mjs"
-    },
-    "./filters/text": {
-      "types": "./filters/text/index.d.ts",
-      "esm2022": "./esm2022/filters/text/provoly-dashboard-filters-text.mjs",
-      "esm": "./esm2022/filters/text/provoly-dashboard-filters-text.mjs",
-      "default": "./fesm2022/provoly-dashboard-filters-text.mjs"
-    },
     "./components/card": {
       "types": "./components/card/index.d.ts",
       "esm2022": "./esm2022/components/card/provoly-dashboard-components-card.mjs",
@@ -216,6 +186,36 @@
       "esm": "./esm2022/components/stepper/provoly-dashboard-components-stepper.mjs",
       "default": "./fesm2022/provoly-dashboard-components-stepper.mjs"
     },
+    "./filters/autocomplete": {
+      "types": "./filters/autocomplete/index.d.ts",
+      "esm2022": "./esm2022/filters/autocomplete/provoly-dashboard-filters-autocomplete.mjs",
+      "esm": "./esm2022/filters/autocomplete/provoly-dashboard-filters-autocomplete.mjs",
+      "default": "./fesm2022/provoly-dashboard-filters-autocomplete.mjs"
+    },
+    "./filters/date": {
+      "types": "./filters/date/index.d.ts",
+      "esm2022": "./esm2022/filters/date/provoly-dashboard-filters-date.mjs",
+      "esm": "./esm2022/filters/date/provoly-dashboard-filters-date.mjs",
+      "default": "./fesm2022/provoly-dashboard-filters-date.mjs"
+    },
+    "./filters/list": {
+      "types": "./filters/list/index.d.ts",
+      "esm2022": "./esm2022/filters/list/provoly-dashboard-filters-list.mjs",
+      "esm": "./esm2022/filters/list/provoly-dashboard-filters-list.mjs",
+      "default": "./fesm2022/provoly-dashboard-filters-list.mjs"
+    },
+    "./filters/number": {
+      "types": "./filters/number/index.d.ts",
+      "esm2022": "./esm2022/filters/number/provoly-dashboard-filters-number.mjs",
+      "esm": "./esm2022/filters/number/provoly-dashboard-filters-number.mjs",
+      "default": "./fesm2022/provoly-dashboard-filters-number.mjs"
+    },
+    "./filters/text": {
+      "types": "./filters/text/index.d.ts",
+      "esm2022": "./esm2022/filters/text/provoly-dashboard-filters-text.mjs",
+      "esm": "./esm2022/filters/text/provoly-dashboard-filters-text.mjs",
+      "default": "./fesm2022/provoly-dashboard-filters-text.mjs"
+    },
     "./pipeline-components/filter": {
       "types": "./pipeline-components/filter/index.d.ts",
       "esm2022": "./esm2022/pipeline-components/filter/provoly-dashboard-pipeline-components-filter.mjs",

package/styles/components/_o-chips-selector.scss

@@ -11,12 +11,15 @@
 }
 
 .o-chips-selector {
+  display: flex;
+  flex-direction: column;
+  gap: toRem(15);
+
   &__list {
     @extend %list-unstyled;
     gap: toRem(15) toRem(30);
     display: flex;
     flex-wrap: wrap;
-    margin: toRem(10) 0;
   }
 
   &__main {
@@ -40,4 +43,12 @@
       margin-bottom: 0;
     }
   }
+
+  .a-h4 {
+    margin-bottom: 0;
+  }
+
+  .-no-items {
+    margin-left: toRem(5);
+  }
 }

package/styles/components/_o-modal.scss

@@ -18,7 +18,7 @@
   top: 50%;
   left: 50%;
   width: 100%;
-  max-width: toRem(480);
+  max-width: toRem(500);
   max-height: 95%;
   overflow-x: hidden;
   overflow-y: auto;

package/styles/components/_o-pry-admin-dataset-select.scss

@@ -0,0 +1,13 @@
+@use '../../styles/abstracts' as *;
+
+.o-pry-admin-dataset-select {
+  &__share {
+    display: flex;
+    flex-direction: column;
+    gap: toRem(15);
+  }
+
+  &__errors {
+    margin: toRem(10) 0;
+  }
+}

package/styles/components/_o-tabs.scss

@@ -43,7 +43,6 @@
     @include outlineOnFocus($border-radius: 3px);
 
     .a-h4 {
-      margin-bottom: toRem(14);
       font-size: toRem(14);
     }
 

package/styles/components/_o-widget.scss

@@ -281,5 +281,6 @@
 }
 
 pry-datasource-selector {
+  padding: toRem(20);
   height: 100%;
 }

package/styles/main.scss

@@ -67,6 +67,7 @@
 @use 'components/o-tabs' as *;
 @use 'components/o-widget' as *;
 @use 'components/o-pry-admin-classes-customize' as *;
+@use 'components/o-pry-admin-dataset-select' as *;
 @use 'components/o-pry-composed-condition' as *;
 @use 'components/o-pry-card' as *;
 @use 'components/o-pry-edit' as *;

package/styles-theme/components-theme/_a-btn.theme.scss

@@ -54,8 +54,8 @@
       );
     }
 
-    &:focus,
     &:active {
+      color: themed($theme-map, 'color', 'primary', 'contrast', 50);
       background-color: themed($theme-map, 'color', 'primary', 600);
     }
 

package/styles-theme/components-theme/_a-checkbox.theme.scss

@@ -18,6 +18,11 @@
         background-color: themed($theme-map, 'color', 'primary', 'contrast', 50);
       }
     }
+
+    &:hover {
+      border-color: themed($theme-map, 'color', 'primary', 600);
+      background-color: themed($theme-map, 'color', 'primary', 600);
+    }
   }
 
   &__text {

package/styles-theme/components-theme/_a-chip.theme.scss

@@ -21,7 +21,7 @@
   &--light {
     background-color: themed($theme-map, 'color', 'primary', 50);
     color: themed($theme-map, 'color', 'primary', 600);
-    box-shadow: 0px 4px 4px rgba(17, 59, 110, 0.12);
+    box-shadow: 0px 0px 1px rgba(17, 59, 110, 0.6);
 
     &:hover {
       @include changeBgColor(

package/styles-theme/components-theme/_a-form-field.theme.scss

@@ -57,6 +57,11 @@ textarea.a-form-field {
     }
   }
 
+  &[type='datetime-local'] {
+    @extend %a-form-field-text-theme;
+    display: unset;
+  }
+
   &[aria-invalid='true'] {
     border-color: themed($theme-map, 'color', 'status', 'error');
   }

package/styles-theme/components-theme/_o-chips-selector.theme.scss

@@ -0,0 +1,9 @@
+@use '../../styles/abstracts' as *;
+@use '../abstracts-theme/variables.theme' as *;
+
+.o-chips-selector {
+  .-no-items {
+    font-size: toRem(12);
+    color: themed($theme-map, 'color', 'primary', 500);
+  }
+}

package/styles-theme/main-theme.scss

@@ -42,6 +42,7 @@
 @use 'components-theme/o-accordion.theme' as *;
 @use 'components-theme/o-card.theme' as *;
 @use 'components-theme/o-catalog.theme' as *;
+@use 'components-theme/o-chips-selector.theme' as *;
 @use 'components-theme/o-dashboard.theme' as *;
 @use 'components-theme/o-date-picker.theme' as *;
 @use 'components-theme/o-draggable-menu.theme' as *;