fix(simple-combo): resolve conflicts

Author: Hristo313

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, 19.0.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
+    branches: [ master, 19.1.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master, 19.0.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
+    branches: [ master, 19.1.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
   schedule:
     - cron: '33 4 * * 4'
 

.github/workflows/nodejs.yml

@@ -52,6 +52,7 @@ jobs:
             npm run test:i18n
         env:
             NODE_OPTIONS: --max_old_space_size=4096
+            TZ: America/New_York
       - name: Build i18n & validate output
         run: |
             npm run build:i18n

.vscode/settings.json

@@ -1,5 +1,15 @@
 {
     "git.ignoreLimitWarning": true,
     "javascript.preferences.quoteStyle": "single",
-    "typescript.preferences.quoteStyle": "single"
-}
+    "typescript.preferences.quoteStyle": "single",
+    "cSpell.words": [
+        "aria-describedby",
+        "aria-haspopup",
+        "aria-labelledby",
+        "ghostclass",
+        "groupable",
+        "groupby",
+        "maxlength",
+        "ungroup"
+    ]
+}

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Ignite UI for Angular Change Log
 
 All notable changes for each version of this project will be documented in this file.
+## 19.1.1
+### New Features
+- IgxListItem
+  - Added a new `selected` input property, making it easier to indicate when a list item is selected by applying styling responsible for that state.
+
 ## 19.1.0
 ### General
 - `IgxCarousel`
@@ -11,6 +16,42 @@ All notable changes for each version of this project will be documented in this
     - Introduced a new `expanded` input property, enabling dynamic control over the banner's state. The banner can now be programmatically set to expanded (visible) or collapsed (hidden) both initially and at runtime. Animations will trigger during runtime updates — the **open animation** plays when `expanded` is set to `true`, and the **close animation** plays when set to `false`. However, no animations will trigger when the property is set initially.
     - The banner's event lifecycle (`opening`, `opened`, `closing`, `closed`) only triggers through **user interactions** (e.g., clicking to open/close). Programmatic updates using the `expanded` property will not fire any events.
     - If the `expanded` property changes during an ongoing animation, the current animation will **stop** and the opposite animation will begin from the **point where the previous animation left off**. For instance, if the open animation (10 seconds) is interrupted at 6 seconds and `expanded` is set to `false`, the close animation (5 seconds) will start from its 3rd second.
+- `IgxQueryBuilder` has new design that comes with updated appearance and new functionality
+    - `IgxQueryBuilderComponent`
+        - Introduced the ability to create nested queries by specifying IN/NOT IN operators.
+        - Introduced the ability to reposition condition chips by dragging or using `Arrow Up/Down`.
+        - Added the `entities` property that accepts an array of `EntityType` objects describing an entity with its name and an array of fields. The `fields` input property has been deprecated and will be removed in a future version. Automatic migrations are available and will be applied on `ng update`.
+        - Added `disableEntityChange` property that can be used to disable the entity select on root level after the initial selection. Defaults to `false`.
+        - Added `disableReturnFieldsChange` property that can be used to disable the fields combo on root level. Defaults to `false`.
+        - Added the `canCommit`, `commit` and `discard` public methods that allows the user to save/discard the current state of the expression tree.
+        - Added option to template the search value input:
+            ```
+            <ng-template igxQueryBuilderSearchValue 
+                        let-searchValue
+                        let-selectedField = "selectedField" 
+                        let-selectedCondition = "selectedCondition"
+                        let-defaultSearchValueTemplate = "defaultSearchValueTemplate">
+                @if (selectedField?.field === 'Id' && selectedCondition === 'equals'){
+                    <input type="text" required [(ngModel)]="searchValue.value"/>
+                } @else {  
+                    <ng-container #defaultTemplate *ngTemplateOutlet="defaultSearchValueTemplate"></    ng-container>
+                }
+            </ng-template> 
+            ```
+        - **Behavioral Changes** 
+        - Expression enters edit mode on single click, `Enter` or `Space`.
+        - Selecting conditions inside the `IgxQueryBuilderComponent` is no longer supported. Grouping/ungrouping expressions is now achieved via the newly exposed Drag & Drop functionality.
+        - Deleting multiple expressions through the context menu is no longer supported.
+    - `IgxQueryBuilderHeaderComponent`
+        - **Behavioral Change** 
+        - Legend is no longer shown.
+        - If the `title` input property is not set, by default it would be empty string.
+        - **Deprecation**
+        - The `showLegend` and `resourceStrings` input properties have been deprecated and will be removed in a future version. Automatic migrations are available and will be applied on `ng update`.
+- `IFilteringExpression`
+    - A new optional property called `conditionName` has been introduced. This would generally be equal to the existing `condition.name`.
+- `IFilteringOperation`
+    - A new optional property called `isNestedQuery` has been introduced. It's used to indicate whether the condition leads to a nested query creation.
 
 ## 19.0.0
 ### General

ROADMAP.md

@@ -2,18 +2,18 @@
 
 # Current Milestone
 
-## Milestone 35, (Due by Jan, 2025)
+## Milestone 36,  version 19.1 (Due by Feb, 2025)
 
-1. Tile Manager - new component [#239](https://github.com/IgniteUI/igniteui-angular/issues/239)
-2. Query Builder component update [#14979](https://github.com/IgniteUI/igniteui-angular/issues/14979)
-3. IgxBannerComponent - Support collapsed input [#14890](https://github.com/IgniteUI/igniteui-angular/issues/14890)
-4. Update of the carousel component [#15025](https://github.com/IgniteUI/igniteui-angular/issues/15025)
+1. Query Builder multi-table query support [#14979](https://github.com/IgniteUI/igniteui-angular/issues/14979)
+2. IgxBannerComponent - Support collapsed input [#14890](https://github.com/IgniteUI/igniteui-angular/issues/14890)
+3. Carousel component vertical orientation support [#15025](https://github.com/IgniteUI/igniteui-angular/issues/15025)
 
 ## Going down the road
 
 1. Provide an option to modify the default enter edit mode conditions, to e.g. allow edit mode start on a single click [#14658](https://github.com/IgniteUI/igniteui-angular/issues/14658)
 2. Provide an excel-like navigation mode for editing where all arrow keys navigate the cell in edit mode. [#14659](https://github.com/IgniteUI/igniteui-angular/issues/14659)
 3. Extend the 18.2 editorOptions property to allow modifying numeric editors to not change the value on up/down arrow press [#14660](https://github.com/IgniteUI/igniteui-angular/issues/14660)
+4. Tile Manager - layout component [#239](https://github.com/IgniteUI/igniteui-angular/issues/239)
 
 # Previous Milestone
 

SECURITY.md

@@ -4,7 +4,8 @@
 
 | Version  | Supported          |
 | -------- | ------------------ |
-| 19.0.x   | :white_check_mark: |
+| 19.1.x   | :white_check_mark: |
+| 19.0.x   | :x:                |
 | 18.2.x   | :white_check_mark: |
 | 18.1.x   | :x:                |
 | 18.0.x   | :x:                |