From 960ab61a736bac42a51e671369a59b1a0f48b9e8 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Tue, 3 Oct 2023 12:58:05 +0300
Subject: [PATCH 01/19] feat(storybook): up storybook version

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ce3560215..278962cd5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ Help us keep FusionUI open and inclusive.
 Please read and follow our [Code of Conduct][coc].
 
 
-## <a name="question"></a> Got a Question or Problem?
+## <a name="question"></a> Got a Question or Problem? 
 
 Do not open issues for general support questions as we want to keep GitHub issues for bug reports and feature requests.
 Instead, we recommend email us to [fusion@is.com](mailto://fusion@is.com) or contact us on our Slack channel: [fusion-ui-community](https://superops.slack.com/app_redirect?channel=CR47GLKHQ)

From a0b394f2001e6a46eb543c6cf87152897d356d68 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Wed, 4 Oct 2023 14:10:06 +0300
Subject: [PATCH 02/19] chore(isct-13): start add tests attributes

---
 .../common/base/chip-filter.base.component.ts        |  4 ++++
 .../chip-filter/v3/chip-filter.component.html        |  2 +-
 .../chip-filter/v3/chip-filter.component.stories.ts  |  3 ++-
 .../v3/stories/chip-filters.component.stories.ts     | 12 +++++++-----
 .../dropdown-dual-multi-select.base.component.html   |  4 +++-
 .../dropdown-dual-multi-select.base.component.ts     |  4 ++++
 .../dropdown-dual-multi-select-body.component.html   |  1 +
 .../dropdown-dual-multi-select-body.component.ts     |  4 ++++
 .../dropdown-dual-multi-select-header.component.html |  1 +
 .../dropdown-dual-multi-select-header.component.ts   |  3 +++
 projects/fusion-ui/entities/public-api.ts            |  1 +
 projects/fusion-ui/entities/test-ids-modifiers.ts    | 10 ++++++++++
 12 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 projects/fusion-ui/entities/test-ids-modifiers.ts

diff --git a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
index 2add68b5a..cc006049a 100644
--- a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
+++ b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
@@ -24,9 +24,11 @@ import {
 } from './chip-filter-component-configurations';
 import {takeUntil} from 'rxjs/operators';
 import {ApiBase} from '@ironsource/fusion-ui/components/api-base';
+import {ChipFilterTestIdModifiers} from '@ironsource/fusion-ui';
 
 @Directive()
 export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit, OnDestroy, AfterContentInit {
+    @Input() testId: string;
     /** @internal */
     @ContentChild(ApiBase, {static: true}) apiBase: ApiBase;
     /** @internal */
@@ -47,6 +49,8 @@ export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit,
     /** @internal */
     rightIcon: ChipIcon;
 
+    testIdChipFilterModifiers: typeof ChipFilterTestIdModifiers = ChipFilterTestIdModifiers;
+
     private onDestroy$ = new Subject<void>();
     private restListeners$ = new Subject<void>();
     private clearClickSubscription$ = merge(this.onDestroy$, this.restListeners$);
diff --git a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
index f5fefd18e..2d4a9bae9 100644
--- a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
+++ b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
@@ -14,7 +14,7 @@
             <ng-container *ngIf="apiBase && isDefaultContent" [ngTemplateOutlet]="defaultContent"></ng-container>
         </div>
         <fusion-icon class="fu-chip-right-icon" *ngIf="rightIcon" [name]="rightIcon.icon" [fusionTooltip]="rightIcon.tooltipText"></fusion-icon>
-        <fusion-icon class="fu-icon-close" *ngIf="isCloseIcon$ | async" (click)="closeClicked($event)" [name]="'close-bold'"></fusion-icon>
+        <fusion-icon class="fu-icon-close" *ngIf="isCloseIcon$ | async" (click)="closeClicked($event)" [name]="'close-bold'" [attr.data-testid]="testId+'--'+testIdChipFilterModifiers.RESET_BUTTON"></fusion-icon>
     </div>
 </ng-template>
 
diff --git a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.stories.ts b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.stories.ts
index d30716de0..dddee0582 100644
--- a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.stories.ts
+++ b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.stories.ts
@@ -574,13 +574,14 @@ export const DateRangeWithIcon = {
 const ChipFilterIncludeExcludeTemplate: StoryFn<ChipFilterComponent> = (args: ChipFilterComponent) => ({
     props: {...args},
     template: `<div style="height: 350px; width: 250px;">
-    <fusion-chip-filter [configuration]="configuration">
+    <fusion-chip-filter [configuration]="configuration" [testId]="testId">
         <div class="filter-element">
              <fusion-dropdown-dual-multi-select
                 [title]="title"
                 [placeholder]="placeholder"
                 [formControl]="formControl"
                 [items]="items"
+                [testId]="testId"
              ></fusion-dropdown-dual-multi-select>
         </div>
     </fusion-chip-filter>
diff --git a/projects/fusion-ui/components/chip-filters/v3/stories/chip-filters.component.stories.ts b/projects/fusion-ui/components/chip-filters/v3/stories/chip-filters.component.stories.ts
index 9afa57c29..ea6415db3 100644
--- a/projects/fusion-ui/components/chip-filters/v3/stories/chip-filters.component.stories.ts
+++ b/projects/fusion-ui/components/chip-filters/v3/stories/chip-filters.component.stories.ts
@@ -408,7 +408,7 @@ const FilterPanelTemplate: StoryFn<ChipFiltersComponent> = (args: ChipFiltersCom
         [disableAddFilter]="disableAddFilter"
         [isSearch]="isSearch"
         >
-        <fusion-chip-filter [configuration]="configChip1">
+        <fusion-chip-filter [configuration]="configChip1" testId="test-chip-1" testId="test-chip-users">
             <div class="filter-element">
                 <fusion-dropdown
                      [placeholderPrefix]="placeholderPrefixChip1"
@@ -421,7 +421,7 @@ const FilterPanelTemplate: StoryFn<ChipFiltersComponent> = (args: ChipFiltersCom
                 </fusion-dropdown>
             </div>
         </fusion-chip-filter>
-        <fusion-chip-filter [configuration]="configChip2">
+        <fusion-chip-filter [configuration]="configChip2" testId="test-chip-status">
             <div class="filter-element">
                 <fusion-dropdown
                      [placeholderPrefix]="placeholderPrefixChip2"
@@ -433,14 +433,15 @@ const FilterPanelTemplate: StoryFn<ChipFiltersComponent> = (args: ChipFiltersCom
                 </fusion-dropdown>
             </div>
         </fusion-chip-filter>
-        <fusion-chip-filter [configuration]="configChip3">
+        <fusion-chip-filter [configuration]="configChip3"  testId="test-chip-dates">
             <div class="filter-element">
                 <fusion-daterange [options]="dateRangeOptions" [formControl]="fcChip3"> </fusion-daterange>
             </div>
         </fusion-chip-filter>
-        <fusion-chip-filter [configuration]="configChip4">
+        <fusion-chip-filter [configuration]="configChip4" testId="test-chip-country">
             <div class="filter-element">
                 <fusion-dropdown-dual-multi-select
+                    testId="test-chip-country"
                     [title]="optionsTitleChip4"
                     [placeholder]="placeholderChip4"
                     [formControl]="fcChip4"
@@ -448,9 +449,10 @@ const FilterPanelTemplate: StoryFn<ChipFiltersComponent> = (args: ChipFiltersCom
                  ></fusion-dropdown-dual-multi-select>
             </div>
         </fusion-chip-filter>
-        <fusion-chip-filter [configuration]="configChip5">
+        <fusion-chip-filter [configuration]="configChip5" testId="test-chip-campaign">
             <div class="filter-element">
                 <fusion-dropdown-dual-multi-select
+                    testId="test-chip-campaign"
                     [title]="optionsTitleChip5"
                     [placeholder]="placeholderChip5"
                     [formControl]="fcChip5"
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
index 8c1b931cc..4b8e645c3 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
@@ -47,6 +47,7 @@
         <fusion-dropdown-dual-multi-select-header
             [formControl]="searchControlTerm"
             [title]="title"
+            [testId]="testId"
         ></fusion-dropdown-dual-multi-select-header>
 
         <fusion-dropdown-dual-multi-select-body
@@ -61,6 +62,7 @@
             [hasSelectAll]="hasSelectAll"
             [loadingLeft]="loadingLeft$ | async"
             [hasBackendPagination]="hasBackendPagination"
+            [testId]="testId"
         ></fusion-dropdown-dual-multi-select-body>
 
         <fusion-dropdown-dual-multi-select-footer
@@ -72,6 +74,6 @@
 
 <ng-template #chipContent>
     <div class="fu-chip-content-default">
-        <div [fusionTooltip]="chipDefaultContent" class="truncate fu-chip-text"><span *ngIf="title" class="fu-chip-label">{{ title + ': ' }}</span>{{ selected$ | async }}</div>
+        <div [fusionTooltip]="chipDefaultContent" class="truncate fu-chip-text"><span *ngIf="title" class="fu-chip-label" [attr.data-testid]="testId+'--'+testIdIncludeExcludeModifiers.CHIP_FILTER_LABEL">{{ title + ': ' }}</span><span [attr.data-testid]="testId+'--'+testIdIncludeExcludeModifiers.CHIP_FILTER_VALUE">{{ selected$ | async }}</span></div>
     </div>
 </ng-template>
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
index 6a6ab15b4..028231bab 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
@@ -9,6 +9,7 @@ import {ApiBase} from '@ironsource/fusion-ui/components/api-base';
 import {UniqueIdService} from '@ironsource/fusion-ui/services/unique-id';
 import {BackendPagination, SelectedItemName} from '@ironsource/fusion-ui/components/dropdown';
 import {isNullOrUndefined} from '@ironsource/fusion-ui/utils';
+import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
 
 const CLASS_LIST = [
     'dual-select-button',
@@ -31,6 +32,7 @@ export abstract class DropdownDualMultiSelectBaseComponent extends ApiBase imple
     /** @internal */
     @Input() autoComplete: boolean = true;
     @Input() title: string;
+    @Input() testId: string;
     /** @internal */
     @Input() pendingItems: boolean = false;
     /** @internal */
@@ -43,6 +45,8 @@ export abstract class DropdownDualMultiSelectBaseComponent extends ApiBase imple
         return this._hasSelectAll;
     }
 
+    testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+
     @Input() set placeholder(data: string) {
         this.placeholder$.next(data);
         this.defaultPlaceHolder = data;
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
index 9a84fa835..3fe748e08 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
@@ -21,6 +21,7 @@
                 </label>
                 <div
                     *ngIf="showClearAllButton()"
+                    [attr.data-testid]="testId+'--'+testIdIncludeExcludeModifiers.CLEAR_ALL_BUTTON"
                     (click)="clearAll()" class="clear-all-btn">Clear all</div>
             </div>
         </div>
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
index 598f0d5f8..2145ceb44 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
@@ -15,6 +15,7 @@ import {BehaviorSubject, combineLatest, fromEvent, Observable, of, Subject} from
 import {debounceTime, filter, map, scan, takeUntil, tap} from 'rxjs/operators';
 import {ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {isNullOrUndefined} from '@ironsource/fusion-ui/utils';
+import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui';
 
 const PAGINATION_CHUNK = 20;
 
@@ -47,6 +48,7 @@ export class DropdownDualMultiSelectBodyComponent implements OnInit, OnDestroy,
     @Input() totalItems: number;
     @Input() isPendingItems: boolean;
     @Input() hasSelectAll: boolean = true;
+    @Input() testId: string;
 
     @Input() set items(data: DropdownOption[]) {
         this.options$.next(data || []);
@@ -71,6 +73,8 @@ export class DropdownDualMultiSelectBodyComponent implements OnInit, OnDestroy,
 
     @Output() scrollDown = new EventEmitter();
 
+    testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+
     isSelectAllDisabled$ = new BehaviorSubject<boolean>(false);
     selectedItemsNumber: number;
     selectedControl = new FormControl([]);
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
index 8e405d4e0..7613ae7e5 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
@@ -6,6 +6,7 @@
         <div class="fu-search-bar">
             <fusion-icon class="fu-icon-search" [name]="searchIcon"></fusion-icon>
             <input #input
+                   [attr.data-testid]="testId+'--'+testIdIncludeExcludeModifiers.SEARCH_INPUT"
                    autocomplete="off"
                    minlength="1"
                    [placeholder]="'Search'"
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
index cdeff5486..cb154c3db 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
@@ -3,6 +3,7 @@ import {ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR} from '@angular/for
 import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
 import {Subject} from 'rxjs';
 import {IconData} from '@ironsource/fusion-ui/components/icon/common/entities';
+import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui';
 
 @Component({
     selector: 'fusion-dropdown-dual-multi-select-header',
@@ -21,7 +22,9 @@ export class DropdownDualMultiSelectHeaderComponent implements OnDestroy, AfterV
     @ViewChild('input') input?: ElementRef;
 
     @Input() title: string;
+    @Input() testId: string;
 
+    testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
     searchIcon?: IconData = {iconName: 'search-bold', iconVersion: 'v3'};
     searchClearIcon?: IconData = {iconName: 'cancel', iconVersion: 'v3'};
     searchControl = new FormControl();
diff --git a/projects/fusion-ui/entities/public-api.ts b/projects/fusion-ui/entities/public-api.ts
index c2d7b198f..8616d0a6e 100644
--- a/projects/fusion-ui/entities/public-api.ts
+++ b/projects/fusion-ui/entities/public-api.ts
@@ -1 +1,2 @@
 export * from './layout-user';
+export * from './test-ids-modifiers';
diff --git a/projects/fusion-ui/entities/test-ids-modifiers.ts b/projects/fusion-ui/entities/test-ids-modifiers.ts
new file mode 100644
index 000000000..92bf8c2c1
--- /dev/null
+++ b/projects/fusion-ui/entities/test-ids-modifiers.ts
@@ -0,0 +1,10 @@
+export enum ChipFilterTestIdModifiers {
+    RESET_BUTTON = 'chf-reset-button'
+}
+
+export enum IncludeExcludeTestIdModifiers {
+    CHIP_FILTER_LABEL = 'ie-chf-label',
+    CHIP_FILTER_VALUE = 'ie-chf-value',
+    CLEAR_ALL_BUTTON = 'ie-clear-all-button',
+    SEARCH_INPUT = 'ie-search-input'
+}

From 45073ecec7c04c753ee9c4cba8c296059c5b6d40 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Wed, 4 Oct 2023 15:12:30 +0300
Subject: [PATCH 03/19] chore(isct-13): add test ids services

---
 .../common/base/chip-filter.base.component.ts |  8 +++--
 .../chip-filter/v3/chip-filter.component.html |  2 +-
 ...down-dual-multi-select.base.component.html |  2 +-
 ...opdown-dual-multi-select.base.component.ts | 23 ++++++++++++--
 ...down-dual-multi-select-body.component.html |  2 +-
 ...opdown-dual-multi-select-body.component.ts |  7 +++--
 ...wn-dual-multi-select-header.component.html |  2 +-
 ...down-dual-multi-select-header.component.ts | 19 ++++++++++--
 projects/fusion-ui/services/index.ts          |  1 +
 projects/fusion-ui/services/test-ids/index.ts |  1 +
 .../services/test-ids/ng-package.json         |  7 +++++
 .../fusion-ui/services/test-ids/public-api.ts |  1 +
 .../test-ids/test-ids.service.spec.ts         | 30 +++++++++++++++++++
 .../services/test-ids/test-ids.service.ts     | 13 ++++++++
 14 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 projects/fusion-ui/services/test-ids/index.ts
 create mode 100644 projects/fusion-ui/services/test-ids/ng-package.json
 create mode 100644 projects/fusion-ui/services/test-ids/public-api.ts
 create mode 100644 projects/fusion-ui/services/test-ids/test-ids.service.spec.ts
 create mode 100644 projects/fusion-ui/services/test-ids/test-ids.service.ts

diff --git a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
index cc006049a..ea805367e 100644
--- a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
+++ b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
@@ -6,6 +6,7 @@ import {
     Directive,
     ElementRef,
     EventEmitter,
+    Injector,
     Input,
     OnDestroy,
     OnInit,
@@ -24,7 +25,8 @@ import {
 } from './chip-filter-component-configurations';
 import {takeUntil} from 'rxjs/operators';
 import {ApiBase} from '@ironsource/fusion-ui/components/api-base';
-import {ChipFilterTestIdModifiers} from '@ironsource/fusion-ui';
+import {ChipFilterTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services';
 
 @Directive()
 export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit, OnDestroy, AfterContentInit {
@@ -50,6 +52,7 @@ export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit,
     rightIcon: ChipIcon;
 
     testIdChipFilterModifiers: typeof ChipFilterTestIdModifiers = ChipFilterTestIdModifiers;
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     private onDestroy$ = new Subject<void>();
     private restListeners$ = new Subject<void>();
@@ -148,7 +151,8 @@ export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit,
         /** @internal */
         public element: ElementRef,
         private renderer: Renderer2,
-        private cdr: ChangeDetectorRef
+        private cdr: ChangeDetectorRef,
+        private injector: Injector
     ) {}
 
     ngOnInit() {
diff --git a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
index 2d4a9bae9..dc36e289e 100644
--- a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
+++ b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
@@ -14,7 +14,7 @@
             <ng-container *ngIf="apiBase && isDefaultContent" [ngTemplateOutlet]="defaultContent"></ng-container>
         </div>
         <fusion-icon class="fu-chip-right-icon" *ngIf="rightIcon" [name]="rightIcon.icon" [fusionTooltip]="rightIcon.tooltipText"></fusion-icon>
-        <fusion-icon class="fu-icon-close" *ngIf="isCloseIcon$ | async" (click)="closeClicked($event)" [name]="'close-bold'" [attr.data-testid]="testId+'--'+testIdChipFilterModifiers.RESET_BUTTON"></fusion-icon>
+        <fusion-icon class="fu-icon-close" *ngIf="isCloseIcon$ | async" (click)="closeClicked($event)" [name]="'close-bold'" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdChipFilterModifiers.RESET_BUTTON)"></fusion-icon>
     </div>
 </ng-template>
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
index 4b8e645c3..4ae670b9d 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
@@ -74,6 +74,6 @@
 
 <ng-template #chipContent>
     <div class="fu-chip-content-default">
-        <div [fusionTooltip]="chipDefaultContent" class="truncate fu-chip-text"><span *ngIf="title" class="fu-chip-label" [attr.data-testid]="testId+'--'+testIdIncludeExcludeModifiers.CHIP_FILTER_LABEL">{{ title + ': ' }}</span><span [attr.data-testid]="testId+'--'+testIdIncludeExcludeModifiers.CHIP_FILTER_VALUE">{{ selected$ | async }}</span></div>
+        <div [fusionTooltip]="chipDefaultContent" class="truncate fu-chip-text"><span *ngIf="title" class="fu-chip-label" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.CHIP_FILTER_LABEL)">{{ title + ': ' }}</span><span [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.CHIP_FILTER_VALUE)">{{ selected$ | async }}</span></div>
     </div>
 </ng-template>
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
index 028231bab..6afe80eeb 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
@@ -1,4 +1,16 @@
-import {Directive, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, Renderer2, TemplateRef, ViewChild} from '@angular/core';
+import {
+    Directive,
+    ElementRef,
+    EventEmitter,
+    Injector,
+    Input,
+    OnDestroy,
+    OnInit,
+    Output,
+    Renderer2,
+    TemplateRef,
+    ViewChild
+} from '@angular/core';
 import {InputSize} from '@ironsource/fusion-ui/components/input/common/base';
 import {ControlValueAccessor, FormControl} from '@angular/forms';
 import {DynamicComponentConfiguration} from '@ironsource/fusion-ui/components/dynamic-components/common/entities';
@@ -10,6 +22,7 @@ import {UniqueIdService} from '@ironsource/fusion-ui/services/unique-id';
 import {BackendPagination, SelectedItemName} from '@ironsource/fusion-ui/components/dropdown';
 import {isNullOrUndefined} from '@ironsource/fusion-ui/utils';
 import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services';
 
 const CLASS_LIST = [
     'dual-select-button',
@@ -46,6 +59,7 @@ export abstract class DropdownDualMultiSelectBaseComponent extends ApiBase imple
     }
 
     testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     @Input() set placeholder(data: string) {
         this.placeholder$.next(data);
@@ -144,7 +158,12 @@ export abstract class DropdownDualMultiSelectBaseComponent extends ApiBase imple
     /** @internal */
     loadingLeft$ = new BehaviorSubject<boolean>(false);
 
-    constructor(protected element: ElementRef, protected renderer: Renderer2, protected uidService: UniqueIdService) {
+    constructor(
+        protected element: ElementRef,
+        protected renderer: Renderer2,
+        protected uidService: UniqueIdService,
+        private injector: Injector
+    ) {
         super();
         this.uid = this.uidService.getUniqueId().toString();
     }
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
index 3fe748e08..c729881c5 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
@@ -21,7 +21,7 @@
                 </label>
                 <div
                     *ngIf="showClearAllButton()"
-                    [attr.data-testid]="testId+'--'+testIdIncludeExcludeModifiers.CLEAR_ALL_BUTTON"
+                    [attr.data-testid]="testIdsService.getTestAttribute(testId,testIdIncludeExcludeModifiers.CLEAR_ALL_BUTTON)"
                     (click)="clearAll()" class="clear-all-btn">Clear all</div>
             </div>
         </div>
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
index 2145ceb44..4c42da730 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
@@ -4,6 +4,7 @@ import {
     ElementRef,
     EventEmitter,
     forwardRef,
+    Injector,
     Input,
     OnDestroy,
     OnInit,
@@ -15,7 +16,8 @@ import {BehaviorSubject, combineLatest, fromEvent, Observable, of, Subject} from
 import {debounceTime, filter, map, scan, takeUntil, tap} from 'rxjs/operators';
 import {ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {isNullOrUndefined} from '@ironsource/fusion-ui/utils';
-import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui';
+import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services';
 
 const PAGINATION_CHUNK = 20;
 
@@ -74,6 +76,7 @@ export class DropdownDualMultiSelectBodyComponent implements OnInit, OnDestroy,
     @Output() scrollDown = new EventEmitter();
 
     testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     isSelectAllDisabled$ = new BehaviorSubject<boolean>(false);
     selectedItemsNumber: number;
@@ -98,7 +101,7 @@ export class DropdownDualMultiSelectBodyComponent implements OnInit, OnDestroy,
     private propagateChange = (_: DropdownOption[]) => {};
     private propagateTouched = () => {};
 
-    constructor() {}
+    constructor(private injector: Injector) {}
 
     ngOnInit(): void {
         this.displayOptions$ = this.generateOptions('left').pipe(
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
index 7613ae7e5..1252c6c0b 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
@@ -6,7 +6,7 @@
         <div class="fu-search-bar">
             <fusion-icon class="fu-icon-search" [name]="searchIcon"></fusion-icon>
             <input #input
-                   [attr.data-testid]="testId+'--'+testIdIncludeExcludeModifiers.SEARCH_INPUT"
+                   [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.SEARCH_INPUT)"
                    autocomplete="off"
                    minlength="1"
                    [placeholder]="'Search'"
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
index cb154c3db..b680908a3 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
@@ -1,9 +1,20 @@
-import {ChangeDetectionStrategy, Component, Input, forwardRef, OnDestroy, ViewChild, ElementRef, AfterViewInit} from '@angular/core';
+import {
+    ChangeDetectionStrategy,
+    Component,
+    Input,
+    forwardRef,
+    OnDestroy,
+    ViewChild,
+    ElementRef,
+    AfterViewInit,
+    Injector
+} from '@angular/core';
 import {ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
 import {Subject} from 'rxjs';
 import {IconData} from '@ironsource/fusion-ui/components/icon/common/entities';
-import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui';
+import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services';
 
 @Component({
     selector: 'fusion-dropdown-dual-multi-select-header',
@@ -25,13 +36,15 @@ export class DropdownDualMultiSelectHeaderComponent implements OnDestroy, AfterV
     @Input() testId: string;
 
     testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
     searchIcon?: IconData = {iconName: 'search-bold', iconVersion: 'v3'};
     searchClearIcon?: IconData = {iconName: 'cancel', iconVersion: 'v3'};
     searchControl = new FormControl();
 
     private onDestroy$ = new Subject<void>();
 
-    constructor() {}
+    constructor(private injector: Injector) {}
 
     ngOnDestroy(): void {
         this.onDestroy$.next();
diff --git a/projects/fusion-ui/services/index.ts b/projects/fusion-ui/services/index.ts
index 4b6e9752d..ebe52f5a5 100644
--- a/projects/fusion-ui/services/index.ts
+++ b/projects/fusion-ui/services/index.ts
@@ -4,3 +4,4 @@ export * from './log';
 export * from './mocks';
 export * from './timezone';
 export * from './unique-id';
+export * from './test-ids';
diff --git a/projects/fusion-ui/services/test-ids/index.ts b/projects/fusion-ui/services/test-ids/index.ts
new file mode 100644
index 000000000..7e1a213e3
--- /dev/null
+++ b/projects/fusion-ui/services/test-ids/index.ts
@@ -0,0 +1 @@
+export * from './public-api';
diff --git a/projects/fusion-ui/services/test-ids/ng-package.json b/projects/fusion-ui/services/test-ids/ng-package.json
new file mode 100644
index 000000000..c154cd4ee
--- /dev/null
+++ b/projects/fusion-ui/services/test-ids/ng-package.json
@@ -0,0 +1,7 @@
+{
+    "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+    "lib": {
+        "entryFile": "public-api.ts"
+    },
+    "allowedNonPeerDependencies": ["."]
+}
diff --git a/projects/fusion-ui/services/test-ids/public-api.ts b/projects/fusion-ui/services/test-ids/public-api.ts
new file mode 100644
index 000000000..c80899e30
--- /dev/null
+++ b/projects/fusion-ui/services/test-ids/public-api.ts
@@ -0,0 +1 @@
+export * from './test-ids.service';
diff --git a/projects/fusion-ui/services/test-ids/test-ids.service.spec.ts b/projects/fusion-ui/services/test-ids/test-ids.service.spec.ts
new file mode 100644
index 000000000..920b6b856
--- /dev/null
+++ b/projects/fusion-ui/services/test-ids/test-ids.service.spec.ts
@@ -0,0 +1,30 @@
+import { TestBed } from '@angular/core/testing';
+import { TestIdsService } from './test-ids.service';
+
+const testId = 'test-id';
+const testModifier = 'test-modifier';
+
+describe('TestIdsService', () => {
+  let service: TestIdsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(TestIdsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should return undefined in case no test id', () => {
+    expect(service.getTestAttribute(undefined, testModifier)).toBeUndefined();
+  });
+
+  it('should return undefined in case no testId "undefined"', () => {
+    expect(service.getTestAttribute('undefined', testModifier)).toBeUndefined();
+  });
+
+  it('should return attribute value for testId and Modifier', () => {
+    expect(service.getTestAttribute(testId, testModifier)).toBe(`${testId}--${testModifier}`);
+  });
+});
diff --git a/projects/fusion-ui/services/test-ids/test-ids.service.ts b/projects/fusion-ui/services/test-ids/test-ids.service.ts
new file mode 100644
index 000000000..1c185591d
--- /dev/null
+++ b/projects/fusion-ui/services/test-ids/test-ids.service.ts
@@ -0,0 +1,13 @@
+import {Injectable} from '@angular/core';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class TestIdsService {
+    public getTestAttribute(testId: string, testModifier: string): string {
+        if (!!testId && testId !== 'undefined') {
+            return `${testId}--${testModifier}`;
+        }
+        return undefined;
+    }
+}

From 60e8396d62e2cfd512986f121c71b66b932d422c Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Wed, 4 Oct 2023 15:14:34 +0300
Subject: [PATCH 04/19] chore(isct-13): add test ids services

---
 .../dropdown-dual-multi-select-body.component.ts                 | 1 +
 .../dropdown-dual-multi-select-header.component.ts               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
index b5e0fc2f2..045b341d5 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
@@ -46,6 +46,7 @@ export class DropdownDualMultiSelectBodyComponent implements OnInit, OnDestroy,
     @Input() totalItems: number;
     @Input() isPendingItems: boolean;
     @Input() hasSelectAll: boolean = true;
+    @Input() testId: string;
 
     @Input() set items(data: DropdownOption[]) {
         this.options$.next(data || []);
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
index 9c4d51ad6..0510253cc 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
@@ -19,6 +19,7 @@ import {Subject} from 'rxjs';
 })
 export class DropdownDualMultiSelectHeaderComponent implements OnDestroy, ControlValueAccessor {
     @Input() title: string;
+    @Input() testId: string;
 
     inputSize = InputSize;
     searchControl = new FormControl();

From c7ad78d132a4702facd22bc01187df553cdc6b8c Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Wed, 4 Oct 2023 15:48:43 +0300
Subject: [PATCH 05/19] chore(isct-13): add attributes to the include-exclude
 component

---
 .../dropdown-dual-multi-select.base.component.html    |  1 +
 .../dropdown-dual-multi-select-footer.component.ts    |  3 ++-
 ...ropdown-dual-multi-select-body-item.component.html |  7 ++++---
 .../dropdown-dual-multi-select-body-item.component.ts |  9 +++++++--
 .../dropdown-dual-multi-select-body.component.html    |  4 +++-
 .../dropdown-dual-multi-select-footer.component.html  |  4 ++--
 .../dropdown-dual-multi-select-footer.component.ts    |  9 +++++++--
 .../dropdown-dual-multi-select-header.component.html  |  2 +-
 projects/fusion-ui/entities/test-ids-modifiers.ts     | 11 ++++++++++-
 9 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
index 4ae670b9d..7430b8974 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
@@ -66,6 +66,7 @@
         ></fusion-dropdown-dual-multi-select-body>
 
         <fusion-dropdown-dual-multi-select-footer
+            [testId]="testId"
             (closeSelect)="closeDropdownDualSelect()"
             (applySelect)="applySelect($event)"
         ></fusion-dropdown-dual-multi-select-footer>
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
index 427b224c3..6e3738783 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
@@ -1,4 +1,4 @@
-import {ChangeDetectionStrategy, Component, EventEmitter, Output} from '@angular/core';
+import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core';
 
 @Component({
     selector: 'fusion-dropdown-dual-multi-select-footer',
@@ -7,6 +7,7 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Output} from '@angular
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DropdownDualMultiSelectFooterComponent {
+    @Input() testId: string;
     @Output() applySelect = new EventEmitter<boolean>();
     @Output() closeSelect = new EventEmitter();
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.html
index 836b9ef6c..4a9cc8826 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.html
@@ -4,9 +4,10 @@
 <ng-template #leftSide let-item="item">
     <label
         [for]="item.id"
-        class="is-option-label left-side">
+        class="is-option-label left-side" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.OPTION)">
         <fusion-checkbox
             class="item-check"
+            [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.CHECKBOX)"
             [id]="item.id"
             [isDisabled]="isDisabled"
             [checked]="isSelectedItem"
@@ -19,9 +20,9 @@
 
 
 <ng-template #rightSide let-item="item" >
-    <label class="is-option-label right-side">
+    <label class="is-option-label right-side" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.SELECTED_OPTION)">
         <ng-container [ngTemplateOutlet]="item?.content ? dynamicItem : optionTemplate" [ngTemplateOutletContext]="{item: item}"></ng-container>
-        <fusion-icon *ngIf="!isDisabled" (click)="clearSelectItem(item)" class="icon-clear" [name]="{iconName: 'close-bold', iconVersion: 'v3'}"></fusion-icon>
+        <fusion-icon *ngIf="!isDisabled" (click)="clearSelectItem(item)" class="icon-clear" [name]="{iconName: 'close-bold', iconVersion: 'v3'}" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.REMOVE_SELECTED_OPTION)"></fusion-icon>
     </label>
 </ng-template>
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
index d283d0958..4415bafa2 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
@@ -1,5 +1,6 @@
-import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core';
+import {ChangeDetectionStrategy, Component, EventEmitter, Injector, Input, Output} from '@angular/core';
 import {DropdownOption} from '@ironsource/fusion-ui/components/dropdown-option/entities';
+import {IncludeExcludeTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
 
 @Component({
     selector: 'fusion-dropdown-dual-multi-select-body-item',
@@ -12,11 +13,15 @@ export class DropdownDualMultiSelectBodyItemComponent {
     @Input() item: DropdownOption;
     @Input() isDisabled: boolean;
     @Input() isSelectedItem: boolean;
+    @Input() testId: string;
 
     @Output() changeSelected = new EventEmitter();
     @Output() clearSelect = new EventEmitter();
 
-    constructor() {}
+    testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
+    constructor(private injector: Injector) {}
 
     changeSelectedItem(item: DropdownOption): void {
         this.changeSelected.emit(item);
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
index c729881c5..cea661929 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
@@ -5,6 +5,7 @@
                 <label class="option-header-body" *ngIf="!isPendingItems && hasSelectAll">
                     <fusion-checkbox
                         class="fu-check-all"
+                        [attr.data-testid]="testIdsService.getTestAttribute(testId,testIdIncludeExcludeModifiers.SELECT_ALL)"
                         [isIndeterminate]="isIndeterminate"
                         [checked]="isAllSelected"
                         (changed)="selectAll($event)"
@@ -16,7 +17,7 @@
         </div>
         <div class="content-col-right">
             <div class="body-header">
-                <label class="fu-select-label">
+                <label class="fu-select-label" [attr.data-testid]="testIdsService.getTestAttribute(testId,testIdIncludeExcludeModifiers.SELECTED_AMOUNT)">
                     {{(selectedItemsMapping ? selectedItemsMapping : {}) | objectLengthWhereValueTrue}} selected
                 </label>
                 <div
@@ -34,6 +35,7 @@
                     <ng-container *ngIf="!isPendingItems">
                         <li *ngFor="let item of displayOptions$ | async;trackBy: trackById">
                             <fusion-dropdown-dual-multi-select-body-item
+                                [testId]="testId"
                                 [isSelectedItem]="selectedItemsMapping[item.id]"
                                 [isDisabled]="item.isDisabled"
                                 (changeSelected)="changeSelected($event)"
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.html
index 5b29c54cf..905450675 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.html
@@ -1,8 +1,8 @@
 <div class="is-dropdown-dual-multi-select-footer">
-    <fusion-button class="small transparent third" (click)="closeSelectItems()">
+    <fusion-button class="small transparent third" (click)="closeSelectItems()" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.CANCEL_BUTTON)">
         <span>Cancel</span>
     </fusion-button>
-    <fusion-button class="small primary" (click)="applySelectItems(true)">
+    <fusion-button class="small primary" (click)="applySelectItems(true)" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.APPLY_BUTTON)">
         <span>Apply</span>
     </fusion-button>
 </div>
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
index 427b224c3..24a0e233f 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
@@ -1,4 +1,5 @@
-import {ChangeDetectionStrategy, Component, EventEmitter, Output} from '@angular/core';
+import {ChangeDetectionStrategy, Component, EventEmitter, Injector, Input, Output} from '@angular/core';
+import {IncludeExcludeTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
 
 @Component({
     selector: 'fusion-dropdown-dual-multi-select-footer',
@@ -7,10 +8,14 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Output} from '@angular
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DropdownDualMultiSelectFooterComponent {
+    @Input() testId: string;
     @Output() applySelect = new EventEmitter<boolean>();
     @Output() closeSelect = new EventEmitter();
 
-    constructor() {}
+    testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
+    constructor(private injector: Injector) {}
 
     applySelectItems(close: boolean): void {
         this.applySelect.emit(close);
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
index 1252c6c0b..9de4899f3 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
@@ -1,6 +1,6 @@
 <div class="is-dropdown-dual-multi-select-header">
     <div class="fu-label-holder">
-        <span class="fu-label">{{title}}</span>
+        <span class="fu-label" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.TYPE_TITLE)">{{title}}</span>
     </div>
     <div class="fu-search-holder" (click)="setFocusToInput()">
         <div class="fu-search-bar">
diff --git a/projects/fusion-ui/entities/test-ids-modifiers.ts b/projects/fusion-ui/entities/test-ids-modifiers.ts
index 92bf8c2c1..8947eb55f 100644
--- a/projects/fusion-ui/entities/test-ids-modifiers.ts
+++ b/projects/fusion-ui/entities/test-ids-modifiers.ts
@@ -6,5 +6,14 @@ export enum IncludeExcludeTestIdModifiers {
     CHIP_FILTER_LABEL = 'ie-chf-label',
     CHIP_FILTER_VALUE = 'ie-chf-value',
     CLEAR_ALL_BUTTON = 'ie-clear-all-button',
-    SEARCH_INPUT = 'ie-search-input'
+    TYPE_TITLE = 'ie-type-title',
+    SEARCH_INPUT = 'ie-search-input',
+    SELECT_ALL = 'ie-select-all',
+    SELECTED_AMOUNT = 'ie-selected-amount',
+    OPTION = 'ie-option',
+    CHECKBOX = 'ie-checkbox',
+    SELECTED_OPTION = 'ie-selected-option',
+    REMOVE_SELECTED_OPTION = 'ie-remove-selected-option',
+    CANCEL_BUTTON = 'ie-cancel-button',
+    APPLY_BUTTON = 'ie-apply-button'
 }

From f4d2b0824b03de5151d9458b28a31a1f2be96d84 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Wed, 4 Oct 2023 16:58:25 +0300
Subject: [PATCH 06/19] chore(isct-13): add attributes to the include-exclude
 component

---
 .../chip-filter/common/base/chip-filter.base.component.ts      | 2 +-
 .../common/base/dropdown-dual-multi-select.base.component.ts   | 2 +-
 .../dropdown-dual-multi-select-body-item.component.ts          | 3 ++-
 .../dropdown-dual-multi-select-body.component.ts               | 2 +-
 .../dropdown-dual-multi-select-footer.component.ts             | 3 ++-
 .../dropdown-dual-multi-select-header.component.ts             | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
index ea805367e..c7fe5a87d 100644
--- a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
+++ b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
@@ -26,7 +26,7 @@ import {
 import {takeUntil} from 'rxjs/operators';
 import {ApiBase} from '@ironsource/fusion-ui/components/api-base';
 import {ChipFilterTestIdModifiers} from '@ironsource/fusion-ui/entities';
-import {TestIdsService} from '@ironsource/fusion-ui/services';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Directive()
 export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit, OnDestroy, AfterContentInit {
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
index 6afe80eeb..49ac2d33d 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
@@ -22,7 +22,7 @@ import {UniqueIdService} from '@ironsource/fusion-ui/services/unique-id';
 import {BackendPagination, SelectedItemName} from '@ironsource/fusion-ui/components/dropdown';
 import {isNullOrUndefined} from '@ironsource/fusion-ui/utils';
 import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
-import {TestIdsService} from '@ironsource/fusion-ui/services';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 const CLASS_LIST = [
     'dual-select-button',
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
index 4415bafa2..c0fc0bfc5 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
@@ -1,6 +1,7 @@
 import {ChangeDetectionStrategy, Component, EventEmitter, Injector, Input, Output} from '@angular/core';
 import {DropdownOption} from '@ironsource/fusion-ui/components/dropdown-option/entities';
-import {IncludeExcludeTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
+import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     selector: 'fusion-dropdown-dual-multi-select-body-item',
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
index 4c42da730..605040f41 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
@@ -17,7 +17,7 @@ import {debounceTime, filter, map, scan, takeUntil, tap} from 'rxjs/operators';
 import {ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {isNullOrUndefined} from '@ironsource/fusion-ui/utils';
 import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
-import {TestIdsService} from '@ironsource/fusion-ui/services';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 const PAGINATION_CHUNK = 20;
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
index 24a0e233f..84d908a2b 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
@@ -1,5 +1,6 @@
 import {ChangeDetectionStrategy, Component, EventEmitter, Injector, Input, Output} from '@angular/core';
-import {IncludeExcludeTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
+import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     selector: 'fusion-dropdown-dual-multi-select-footer',
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
index b680908a3..b56c09dce 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
@@ -14,7 +14,7 @@ import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
 import {Subject} from 'rxjs';
 import {IconData} from '@ironsource/fusion-ui/components/icon/common/entities';
 import {IncludeExcludeTestIdModifiers} from '@ironsource/fusion-ui/entities';
-import {TestIdsService} from '@ironsource/fusion-ui/services';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     selector: 'fusion-dropdown-dual-multi-select-header',

From 5889d20150935dcde5ee9f9ab364a952cc945541 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Wed, 4 Oct 2023 14:14:09 +0000
Subject: [PATCH 07/19] chore(release): 6.1.0-rc.0

---
 CHANGELOG.md                    | 9 +++++++++
 package.json                    | 2 +-
 projects/fusion-ui/package.json | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0036f272a..3cd57354b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [6.1.0-rc.0](https://github.com/ironSource/fusion-ui/compare/v6.0.1...v6.1.0-rc.0) (2023-10-04)
+
+
+### Features
+
+* **storybook:** up storybook version ([960ab61](https://github.com/ironSource/fusion-ui/commit/960ab61a736bac42a51e671369a59b1a0f48b9e8))
+* **storybook:** up storybook version ([936f9ae](https://github.com/ironSource/fusion-ui/commit/936f9ae864c4a9d0f0471c9687764525baa508b1))
+* **storybook:** up storybook version ([8caa520](https://github.com/ironSource/fusion-ui/commit/8caa520a4021fdb11b411771d4b5c2d90897c85d))
+
 ### [6.0.1](https://github.com/ironSource/fusion-ui/compare/v6.0.1-rc.0...v6.0.1) (2023-10-01)
 
 ### [6.0.1-rc.0](https://github.com/ironSource/fusion-ui/compare/v6.0.0...v6.0.1-rc.0) (2023-09-28)
diff --git a/package.json b/package.json
index f3586e970..f6f2d5e81 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fusion-ui",
-    "version": "6.0.1",
+    "version": "6.1.0-rc.0",
     "description": "UI library created by ironSource",
     "license": "MIT",
     "repository": {
diff --git a/projects/fusion-ui/package.json b/projects/fusion-ui/package.json
index 12e0a2dd3..dc27aed81 100644
--- a/projects/fusion-ui/package.json
+++ b/projects/fusion-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ironsource/fusion-ui",
-    "version": "6.0.1",
+    "version": "6.1.0-rc.0",
     "dependencies": {
         "chart.js": "^3.5.1",
         "@floating-ui/dom": "^1.0.9",

From d9ff28364312f0f864a16ad64a125c626f6a1aab Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Thu, 5 Oct 2023 10:02:30 +0300
Subject: [PATCH 08/19] ci(isct-13): add attributes to the include-exclude
 component

---
 .../chip-filter/common/base/chip-filter.base.component.ts   | 6 ++++++
 .../base/dropdown-dual-multi-select.base.component.ts       | 5 +++++
 projects/fusion-ui/entities/test-ids-modifiers.ts           | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
index c7fe5a87d..1014ca6c1 100644
--- a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
+++ b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
@@ -6,6 +6,7 @@ import {
     Directive,
     ElementRef,
     EventEmitter,
+    HostBinding,
     Injector,
     Input,
     OnDestroy,
@@ -88,6 +89,11 @@ export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit,
     @Input() set isDynamicContent(value: boolean) {
         this.isDefaultContent = !value;
     }
+
+    @HostBinding('attr.data-testid') get testAttribute(): string {
+        return this.testIdsService.getTestAttribute(this.testId, this.testIdChipFilterModifiers.CHIP_FILTER);
+    }
+
     /**
      * On dynamic filter close button clicked (filter removed)
      * @ignore
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
index 49ac2d33d..f8b7fd113 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
@@ -2,6 +2,7 @@ import {
     Directive,
     ElementRef,
     EventEmitter,
+    HostBinding,
     Injector,
     Input,
     OnDestroy,
@@ -107,6 +108,10 @@ export abstract class DropdownDualMultiSelectBaseComponent extends ApiBase imple
         return !isNullOrUndefined(this.backendPaginationState);
     }
 
+    @HostBinding('attr.data-testid') get testAttribute(): string {
+        return this.testIdsService.getTestAttribute(this.testId, this.testIdIncludeExcludeModifiers.INCLUDE_EXCLUDE);
+    }
+
     @Output() scrollDown = new EventEmitter();
     @Output() searchChange = new EventEmitter();
     @Output() viewChange = new EventEmitter();
diff --git a/projects/fusion-ui/entities/test-ids-modifiers.ts b/projects/fusion-ui/entities/test-ids-modifiers.ts
index 8947eb55f..390631f47 100644
--- a/projects/fusion-ui/entities/test-ids-modifiers.ts
+++ b/projects/fusion-ui/entities/test-ids-modifiers.ts
@@ -1,8 +1,10 @@
 export enum ChipFilterTestIdModifiers {
+    CHIP_FILTER = 'chf',
     RESET_BUTTON = 'chf-reset-button'
 }
 
 export enum IncludeExcludeTestIdModifiers {
+    INCLUDE_EXCLUDE = 'ie',
     CHIP_FILTER_LABEL = 'ie-chf-label',
     CHIP_FILTER_VALUE = 'ie-chf-value',
     CLEAR_ALL_BUTTON = 'ie-clear-all-button',

From 68731d29e28bef1926aa297f5f719f3d8e27fef1 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Thu, 5 Oct 2023 07:09:18 +0000
Subject: [PATCH 09/19] chore(release): 6.1.0-rc.1

---
 CHANGELOG.md                    | 7 +++++++
 package.json                    | 2 +-
 projects/fusion-ui/package.json | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cd57354b..e0fbbdd45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [6.1.0-rc.1](https://github.com/ironSource/fusion-ui/compare/v6.1.0-rc.0...v6.1.0-rc.1) (2023-10-05)
+
+
+### CI
+
+* **isct-13:** add attributes to the include-exclude component ([d9ff283](https://github.com/ironSource/fusion-ui/commit/d9ff28364312f0f864a16ad64a125c626f6a1aab))
+
 ## [6.1.0-rc.0](https://github.com/ironSource/fusion-ui/compare/v6.0.1...v6.1.0-rc.0) (2023-10-04)
 
 
diff --git a/package.json b/package.json
index f6f2d5e81..3a346e3ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fusion-ui",
-    "version": "6.1.0-rc.0",
+    "version": "6.1.0-rc.1",
     "description": "UI library created by ironSource",
     "license": "MIT",
     "repository": {
diff --git a/projects/fusion-ui/package.json b/projects/fusion-ui/package.json
index dc27aed81..9a5ec1b5e 100644
--- a/projects/fusion-ui/package.json
+++ b/projects/fusion-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ironsource/fusion-ui",
-    "version": "6.1.0-rc.0",
+    "version": "6.1.0-rc.1",
     "dependencies": {
         "chart.js": "^3.5.1",
         "@floating-ui/dom": "^1.0.9",

From f79a6f64861a3b5a05fc323d0e679debd84733c1 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Thu, 5 Oct 2023 11:38:59 +0300
Subject: [PATCH 10/19] chore(isct-13): changes in include-exclude component
 test attributes

---
 .../dropdown-dual-multi-select-body-item.component.html  | 7 +++----
 .../dropdown-dual-multi-select-body.component.html       | 9 ++++++---
 projects/fusion-ui/entities/test-ids-modifiers.ts        | 4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.html
index 4a9cc8826..836b9ef6c 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.html
@@ -4,10 +4,9 @@
 <ng-template #leftSide let-item="item">
     <label
         [for]="item.id"
-        class="is-option-label left-side" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.OPTION)">
+        class="is-option-label left-side">
         <fusion-checkbox
             class="item-check"
-            [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.CHECKBOX)"
             [id]="item.id"
             [isDisabled]="isDisabled"
             [checked]="isSelectedItem"
@@ -20,9 +19,9 @@
 
 
 <ng-template #rightSide let-item="item" >
-    <label class="is-option-label right-side" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.SELECTED_OPTION)">
+    <label class="is-option-label right-side">
         <ng-container [ngTemplateOutlet]="item?.content ? dynamicItem : optionTemplate" [ngTemplateOutletContext]="{item: item}"></ng-container>
-        <fusion-icon *ngIf="!isDisabled" (click)="clearSelectItem(item)" class="icon-clear" [name]="{iconName: 'close-bold', iconVersion: 'v3'}" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.REMOVE_SELECTED_OPTION)"></fusion-icon>
+        <fusion-icon *ngIf="!isDisabled" (click)="clearSelectItem(item)" class="icon-clear" [name]="{iconName: 'close-bold', iconVersion: 'v3'}"></fusion-icon>
     </label>
 </ng-template>
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
index cea661929..16cbf2091 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
@@ -30,12 +30,13 @@
     </div>
     <div class="body-control">
         <div class="options-wrapper content-col">
-            <div class="items-holder" #wrapperLeft>
+            <div class="items-holder" #wrapperLeft [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.OPTIONS_LIST)">
                 <ul class="options-data-list" #containerLeft>
                     <ng-container *ngIf="!isPendingItems">
                         <li *ngFor="let item of displayOptions$ | async;trackBy: trackById">
                             <fusion-dropdown-dual-multi-select-body-item
                                 [testId]="testId"
+                                [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.OPTION)"
                                 [isSelectedItem]="selectedItemsMapping[item.id]"
                                 [isDisabled]="item.isDisabled"
                                 (changeSelected)="changeSelected($event)"
@@ -49,15 +50,17 @@
             </div>
         </div>
         <div class="selected-list content-col">
-            <div class="items-holder" #wrapperRight>
+            <div class="items-holder" #wrapperRight  [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.SELECTED_OPTIONS_LIST)">
                 <ul class="options-data-list" #containerRight>
                     <ng-container *ngIf="!isPendingItems">
                         <li *ngFor="let selectedItem of selectedOptions$ | async;trackBy: trackById">
                             <fusion-dropdown-dual-multi-select-body-item
-                                (clearSelect)="clearSelect($event)"
+                                [testId]="testId"
+                                [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.SELECTED_OPTION)"
                                 [isDisabled]="selectedItem.isDisabled"
                                 [item]="selectedItem"
                                 [bodySide]="'right'">
+                                (clearSelect)="clearSelect($event)"
                             </fusion-dropdown-dual-multi-select-body-item>
                         </li>
                     </ng-container>
diff --git a/projects/fusion-ui/entities/test-ids-modifiers.ts b/projects/fusion-ui/entities/test-ids-modifiers.ts
index 390631f47..96d37665e 100644
--- a/projects/fusion-ui/entities/test-ids-modifiers.ts
+++ b/projects/fusion-ui/entities/test-ids-modifiers.ts
@@ -12,10 +12,10 @@ export enum IncludeExcludeTestIdModifiers {
     SEARCH_INPUT = 'ie-search-input',
     SELECT_ALL = 'ie-select-all',
     SELECTED_AMOUNT = 'ie-selected-amount',
+    OPTIONS_LIST = 'ie-options-list',
     OPTION = 'ie-option',
-    CHECKBOX = 'ie-checkbox',
+    SELECTED_OPTIONS_LIST = 'ie-selected-options-list',
     SELECTED_OPTION = 'ie-selected-option',
-    REMOVE_SELECTED_OPTION = 'ie-remove-selected-option',
     CANCEL_BUTTON = 'ie-cancel-button',
     APPLY_BUTTON = 'ie-apply-button'
 }

From 7fb42369d428547392fb43e69cddeb7f81745a00 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Thu, 5 Oct 2023 08:41:26 +0000
Subject: [PATCH 11/19] chore(release): 6.1.0-rc.2

---
 CHANGELOG.md                    | 2 ++
 package.json                    | 2 +-
 projects/fusion-ui/package.json | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0fbbdd45..98dab134a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [6.1.0-rc.2](https://github.com/ironSource/fusion-ui/compare/v6.1.0-rc.1...v6.1.0-rc.2) (2023-10-05)
+
 ## [6.1.0-rc.1](https://github.com/ironSource/fusion-ui/compare/v6.1.0-rc.0...v6.1.0-rc.1) (2023-10-05)
 
 
diff --git a/package.json b/package.json
index 3a346e3ae..866ae307f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fusion-ui",
-    "version": "6.1.0-rc.1",
+    "version": "6.1.0-rc.2",
     "description": "UI library created by ironSource",
     "license": "MIT",
     "repository": {
diff --git a/projects/fusion-ui/package.json b/projects/fusion-ui/package.json
index 9a5ec1b5e..a69524575 100644
--- a/projects/fusion-ui/package.json
+++ b/projects/fusion-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ironsource/fusion-ui",
-    "version": "6.1.0-rc.1",
+    "version": "6.1.0-rc.2",
     "dependencies": {
         "chart.js": "^3.5.1",
         "@floating-ui/dom": "^1.0.9",

From a721b0ffb0e2304f1b07cf71f913c053ed7325d6 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Thu, 5 Oct 2023 15:54:05 +0300
Subject: [PATCH 12/19] chore(isct-13): changes in templates use test
 attributes with generic pipe

---
 .../chip-filter/v3/chip-filter.component.html        |  2 +-
 .../components/chip-filter/v3/chip-filter.module.ts  |  3 ++-
 .../dropdown-dual-multi-select.base.component.html   |  2 +-
 .../v2/dropdown-dual-multi-select.module.ts          |  4 +++-
 .../dropdown-dual-multi-select-body.component.html   | 12 ++++++------
 .../dropdown-dual-multi-select-body.module.ts        |  4 +++-
 .../dropdown-dual-multi-select-footer.component.html |  4 ++--
 .../dropdown-dual-multi-select-footer.module.ts      |  3 ++-
 .../dropdown-dual-multi-select-header.component.html |  4 ++--
 .../dropdown-dual-multi-select-header.module.ts      |  3 ++-
 10 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
index dc36e289e..e52b2d131 100644
--- a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
+++ b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.html
@@ -14,7 +14,7 @@
             <ng-container *ngIf="apiBase && isDefaultContent" [ngTemplateOutlet]="defaultContent"></ng-container>
         </div>
         <fusion-icon class="fu-chip-right-icon" *ngIf="rightIcon" [name]="rightIcon.icon" [fusionTooltip]="rightIcon.tooltipText"></fusion-icon>
-        <fusion-icon class="fu-icon-close" *ngIf="isCloseIcon$ | async" (click)="closeClicked($event)" [name]="'close-bold'" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdChipFilterModifiers.RESET_BUTTON)"></fusion-icon>
+        <fusion-icon class="fu-icon-close" *ngIf="isCloseIcon$ | async" (click)="closeClicked($event)" [name]="'close-bold'" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdChipFilterModifiers.RESET_BUTTON"></fusion-icon>
     </div>
 </ng-template>
 
diff --git a/projects/fusion-ui/components/chip-filter/v3/chip-filter.module.ts b/projects/fusion-ui/components/chip-filter/v3/chip-filter.module.ts
index f7160b1af..34b6b2b41 100644
--- a/projects/fusion-ui/components/chip-filter/v3/chip-filter.module.ts
+++ b/projects/fusion-ui/components/chip-filter/v3/chip-filter.module.ts
@@ -4,10 +4,11 @@ import {ChipFilterComponent} from './chip-filter.component';
 import {IconModule} from '@ironsource/fusion-ui/components/icon/v1';
 import {FlagModule} from '@ironsource/fusion-ui/components/flag/v1';
 import {TooltipModule} from '@ironsource/fusion-ui/components/tooltip';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
 
 @NgModule({
     declarations: [ChipFilterComponent],
     exports: [ChipFilterComponent],
-    imports: [CommonModule, IconModule, FlagModule, TooltipModule]
+    imports: [CommonModule, IconModule, FlagModule, TooltipModule, GenericPipe]
 })
 export class ChipFilterModule {}
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
index 7430b8974..4b79d193c 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.html
@@ -75,6 +75,6 @@
 
 <ng-template #chipContent>
     <div class="fu-chip-content-default">
-        <div [fusionTooltip]="chipDefaultContent" class="truncate fu-chip-text"><span *ngIf="title" class="fu-chip-label" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.CHIP_FILTER_LABEL)">{{ title + ': ' }}</span><span [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.CHIP_FILTER_VALUE)">{{ selected$ | async }}</span></div>
+        <div [fusionTooltip]="chipDefaultContent" class="truncate fu-chip-text"><span *ngIf="title" class="fu-chip-label" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.CHIP_FILTER_LABEL">{{ title + ': ' }}</span><span [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.CHIP_FILTER_VALUE">{{ selected$ | async }}</span></div>
     </div>
 </ng-template>
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/dropdown-dual-multi-select.module.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/dropdown-dual-multi-select.module.ts
index a86f62df2..6a3120cb8 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/dropdown-dual-multi-select.module.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/dropdown-dual-multi-select.module.ts
@@ -13,6 +13,7 @@ import {DropdownDualMultiSelectBodyModule} from './components/dropdown-dual-mult
 import {DropdownDualMultiSelectHeaderModule} from './components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.module';
 import {DropdownDualMultiSelectFooterModule} from './components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.module';
 import {DropdownDualMultiSelectLoadingModule} from './components/dropdown-dual-multi-select-loading/dropdown-dual-multi-select-loading.module';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
 @NgModule({
     declarations: [DropdownDualMultiSelectComponent],
     exports: [DropdownDualMultiSelectComponent],
@@ -29,7 +30,8 @@ import {DropdownDualMultiSelectLoadingModule} from './components/dropdown-dual-m
         DropdownDualMultiSelectBodyModule,
         DropdownDualMultiSelectHeaderModule,
         DropdownDualMultiSelectFooterModule,
-        DropdownDualMultiSelectLoadingModule
+        DropdownDualMultiSelectLoadingModule,
+        GenericPipe
     ]
 })
 export class DropdownDualMultiSelectModule {}
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
index 16cbf2091..64cab63e4 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.html
@@ -5,7 +5,7 @@
                 <label class="option-header-body" *ngIf="!isPendingItems && hasSelectAll">
                     <fusion-checkbox
                         class="fu-check-all"
-                        [attr.data-testid]="testIdsService.getTestAttribute(testId,testIdIncludeExcludeModifiers.SELECT_ALL)"
+                        [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.SELECT_ALL"
                         [isIndeterminate]="isIndeterminate"
                         [checked]="isAllSelected"
                         (changed)="selectAll($event)"
@@ -17,12 +17,12 @@
         </div>
         <div class="content-col-right">
             <div class="body-header">
-                <label class="fu-select-label" [attr.data-testid]="testIdsService.getTestAttribute(testId,testIdIncludeExcludeModifiers.SELECTED_AMOUNT)">
+                <label class="fu-select-label" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.SELECTED_AMOUNT">
                     {{(selectedItemsMapping ? selectedItemsMapping : {}) | objectLengthWhereValueTrue}} selected
                 </label>
                 <div
                     *ngIf="showClearAllButton()"
-                    [attr.data-testid]="testIdsService.getTestAttribute(testId,testIdIncludeExcludeModifiers.CLEAR_ALL_BUTTON)"
+                    [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.CLEAR_ALL_BUTTON"
                     (click)="clearAll()" class="clear-all-btn">Clear all</div>
             </div>
         </div>
@@ -30,7 +30,7 @@
     </div>
     <div class="body-control">
         <div class="options-wrapper content-col">
-            <div class="items-holder" #wrapperLeft [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.OPTIONS_LIST)">
+            <div class="items-holder" #wrapperLeft [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.OPTIONS_LIST">
                 <ul class="options-data-list" #containerLeft>
                     <ng-container *ngIf="!isPendingItems">
                         <li *ngFor="let item of displayOptions$ | async;trackBy: trackById">
@@ -50,13 +50,13 @@
             </div>
         </div>
         <div class="selected-list content-col">
-            <div class="items-holder" #wrapperRight  [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.SELECTED_OPTIONS_LIST)">
+            <div class="items-holder" #wrapperRight  [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.SELECTED_OPTIONS_LIST">
                 <ul class="options-data-list" #containerRight>
                     <ng-container *ngIf="!isPendingItems">
                         <li *ngFor="let selectedItem of selectedOptions$ | async;trackBy: trackById">
                             <fusion-dropdown-dual-multi-select-body-item
                                 [testId]="testId"
-                                [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.SELECTED_OPTION)"
+                                [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.SELECTED_OPTION"
                                 [isDisabled]="selectedItem.isDisabled"
                                 [item]="selectedItem"
                                 [bodySide]="'right'">
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.module.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.module.ts
index d199d1984..2d1cda8e7 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.module.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.module.ts
@@ -10,6 +10,7 @@ import {LoaderInlineModule} from '@ironsource/fusion-ui/components/loader-inline
 import {DropdownDualMultiSelectLoadingModule} from '../dropdown-dual-multi-select-loading/dropdown-dual-multi-select-loading.module';
 import {DynamicComponentsModule} from '@ironsource/fusion-ui/components/dynamic-components/v1';
 import {GetObjectLengthPipe} from '@ironsource/fusion-ui/pipes/collection';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
 
 @NgModule({
     declarations: [DropdownDualMultiSelectBodyComponent, DropdownDualMultiSelectBodyItemComponent],
@@ -23,7 +24,8 @@ import {GetObjectLengthPipe} from '@ironsource/fusion-ui/pipes/collection';
         LoaderInlineModule,
         DropdownDualMultiSelectLoadingModule,
         DynamicComponentsModule,
-        GetObjectLengthPipe
+        GetObjectLengthPipe,
+        GenericPipe
     ]
 })
 export class DropdownDualMultiSelectBodyModule {}
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.html
index 905450675..8ab00f6e2 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.html
@@ -1,8 +1,8 @@
 <div class="is-dropdown-dual-multi-select-footer">
-    <fusion-button class="small transparent third" (click)="closeSelectItems()" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.CANCEL_BUTTON)">
+    <fusion-button class="small transparent third" (click)="closeSelectItems()" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.CANCEL_BUTTON">
         <span>Cancel</span>
     </fusion-button>
-    <fusion-button class="small primary" (click)="applySelectItems(true)" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.APPLY_BUTTON)">
+    <fusion-button class="small primary" (click)="applySelectItems(true)" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.APPLY_BUTTON">
         <span>Apply</span>
     </fusion-button>
 </div>
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.module.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.module.ts
index e8ef0a220..c9f4d3c5a 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.module.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.module.ts
@@ -2,10 +2,11 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {DropdownDualMultiSelectFooterComponent} from './dropdown-dual-multi-select-footer.component';
 import {ButtonModule} from '@ironsource/fusion-ui/components/button/v3';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
 
 @NgModule({
     declarations: [DropdownDualMultiSelectFooterComponent],
     exports: [DropdownDualMultiSelectFooterComponent],
-    imports: [CommonModule, ButtonModule]
+    imports: [CommonModule, ButtonModule, GenericPipe]
 })
 export class DropdownDualMultiSelectFooterModule {}
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
index 9de4899f3..c702a3570 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.html
@@ -1,12 +1,12 @@
 <div class="is-dropdown-dual-multi-select-header">
     <div class="fu-label-holder">
-        <span class="fu-label" [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.TYPE_TITLE)">{{title}}</span>
+        <span class="fu-label" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.TYPE_TITLE">{{title}}</span>
     </div>
     <div class="fu-search-holder" (click)="setFocusToInput()">
         <div class="fu-search-bar">
             <fusion-icon class="fu-icon-search" [name]="searchIcon"></fusion-icon>
             <input #input
-                   [attr.data-testid]="testIdsService.getTestAttribute(testId, testIdIncludeExcludeModifiers.SEARCH_INPUT)"
+                   [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:testIdIncludeExcludeModifiers.SEARCH_INPUT"
                    autocomplete="off"
                    minlength="1"
                    [placeholder]="'Search'"
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.module.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.module.ts
index f95a4e763..546f041b8 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.module.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.module.ts
@@ -3,10 +3,11 @@ import {CommonModule} from '@angular/common';
 import {DropdownDualMultiSelectHeaderComponent} from './dropdown-dual-multi-select-header.component';
 import {ReactiveFormsModule} from '@angular/forms';
 import {IconModule} from '@ironsource/fusion-ui/components/icon/v1';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
 
 @NgModule({
     declarations: [DropdownDualMultiSelectHeaderComponent],
-    imports: [CommonModule, ReactiveFormsModule, IconModule],
+    imports: [CommonModule, ReactiveFormsModule, IconModule, GenericPipe],
     exports: [DropdownDualMultiSelectHeaderComponent]
 })
 export class DropdownDualMultiSelectHeaderModule {}

From 500dfbd3065cd6e8ec7ec9c6a77f070771c35f55 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Thu, 5 Oct 2023 18:13:55 +0300
Subject: [PATCH 13/19] chore(isct-13): added generic pipe to unit tests

---
 .../chip-filter/v3/chip-filter.component.spec.ts      |  3 ++-
 .../chip-filters/v3/chip-filters.component.spec.ts    |  3 ++-
 .../dropdown-dual-multi-select-body.component.spec.ts |  3 ++-
 .../dropdown-dual-multi-select-body.module.ts         |  4 +++-
 ...ropdown-dual-multi-select-footer.component.spec.ts |  4 +++-
 .../dropdown-dual-multi-select-body.component.spec.ts |  3 ++-
 ...ropdown-dual-multi-select-footer.component.spec.ts |  4 +++-
 ...ropdown-dual-multi-select-header.component.spec.ts |  4 +++-
 .../v3/dropdown-dual-multi-select.component.spec.ts   |  4 +++-
 .../v3/dropdown-dual-multi-select.module.ts           |  4 +++-
 projects/fusion-ui/entities/test-ids-modifiers.ts     | 11 +++++++++++
 11 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.spec.ts b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.spec.ts
index ff1ccd919..7558a5753 100644
--- a/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.spec.ts
+++ b/projects/fusion-ui/components/chip-filter/v3/chip-filter.component.spec.ts
@@ -6,6 +6,7 @@ import {FlagModule} from '@ironsource/fusion-ui/components/flag/v1';
 import {By} from '@angular/platform-browser';
 import {Component, DebugElement, Input} from '@angular/core';
 import {ChipFilterComponentConfigurations} from '@ironsource/fusion-ui/components/chip-filter/common/base';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 const innerText = 'Test Chip';
 
@@ -31,7 +32,7 @@ describe('ChipFilterComponent', () => {
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
-            imports: [IconModule, FlagModule, TooltipModule],
+            imports: [IconModule, FlagModule, TooltipModule, GenericPipe],
             declarations: [ChipFilterComponent, TestChipComponent]
         }).compileComponents();
     }));
diff --git a/projects/fusion-ui/components/chip-filters/v3/chip-filters.component.spec.ts b/projects/fusion-ui/components/chip-filters/v3/chip-filters.component.spec.ts
index ce9d8292e..a616388e2 100644
--- a/projects/fusion-ui/components/chip-filters/v3/chip-filters.component.spec.ts
+++ b/projects/fusion-ui/components/chip-filters/v3/chip-filters.component.spec.ts
@@ -8,6 +8,7 @@ import {By} from '@angular/platform-browser';
 import {Component, DebugElement, Input} from '@angular/core';
 import {ChipFilterComponentConfigurations} from '@ironsource/fusion-ui/components/chip-filter/common/base';
 import {ChipFiltersComponent} from '@ironsource/fusion-ui/components/chip-filters';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 const innerText = 'Test Chip';
 
@@ -44,7 +45,7 @@ describe('ChipFiltersComponent', () => {
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
-            imports: [IconModule, FlagModule],
+            imports: [IconModule, FlagModule, GenericPipe],
             declarations: [ChipFilterComponent, TestChipComponent, ChipFiltersComponent]
         }).compileComponents();
     }));
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.spec.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.spec.ts
index 70e8cdf58..2e6d4fc9b 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.spec.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.spec.ts
@@ -2,6 +2,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {DropdownDualMultiSelectBodyComponent} from './dropdown-dual-multi-select-body.component';
 import {GetObjectLengthPipe} from '@ironsource/fusion-ui/pipes/collection';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 describe('DropdownDualMultiSelectBodyComponent', () => {
     let component: DropdownDualMultiSelectBodyComponent;
@@ -10,7 +11,7 @@ describe('DropdownDualMultiSelectBodyComponent', () => {
     beforeEach(async () => {
         await TestBed.configureTestingModule({
             declarations: [DropdownDualMultiSelectBodyComponent],
-            imports: [GetObjectLengthPipe]
+            imports: [GetObjectLengthPipe, GenericPipe]
         }).compileComponents();
     });
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.module.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.module.ts
index 59c25a9ef..0823b4102 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.module.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.module.ts
@@ -10,6 +10,7 @@ import {LoaderInlineModule} from '@ironsource/fusion-ui/components/loader-inline
 import {DropdownDualMultiSelectLoadingModule} from '../dropdown-dual-multi-select-loading/dropdown-dual-multi-select-loading.module';
 import {DynamicComponentsModule} from '@ironsource/fusion-ui/components/dynamic-components/v1';
 import {GetObjectLengthPipe} from '@ironsource/fusion-ui/pipes/collection';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
 
 @NgModule({
     declarations: [DropdownDualMultiSelectBodyComponent, DropdownDualMultiSelectBodyItemComponent],
@@ -23,7 +24,8 @@ import {GetObjectLengthPipe} from '@ironsource/fusion-ui/pipes/collection';
         LoaderInlineModule,
         DropdownDualMultiSelectLoadingModule,
         DynamicComponentsModule,
-        GetObjectLengthPipe
+        GetObjectLengthPipe,
+        GenericPipe
     ]
 })
 export class DropdownDualMultiSelectBodyModule {}
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.spec.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.spec.ts
index 32737bff5..b10c8d99b 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.spec.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.spec.ts
@@ -1,6 +1,7 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {DropdownDualMultiSelectFooterComponent} from './dropdown-dual-multi-select-footer.component';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 describe('DropdownDualMultiSelectFooterComponent', () => {
     let component: DropdownDualMultiSelectFooterComponent;
@@ -8,7 +9,8 @@ describe('DropdownDualMultiSelectFooterComponent', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            declarations: [DropdownDualMultiSelectFooterComponent]
+            declarations: [DropdownDualMultiSelectFooterComponent],
+            imports: [GenericPipe]
         }).compileComponents();
     });
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.spec.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.spec.ts
index 70e8cdf58..2e6d4fc9b 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.spec.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.spec.ts
@@ -2,6 +2,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {DropdownDualMultiSelectBodyComponent} from './dropdown-dual-multi-select-body.component';
 import {GetObjectLengthPipe} from '@ironsource/fusion-ui/pipes/collection';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 describe('DropdownDualMultiSelectBodyComponent', () => {
     let component: DropdownDualMultiSelectBodyComponent;
@@ -10,7 +11,7 @@ describe('DropdownDualMultiSelectBodyComponent', () => {
     beforeEach(async () => {
         await TestBed.configureTestingModule({
             declarations: [DropdownDualMultiSelectBodyComponent],
-            imports: [GetObjectLengthPipe]
+            imports: [GetObjectLengthPipe, GenericPipe]
         }).compileComponents();
     });
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.spec.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.spec.ts
index 32737bff5..b10c8d99b 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.spec.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.spec.ts
@@ -1,6 +1,7 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {DropdownDualMultiSelectFooterComponent} from './dropdown-dual-multi-select-footer.component';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 describe('DropdownDualMultiSelectFooterComponent', () => {
     let component: DropdownDualMultiSelectFooterComponent;
@@ -8,7 +9,8 @@ describe('DropdownDualMultiSelectFooterComponent', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            declarations: [DropdownDualMultiSelectFooterComponent]
+            declarations: [DropdownDualMultiSelectFooterComponent],
+            imports: [GenericPipe]
         }).compileComponents();
     });
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.spec.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.spec.ts
index bc933d2d1..0259cff44 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.spec.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.spec.ts
@@ -1,6 +1,7 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {DropdownDualMultiSelectHeaderComponent} from './dropdown-dual-multi-select-header.component';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 describe('DropdownDualMultiSelectHeaderComponent', () => {
     let component: DropdownDualMultiSelectHeaderComponent;
@@ -8,7 +9,8 @@ describe('DropdownDualMultiSelectHeaderComponent', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            declarations: [DropdownDualMultiSelectHeaderComponent]
+            declarations: [DropdownDualMultiSelectHeaderComponent],
+            imports:[GenericPipe]
         }).compileComponents();
     });
 
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/dropdown-dual-multi-select.component.spec.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/dropdown-dual-multi-select.component.spec.ts
index 46b0dfc13..dc90b8389 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/dropdown-dual-multi-select.component.spec.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/dropdown-dual-multi-select.component.spec.ts
@@ -14,6 +14,7 @@ import {DropdownDualMultiSelectFooterModule} from './components/dropdown-dual-mu
 import {DropdownDualMultiSelectLoadingModule} from './components/dropdown-dual-multi-select-loading/dropdown-dual-multi-select-loading.module';
 import {Component} from '@angular/core';
 import {MOCK_DUAL_ITEMS} from './mock-entities';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 const itemNames = {singular: 'Actor', plural: 'Actors'};
 
@@ -44,7 +45,8 @@ describe('DropdownDualMultiSelectComponent', () => {
                 DropdownDualMultiSelectBodyModule,
                 DropdownDualMultiSelectHeaderModule,
                 DropdownDualMultiSelectFooterModule,
-                DropdownDualMultiSelectLoadingModule
+                DropdownDualMultiSelectLoadingModule,
+                GenericPipe
             ]
         }).compileComponents();
     });
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/dropdown-dual-multi-select.module.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/dropdown-dual-multi-select.module.ts
index c1b4e2de0..65046830b 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/dropdown-dual-multi-select.module.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/dropdown-dual-multi-select.module.ts
@@ -12,6 +12,7 @@ import {DropdownDualMultiSelectBodyModule} from './components/dropdown-dual-mult
 import {DropdownDualMultiSelectHeaderModule} from './components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.module';
 import {DropdownDualMultiSelectFooterModule} from './components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.module';
 import {DropdownDualMultiSelectLoadingModule} from './components/dropdown-dual-multi-select-loading/dropdown-dual-multi-select-loading.module';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
 
 @NgModule({
     declarations: [DropdownDualMultiSelectComponent],
@@ -28,7 +29,8 @@ import {DropdownDualMultiSelectLoadingModule} from './components/dropdown-dual-m
         DropdownDualMultiSelectHeaderModule,
         DropdownDualMultiSelectFooterModule,
         DropdownDualMultiSelectLoadingModule,
-        TooltipModule
+        TooltipModule,
+        GenericPipe
     ]
 })
 export class DropdownDualMultiSelectModule {}
diff --git a/projects/fusion-ui/entities/test-ids-modifiers.ts b/projects/fusion-ui/entities/test-ids-modifiers.ts
index 96d37665e..7c5a8ecda 100644
--- a/projects/fusion-ui/entities/test-ids-modifiers.ts
+++ b/projects/fusion-ui/entities/test-ids-modifiers.ts
@@ -19,3 +19,14 @@ export enum IncludeExcludeTestIdModifiers {
     CANCEL_BUTTON = 'ie-cancel-button',
     APPLY_BUTTON = 'ie-apply-button'
 }
+
+export enum ModalTestIdModifiers {
+    MODAL = 'modal',
+    MODAL_HEADER = 'modal-header',
+    MODAL_TITLE = 'modal-title',
+    MODAL_CLOSE_BUTTON = 'modal-close-button',
+    MODAL_CONTENT = 'modal-content',
+    MODAL_FOOTER = 'modal-footer',
+    MODAL_SUBMIT_BUTTON = 'modal-submit-button',
+    MODAL_CANCEL_BUTTON = 'modal-cancel-button'
+}

From 516462b01d6eba64433cc6e21c4867b038dcbaf1 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Thu, 5 Oct 2023 18:19:00 +0300
Subject: [PATCH 14/19] chore(isct-13): start add tests attributes to modal

---
 .../components/modal/v3/modal.component.html          |  2 +-
 .../components/modal/v3/modal.component.spec.ts       |  3 ++-
 .../components/modal/v3/modal.component.stories.ts    |  5 +++--
 .../fusion-ui/components/modal/v3/modal.component.ts  | 11 ++++++++++-
 .../fusion-ui/components/modal/v3/modal.module.ts     |  3 ++-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/projects/fusion-ui/components/modal/v3/modal.component.html b/projects/fusion-ui/components/modal/v3/modal.component.html
index b1d2df739..5e654be33 100644
--- a/projects/fusion-ui/components/modal/v3/modal.component.html
+++ b/projects/fusion-ui/components/modal/v3/modal.component.html
@@ -1,4 +1,4 @@
-<div class="modal" #modalHolder>
+<div class="modal" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:modalTestIdModifiers.MODAL" #modalHolder>
     <div class="modal-body" [class.has-footer]="configuration?.hasFooter" [class.has-header]="configuration?.headerText" [style.width]="configuration?.width" [style.height]="configuration?.height" #modalBody>
 
         <fusion-modal-header [headerText]="configuration?.headerText" [infoText]="configuration?.headerInfoText" (close)="onClose(true, 'close')"></fusion-modal-header>
diff --git a/projects/fusion-ui/components/modal/v3/modal.component.spec.ts b/projects/fusion-ui/components/modal/v3/modal.component.spec.ts
index fc7fe9d5a..5ba86dd59 100644
--- a/projects/fusion-ui/components/modal/v3/modal.component.spec.ts
+++ b/projects/fusion-ui/components/modal/v3/modal.component.spec.ts
@@ -5,6 +5,7 @@ import {IconModule} from '@ironsource/fusion-ui/components/icon/v1';
 import {ModalFooterComponent} from './components/modal-footer/modal-footer.component';
 import {ModalContentComponent} from './components/modal-content/modal-content.component';
 import {ModalHeaderComponent} from './components/modal-header/modal-header.component';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 describe('ModalComponent', () => {
     let component: ModalComponent;
@@ -12,7 +13,7 @@ describe('ModalComponent', () => {
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
-            imports: [ButtonModule, IconModule],
+            imports: [ButtonModule, IconModule, GenericPipe],
             declarations: [ModalComponent, ModalFooterComponent, ModalContentComponent, ModalHeaderComponent]
         }).compileComponents();
     }));
diff --git a/projects/fusion-ui/components/modal/v3/modal.component.stories.ts b/projects/fusion-ui/components/modal/v3/modal.component.stories.ts
index 20c07c62d..00c9614eb 100644
--- a/projects/fusion-ui/components/modal/v3/modal.component.stories.ts
+++ b/projects/fusion-ui/components/modal/v3/modal.component.stories.ts
@@ -31,7 +31,8 @@ export default {
         }
     },
     args: {
-        configuration: DEFAULT_CONFIGURATION
+        configuration: DEFAULT_CONFIGURATION,
+        testId: 'modal-test-id'
     }
 } as Meta<ModalComponent>;
 
@@ -53,7 +54,7 @@ hr{
     margin: 20px 0;
 }
 </style>
-<fusion-modal [configuration]="configuration" [submitPending]="submitPending">
+<fusion-modal [configuration]="configuration" [submitPending]="submitPending" [testId]="testId">
 <div class="content-example">Content item placeholder. To be replaced with component</div>
 <hr/>
 <div class="content-example">Content item placeholder. To be replaced with component</div>
diff --git a/projects/fusion-ui/components/modal/v3/modal.component.ts b/projects/fusion-ui/components/modal/v3/modal.component.ts
index 906d358a2..55d5326bf 100644
--- a/projects/fusion-ui/components/modal/v3/modal.component.ts
+++ b/projects/fusion-ui/components/modal/v3/modal.component.ts
@@ -5,6 +5,7 @@ import {
     EventEmitter,
     forwardRef,
     Inject,
+    Injector,
     Input,
     OnDestroy,
     OnInit,
@@ -22,6 +23,8 @@ import {ModalConfiguration} from './modal.entities';
 import {getDefaultCssUnit} from './modal-utils';
 import {takeUntil} from 'rxjs/operators';
 import {isNullOrUndefined} from '@ironsource/fusion-ui/utils';
+import {ModalTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     selector: 'fusion-modal',
@@ -56,6 +59,8 @@ export class ModalComponent implements OnDestroy, OnInit {
         return this._configuration.getValue();
     }
 
+    @Input() testId: string;
+
     @Output() open = new EventEmitter();
     @Output() close = new EventEmitter();
 
@@ -64,6 +69,9 @@ export class ModalComponent implements OnDestroy, OnInit {
     /** @internal */
     @ViewChild('modalHolder', {static: true}) modalHolder: ElementRef;
 
+    modalTestIdModifiers: typeof ModalTestIdModifiers = ModalTestIdModifiers;
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
     private uid: string;
     private _configuration = new BehaviorSubject<ModalConfiguration>(null);
     private isClosed$ = new BehaviorSubject<boolean>(false);
@@ -76,7 +84,8 @@ export class ModalComponent implements OnDestroy, OnInit {
         private elRef: ElementRef,
         private windowRef: WindowService,
         private logService: LogService,
-        private renderer: Renderer2
+        private renderer: Renderer2,
+        private injector: Injector
     ) {
         this.uid = this.uidService.getUniqueId().toString();
     }
diff --git a/projects/fusion-ui/components/modal/v3/modal.module.ts b/projects/fusion-ui/components/modal/v3/modal.module.ts
index 08e0b3245..dfa383222 100644
--- a/projects/fusion-ui/components/modal/v3/modal.module.ts
+++ b/projects/fusion-ui/components/modal/v3/modal.module.ts
@@ -8,10 +8,11 @@ import {LoaderModule} from '@ironsource/fusion-ui/components/loader/v2';
 import {ButtonModule} from '@ironsource/fusion-ui/components/button/v3';
 import {IconModule} from '@ironsource/fusion-ui/components/icon/v1';
 import {TooltipModule} from '@ironsource/fusion-ui/components/tooltip/v3';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
 
 @NgModule({
     declarations: [ModalComponent, ModalFooterComponent, ModalContentComponent, ModalHeaderComponent],
     exports: [ModalComponent, ModalFooterComponent, ModalContentComponent, ModalHeaderComponent],
-    imports: [CommonModule, LoaderModule, ButtonModule, IconModule, TooltipModule]
+    imports: [CommonModule, LoaderModule, ButtonModule, IconModule, TooltipModule, GenericPipe]
 })
 export class ModalModule {}

From f7e2f51984260111788b9eda40fcfbae321a1610 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Sun, 8 Oct 2023 13:03:53 +0300
Subject: [PATCH 15/19] chore(isct-63): added attribution to the modal
 component

---
 .../modal-footer/modal-footer.component.html          |  4 +++-
 .../components/modal-footer/modal-footer.component.ts | 11 ++++++++++-
 .../modal-header/modal-header.component.html          |  3 ++-
 .../components/modal-header/modal-header.component.ts | 11 ++++++++++-
 .../components/modal/v3/modal.component.html          |  4 +++-
 projects/fusion-ui/entities/test-ids-modifiers.ts     |  5 ++---
 6 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.html b/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.html
index d3610ca04..dbf7e7b17 100644
--- a/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.html
+++ b/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.html
@@ -1,6 +1,7 @@
 <div class="modal-footer">
-    <span class="fu-error-message">{{ error }}</span>
+    <span class="fu-error-message" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:modalTestIdModifiers.MODAL_ERROR">{{ error }}</span>
     <fusion-button class="fu-secondary-button"
+        [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:modalTestIdModifiers.MODAL_CANCEL_BUTTON"
         [class]="cancelButtonClass"
         (click)="onCloseButtonClicked.emit()"
         *ngIf="!cancelButtonHidden"
@@ -8,6 +9,7 @@
         {{ cancelButtonText }}
     </fusion-button>
     <fusion-button class="fu-primary-button"
+        [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:modalTestIdModifiers.MODAL_SUBMIT_BUTTON"
         [class]="submitButtonClass"
         [loading]="submitButtonPending"
         [disabled]="submitButtonDisabled || !!error"
diff --git a/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.ts b/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.ts
index dede13107..2709791e6 100644
--- a/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.ts
+++ b/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.ts
@@ -1,4 +1,5 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Injector, Input, Output} from '@angular/core';
+import {ModalTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
 
 @Component({
     selector: 'fusion-modal-footer',
@@ -18,10 +19,16 @@ export class ModalFooterComponent {
         this.submitButtonDisabled = config?.submitButtonDisabled;
     }
     @Input() error;
+    @Input() testId: string;
 
     @Output() onSubmit = new EventEmitter();
     @Output() onCloseButtonClicked = new EventEmitter();
 
+    /** @internal */
+    modalTestIdModifiers: typeof ModalTestIdModifiers = ModalTestIdModifiers;
+    /** @internal */
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
     /** @internal */
     submitButtonText: string;
     /** @internal */
@@ -34,4 +41,6 @@ export class ModalFooterComponent {
     cancelButtonClass: string;
     /** @internal */
     cancelButtonHidden: boolean;
+
+    constructor(private injector: Injector) {}
 }
diff --git a/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.html b/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.html
index e8d518e1e..358a9b9f8 100644
--- a/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.html
+++ b/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header" *ngIf="headerText">
-    <div>{{ headerText }}</div>
+    <div class="modal-header-title" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:modalTestIdModifiers.MODAL_TITLE">{{ headerText }}</div>
     <fusion-icon class="fu-info"
                  *ngIf="infoText"
                  [name]="infoIcon"
@@ -8,6 +8,7 @@
     <fusion-icon class="fu-close"
                  *ngIf="showCloseButton"
                  [name]="closeButtonIcon"
+                 [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:modalTestIdModifiers.MODAL_CLOSE_BUTTON"
                  (click)="close.emit()"
     ></fusion-icon>
 </div>
diff --git a/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.ts b/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.ts
index 9367989db..f72decea4 100644
--- a/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.ts
+++ b/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.ts
@@ -1,5 +1,6 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Injector, Input, Output} from '@angular/core';
 import {BehaviorSubject} from 'rxjs';
+import {ModalTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
 
 @Component({
     selector: 'fusion-modal-header',
@@ -9,6 +10,7 @@ import {BehaviorSubject} from 'rxjs';
 export class ModalHeaderComponent {
     @Input() headerText: string;
     @Input() showCloseButton = true;
+    @Input() testId: string;
 
     private _infoText: string;
     @Input() set infoText(value: string) {
@@ -18,10 +20,17 @@ export class ModalHeaderComponent {
         return this._infoText;
     }
 
+    /** @internal */
+    modalTestIdModifiers: typeof ModalTestIdModifiers = ModalTestIdModifiers;
+    /** @internal */
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
     /** @internal */
     closeButtonIcon = {iconName: 'close', iconVersion: 'v3'};
     /** @internal */
     infoIcon = {iconName: 'info', iconVersion: 'v3'};
 
     @Output() close = new EventEmitter();
+
+    constructor(private injector: Injector) {}
 }
diff --git a/projects/fusion-ui/components/modal/v3/modal.component.html b/projects/fusion-ui/components/modal/v3/modal.component.html
index 5e654be33..4c9cc64a4 100644
--- a/projects/fusion-ui/components/modal/v3/modal.component.html
+++ b/projects/fusion-ui/components/modal/v3/modal.component.html
@@ -1,12 +1,13 @@
 <div class="modal" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:modalTestIdModifiers.MODAL" #modalHolder>
     <div class="modal-body" [class.has-footer]="configuration?.hasFooter" [class.has-header]="configuration?.headerText" [style.width]="configuration?.width" [style.height]="configuration?.height" #modalBody>
 
-        <fusion-modal-header [headerText]="configuration?.headerText" [infoText]="configuration?.headerInfoText" (close)="onClose(true, 'close')"></fusion-modal-header>
+        <fusion-modal-header [testId]="testId" [headerText]="configuration?.headerText" [infoText]="configuration?.headerInfoText" (close)="onClose(true, 'close')"></fusion-modal-header>
 
         <fusion-modal-content
             *ngIf="configuration?.headerText || configuration?.hasFooter"
             [pending]="submitPending"
             [ngClass]="{'fu-has-height': !!configuration?.height}"
+            [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:modalTestIdModifiers.MODAL_CONTENT"
         >
             <ng-container *ngTemplateOutlet="content"></ng-container>
         </fusion-modal-content>
@@ -29,6 +30,7 @@
             (onSubmit)="onClose(true, 'submit')"
             (onCloseButtonClicked)="onClose(true, 'close')"
             [submitButtonPending]="submitPending"
+            [testId]="testId"
         ></fusion-modal-footer>
 
     </div>
diff --git a/projects/fusion-ui/entities/test-ids-modifiers.ts b/projects/fusion-ui/entities/test-ids-modifiers.ts
index 7c5a8ecda..4391d9352 100644
--- a/projects/fusion-ui/entities/test-ids-modifiers.ts
+++ b/projects/fusion-ui/entities/test-ids-modifiers.ts
@@ -22,11 +22,10 @@ export enum IncludeExcludeTestIdModifiers {
 
 export enum ModalTestIdModifiers {
     MODAL = 'modal',
-    MODAL_HEADER = 'modal-header',
     MODAL_TITLE = 'modal-title',
     MODAL_CLOSE_BUTTON = 'modal-close-button',
     MODAL_CONTENT = 'modal-content',
-    MODAL_FOOTER = 'modal-footer',
     MODAL_SUBMIT_BUTTON = 'modal-submit-button',
-    MODAL_CANCEL_BUTTON = 'modal-cancel-button'
+    MODAL_CANCEL_BUTTON = 'modal-cancel-button',
+    MODAL_ERROR = 'modal-error'
 }

From 68c984452091698a8bb988f254255823369eb575 Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Sun, 8 Oct 2023 14:18:48 +0300
Subject: [PATCH 16/19] chore(isct-63): fix unit test

---
 .../v3/components/modal-footer/modal-footer.component.spec.ts  | 3 ++-
 .../v3/components/modal-header/modal-header.component.spec.ts  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.spec.ts b/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.spec.ts
index ea22e7c1a..30bf5585b 100644
--- a/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.spec.ts
+++ b/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.spec.ts
@@ -2,6 +2,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
 import {ModalFooterComponent} from './modal-footer.component';
 import {ButtonModule} from '@ironsource/fusion-ui/components/button';
 import {IconModule} from '@ironsource/fusion-ui/components/icon/v1';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 describe('ModalFooterComponent', () => {
     let component: ModalFooterComponent;
@@ -9,7 +10,7 @@ describe('ModalFooterComponent', () => {
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
-            imports: [ButtonModule, IconModule],
+            imports: [ButtonModule, IconModule, GenericPipe],
             declarations: [ModalFooterComponent]
         }).compileComponents();
     }));
diff --git a/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.spec.ts b/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.spec.ts
index 8bb612432..1e79557cd 100644
--- a/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.spec.ts
+++ b/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.spec.ts
@@ -2,6 +2,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
 import {ModalHeaderComponent} from './modal-header.component';
 import {ButtonModule} from '@ironsource/fusion-ui/components/button';
 import {IconModule} from '@ironsource/fusion-ui/components/icon/v1';
+import {GenericPipe} from "@ironsource/fusion-ui/pipes/generic";
 
 describe('ModalHeaderComponent', () => {
     let component: ModalHeaderComponent;
@@ -9,7 +10,7 @@ describe('ModalHeaderComponent', () => {
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
-            imports: [ButtonModule, IconModule],
+            imports: [ButtonModule, IconModule, GenericPipe],
             declarations: [ModalHeaderComponent]
         }).compileComponents();
     }));

From e217068b9c2a17a263721a967356706450dff88c Mon Sep 17 00:00:00 2001
From: AndyKIron <andy.kononenko@unity3d.com>
Date: Mon, 16 Oct 2023 12:04:05 +0300
Subject: [PATCH 17/19] chore(isct-63): add attribution to table, table row,
 search, modal

---
 .../common/base/chip-filter.base.component.ts |  3 +++
 ...opdown-dual-multi-select.base.component.ts |  3 +++
 ...opdown-dual-multi-select-body.component.ts |  1 +
 ...down-dual-multi-select-footer.component.ts |  1 +
 ...down-dual-multi-select-header.component.ts |  1 +
 ...n-dual-multi-select-body-item.component.ts |  3 +++
 ...opdown-dual-multi-select-body.component.ts |  3 +++
 ...down-dual-multi-select-footer.component.ts |  3 +++
 ...down-dual-multi-select-header.component.ts |  3 +++
 .../modal-footer/modal-footer.component.ts    |  4 +++-
 .../modal-header/modal-header.component.ts    |  5 +++--
 .../components/modal/v3/modal.component.ts    |  4 +++-
 .../search/v3/search.component.html           |  8 +++++++-
 .../components/search/v3/search.component.ts  | 17 +++++++++++++++--
 .../table-basic/table-basic.component.html    |  1 +
 .../table-basic/table-basic.component.ts      | 14 +++++++++++++-
 .../table-row/table-row.component.html        |  6 ++++--
 .../table-row/table-row.component.ts          | 14 +++++++++++++-
 .../v3/stories/table.component.stories.ts     |  5 ++++-
 .../components/table/v3/table.component.html  | 19 +++++++++++++------
 .../components/table/v3/table.component.ts    | 16 ++++++++++++++--
 .../fusion-ui/entities/test-ids-modifiers.ts  | 17 +++++++++++++++++
 22 files changed, 131 insertions(+), 20 deletions(-)

diff --git a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
index 1014ca6c1..2d108a5b2 100644
--- a/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
+++ b/projects/fusion-ui/components/chip-filter/common/base/chip-filter.base.component.ts
@@ -31,6 +31,7 @@ import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Directive()
 export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit, OnDestroy, AfterContentInit {
+    /** @internal */
     @Input() testId: string;
     /** @internal */
     @ContentChild(ApiBase, {static: true}) apiBase: ApiBase;
@@ -52,7 +53,9 @@ export abstract class ChipFilterBaseComponent implements OnInit, AfterViewInit,
     /** @internal */
     rightIcon: ChipIcon;
 
+    /** @internal */
     testIdChipFilterModifiers: typeof ChipFilterTestIdModifiers = ChipFilterTestIdModifiers;
+    /** @internal */
     testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     private onDestroy$ = new Subject<void>();
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
index f8b7fd113..d193b4206 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/common/base/dropdown-dual-multi-select.base.component.ts
@@ -46,6 +46,7 @@ export abstract class DropdownDualMultiSelectBaseComponent extends ApiBase imple
     /** @internal */
     @Input() autoComplete: boolean = true;
     @Input() title: string;
+    /** @internal */
     @Input() testId: string;
     /** @internal */
     @Input() pendingItems: boolean = false;
@@ -59,7 +60,9 @@ export abstract class DropdownDualMultiSelectBaseComponent extends ApiBase imple
         return this._hasSelectAll;
     }
 
+    /** @internal */
     testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    /** @internal */
     testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     @Input() set placeholder(data: string) {
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
index 045b341d5..9209ac492 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
@@ -46,6 +46,7 @@ export class DropdownDualMultiSelectBodyComponent implements OnInit, OnDestroy,
     @Input() totalItems: number;
     @Input() isPendingItems: boolean;
     @Input() hasSelectAll: boolean = true;
+    /** @internal */
     @Input() testId: string;
 
     @Input() set items(data: DropdownOption[]) {
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
index 6e3738783..4d62385d3 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
@@ -7,6 +7,7 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DropdownDualMultiSelectFooterComponent {
+    /** @internal */
     @Input() testId: string;
     @Output() applySelect = new EventEmitter<boolean>();
     @Output() closeSelect = new EventEmitter();
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
index 0510253cc..87a055cc6 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v2/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
@@ -19,6 +19,7 @@ import {Subject} from 'rxjs';
 })
 export class DropdownDualMultiSelectHeaderComponent implements OnDestroy, ControlValueAccessor {
     @Input() title: string;
+    /** @internal */
     @Input() testId: string;
 
     inputSize = InputSize;
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
index c0fc0bfc5..fbc49e08b 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body-item/dropdown-dual-multi-select-body-item.component.ts
@@ -14,12 +14,15 @@ export class DropdownDualMultiSelectBodyItemComponent {
     @Input() item: DropdownOption;
     @Input() isDisabled: boolean;
     @Input() isSelectedItem: boolean;
+    /** @internal */
     @Input() testId: string;
 
     @Output() changeSelected = new EventEmitter();
     @Output() clearSelect = new EventEmitter();
 
+    /** @internal */
     testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    /** @internal */
     testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     constructor(private injector: Injector) {}
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
index 605040f41..26c7af1e8 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-body/dropdown-dual-multi-select-body.component.ts
@@ -50,6 +50,7 @@ export class DropdownDualMultiSelectBodyComponent implements OnInit, OnDestroy,
     @Input() totalItems: number;
     @Input() isPendingItems: boolean;
     @Input() hasSelectAll: boolean = true;
+    /** @internal */
     @Input() testId: string;
 
     @Input() set items(data: DropdownOption[]) {
@@ -75,7 +76,9 @@ export class DropdownDualMultiSelectBodyComponent implements OnInit, OnDestroy,
 
     @Output() scrollDown = new EventEmitter();
 
+    /** @internal */
     testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    /** @internal */
     testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     isSelectAllDisabled$ = new BehaviorSubject<boolean>(false);
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
index 84d908a2b..db44e9c67 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-footer/dropdown-dual-multi-select-footer.component.ts
@@ -9,11 +9,14 @@ import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DropdownDualMultiSelectFooterComponent {
+    /** @internal */
     @Input() testId: string;
     @Output() applySelect = new EventEmitter<boolean>();
     @Output() closeSelect = new EventEmitter();
 
+    /** @internal */
     testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    /** @internal */
     testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     constructor(private injector: Injector) {}
diff --git a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
index b56c09dce..f474cab2c 100644
--- a/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
+++ b/projects/fusion-ui/components/dropdown-dual-multi-select/v3/components/dropdown-dual-multi-select-header/dropdown-dual-multi-select-header.component.ts
@@ -33,9 +33,12 @@ export class DropdownDualMultiSelectHeaderComponent implements OnDestroy, AfterV
     @ViewChild('input') input?: ElementRef;
 
     @Input() title: string;
+    /** @internal */
     @Input() testId: string;
 
+    /** @internal */
     testIdIncludeExcludeModifiers: typeof IncludeExcludeTestIdModifiers = IncludeExcludeTestIdModifiers;
+    /** @internal */
     testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     searchIcon?: IconData = {iconName: 'search-bold', iconVersion: 'v3'};
diff --git a/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.ts b/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.ts
index 2709791e6..d2391ae86 100644
--- a/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.ts
+++ b/projects/fusion-ui/components/modal/v3/components/modal-footer/modal-footer.component.ts
@@ -1,5 +1,6 @@
 import {Component, EventEmitter, Injector, Input, Output} from '@angular/core';
-import {ModalTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
+import {ModalTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     selector: 'fusion-modal-footer',
@@ -19,6 +20,7 @@ export class ModalFooterComponent {
         this.submitButtonDisabled = config?.submitButtonDisabled;
     }
     @Input() error;
+    /** @internal */
     @Input() testId: string;
 
     @Output() onSubmit = new EventEmitter();
diff --git a/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.ts b/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.ts
index f72decea4..0bd303d0a 100644
--- a/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.ts
+++ b/projects/fusion-ui/components/modal/v3/components/modal-header/modal-header.component.ts
@@ -1,6 +1,6 @@
 import {Component, EventEmitter, Injector, Input, Output} from '@angular/core';
-import {BehaviorSubject} from 'rxjs';
-import {ModalTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
+import {ModalTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     selector: 'fusion-modal-header',
@@ -10,6 +10,7 @@ import {ModalTestIdModifiers, TestIdsService} from '@ironsource/fusion-ui';
 export class ModalHeaderComponent {
     @Input() headerText: string;
     @Input() showCloseButton = true;
+    /** @internal */
     @Input() testId: string;
 
     private _infoText: string;
diff --git a/projects/fusion-ui/components/modal/v3/modal.component.ts b/projects/fusion-ui/components/modal/v3/modal.component.ts
index 55d5326bf..41a7464ce 100644
--- a/projects/fusion-ui/components/modal/v3/modal.component.ts
+++ b/projects/fusion-ui/components/modal/v3/modal.component.ts
@@ -58,7 +58,7 @@ export class ModalComponent implements OnDestroy, OnInit {
     get configuration(): ModalConfiguration {
         return this._configuration.getValue();
     }
-
+    /** @internal */
     @Input() testId: string;
 
     @Output() open = new EventEmitter();
@@ -69,7 +69,9 @@ export class ModalComponent implements OnDestroy, OnInit {
     /** @internal */
     @ViewChild('modalHolder', {static: true}) modalHolder: ElementRef;
 
+    /** @internal */
     modalTestIdModifiers: typeof ModalTestIdModifiers = ModalTestIdModifiers;
+    /** @internal */
     testIdsService: TestIdsService = this.injector.get(TestIdsService);
 
     private uid: string;
diff --git a/projects/fusion-ui/components/search/v3/search.component.html b/projects/fusion-ui/components/search/v3/search.component.html
index e623a7afa..74f53e857 100644
--- a/projects/fusion-ui/components/search/v3/search.component.html
+++ b/projects/fusion-ui/components/search/v3/search.component.html
@@ -6,5 +6,11 @@
        [placeholder]="placeholder"
        [formControl]="searchFormControl"
        [class.fu-has-clear-icon]="showClearIcon"
+       [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:searchTestIdModifiers.INPUT"
 />
-<fusion-icon class="fu-clear" *ngIf="showClearIcon && (searchFormControl.valueChanges | async)" [name]="clearIcon" (click)="clearInput(true)"></fusion-icon>
+<fusion-icon class="fu-clear"
+             *ngIf="showClearIcon && (searchFormControl.valueChanges | async)"
+             [name]="clearIcon"
+             [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:searchTestIdModifiers.CLEAR_BUTTON"
+             (click)="clearInput(true)"
+></fusion-icon>
diff --git a/projects/fusion-ui/components/search/v3/search.component.ts b/projects/fusion-ui/components/search/v3/search.component.ts
index 8d950e721..217d8c6ea 100644
--- a/projects/fusion-ui/components/search/v3/search.component.ts
+++ b/projects/fusion-ui/components/search/v3/search.component.ts
@@ -1,10 +1,13 @@
-import {ChangeDetectionStrategy, Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild} from '@angular/core';
+import {ChangeDetectionStrategy, Component, ElementRef, forwardRef, Injector, Input, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormControl, FormsModule, NG_VALUE_ACCESSOR, ReactiveFormsModule} from '@angular/forms';
 import {Subject} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
 import {isNullOrUndefined} from '@ironsource/fusion-ui/utils';
 import {IconData, IconModule} from '@ironsource/fusion-ui/components/icon/v1';
+import {GenericPipe} from '@ironsource/fusion-ui/pipes/generic';
+import {SearchTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     selector: 'fusion-search',
@@ -12,7 +15,7 @@ import {IconData, IconModule} from '@ironsource/fusion-ui/components/icon/v1';
     styleUrls: ['./search.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
     standalone: true,
-    imports: [CommonModule, FormsModule, ReactiveFormsModule, IconModule],
+    imports: [CommonModule, FormsModule, ReactiveFormsModule, IconModule, GenericPipe],
     providers: [
         {
             provide: NG_VALUE_ACCESSOR,
@@ -45,6 +48,9 @@ export class SearchComponent implements OnInit, OnDestroy {
         return this._showClearIcon;
     }
 
+    /** @internal */
+    @Input() testId: string;
+
     /** @internal */
     searchFormControl = new FormControl();
     /** @internal */
@@ -54,6 +60,13 @@ export class SearchComponent implements OnInit, OnDestroy {
     /** @internal */
     clearIcon: IconData = {iconName: 'cancel', iconVersion: 'v3'};
 
+    /** @internal */
+    searchTestIdModifiers: typeof SearchTestIdModifiers = SearchTestIdModifiers;
+    /** @internal */
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
+    constructor(private injector: Injector) {}
+
     ngOnInit() {
         this.searchFormControl.valueChanges.pipe(takeUntil(this.onDestroy$)).subscribe(value => {
             this.propagateTouched();
diff --git a/projects/fusion-ui/components/table/v3/components/table-basic/table-basic.component.html b/projects/fusion-ui/components/table/v3/components/table-basic/table-basic.component.html
index 52d1e3fad..9327cc826 100644
--- a/projects/fusion-ui/components/table/v3/components/table-basic/table-basic.component.html
+++ b/projects/fusion-ui/components/table/v3/components/table-basic/table-basic.component.html
@@ -10,6 +10,7 @@
         [isExpanded]="isExpanded(rowIndex)"
         [isInnerRow]="false"
         [class.is-row-in-request]="tableService.rowsMetadata[row['_rowId']]?.inRequest"
+        [testId]="testId"
         (rowRemoved)="tableService.removeRow({rows: rows, rowIndex: rowIndex, row: row, options: options})"
         (selectedChange)="tableService.onRowSelectChanged($event, row)"
         (expandRow)="onExpandRow($event)"
diff --git a/projects/fusion-ui/components/table/v3/components/table-basic/table-basic.component.ts b/projects/fusion-ui/components/table/v3/components/table-basic/table-basic.component.ts
index 1c1f3b4ee..236fde114 100644
--- a/projects/fusion-ui/components/table/v3/components/table-basic/table-basic.component.ts
+++ b/projects/fusion-ui/components/table/v3/components/table-basic/table-basic.component.ts
@@ -5,6 +5,7 @@ import {
     Component,
     ElementRef,
     EventEmitter,
+    Injector,
     Input,
     OnDestroy,
     OnInit,
@@ -21,6 +22,8 @@ import {
 import {TableService} from '@ironsource/fusion-ui/components/table/common/services';
 import {fromEvent, Subject, from} from 'rxjs';
 import {filter, mergeMap, takeUntil} from 'rxjs/operators';
+import {TableTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     // eslint-disable-next-line
@@ -44,6 +47,9 @@ export class TableBasicComponent implements OnInit, OnDestroy, AfterViewInit {
         this._halfTableClientWidth = value ? value / 2 : 0;
     }
 
+    /** @internal */
+    @Input() testId: string;
+
     @Output() rowSelected = new EventEmitter();
     @Output() expandRow = new EventEmitter<TableRowExpandEmitter>();
 
@@ -71,6 +77,11 @@ export class TableBasicComponent implements OnInit, OnDestroy, AfterViewInit {
     rowClass = this.getRowClass.bind(this);
     rowRowspanIndexes = this.getRowspanIndexes.bind(this);
 
+    /** @internal */
+    tableTestIdModifiers: typeof TableTestIdModifiers = TableTestIdModifiers;
+    /** @internal */
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
     private _halfTableClientWidth = 0;
     private tableOptions;
     private onDestroy$ = new Subject();
@@ -79,7 +90,8 @@ export class TableBasicComponent implements OnInit, OnDestroy, AfterViewInit {
         public tableService: TableService,
         private cdr: ChangeDetectorRef,
         private elementRef: ElementRef,
-        private renderer: Renderer2
+        private renderer: Renderer2,
+        private injector: Injector
     ) {}
 
     ngOnInit(): void {
diff --git a/projects/fusion-ui/components/table/v3/components/table-row/table-row.component.html b/projects/fusion-ui/components/table/v3/components/table-row/table-row.component.html
index 06de451a6..6cb1d9abc 100644
--- a/projects/fusion-ui/components/table/v3/components/table-row/table-row.component.html
+++ b/projects/fusion-ui/components/table/v3/components/table-row/table-row.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngFor="let expandCell of expandCellCount | async; let isLast = last">
+<ng-container *ngFor="let expandCell of expandCellCount | async; let isLast = last; let idx=index">
     <td *ngIf="cellShown | generic:'cell-expand'"
         class="expand-cell"
         [class.total-row]="isRowTotal"
@@ -6,6 +6,7 @@
         [class.inner-row]="isInnerRow"
         [class.sticky-left]="options?.rowsExpandableOptions?.sticky"
         [attr.rowspan]="attrRowspan | generic:'cell-expand'"
+        [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:(tableTestIdModifiers.CELL+'-r'+rowIndex+'-c'+idx)"
     >
         <fusion-icon
             *ngIf="isLast && showExpandIcon()"
@@ -16,7 +17,7 @@
         </fusion-icon>
     </td>
 </ng-container>
-<ng-container *ngFor="let column of columns; trackBy: trackByFn; let columnIndex = index; let isLast = last;">
+<ng-container *ngFor="let column of columns; trackBy: trackByFn; let columnIndex = index; let isLast = last; let idx=index">
     <td *ngIf="cellShown | generic:column.key"
         fusionTableCell
         [fusionTooltip]="columnsData[columnIndex]?.tooltip"
@@ -41,6 +42,7 @@
         [style.width]="columnsData[columnIndex]?.width"
         [attr.colspan]="columnsData[columnIndex]?.colspan"
         [attr.rowspan]="attrRowspan | generic:column.key"
+        [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:(tableTestIdModifiers.CELL+'-r'+rowIndex+'-c'+idx)"
         (remove)="rowRemoved.emit()"
         (selectedChange)="selectedChange.emit($event)"
         (dataChange)="onDataChange($event, column.key)"
diff --git a/projects/fusion-ui/components/table/v3/components/table-row/table-row.component.ts b/projects/fusion-ui/components/table/v3/components/table-row/table-row.component.ts
index b2d687340..029043a95 100644
--- a/projects/fusion-ui/components/table/v3/components/table-row/table-row.component.ts
+++ b/projects/fusion-ui/components/table/v3/components/table-row/table-row.component.ts
@@ -4,6 +4,7 @@ import {
     Component,
     EventEmitter,
     HostBinding,
+    Injector,
     Input,
     OnChanges,
     OnInit,
@@ -17,6 +18,8 @@ import {Observable, of} from 'rxjs';
 import {ColumnData} from './column-data';
 import {TableRow} from '@ironsource/fusion-ui/components/table/common/entities';
 import {IconData} from '@ironsource/fusion-ui/components/icon/v1';
+import {TableTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     // eslint-disable-next-line
@@ -36,6 +39,10 @@ export class TableRowComponent implements OnInit, OnChanges {
     @Input() isExpanded: boolean;
     @Input() isInnerRow: boolean;
     @Input() hasAfterSticky: boolean;
+
+    /** @internal */
+    @Input() testId: string;
+
     @Output() rowRemoved = new EventEmitter();
     @Output() selectedChange = new EventEmitter();
     @Output() expandRow = new EventEmitter<TableRowExpandEmitter>();
@@ -69,6 +76,11 @@ export class TableRowComponent implements OnInit, OnChanges {
     cellShown = this.showCell.bind(this);
     attrRowspan = this.getAttrRowspan.bind(this);
 
+    /** @internal */
+    tableTestIdModifiers: typeof TableTestIdModifiers = TableTestIdModifiers;
+    /** @internal */
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
     get expandCellCount(): Observable<number[]> {
         if (!!this.options && !!this.options.rowsExpandableOptions && !!this.tableService.expandLevels) {
             const expandLevelsByIndex = this.tableService.getExpandLevelByRowIndex(this.rowIndex);
@@ -100,7 +112,7 @@ export class TableRowComponent implements OnInit, OnChanges {
         };
     }
 
-    constructor(public tableService: TableService, private cdRef: ChangeDetectorRef) {}
+    constructor(public tableService: TableService, private cdRef: ChangeDetectorRef, private injector: Injector) {}
 
     ngOnInit(): void {
         this.dataRowIndex = this.rowIndex;
diff --git a/projects/fusion-ui/components/table/v3/stories/table.component.stories.ts b/projects/fusion-ui/components/table/v3/stories/table.component.stories.ts
index c29bd7d14..10e98f1a6 100644
--- a/projects/fusion-ui/components/table/v3/stories/table.component.stories.ts
+++ b/projects/fusion-ui/components/table/v3/stories/table.component.stories.ts
@@ -65,7 +65,8 @@ export default {
     args: {
         options: TABLE_DEFAULT_OPTIONS,
         columns: TABLE_DEFAULT_COLUMNS_CONFIG,
-        rows: ROWS_DEFAULT_DATA
+        rows: ROWS_DEFAULT_DATA,
+        testId: 'test-id'
     }
 } as Meta<TableComponent>;
 
@@ -76,6 +77,7 @@ const TableTemplate: StoryFn<TableComponent> = (args: TableComponent) => ({
     [columns]="columns"
     [rows]="rows"
     [loading]="loading"
+    [testId]="testId"
 ></fusion-table>`
 });
 
@@ -85,6 +87,7 @@ const TableWithHostTemplate: StoryFn<TableComponent> = (args: TableComponent) =>
     [options]="options"
     [columns]="columns"
     [rows]="rows"
+    [testId]="testId"
 ></fusion-table-story-holder>`
 });
 
diff --git a/projects/fusion-ui/components/table/v3/table.component.html b/projects/fusion-ui/components/table/v3/table.component.html
index f49263b42..5d80e3ee3 100644
--- a/projects/fusion-ui/components/table/v3/table.component.html
+++ b/projects/fusion-ui/components/table/v3/table.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="!noTableFrame" class="fu-table-header">
     <ng-container *ngIf="options?.tableLabel as tableLabel">
-        <div class="fu-table-label">{{tableLabel.text}}
+        <div class="fu-table-label" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:tableTestIdModifiers.LABEL">{{tableLabel.text}}
         <ng-container *ngIf="tableLabel.tooltip">
             <fusion-icon [fusionTooltip]="tableLabel.tooltip" class="fu-info-icon" [name]="tableLabel.icon ?? {iconName: 'info', iconVersion: 'v3'}"></fusion-icon>
         </ng-container>
@@ -10,6 +10,7 @@
         <fusion-search style="width: 300px;"
             [formControl]="searchFormControl"
             [placeholder]="searchOptions.placeholder"
+            [testId]="testId"
         ></fusion-search>
     </div>
 </div>
@@ -33,7 +34,7 @@
                 <tr [ngStyle]="!!options.rowsOptions && !!options.rowsOptions.headerRow ? options.rowsOptions.headerRow.style : null">
                     <!--<ng-container *ngIf="!!options?.rowsExpandableOptions" [ngTemplateOutlet]="headerExpandColumn"></ng-container>-->
                     <td
-                        *ngFor="let column of columns; trackBy: trackByFunc; let isLast = last; let isFirst = first"
+                        *ngFor="let column of columns; trackBy: trackByFunc; let isLast = last; let isFirst = first; let idx = index"
                         [attr.data-col-key]="column.key"
                         [ngClass]="tableService.getColumnClasses(column, true)"
                         [ngStyle]="tableService.getColumnStyle(column)"
@@ -42,12 +43,16 @@
                         [style.text-align]="column.headerAlign"
                         [attr.colspan]="isFirst ? (tableService.expandLevels + 1) : undefined"
                         [style.top.px]="options?.stickyHeaderTopOffset"
+                        [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:(tableTestIdModifiers.COLUMN_HEADER+idx)"
                     >
                         <ng-container>
-                            <div class="fu-header-text" [class.fu-tooltiped]="column.tooltip" [fusionTooltip]="column.tooltip">{{ column.title }}</div>
+                            <div class="fu-header-text"
+                                 [class.fu-tooltiped]="column.tooltip" [fusionTooltip]="column.tooltip"
+                                 [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:(tableTestIdModifiers.COLUMN_TITLE+idx)"
+                            >{{ column.title }}</div>
                             <div class="fu-sort-wrapper">
-                                <div class="fu-sort-up"></div>
-                                <div class="fu-sort-down"></div>
+                                <div class="fu-sort-up" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:(tableTestIdModifiers.COLUMN_SORT_UP+idx)"></div>
+                                <div class="fu-sort-down" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:(tableTestIdModifiers.COLUMN_SORT_DOWN+idx)"></div>
                             </div>
                         </ng-container>
                         <fusion-multi-dropdown
@@ -70,6 +75,7 @@
                             [isIndeterminate]="tableService.isPartialSelected(rows)"
                             (changed)="tableService.onRowsSelectChanged(options.isGroupedTable, rows, $event)"
                             [name]="'rows_all'"
+                            [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:tableTestIdModifiers.COLUMN_HEADER_SELECT_ALL"
                         >
                         </fusion-checkbox>
                     </td>
@@ -87,6 +93,7 @@
                 [options]="options"
                 [tableClientWidth]="getTableClientWidth()"
                 [expandedRows]="expandedRows"
+                [testId]="testId"
                 (rowSelected)="selectionChanged.emit($event)"
                 (expandRow)="doExpandRow($event)"
                 (click)="onTableBodyClicked($event)"
@@ -128,7 +135,7 @@
     </table>
     <!--table pagination loading overlay-->
     <ng-container *ngIf="options?.hasReturnToTopButton && (shownGoTopButton$ | async)">
-        <div class="fu-button-return-top" fusionTooltip="Return to top" (click)="onClickReturnTop()">
+        <div class="fu-button-return-top" fusionTooltip="Return to top" (click)="onClickReturnTop()" [attr.data-testid]="testIdsService.getTestAttribute.bind(this) | generic:testId:tableTestIdModifiers.BUTTON_GO_TOP">
             <fusion-icon class="fu-return-top-icon" [name]="{iconName:'angle-up', iconVersion: 'v3'}"></fusion-icon>
         </div>
     </ng-container>
diff --git a/projects/fusion-ui/components/table/v3/table.component.ts b/projects/fusion-ui/components/table/v3/table.component.ts
index 3b711e7b6..ff04dd43e 100644
--- a/projects/fusion-ui/components/table/v3/table.component.ts
+++ b/projects/fusion-ui/components/table/v3/table.component.ts
@@ -9,7 +9,8 @@ import {
     ChangeDetectorRef,
     Component,
     ChangeDetectionStrategy,
-    OnDestroy
+    OnDestroy,
+    Injector
 } from '@angular/core';
 import {BehaviorSubject, defer, fromEvent, Subject} from 'rxjs';
 import {debounceTime, takeUntil, tap} from 'rxjs/operators';
@@ -30,6 +31,8 @@ import {
 import {TableBasicComponent} from './components/table-basic/table-basic.component';
 import {MenuDropItem} from '@ironsource/fusion-ui/components/menu-drop';
 import {FormControl} from '@angular/forms';
+import {TableTestIdModifiers} from '@ironsource/fusion-ui/entities';
+import {TestIdsService} from '@ironsource/fusion-ui/services/test-ids';
 
 @Component({
     selector: 'fusion-table',
@@ -85,6 +88,9 @@ export class TableComponent implements OnInit, OnDestroy {
         this._expandedRows = value;
     }
 
+    /** @internal */
+    @Input() testId: string;
+
     /**
      * On Sort changed
      */
@@ -185,6 +191,11 @@ export class TableComponent implements OnInit, OnDestroy {
     /** @internal */
     searchFormControl: FormControl<string>;
 
+    /** @internal */
+    tableTestIdModifiers: typeof TableTestIdModifiers = TableTestIdModifiers;
+    /** @internal */
+    testIdsService: TestIdsService = this.injector.get(TestIdsService);
+
     get isCheckboxTitleShown(): boolean {
         return this.columns ? this.columns.some(column => column.type === TableColumnTypeEnum.Checkbox && column.title !== '') : false;
     }
@@ -246,7 +257,8 @@ export class TableComponent implements OnInit, OnDestroy {
         /** @internal */
         public tableService: TableService,
         private uniqueService: UniqueIdService,
-        private cdr: ChangeDetectorRef
+        private cdr: ChangeDetectorRef,
+        private injector: Injector
     ) {
         this.tableService.clearSelectedRows();
     }
diff --git a/projects/fusion-ui/entities/test-ids-modifiers.ts b/projects/fusion-ui/entities/test-ids-modifiers.ts
index 4391d9352..8f6cfce85 100644
--- a/projects/fusion-ui/entities/test-ids-modifiers.ts
+++ b/projects/fusion-ui/entities/test-ids-modifiers.ts
@@ -29,3 +29,20 @@ export enum ModalTestIdModifiers {
     MODAL_CANCEL_BUTTON = 'modal-cancel-button',
     MODAL_ERROR = 'modal-error'
 }
+
+export enum SearchTestIdModifiers {
+    INPUT = 'search-input',
+    CLEAR_BUTTON = 'search-clear-button'
+}
+
+export enum TableTestIdModifiers {
+    LABEL = 'table-label',
+    COLUMN_HEADER = 'table-header-c',
+    COLUMN_TITLE = 'table-column-title-c',
+    COLUMN_SORT_UP = 'table-column-sort-up-c',
+    COLUMN_SORT_DOWN = 'table-column-sort-down-c',
+    COLUMN_HEADER_SELECT_ALL = 'table-header-select-all',
+    CELL = 'table-cell',
+
+    BUTTON_GO_TOP = 'table-button-go-top'
+}

From a4d057ab3f2aae64806f758ef42fb6f88650f661 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:26:36 +0000
Subject: [PATCH 18/19] chore(release): 6.2.0-rc.0

---
 CHANGELOG.md                    | 18 ++++++++++++++++++
 package.json                    |  2 +-
 projects/fusion-ui/package.json |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9424ff44f..efb632deb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [6.2.0-rc.0](https://github.com/ironSource/fusion-ui/compare/v6.1.1...v6.2.0-rc.0) (2023-10-16)
+
+## [6.1.0-rc.2](https://github.com/ironSource/fusion-ui/compare/v6.1.0-rc.1...v6.1.0-rc.2) (2023-10-05)
+
+## [6.1.0-rc.1](https://github.com/ironSource/fusion-ui/compare/v6.1.0-rc.0...v6.1.0-rc.1) (2023-10-05)
+
+
+### CI
+
+* **isct-13:** add attributes to the include-exclude component ([d9ff283](https://github.com/ironSource/fusion-ui/commit/d9ff28364312f0f864a16ad64a125c626f6a1aab))
+
+## [6.1.0-rc.0](https://github.com/ironSource/fusion-ui/compare/v6.0.1...v6.1.0-rc.0) (2023-10-04)
+
+
+### Features
+
+* **storybook:** up storybook version ([960ab61](https://github.com/ironSource/fusion-ui/commit/960ab61a736bac42a51e671369a59b1a0f48b9e8))
+
 ### [6.1.1](https://github.com/ironSource/fusion-ui/compare/v6.1.0...v6.1.1) (2023-10-08)
 
 ## [6.1.0](https://github.com/ironSource/fusion-ui/compare/v6.0.1...v6.1.0) (2023-10-08)
diff --git a/package.json b/package.json
index c91bececb..a3b39b647 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fusion-ui",
-    "version": "6.1.1",
+    "version": "6.2.0-rc.0",
     "description": "UI library created by ironSource",
     "license": "MIT",
     "repository": {
diff --git a/projects/fusion-ui/package.json b/projects/fusion-ui/package.json
index 0d3529a0e..e492af49d 100644
--- a/projects/fusion-ui/package.json
+++ b/projects/fusion-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ironsource/fusion-ui",
-    "version": "6.1.1",
+    "version": "6.2.0-rc.0",
     "dependencies": {
         "chart.js": "^3.5.1",
         "@floating-ui/dom": "^1.0.9",

From d611af18f876acd009bf98ab9260533a222074ab Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Mon, 30 Oct 2023 13:21:20 +0000
Subject: [PATCH 19/19] chore(release): 6.2.0

---
 CHANGELOG.md                    | 2 ++
 package.json                    | 2 +-
 projects/fusion-ui/package.json | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efb632deb..d948e0abe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [6.2.0](https://github.com/ironSource/fusion-ui/compare/v6.2.0-rc.0...v6.2.0) (2023-10-30)
+
 ## [6.2.0-rc.0](https://github.com/ironSource/fusion-ui/compare/v6.1.1...v6.2.0-rc.0) (2023-10-16)
 
 ## [6.1.0-rc.2](https://github.com/ironSource/fusion-ui/compare/v6.1.0-rc.1...v6.1.0-rc.2) (2023-10-05)
diff --git a/package.json b/package.json
index a3b39b647..4c2501e13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fusion-ui",
-    "version": "6.2.0-rc.0",
+    "version": "6.2.0",
     "description": "UI library created by ironSource",
     "license": "MIT",
     "repository": {
diff --git a/projects/fusion-ui/package.json b/projects/fusion-ui/package.json
index e492af49d..aab7e19f3 100644
--- a/projects/fusion-ui/package.json
+++ b/projects/fusion-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ironsource/fusion-ui",
-    "version": "6.2.0-rc.0",
+    "version": "6.2.0",
     "dependencies": {
         "chart.js": "^3.5.1",
         "@floating-ui/dom": "^1.0.9",