@fundamental-ngx/platform 0.64.2-rc.2 → 0.64.2-rc.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/platform",
-  "version": "0.64.2-rc.2",
+  "version": "0.64.2-rc.21",
   "schematics": "./schematics/collection.json",
   "description": "Fundamental Library for Angular - platform",
   "license": "Apache-2.0",
@@ -13,9 +13,9 @@
     "node": ">= 10"
   },
   "peerDependencies": {
-    "@fundamental-ngx/cdk": "0.64.2-rc.2",
-    "@fundamental-ngx/core": "0.64.2-rc.2",
-    "@fundamental-ngx/i18n": "0.64.2-rc.2"
+    "@fundamental-ngx/cdk": "0.64.2-rc.21",
+    "@fundamental-ngx/core": "0.64.2-rc.21",
+    "@fundamental-ngx/i18n": "0.64.2-rc.21"
   },
   "dependencies": {
     "fast-equals": "^6.0.0",

package/schematics/ng-add/index.js

@@ -31,7 +31,7 @@ function callCoreSchematic(options) {
         (0, dependencies_1.addPackageJsonDependency)(tree, {
             type: dependencies_1.NodeDependencyType.Default,
             // Will be replaced with the real version during sync-version script run
-            version: `0.64.2-rc.2`,
+            version: `0.64.2-rc.21`,
             name: '@fundamental-ngx/core'
         });
         const installTaskId = context.addTask(new tasks_1.NodePackageInstallTask({

package/schematics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "platform-schematics",
-  "version": "0.64.2-rc.2",
+  "version": "0.64.2-rc.21",
   "types": "./ng-add/index.d.ts",
   "main": "./ng-add/index.js",
   "type": "commonjs"

package/types/fundamental-ngx-platform-table-helpers.d.ts

@@ -551,6 +551,20 @@ declare abstract class TableInitialState {
     abstract state: TableState;
     abstract setTable(table: Table): void;
     abstract setInitialState(): void;
+    /**
+     * Returns the initial sort state snapshot captured when setInitialState() was first called.
+     * This value does not change even if the initialSortBy input is dynamically updated.
+     * Used by the settings dialog to determine the true "reset" target.
+     */
+    abstract getInitialSortBySnapshot(): CollectionSort[];
+    /**
+     * Returns the initial filter state snapshot captured when setInitialState() was first called.
+     */
+    abstract getInitialFilterBySnapshot(): CollectionFilter[];
+    /**
+     * Returns the initial group state snapshot captured when setInitialState() was first called.
+     */
+    abstract getInitialGroupBySnapshot(): CollectionGroup[];
 }
 declare abstract class TableVirtualScroll {
     abstract rowHeight: number;
@@ -1627,6 +1641,14 @@ declare class TableInitialStateDirective extends TableInitialState {
     private _table;
     /** @hidden */
     private readonly _tableService;
+    /** @hidden Snapshot of initialSortBy captured on first setInitialState() call */
+    private _initialSortBySnapshot;
+    /** @hidden Snapshot of initialFilterBy captured on first setInitialState() call */
+    private _initialFilterBySnapshot;
+    /** @hidden Snapshot of initialGroupBy captured on first setInitialState() call */
+    private _initialGroupBySnapshot;
+    /** @hidden */
+    private _initialStateApplied;
     /** @hidden */
     setTable(table: Table): void;
     /** @hidden */
@@ -1635,6 +1657,12 @@ declare class TableInitialStateDirective extends TableInitialState {
     getTableState(): TableState;
     /** Set current state/settings of the Table. */
     setTableState(state: TableState): void;
+    /** Returns the initial sort state snapshot captured when setInitialState() was first called. */
+    getInitialSortBySnapshot(): CollectionSort[];
+    /** Returns the initial filter state snapshot captured when setInitialState() was first called. */
+    getInitialFilterBySnapshot(): CollectionFilter[];
+    /** Returns the initial group state snapshot captured when setInitialState() was first called. */
+    getInitialGroupBySnapshot(): CollectionGroup[];
     static ɵfac: i0.ɵɵFactoryDeclaration<TableInitialStateDirective, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<TableInitialStateDirective, "[fdpTableInitialState],    fdp-table", never, { "initialVisibleColumns": { "alias": "initialVisibleColumns"; "required": false; }; "initialSortBy": { "alias": "initialSortBy"; "required": false; }; "initialFilterBy": { "alias": "initialFilterBy"; "required": false; }; "initialGroupBy": { "alias": "initialGroupBy"; "required": false; }; "initialPage": { "alias": "initialPage"; "required": false; }; "state": { "alias": "state"; "required": false; }; }, {}, never, never, true, never>;
 }

package/types/fundamental-ngx-platform-table.d.ts

@@ -1158,14 +1158,20 @@ interface SettingsSortDialogColumn {
     key: string;
 }
 interface SettingsSortDialogData extends TableDialogCommonData {
-    direction: SortDirection;
-    field: string | null;
     columns: SettingsSortDialogColumn[];
     allowDisablingSorting: boolean;
+    /** Array of current sort criteria in priority order (only includes criteria with non-null fields) */
+    sortBy?: Array<{
+        field: string;
+        direction: SortDirection;
+    }>;
 }
 interface SettingsSortDialogResultData {
-    field: string | null;
-    direction: SortDirection;
+    /** Array of sort criteria in priority order (first has highest priority) */
+    sortBy: Array<{
+        field: string;
+        direction: SortDirection;
+    }>;
 }
 interface SettingsGroupDialogColumn {
     label: string;
@@ -1309,6 +1315,11 @@ declare class GroupingComponent {
     static ɵcmp: i0.ɵɵComponentDeclaration<GroupingComponent, "fdp-grouping", never, { "groupingData": { "alias": "groupingData"; "required": false; "isSignal": true; }; "initialGrouping": { "alias": "initialGrouping"; "required": false; "isSignal": true; }; }, { "groupChange": "groupChange"; "resetAvailabilityChange": "resetAvailabilityChange"; }, never, never, true, never>;
 }
 
+/** Represents a single sort criteria row */
+interface SortCriteria {
+    field: string | null;
+    direction: SortDirection;
+}
 declare class SortingComponent {
     /** Input data for sorting */
     sortingData: i0.InputSignal<SettingsSortDialogData | undefined>;
@@ -1316,10 +1327,10 @@ declare class SortingComponent {
     initialSorting: i0.InputSignal<Nullable<CollectionSort>>;
     /** Event emitter for sort changes */
     sortChange: i0.OutputEmitterRef<SettingsSortDialogResultData>;
-    /** Current selected sorting direction - resets when sortingData changes */
-    direction: i0.WritableSignal<SortDirection>;
-    /** Current selected sorting field - resets when sortingData changes */
-    field: i0.WritableSignal<string | null>;
+    /** Event emitter for reset availability changes */
+    resetAvailabilityChange: i0.OutputRef<boolean>;
+    /** Event emitter for validity changes */
+    validityChange: i0.OutputRef<boolean>;
     /** @hidden */
     sortOrderHeaderId: string;
     /** @hidden */
@@ -1332,25 +1343,192 @@ declare class SortingComponent {
     allowDisablingSorting: i0.Signal<boolean>;
     /** Available table columns for sorting */
     columns: i0.Signal<SettingsSortDialogColumn[]>;
-    /** Event emitter for reset availability changes */
-    resetAvailabilityChange: i0.OutputRef<boolean>;
+    /** @hidden Computed signal that checks if any row has invalid input */
+    isValid: i0.Signal<boolean>;
+    /** @hidden Computed signal that returns the currently selected column object */
+    selectedColumn: i0.Signal<SettingsSortDialogColumn | null>;
+    /**
+     * @hidden
+     * Computed signal that returns available columns for each row.
+     * Columns selected in other rows are filtered out.
+     */
+    availableColumnsPerRow: i0.Signal<SettingsSortDialogColumn[][]>;
+    /**
+     * @hidden
+     * Computed signal that returns the selected column object for each row.
+     */
+    selectedColumnsPerRow: i0.Signal<(SettingsSortDialogColumn | null)[]>;
+    /**
+     * @hidden
+     * Computed signal that returns the direction for each row.
+     */
+    directionsPerRow: i0.Signal<SortDirection[]>;
+    /**
+     * @hidden
+     * Computed signal that returns the form state ('error' or undefined) for each row.
+     */
+    rowStates: i0.Signal<("error" | undefined)[]>;
+    /**
+     * @hidden
+     * Computed signal that returns visibility for each row.
+     * First row is always visible, subsequent rows visible only if previous has selection.
+     */
+    rowVisibility: i0.Signal<boolean[]>;
+    /**
+     * @hidden
+     * Computed signal that returns whether each row can be moved up.
+     */
+    canMoveUpPerRow: i0.Signal<boolean[]>;
+    /**
+     * @hidden
+     * Computed signal that returns whether each row can be moved down.
+     */
+    canMoveDownPerRow: i0.Signal<boolean[]>;
+    /**
+     * @hidden
+     * Computed signal that returns whether each row can be deleted.
+     */
+    canDeletePerRow: i0.Signal<boolean[]>;
+    /** Current selected sorting direction - derived from first sortBy entry */
+    direction: i0.WritableSignal<SortDirection>;
+    /** Current selected sorting field - derived from first sortBy entry */
+    firstSortingField: i0.WritableSignal<string | null>;
+    /**
+     * @hidden
+     * Array of sort criteria rows. Each row has a field and direction.
+     * linkedSignal resets when sortBy reference changes (e.g., on reset),
+     * but allows local modifications via .set()/.update().
+     */
+    sortCriteriaList: i0.WritableSignal<SortCriteria[]>;
+    /**
+     * @hidden
+     * Extracts the sortBy array reference from sortingData.
+     * Used as the source for linkedSignal to track only sortBy reference changes.
+     */
+    private _sortByRef;
     /**
-     * Handle sort direction changes.
+     * @hidden
+     * Tracks invalid input text per row (non-empty text that doesn't match any column).
+     * Resets to empty Map when sortBy reference changes.
+     */
+    private _invalidInputPerRow;
+    /**
+     * @hidden
+     * Computed signal that checks if any row has invalid combobox text.
+     * Used by resetAvailabilityChange to determine if reset should be available.
+     */
+    private _hasInvalidComboboxText;
+    /** @hidden Reference to the comboboxes for programmatic reset */
+    private _comboboxes;
+    /** @hidden Track previous sortBy reference for combobox sync */
+    private _previousSortByRef;
+    /** @hidden */
+    constructor();
+    /**
+     * Get available columns for a specific sort criteria row.
+     * Excludes columns that are already selected in other rows.
+     * @param rowIndex Index of the current row.
+     * @returns Array of columns available for selection.
+     */
+    getAvailableColumns(rowIndex: number): SettingsSortDialogColumn[];
+    /**
+     * Get the selected column object for a specific row.
+     * @param rowIndex Index of the row.
+     * @returns The selected column object or null.
+     */
+    getSelectedColumnForRow(rowIndex: number): SettingsSortDialogColumn | null;
+    /**
+     * Get the direction for a specific row.
+     * @param rowIndex Index of the row.
+     * @returns The sort direction.
+     */
+    getDirectionForRow(rowIndex: number): SortDirection;
+    /**
+     * Get the form state for a specific row's combobox.
+     * Returns 'error' if the row has invalid input, undefined otherwise.
+     * @param rowIndex Index of the row.
+     * @returns The form state or undefined.
+     */
+    getRowState(rowIndex: number): 'error' | undefined;
+    /**
+     * Determine if a row should be visible.
+     * The first row is always visible. Subsequent rows are only visible
+     * if the previous row has a column selected.
+     * @param rowIndex Index of the row.
+     * @returns True if the row should be visible.
+     */
+    isRowVisible(rowIndex: number): boolean;
+    /**
+     * Check if a row can be moved up.
+     * A row can move up if it's not the first row and has a field selected.
+     * @param rowIndex Index of the row.
+     * @returns True if the row can be moved up.
+     */
+    canMoveUp(rowIndex: number): boolean;
+    /**
+     * Check if a row can be moved down.
+     * A row can move down if there's a visible row below it with a field selected.
+     * @param rowIndex Index of the row.
+     * @returns True if the row can be moved down.
+     */
+    canMoveDown(rowIndex: number): boolean;
+    /**
+     * Check if a row can be deleted (cleared).
+     * A row can be deleted if it has a field selected.
+     * @param rowIndex Index of the row.
+     * @returns True if the row can be deleted.
+     */
+    canDelete(rowIndex: number): boolean;
+    /**
+     * Move a sort criteria row up (swap with the row above).
+     * @param rowIndex Index of the row to move up.
+     */
+    moveUp(rowIndex: number): void;
+    /**
+     * Move a sort criteria row down (swap with the row below).
+     * @param rowIndex Index of the row to move down.
+     */
+    moveDown(rowIndex: number): void;
+    /**
+     * Delete (clear) a sort criteria row.
+     * This removes the field selection and shifts remaining criteria up.
+     * @param rowIndex Index of the row to delete.
+     */
+    deleteRow(rowIndex: number): void;
+    /**
+     * Handle sort direction changes for a specific row.
+     * @param rowIndex Index of the row.
      * @param direction New sorting direction.
      */
-    _sortDirectionChange(direction: SortDirection): void;
+    _sortDirectionChangeForRow(rowIndex: number, direction: SortDirection): void;
     /**
-     * Handle sort field changes.
-     * @param field New sorting field.
+     * Handle sort field changes for a specific row.
+     * @param rowIndex Index of the row.
+     * @param column Selected column object or string.
      */
-    _sortFieldChange(field: string): void;
+    _sortFieldChangeForRow(rowIndex: number, column: SettingsSortDialogColumn | string | null): void;
+    /** @hidden */
+    protected displayColumn(column: SettingsSortDialogColumn | null): string;
+    /**
+     * Sync the main field and direction signals with the first row's values.
+     * Used after move/delete operations to keep backward compatibility.
+     * @hidden
+     */
+    private _syncMainFieldAndDirection;
     /**
      * Emit changes to the model.
      * @hidden
      */
     private _onModelChange;
+    /**
+     * Sync combobox display text with the current selected column.
+     * This is a DOM side effect needed when reset happens and the combobox has invalid text,
+     * because ngModel won't call writeValue if the underlying model value hasn't changed.
+     * @hidden
+     */
+    private _syncComboboxDisplayText;
     static ɵfac: i0.ɵɵFactoryDeclaration<SortingComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SortingComponent, "fdp-sorting", never, { "sortingData": { "alias": "sortingData"; "required": false; "isSignal": true; }; "initialSorting": { "alias": "initialSorting"; "required": false; "isSignal": true; }; }, { "sortChange": "sortChange"; "resetAvailabilityChange": "resetAvailabilityChange"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SortingComponent, "fdp-sorting", never, { "sortingData": { "alias": "sortingData"; "required": false; "isSignal": true; }; "initialSorting": { "alias": "initialSorting"; "required": false; "isSignal": true; }; }, { "sortChange": "sortChange"; "resetAvailabilityChange": "resetAvailabilityChange"; "validityChange": "validityChange"; }, never, never, true, never>;
 }
 
 declare const dialogConfig: DialogConfig;
@@ -2543,4 +2721,4 @@ declare class PlatformTableModule {
 }
 
 export { FILTERS_VIEW_STEP_TOKEN, FilterCustomComponent, FilterMultiSelectComponent, FilterRule, FilterRuleComponent, FilterSingleSelectComponent, FilterStepComponent, FiltersComponent, FiltersListStepComponent, GetAvailableSortColumnsPipe, GroupingComponent, IsColumnHasHeaderMenuPipe, NOT_FILTERED_OPTION_VALUE, NoDataWrapperComponent, P13ColumnsDialogComponent, P13FilteringDialogComponent, P13GroupingDialogComponent, P13SortingDialogComponent, PlatformTableColumnResizerComponent, PlatformTableModule, RESETTABLE_TOKEN, ResetButtonComponent, SortingComponent, TABLE_TOOLBAR, TableCellHeaderPopoverComponent, TableColumnComponent, TableComponent, TableEditableCellComponent, TableFooterRowComponent, TableGroupRowComponent, TableGrowingButtonComponent, TableHeaderCellContentComponent, TableHeaderRowComponent, TableP13ColumnsComponent, TableP13DialogComponent, TableP13FilterComponent, TableP13GroupComponent, TableP13SortComponent, TablePoppingRowComponent, TableRowComponent, TableToolbarActionsComponent, TableToolbarComponent, TableToolbarLeftActionsComponent, TableToolbarTemplateDirective, TableViewSettingsDialogComponent, TableViewSettingsFilterComponent, dialogConfig };
-export type { ColumnsDialogData, ColumnsDialogResultData, CombinedTableDialogData, DialogTableColumn, EditMode, FilterDialogData, FilterDialogResultData, FilterableColumn, FiltersViewStep, GroupDialogColumn, GroupDialogData, GroupDialogResultData, Resettable, SelectableFilter, SortDialogColumn, SortDialogData, SortDialogResultData, SortRule, TableAppliedFilter, TableToolbarInterface, TableToolbarTitleTemplateContext, TableToolbarWithTemplate, ToolbarContext, VisibleColumnType };
+export type { ColumnsDialogData, ColumnsDialogResultData, CombinedTableDialogData, DialogTableColumn, EditMode, FilterDialogData, FilterDialogResultData, FilterableColumn, FiltersViewStep, GroupDialogColumn, GroupDialogData, GroupDialogResultData, Resettable, SelectableFilter, SortCriteria, SortDialogColumn, SortDialogData, SortDialogResultData, SortRule, TableAppliedFilter, TableToolbarInterface, TableToolbarTitleTemplateContext, TableToolbarWithTemplate, ToolbarContext, VisibleColumnType };