Fix wrongly resolved merge

Merge #fa6eb6ae had wrongly resolved code
AbsaOSS · Nov 6, 2023 · 4d33272 · 4d33272
1 parent c900233
commit 4d33272
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/projects/cps-ui-kit/src/lib/base_components/base-tree-dropdown.component.ts b/projects/cps-ui-kit/src/lib/base_components/base-tree-dropdown.component.ts
@@ -147,8 +147,8 @@ export class BaseTreeDropdownComponent
    * When it is not an empty string, an info icon is displayed to show text for more info.
    * @group Props
    */
-  @Input() numToleratedItems = 10;
   @Input() infoTooltip = '';
+  @Input() numToleratedItems = 10;
 
   /**
    * Info tooltip class for styling.

diff --git a/projects/cps-ui-kit/src/lib/components/cps-autocomplete/cps-autocomplete.component.ts b/projects/cps-ui-kit/src/lib/components/cps-autocomplete/cps-autocomplete.component.ts
@@ -200,8 +200,8 @@ export class CpsAutocompleteComponent
    *When it is not an empty string, an info icon is displayed to show text for more info.
    * @group Props
    */
-  @Input() numToleratedItems = 10;
   @Input() infoTooltip = '';
+  @Input() numToleratedItems = 10;
   /**
    * Info tooltip class for styling.
    * @group Props

diff --git a/projects/cps-ui-kit/src/lib/components/cps-select/cps-select.component.ts b/projects/cps-ui-kit/src/lib/components/cps-select/cps-select.component.ts
@@ -194,8 +194,8 @@ export class CpsSelectComponent
    *When it is not an empty string, an info icon is displayed to show text for more info.
    * @group Props
    */
-  @Input() numToleratedItems = 10;
   @Input() infoTooltip = '';
+  @Input() numToleratedItems = 10;
   /**
    * Info tooltip class for styling.
    * @group Props

diff --git a/projects/cps-ui-kit/src/lib/components/cps-table/cps-table.component.ts b/projects/cps-ui-kit/src/lib/components/cps-table/cps-table.component.ts
@@ -75,12 +75,11 @@ export type CpsTableSortMode = 'single' | 'multiple';
     }
   ]
 })
-export class CpsTableComponent implements OnInit, AfterViewChecked {
+export class CpsTableComponent implements OnInit, AfterViewChecked, OnChanges {
   /**
    * An array of items to display on table.
    * @group Props
    */
-export class CpsTableComponent implements OnInit, AfterViewChecked, OnChanges {
   @Input() data: any[] = [];
   /**
    * An array of objects to represent columns on table.
@@ -296,7 +295,6 @@ export class CpsTableComponent implements OnInit, AfterViewChecked, OnChanges {
    */
   @Input() clearGlobalFilterOnLoading = false;
 
-  @Input() showRemoveBtnOnSelect = true;
   @Input() removeBtnOnSelectDisabled = false;
 
   @Input() showAdditionalBtnOnSelect = false;

diff --git a/projects/cps-ui-kit/src/lib/components/cps-tree-table/cps-tree-table.component.ts b/projects/cps-ui-kit/src/lib/components/cps-tree-table/cps-tree-table.component.ts
@@ -282,7 +282,6 @@ export class CpsTreeTableComponent
    */
   @Input() clearGlobalFilterOnLoading = false;
 
-  @Input() showRemoveBtnOnSelect = true;
   @Input() removeBtnOnSelectDisabled = false;
 
   @Input() showAdditionalBtnOnSelect = false;