Merge branch '21.1.x' into iminchev/fix-16493

Author: ChronosSF

.github/workflows/trigger-licensed-release.yml

@@ -0,0 +1,39 @@
+name: Trigger Licensed Release
+
+permissions:
+  contents: read
+
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        description: 'Release tag to dispatch (e.g. 21.1.1)'
+        required: true
+        type: string
+
+jobs:
+  dispatch-to-private-repo:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get app token
+        id: app-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.IGNITEUI_GITHUB_APP_ID }}
+          private-key: ${{ secrets.IGNITEUI_GITHUB_APP_PRIVATE_KEY }}
+          owner: IgniteUI
+
+      - name: Send repository dispatch to private repo
+        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          repository: IgniteUI/igniteui-actions
+          event-type: igniteui-angular-public-release-created
+          client-payload: |
+            {
+              "release_tag": "${{ github.event_name == 'workflow_dispatch' && inputs.release_tag || github.event.release.tag_name }}",
+              "public_repo": "${{ github.repository }}"
+            }

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes for each version of this project will be documented in this file.
 
+## 21.1.3
+
+### Security Fixes
+- Bumped `jspdf` dependency to `4.2.1` to address a security vulnerability present in earlier versions.
+
 ## 21.1.0
 
 ### New Features

package-lock.json

@@ -79,7 +79,7 @@
     "igniteui-i18n-core": "^1.0.2",
     "igniteui-theming": "^25.0.0",
     "igniteui-trial-watermark": "^3.1.0",
-    "jspdf": "^4.0.0",
+    "jspdf": "^4.2.1",
     "lodash-es": "^4.17.21",
     "marked": "^17.0.1",
     "marked-shiki": "^1.2.1",

package.json

@@ -1,5 +1,5 @@
 import { registerI18n, setCurrentI18n } from 'igniteui-i18n-core';
-import { ByLevelTreeGridMergeStrategy, ColumnPinningPosition, DefaultMergeStrategy, DefaultTreeGridMergeStrategy, FilteringExpressionsTree, FilteringExpressionsTreeType, FilteringLogic, HorizontalAlignment, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxDateTimeFilteringOperand, IgxFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand, IgxTimeFilteringOperand, NoopFilteringStrategy, NoopSortingStrategy, SortingDirection, VerticalAlignment } from 'igniteui-angular/core';
+import { ByLevelTreeGridMergeStrategy, ColumnPinningPosition, DefaultMergeStrategy, DefaultTreeGridMergeStrategy, FilteringExpressionsTree, FilteringExpressionsTreeType, FilteringLogic, HorizontalAlignment, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxDateTimeFilteringOperand, IgxFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand, IgxTimeFilteringOperand, NoopFilteringStrategy, NoopSortingStrategy, SortingDirection, TransactionType, TransactionEventOrigin, VerticalAlignment } from 'igniteui-angular/core';
 import { DropPosition, GridPagingMode, IgxDateSummaryOperand, IgxNumberSummaryOperand, IgxPivotAggregate, IgxPivotDateAggregate, IgxPivotDateDimension, IgxPivotNumericAggregate, IgxPivotTimeAggregate, IgxSummaryOperand, IgxTimeSummaryOperand, NoopPivotDimensionsStrategy, PivotDimensionType, RowPinningPosition } from 'igniteui-angular/grids/core';
 
 /** Export Public API, TODO: reorganize, Generate all w/ renames? */
@@ -49,4 +49,8 @@ export {
     // i18n
     registerI18n,
     setCurrentI18n,
+
+    // Transactions API
+    TransactionType,
+    TransactionEventOrigin,
 }

projects/igniteui-angular-elements/src/public_api.ts

@@ -2189,7 +2189,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
                 result.push(size.width + 'px');
             } else {
                 const currentWidth = parseFloat(this.grid.getPossibleColumnWidth());
-                result.push((this.getConstrainedSizePx(currentWidth)) + 'px');
+                const target = size && size.ref ? size.ref : this;
+                result.push((target as IgxColumnComponent).getConstrainedSizePx(currentWidth) + 'px');
             }
         }
         return result;
@@ -2682,7 +2683,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
         } else if (this.minWidth && newSize <= this.userSetMinWidthPx) {
             this.widthConstrained = true;
             return this.userSetMinWidthPx;
-        } else if (!this.minWidth && (!this.widthSetByUser || this.width === 'fit-content') && !this.grid.columnWidthSetByUser && (!newSize || newSize <= this.grid.minColumnWidth)) {
+        } else if (!this.columnGroup && !this.minWidth && (!this.widthSetByUser || this.width === 'fit-content') && !this.grid.columnWidthSetByUser && (!newSize || newSize <= this.grid.minColumnWidth)) {
             return this.grid.minColumnWidth;
         } else {
             this.widthConstrained = false;

projects/igniteui-angular/grids/core/src/columns/column.component.ts

@@ -2841,7 +2841,7 @@ export abstract class IgxGridBaseDirective implements GridType,
         }
     }
 
-    /* blazorSuppress */
+    /* csSuppress */
     /**
      * Get transactions service for the grid.
      */

projects/igniteui-angular/grids/grid/src/grid-base.directive.ts

