fix: merge conflict

SAP · Jan 14, 2025 · 5fbd4d7 · 5fbd4d7
2 parents 6df31d4 + 0417dfd
commit 5fbd4d7
Show file tree

Hide file tree

Showing 38 changed files with 257 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+
+### Bug Fixes
+
+* **core:** make popover body have dialog role by default ([#12907](https://github.com/SAP/fundamental-ngx/issues/12907)) ([6f33393](https://github.com/SAP/fundamental-ngx/commit/6f33393a592789979976adb2f065350ce77ee9e8))
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+
+### Bug Fixes
+
+* **core,platform:** add input to list item to prevent click selection. fix issue with toggling column on p13 dialog ([#12878](https://github.com/SAP/fundamental-ngx/issues/12878)) ([b908419](https://github.com/SAP/fundamental-ngx/commit/b908419673a8422c1140e3d0110a176a1a1985db))
+* **core:** combobox communicateByObject bugs ([#12815](https://github.com/SAP/fundamental-ngx/issues/12815)) ([26fd691](https://github.com/SAP/fundamental-ngx/commit/26fd691e14e8b8e609cd2e554074fdb4c195a537))
+* **platform:** add configuration options to truncate titles and descriptions in the settings generator ([#12811](https://github.com/SAP/fundamental-ngx/issues/12811)) ([3152649](https://github.com/SAP/fundamental-ngx/commit/31526492811f383425dc3cde9c31de4625dd34c3))
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 

diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
     "packages": ["libs/*"],
-    "version": "0.54.2-rc.2",
+    "version": "0.54.2-rc.4",
     "conventionalCommits": true,
     "tagVersionPrefix": "v",
     "message": "chore(release): publish %v",

diff --git a/libs/btp/CHANGELOG.md b/libs/btp/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+**Note:** Version bump only for package @fundamental-ngx/btp
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/btp
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 **Note:** Version bump only for package @fundamental-ngx/btp

diff --git a/libs/btp/package.json b/libs/btp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fundamental-ngx/btp",
-    "version": "0.54.2-rc.2",
+    "version": "0.54.2-rc.4",
     "peerDependencies": {
         "@angular/common": "ANGULAR_VER_PLACEHOLDER",
         "@angular/core": "ANGULAR_VER_PLACEHOLDER",

diff --git a/libs/cdk/CHANGELOG.md b/libs/cdk/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+**Note:** Version bump only for package @fundamental-ngx/cdk
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/cdk
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 **Note:** Version bump only for package @fundamental-ngx/cdk

diff --git a/libs/cdk/package.json b/libs/cdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/cdk",
-  "version": "0.54.2-rc.2",
+  "version": "0.54.2-rc.4",
   "schematics": "./schematics/collection.json",
   "description": "Fundamental Library for Angular - CDK",
   "license": "Apache-2.0",

diff --git a/libs/core/CHANGELOG.md b/libs/core/CHANGELOG.md
@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+
+### Bug Fixes
+
+* **core:** make popover body have dialog role by default ([#12907](https://github.com/SAP/fundamental-ngx/issues/12907)) ([6f33393](https://github.com/SAP/fundamental-ngx/commit/6f33393a592789979976adb2f065350ce77ee9e8))
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+
+### Bug Fixes
+
+* **core,platform:** add input to list item to prevent click selection. fix issue with toggling column on p13 dialog ([#12878](https://github.com/SAP/fundamental-ngx/issues/12878)) ([b908419](https://github.com/SAP/fundamental-ngx/commit/b908419673a8422c1140e3d0110a176a1a1985db))
+* **core:** combobox communicateByObject bugs ([#12815](https://github.com/SAP/fundamental-ngx/issues/12815)) ([26fd691](https://github.com/SAP/fundamental-ngx/commit/26fd691e14e8b8e609cd2e554074fdb4c195a537))
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 **Note:** Version bump only for package @fundamental-ngx/core

diff --git a/libs/core/package.json b/libs/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core",
-  "version": "0.54.2-rc.2",
+  "version": "0.54.2-rc.4",
   "schematics": "./schematics/collection.json",
   "ng-update": {
     "migrations": "./schematics/migrations.json"

diff --git a/libs/core/popover/base/base-popover.class.ts b/libs/core/popover/base/base-popover.class.ts
@@ -167,7 +167,7 @@ export class BasePopoverClass {
     beforeOpen = new EventEmitter();
 
     /** @hidden Aria role for the popover body. */
-    _bodyRole: string | null = null;
+    _bodyRole: string | null = 'dialog';
 
     /** @hidden ID for the popover body. */
     _bodyId: string | null = null;

diff --git a/libs/core/popover/popover-body/popover-body.component.ts b/libs/core/popover/popover-body/popover-body.component.ts
@@ -98,7 +98,7 @@ export class PopoverBodyComponent implements AfterViewInit {
     _closeOnEscapeKey = false;
 
     /** @hidden Aria role for the popover body. */
-    _bodyRole: Nullable<string> = null;
+    _bodyRole: Nullable<string> = 'dialog';
 
     /** @hidden Aria role for the popover body. */
     _bodyId: Nullable<string> = null;

diff --git a/libs/cx/CHANGELOG.md b/libs/cx/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+**Note:** Version bump only for package @fundamental-ngx/cx
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/cx
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 **Note:** Version bump only for package @fundamental-ngx/cx

diff --git a/libs/cx/package.json b/libs/cx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/cx",
-  "version": "0.54.2-rc.2",
+  "version": "0.54.2-rc.4",
   "schematics": "./schematics/collection.json",
   "description": "Fundamental Library for Angular - cx",
   "license": "Apache-2.0",

diff --git a/libs/datetime-adapter/CHANGELOG.md b/libs/datetime-adapter/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+**Note:** Version bump only for package @fundamental-ngx/datetime-adapter
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/datetime-adapter
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 **Note:** Version bump only for package @fundamental-ngx/datetime-adapter

diff --git a/libs/datetime-adapter/package.json b/libs/datetime-adapter/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fundamental-ngx/datetime-adapter",
-    "version": "0.54.2-rc.2",
+    "version": "0.54.2-rc.4",
     "description": "Datetime adapter for SAP Fundamentals, based on Day.js package",
     "license": "Apache-2.0",
     "homepage": "https://sap.github.io/fundamental-ngx/home",

diff --git a/libs/docs/core/multi-combobox/e2e/multi-combobox.po.ts b/libs/docs/core/multi-combobox/e2e/multi-combobox.po.ts
@@ -16,7 +16,7 @@ export class MultiComboboxPo extends CoreBaseComponentPo {
     listItem = this.list + ' li.fd-list__item[role="option"]';
     selectedListItem = `${this.list} .fd-list__item.is-selected .fd-list__title`;
 
-    dialog = '[role="dialog"]';
+    dialog = '.fd-dialog';
     dialogButton = this.dialog + ' .fd-button';
     dialogListItem = this.dialog + ' .fd-list__item[role="option"]';
     selectedDialogItem = this.dialog + ' .fd-list__item.is-selected .fd-list__title';

diff --git a/libs/docs/platform/multi-combobox/e2e/multi-combobox.po.ts b/libs/docs/platform/multi-combobox/e2e/multi-combobox.po.ts
@@ -16,7 +16,7 @@ export class MultiComboboxPo extends PlatformBaseComponentPo {
     listItem = this.list + ' li.fd-list__item[role="option"]';
     selectedListItem = `${this.list} .fd-list__item.is-selected .fd-list__title`;
 
-    dialog = '[role="dialog"]';
+    dialog = '.fd-dialog';
     dialogButton = this.dialog + ' .fd-button';
     dialogListItem = this.dialog + ' .fd-list__item[role="option"]';
     selectedDialogItem = this.dialog + ' .fd-list__item.is-selected .fd-list__title';

diff --git a/libs/docs/platform/multi-input/e2e/multi-input.po.ts b/libs/docs/platform/multi-input/e2e/multi-input.po.ts
@@ -15,7 +15,7 @@ export class MultiInputPo extends PlatformBaseComponentPo {
     expandedDropdown = 'fdp-list .fd-list';
     activeDropdownButtons = 'button[aria-label="value-help"]';
     activeInputs = '.fd-input-group.fd-input-group--control input';
-    mobileInput = 'div[role="dialog"] input';
+    mobileInput = '.fd-dialog input';
     filledInput = '.fd-tokenizer__inner';
     approveButton = '[fdtype="emphasized"]';
     groupHeader = '.fd-list__group-header';

diff --git a/libs/docs/platform/table/e2e/table-settings-dialog.e2e-spec.ts b/libs/docs/platform/table/e2e/table-settings-dialog.e2e-spec.ts
@@ -137,31 +137,31 @@ describe('Table component test suite', () => {
         it('should check filtering by status color positive', async () => {
             await scrollIntoView(tableFilterableExample);
             await click(tableFilterableExample + toolbarButton);
-            const elem = $('li.last-child');
+            const elem = await $('li.last-child');
             elem.click();
             await expect((await getText(tableCellStatusColor, 1)).trim()).withContext('positive');
         });
 
         it('should check filtering by status color negative', async () => {
             await scrollIntoView(tableFilterableExample);
             await click(tableFilterableExample + toolbarButton);
-            const elem = $('li.last-child');
+            const elem = await $('li.last-child');
             elem.click();
             await expect((await getText(tableCellStatusColor, 2)).trim()).withContext('negative');
         });
 
         it('should check no filter results', async () => {
             await scrollIntoView(tableFilterableExample);
             await click(tableFilterableExample + toolbarButton);
-            const elem = $('li.last-child');
+            const elem = await $('li.last-child');
             elem.click();
             await expect(await doesItExist(tableFilterableExample + tableRow)).withContext(false, '');
         });
 
         it('should check filtering by status', async () => {
             await scrollIntoView(tableFilterableExample);
             await click(tableFilterableExample + toolbarButton);
-            const elem = $('li:nth-child(2)');
+            const elem = await $('li:nth-child(2)');
             elem.click();
             const rowLength = await getElementArrayLength(tableFilterableExample + tableRow);
             for (let i = 0; i < rowLength; i++) {

diff --git a/libs/i18n/CHANGELOG.md b/libs/i18n/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+**Note:** Version bump only for package @fundamental-ngx/i18n
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/i18n
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 **Note:** Version bump only for package @fundamental-ngx/i18n

diff --git a/libs/i18n/package.json b/libs/i18n/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fundamental-ngx/i18n",
-    "version": "0.54.2-rc.2",
+    "version": "0.54.2-rc.4",
     "peerDependencies": {
         "@angular/common": "ANGULAR_VER_PLACEHOLDER",
         "@angular/core": "ANGULAR_VER_PLACEHOLDER",

diff --git a/libs/moment-adapter/CHANGELOG.md b/libs/moment-adapter/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+**Note:** Version bump only for package @fundamental-ngx/moment-adapter
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/moment-adapter
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 **Note:** Version bump only for package @fundamental-ngx/moment-adapter

diff --git a/libs/moment-adapter/package.json b/libs/moment-adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/moment-adapter",
-  "version": "0.54.2-rc.2",
+  "version": "0.54.2-rc.4",
   "description": "Datetime adapter for SAP Fundamentals, based on Moment.js package",
   "license": "Apache-2.0",
   "homepage": "https://sap.github.io/fundamental-ngx/home",

diff --git a/libs/nx-plugin/CHANGELOG.md b/libs/nx-plugin/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.3...v0.54.2-rc.4) (2025-01-10)
+
+**Note:** Version bump only for package @fundamental-ngx/nx-plugin
+
+
+
+
+
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/nx-plugin
+
+
+
+
+
 ## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
 
 **Note:** Version bump only for package @fundamental-ngx/nx-plugin

diff --git a/libs/nx-plugin/package.json b/libs/nx-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fundamental-ngx/nx-plugin",
-    "version": "0.54.2-rc.2",
+    "version": "0.54.2-rc.4",
     "main": "src/index.js",
     "generators": "./generators.json",
     "executors": "./executors.json",