@tsi-developpement/tsi-shared-ui 1.11.6 → 1.11.7

package/fesm2022/tsi-developpement-tsi-shared-ui.mjs

@@ -8186,6 +8186,7 @@ class EditableGridComponent extends TsiInputBase {
         items.forEach(el => el.translatedHeader = this._localizePipe.transform(el.header ?? ""));
         this._columns = items;
         this.selectedColumns = [...items];
+        this._reapplyRestoredColumnOrder();
         if (isObservable) {
             this._columnsChangedSubscription = value.changed.subscribe(event => {
                 console.log("event changed => ", event);
@@ -8345,6 +8346,7 @@ class EditableGridComponent extends TsiInputBase {
     }
     restoreState(configuration) {
         let state = JSON.parse(configuration);
+        this._restoredColumnOrder = state.columnOrder ?? this._restoredColumnOrder;
         if (this.dt) {
             this.columnWidth.setRemembered(state.columnWidths);
             this.dt.columnWidthsState = state.columnWidths;
@@ -8373,6 +8375,7 @@ class EditableGridComponent extends TsiInputBase {
     }
     resetSelectedColumns(configuration) {
         let state = JSON.parse(configuration);
+        this._restoredColumnOrder = state.columnOrder ?? this._restoredColumnOrder;
         if (this.dt) {
             this.columnWidth.reset();
             this.columnWidth.setRemembered(state.columnWidths);
@@ -8438,6 +8441,7 @@ class EditableGridComponent extends TsiInputBase {
                     newColumns.splice(event.newStartingIndex, 0, ...event.newItems);
                     this._columns = newColumns;
                     this.selectedColumns = this._columns.filter(c => prevSelected.has(c) || event.newItems.includes(c));
+                    this._reapplyRestoredColumnOrder();
                 }
                 break;
             }
@@ -8458,6 +8462,7 @@ class EditableGridComponent extends TsiInputBase {
                     newColumns.splice(event.newStartingIndex, event.oldItems.length, ...event.newItems);
                     this._columns = newColumns;
                     this.selectedColumns = this._columns.filter(c => (prevSelected.has(c) && !removedOld.has(c)) || event.newItems.includes(c));
+                    this._reapplyRestoredColumnOrder();
                 }
                 break;
             }
@@ -8471,6 +8476,20 @@ class EditableGridComponent extends TsiInputBase {
         this._verifyGridRequirements();
         this._initCurrentRowNumberAndOrderByRowNumber();
     }
+    /**
+     * Re-applies the saved presentation after the columns changed, so only the saved columns render,
+     * in the saved order. No-op until a layout is restored, or while none of its keys resolve yet
+     * (keeps the default "all columns" instead of an empty grid). Widths need no re-apply: the
+     * positional style PrimeNG wrote in restoreState matches again once the saved order is back.
+     */
+    _reapplyRestoredColumnOrder() {
+        if (!this._restoredColumnOrder)
+            return;
+        const reorderedColumns = this.getReorderedColumns(this._restoredColumnOrder);
+        if (reorderedColumns.length > 0) {
+            this.selectedColumns = reorderedColumns;
+        }
+    }
     saveItems() {
         const clean = this._cleanGridDataForEmit();
         this.saveDataEventEmitter.emit(clean);
@@ -17949,8 +17968,7 @@ class TsiFormComponentBaseComponent extends AppBaseComponent {
     }
     async _fetchWorkflowEntityInformationCore() {
         await this.getEntityInformation(this.businessClass);
-        const requiresDescriminator = !!(this.entityInfo?.discriminatorClassName || this.entityInfo?.discriminatorPropertyName);
-        if (requiresDescriminator && !this.descriminatorValue) {
+        if (this._isAwaitingDescriminator()) {
             return;
         }
         let request = new GetWorkflowInstanceInformationRequest();
@@ -17983,6 +18001,11 @@ class TsiFormComponentBaseComponent extends AppBaseComponent {
             this._fetchWorkflowEntityInformation()
         ]);
     }
+    // The entity is discriminated but the discriminator isn't known yet: the componentDescriminator setter applies the config later.
+    _isAwaitingDescriminator() {
+        return !this.descriminatorValue
+            && !!(this.entityInfo?.discriminatorClassName || this.entityInfo?.discriminatorPropertyName);
+    }
     //#endregion traiter multiple combo
     getWorkflowEtatForm() {
         let workflowEtatForm = this._workflowConfigurationService.getWorkflowEtatFormFromCacheSync(this.businessClass, this.descriminatorValue)