@ecodev/natural 38.1.0 → 41.1.1

package/fesm2015/ecodev-natural.js

@@ -2941,7 +2941,7 @@ function unwrapNavigable(item) {
  * Components inheriting from this class can be used as standalone with input attributes.
  *
  * Usage :
- * <natural-my-listing [forcedVariables]="{filter:...}" [initialColumns]="['col1']" [persistSearch]="false">
+ * <natural-my-listing [forcedVariables]="{filter:...}" [selectedColumns]="['col1']" [persistSearch]="false">
  */
 // @dynamic
 class NaturalAbstractList extends NaturalAbstractPanel {
@@ -2956,7 +2956,7 @@ class NaturalAbstractList extends NaturalAbstractPanel {
         /**
          * Columns list after interaction with <natural-columns-picker>
          */
-        this._selectedColumns = [];
+        this.columnsForTable = [];
         /**
          * The default column selection that automatically happened after <natural-columns-picker> initialization
          */
@@ -3199,7 +3199,7 @@ class NaturalAbstractList extends NaturalAbstractPanel {
      * Uses data provided by router such as:
      *
      * - `route.data.forcedVariables`
-     * - `route.data.initialColumns`
+     * - `route.data.selectedColumns`
      */
     initFromRoute() {
         // Variables
@@ -3207,8 +3207,8 @@ class NaturalAbstractList extends NaturalAbstractPanel {
             this.applyForcedVariables(this.route.snapshot.data.forcedVariables);
         }
         // Columns
-        if (this.route.snapshot.data.initialColumns) {
-            this.initialColumns = this.route.snapshot.data.initialColumns;
+        if (this.route.snapshot.data.selectedColumns) {
+            this.selectedColumns = this.route.snapshot.data.selectedColumns;
         }
     }
     getDataObservable() {
@@ -3234,6 +3234,11 @@ class NaturalAbstractList extends NaturalAbstractPanel {
         if (sorting) {
             this.variablesManager.set('sorting', { sorting });
         }
+        // Columns
+        const persistedColumns = this.persistenceService.get('col', this.route, storageKey);
+        if (typeof persistedColumns === 'string') {
+            this.selectedColumns = persistedColumns.split(',');
+        }
         // Natural search : ns
         this.naturalSearchSelections = fromUrl(this.persistenceService.get('ns', this.route, storageKey));
         this.translateSearchAndRefreshList(this.naturalSearchSelections, true);
@@ -3289,23 +3294,14 @@ class NaturalAbstractList extends NaturalAbstractPanel {
             this.variablesManager.set('sorting', { sorting: variables.sorting });
         }
     }
-    get selectedColumns() {
-        return this._selectedColumns;
-    }
-    set selectedColumns(columns) {
-        this._selectedColumns = columns;
+    selectColumns(columns) {
+        this.columnsForTable = columns;
         if (!this.persistSearch || this.isPanel) {
             return;
         }
         // The first selection we receive is the default one made by <natural-columns-picker>
         if (!this.defaultSelectedColumns) {
             this.defaultSelectedColumns = columns;
-            // Now that we know the defaults, we can try to reload from persistence
-            const storageKey = this.getStorageKey();
-            const persistedColumns = this.persistenceService.get('col', this.route, storageKey);
-            if (typeof persistedColumns === 'string') {
-                this.selectedColumns = persistedColumns.split(',');
-            }
         }
         else {
             // Persist only if wanted columns are different from default selection
@@ -3323,7 +3319,7 @@ NaturalAbstractList.ctorParameters = () => [
 ];
 NaturalAbstractList.propDecorators = {
     persistSearch: [{ type: Input }],
-    initialColumns: [{ type: Input }],
+    selectedColumns: [{ type: Input }],
     forcedVariables: [{ type: Input }]
 };
 
@@ -4342,19 +4338,37 @@ class NaturalColumnsPickerComponent {
     constructor(changeDetectorRef) {
         this.changeDetectorRef = changeDetectorRef;
         /**
-         * Emit a list of column keys whenever the selection changes
+         * Emit a list of valid and selected column keys whenever the selection changes
          */
         this.selectionChange = new EventEmitter();
-        this.defaultSelectionChange = new EventEmitter();
+        /**
+         * Available columns are defined by options in the template
+         */
         this.availableColumns = null;
+        /**
+         * Displayed options in the dropdown menu
+         */
         this.displayedColumns = [];
         this.ngUnsubscribe = new Subject();
     }
-    set selection(columns) {
+    /**
+     * Set the columns that are wanted but might be unavailable.
+     *
+     * If a column is unavailable it will be ignored silently. To know what columns were actually applied
+     * you should use `selectionChange`.
+     *
+     * It is often set once on component initialization, but it can also be set again later in the lifespan of the component.
+     */
+    set selections(columns) {
         var _a;
+        this._selections = columns;
+        if (!columns || !this.availableColumns) {
+            return;
+        }
         (_a = this.availableColumns) === null || _a === void 0 ? void 0 : _a.forEach(col => {
             col.checked = columns.includes(col.key);
         });
+        this.updateColumns();
     }
     ngAfterViewInit() {
         cancellableTimeout(this.ngUnsubscribe).subscribe(() => {
@@ -4366,8 +4380,10 @@ class NaturalColumnsPickerComponent {
     initColumns() {
         var _a, _b, _c;
         (_a = this.availableColumns) === null || _a === void 0 ? void 0 : _a.forEach(col => {
-            col.checked = this.initialSelection ? this.initialSelection.includes(col.key) : col.checked;
+            var _a;
+            col.checked = ((_a = this._selections) === null || _a === void 0 ? void 0 : _a.length) ? this._selections.includes(col.key) : col.checked;
         });
+        // Show options only for columns that are not hidden
         this.displayedColumns = (_c = (_b = this.availableColumns) === null || _b === void 0 ? void 0 : _b.filter(col => !col.hidden)) !== null && _c !== void 0 ? _c : [];
     }
     updateColumns() {
@@ -4391,10 +4407,8 @@ NaturalColumnsPickerComponent.ctorParameters = () => [
     { type: ChangeDetectorRef }
 ];
 NaturalColumnsPickerComponent.propDecorators = {
-    selection: [{ type: Input }],
+    selections: [{ type: Input }],
     selectionChange: [{ type: Output }],
-    defaultSelectionChange: [{ type: Output }],
-    initialSelection: [{ type: Input }],
     availableColumns: [{ type: ContentChildren, args: [NaturalColumnsPickerColumnDirective,] }]
 };
 
@@ -6517,7 +6531,7 @@ class NaturalHierarchicSelectorDialogComponent {
 }
 NaturalHierarchicSelectorDialogComponent.decorators = [
     { type: Component, args: [{
-                template: "<h2 i18n mat-dialog-title>S\u00E9lection</h2>\n\n<mat-dialog-content>\n    <natural-hierarchic-selector\n        (selectionChange)=\"config.hierarchicSelection = $event\"\n        [selected]=\"config.hierarchicSelection ?? {}\"\n        [config]=\"config.hierarchicConfig\"\n        [filters]=\"config.hierarchicFilters\"\n        [multiple]=\"config.multiple ?? false\"\n        [allowUnselect]=\"config.allowUnselect ?? true\"\n        [searchFacets]=\"config.searchFacets ?? []\"\n        [searchSelections]=\"config.searchSelections ?? []\"\n        (searchSelectionChange)=\"searchSelectionsOutput = $event\"\n    ></natural-hierarchic-selector>\n</mat-dialog-content>\n\n<mat-dialog-actions>\n    <button [mat-dialog-close] i18n mat-button>Annuler</button>\n    <button (click)=\"close(config.hierarchicSelection)\" color=\"primary\" mat-raised-button\n        ><span i18n>Valider</span>\n    </button>\n</mat-dialog-actions>\n",
+                template: "<h2 i18n mat-dialog-title>S\u00E9lection</h2>\n\n<mat-dialog-content>\n    <natural-hierarchic-selector\n        (selectionChange)=\"config.hierarchicSelection = $event\"\n        [selected]=\"config.hierarchicSelection ?? {}\"\n        [config]=\"config.hierarchicConfig\"\n        [filters]=\"config.hierarchicFilters\"\n        [multiple]=\"config.multiple ?? false\"\n        [allowUnselect]=\"config.allowUnselect ?? true\"\n        [searchFacets]=\"config.searchFacets ?? []\"\n        [searchSelections]=\"config.searchSelections ?? []\"\n        (searchSelectionChange)=\"searchSelectionsOutput = $event\"\n    ></natural-hierarchic-selector>\n</mat-dialog-content>\n\n<mat-dialog-actions>\n    <button [mat-dialog-close] mat-button i18n>Annuler</button>\n    <button (click)=\"close(config.hierarchicSelection)\" color=\"primary\" mat-raised-button\n        ><span i18n>Valider</span>\n    </button>\n</mat-dialog-actions>\n",
                 styles: [":host mat-dialog-actions{display:flex;flex-direction:row;justify-content:flex-end}\n"]
             },] }
 ];
@@ -7948,6 +7962,13 @@ class NaturalAbstractFile extends NaturalAbstractController {
          * no effect.
          */
         this.selectable = false;
+        /**
+         * If true, the file selection will be broadcast through `NaturalFileService.filesChanged`.
+         *
+         * It is useful to set this to false if there is two upload on a page with different purpose
+         * and the second upload should not be confused with the first one.
+         */
+        this.broadcast = true;
         /**
          * The single valid file that has been selected.
          *
@@ -8028,7 +8049,9 @@ class NaturalAbstractFile extends NaturalAbstractController {
         }
         if (selection.valid.length || selection.invalid.length) {
             this.filesChange.emit(selection);
-            this.naturalFileService.filesChanged.next(selection);
+            if (this.broadcast) {
+                this.naturalFileService.filesChanged.next(selection);
+            }
         }
         this.getFileElement().value = '';
     }
@@ -8105,6 +8128,7 @@ NaturalAbstractFile.propDecorators = {
     maxSize: [{ type: Input }],
     fileSelectionDisabled: [{ type: Input }],
     selectable: [{ type: Input }],
+    broadcast: [{ type: Input }],
     fileChange: [{ type: Output }],
     filesChange: [{ type: Output }],
     onChange: [{ type: HostListener, args: ['change', ['$event'],] }]
@@ -8186,7 +8210,9 @@ class NaturalFileDropDirective extends NaturalAbstractFile {
         this.closeDrags();
     }
     hasObservers() {
-        return this.fileChange.observed || this.filesChange.observed || this.naturalFileService.filesChanged.observed;
+        return (this.fileChange.observed ||
+            this.filesChange.observed ||
+            (this.broadcast && this.naturalFileService.filesChanged.observed));
     }
 }
 NaturalFileDropDirective.decorators = [