@elderbyte/ngx-starter 14.2.3 → 14.3.0

package/fesm2020/elderbyte-ngx-starter.mjs

@@ -6422,7 +6422,7 @@ class SelectionModel {
      * @param keyGetter value identity - default to value object equality
      * @param selectableEvaluatorFn function to evaluate if the element in question is selectable
      */
-    constructor(multiple = false, initial, keyGetter = a => a, selectableEvaluatorFn = () => true) {
+    constructor(multiple = false, initial, keyGetter = SelectionModel.FallbackKeyGetterFn, selectableEvaluatorFn = () => true) {
         /***************************************************************************
          *                                                                         *
          * Fields                                                                  *
@@ -6457,6 +6457,10 @@ class SelectionModel {
         this._selectableEvaluatorFn = fn;
         this.replaceSelection(this.selectionSnapshot);
     }
+    set keyGetterFn(fn) {
+        this._keyGetterFn = fn;
+        this.replaceSelection(this.selectionSnapshot);
+    }
     /***************************************************************************
      *                                                                         *
      * Public API                                                              *
@@ -6604,6 +6608,7 @@ class SelectionModel {
         return false;
     }
 }
+SelectionModel.FallbackKeyGetterFn = ((a) => a);
 
 var DataTransferStatus;
 (function (DataTransferStatus) {
@@ -11772,11 +11777,12 @@ class SelectionModelPopupDirective {
      * Constructor                                                             *
      *                                                                         *
      **************************************************************************/
-    constructor(templateRef, viewContainer, dialog, dataViewSelectionMode) {
+    constructor(templateRef, viewContainer, dialog, dataViewSelectionMode, selectionModel) {
         this.templateRef = templateRef;
         this.viewContainer = viewContainer;
         this.dialog = dialog;
         this.dataViewSelectionMode = dataViewSelectionMode;
+        this.selectionModel = selectionModel;
         /***************************************************************************
          *                                                                         *
          * Fields                                                                  *
@@ -11807,10 +11813,14 @@ class SelectionModelPopupDirective {
     /**
      * Let the user choose some entities and return the selection.
      */
-    choose(filters, sorts, multi = false) {
+    choose(keyGetter, currentSelection, filters, sorts, multi = false) {
         this.dataViewSelectionMode.filters = filters || [];
         this.dataViewSelectionMode.sorts = sorts || [];
         this.dataViewSelectionMode.multi = multi;
+        this.selectionModel.isMultipleSelection = multi;
+        this.selectionModel.keyGetterFn = keyGetter;
+        this.selectionModel.replaceSelection(currentSelection);
+        this.log.info('Replaced selection popup with current ' + currentSelection.length + ' entities:', currentSelection);
         const dialogRef = this.openSelectDialog();
         return dialogRef.afterClosed().pipe(switchMap((chosenEntities) => {
             if (chosenEntities) {
@@ -11840,7 +11850,7 @@ class SelectionModelPopupDirective {
         });
     }
 }
-SelectionModelPopupDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.3", ngImport: i0, type: SelectionModelPopupDirective, deps: [{ token: i0.TemplateRef }, { token: i0.ViewContainerRef }, { token: i1$7.MatDialog }, { token: ElderDataViewSelectionMode }], target: i0.ɵɵFactoryTarget.Directive });
+SelectionModelPopupDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.3", ngImport: i0, type: SelectionModelPopupDirective, deps: [{ token: i0.TemplateRef }, { token: i0.ViewContainerRef }, { token: i1$7.MatDialog }, { token: ElderDataViewSelectionMode }, { token: SelectionModel }], target: i0.ɵɵFactoryTarget.Directive });
 SelectionModelPopupDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.0.3", type: SelectionModelPopupDirective, selector: "[elderSelectionModelPopup]", inputs: { elderSelectionModelPopupTransform: "elderSelectionModelPopupTransform" }, providers: [
         {
             provide: SelectionModel,
@@ -11868,7 +11878,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.3", ngImpor
                         ElderTableProviders.ClearTableModel // Since this popup is frequently used inside an elder-table search box
                     ]
                 }]
-        }], ctorParameters: function () { return [{ type: i0.TemplateRef }, { type: i0.ViewContainerRef }, { type: i1$7.MatDialog }, { type: ElderDataViewSelectionMode }]; }, propDecorators: { elderSelectionModelPopupTransform: [{
+        }], ctorParameters: function () { return [{ type: i0.TemplateRef }, { type: i0.ViewContainerRef }, { type: i1$7.MatDialog }, { type: ElderDataViewSelectionMode }, { type: SelectionModel }]; }, propDecorators: { elderSelectionModelPopupTransform: [{
                 type: Input,
                 args: ['elderSelectionModelPopupTransform']
             }] } });
@@ -11907,8 +11917,9 @@ class ElderDataViewBaseComponent {
          */
         this._embedded = false;
         this._itemClickSubject = new Subject();
+        this.EntityIdKeyFn = (entity) => entity ? this.getId(entity) : 0;
         if (!selectionModel) {
-            this.selectionModel = new SelectionModel(false, [], (entity) => entity ? this.getId(entity) : 0);
+            this.selectionModel = new SelectionModel(false, [], this.EntityIdKeyFn);
         }
         else {
             this.selectionModel = selectionModel;
@@ -21772,7 +21783,8 @@ class ElderSelectComponent extends ElderSelectBase {
     }
     openSelectionPopup(event) {
         if (this.selectionPopup) {
-            this.selectionPopup.choose(this.filters, this.sorts, false).subscribe((selection) => {
+            this.selectionPopup.choose((e) => this.getEntityId(e), [], // TODO Or use current entity?
+            this.filters, this.sorts, false).subscribe((selection) => {
                 this.updateValueByEntity(selection[0]);
             });
         }
@@ -22076,7 +22088,7 @@ class ElderMultiSelectBase extends ElderSelectBase {
     }
     openSelectionPopup(event) {
         if (this.selectionPopup) {
-            this.selectionPopup.choose(this.filters, this.sorts, true).subscribe((selection) => this.appendEntities(selection));
+            this.selectionPopup.choose((e) => this.getEntityId(e), this.entities, this.filters, this.sorts, true).subscribe((selection) => this.updateValueByEntities(selection));
         }
         else {
             this.logger.warn('Cant open selection browser popup, since [SelectionModelPopupDirective] was not found!');