@@ -4,7 +4,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import {
     CollapsibleColumnGroupTestComponent,
     CollapsibleGroupsTemplatesTestComponent,
-    CollapsibleGroupsDynamicColComponent
+    CollapsibleGroupsDynamicColComponent,
+    CollapsibleGroupWithExplicitChildWidthsComponent
 } from '../../../test-utils/grid-samples.spec';
 import { GridFunctions } from '../../../test-utils/grid-functions.spec';
 import { UIInteractions, wait } from '../../../test-utils/ui-interactions.spec';
@@ -28,7 +29,8 @@ describe('IgxGrid - multi-column headers #grid', () => {
                 NoopAnimationsModule,
                 CollapsibleColumnGroupTestComponent,
                 CollapsibleGroupsTemplatesTestComponent,
-                CollapsibleGroupsDynamicColComponent
+                CollapsibleGroupsDynamicColComponent,
+                CollapsibleGroupWithExplicitChildWidthsComponent
             ]
         }).compileComponents();
     }));
@@ -617,6 +619,28 @@ describe('IgxGrid - multi-column headers #grid', () => {
             expect(spans.length).toBe(2);
         });
 
+        it('should not constrain collapsed column group width by default min width when children have explicit widths (#17042)', () => {
+            const fix = TestBed.createComponent(CollapsibleGroupWithExplicitChildWidthsComponent);
+            fix.detectChanges();
+            const g: IgxGridComponent = fix.componentInstance.grid;
+
+            const customerInfoGroup = GridFunctions.getColGroup(g, 'Customer Information');
+            expect(customerInfoGroup.expanded).toBe(false);
+            expect(customerInfoGroup.collapsible).toBe(true);
+
+            // The only visible child when collapsed is CompanyName with width 100px.
+            const visibleChildren = customerInfoGroup.children
+                .filter(c => !c.hidden);
+            expect(visibleChildren.length).toBe(1);
+
+            const visibleChildWidth = visibleChildren
+                .reduce((sum, c) => sum + c.calcPixelWidth, 0);
+
+            const groupWidth = customerInfoGroup.calcPixelWidth;
+            expect(groupWidth).toBe(visibleChildWidth);
+            expect(groupWidth).toBe(100);
+        });
+
         it('Group By: test when group by a column', () => {
             addressInf.expanded = false;
             countryCol.visibleWhenCollapsed = false;

projects/igniteui-angular/grids/grid/src/grid-collapsible-columns.spec.ts

@@ -73,7 +73,7 @@
         "fflate": "^0.8.2",
         "tslib": "^2.8.1",
         "igniteui-trial-watermark": "^3.1.0",
-        "jspdf": "^4.0.0",
+        "jspdf": "^4.2.1",
         "lodash-es": "^4.17.21",
         "igniteui-theming": "^25.0.0",
         "igniteui-i18n-core": "^1.0.2",

projects/igniteui-angular/package.json

@@ -231,6 +231,55 @@ describe('IgxPaginator with default settings', () => {
         expect(totalPages.innerText).toBe('1');
     });
 
+    it('should display the pager text ("of") in page navigation', () => {
+        const fix = TestBed.createComponent(DefaultPaginatorComponent);
+        fix.detectChanges();
+
+        const pageNavTextDiv = fix.debugElement.query(By.css('.igx-page-nav__text')).nativeElement;
+        const spans = pageNavTextDiv.querySelectorAll('span');
+        const paginator = fix.componentInstance.paginator;
+
+        // Should have 3 spans: current page, "of" text, total pages
+        expect(spans.length).toBe(3);
+
+        // Check current page
+        expect(spans[0].innerText.trim()).toBe('1');
+
+        // Check the "of" text
+        expect(spans[1].innerText.trim()).toBe('of');
+
+        // Check total pages
+        expect(spans[2].innerText.trim()).toBe('3');
+
+        // Verify the resource string is set
+        expect(paginator.resourceStrings.igx_paginator_pager_text).toBe('of');
+    });
+
+    it('should preserve default resource strings when partial resourceStrings are provided', () => {
+        const fix = TestBed.createComponent(DefaultPaginatorComponent);
+        fix.detectChanges();
+
+        const paginator = fix.componentInstance.paginator;
+
+        // Set only a partial resource string (only override label)
+        paginator.resourceStrings = { igx_paginator_label: 'Custom per page' };
+        fix.detectChanges();
+
+        const pageNavTextDiv = fix.debugElement.query(By.css('.igx-page-nav__text')).nativeElement;
+        const spans = pageNavTextDiv.querySelectorAll('span');
+
+        // Verify the custom label is set
+        expect(paginator.resourceStrings.igx_paginator_label).toBe('Custom per page');
+
+        // Verify the pager text ("of") is still present from defaults
+        expect(paginator.resourceStrings.igx_paginator_pager_text).toBe('of');
+        expect(spans[1].innerText.trim()).toBe('of');
+
+        // Verify other default strings are also preserved
+        expect(paginator.resourceStrings.igx_paginator_first_page_button_text).toBe('Go to first page');
+        expect(paginator.resourceStrings.igx_paginator_next_page_button_text).toBe('Next page');
+    });
+
 });
 
 describe('IgxPaginator with custom settings', () => {