inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebase went little bit wrong -II

Browse Source
This commit is contained in:
Vito Albano
2023-12-07 00:47:27 +00:00
parent bcf016fe8b
commit 162ddf34ce
6 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts
View File

@@ -225,7 +225,7 @@ describe('SearchDateRangeComponent', () => {
betweenStartDate: undefined,
betweenEndDate: undefined
};
let dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-advanced-in-last"] .mdc-radio__native-control');
let dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-in-last"] .mdc-radio__native-control');
dateRangeTypeRadioButton.click();
selectDropdownOption('date-range-in-last-option-weeks');
enterValueInInputFieldAndTriggerEvent('date-range-in-last-input', '');
@@ -246,7 +246,7 @@ describe('SearchDateRangeComponent', () => {
betweenStartDate: '',
betweenEndDate: ''
};
dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-advanced-between"] .mdc-radio__native-control');
dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-between"] .mdc-radio__native-control');
dateRangeTypeRadioButton.click();
fixture.detectChanges();
expect(component.changed.emit).not.toHaveBeenCalledWith(value);
@@ -261,7 +261,7 @@ describe('SearchDateRangeComponent', () => {
betweenStartDate: null,
betweenEndDate: null
};
let dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-advanced-in-last"] .mdc-radio__native-control');
let dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-in-last"] .mdc-radio__native-control');
dateRangeTypeRadioButton.click();
selectDropdownOption('date-range-in-last-option-weeks');
enterValueInInputFieldAndTriggerEvent('date-range-in-last-input', '5');
@@ -283,7 +283,7 @@ describe('SearchDateRangeComponent', () => {
betweenStartDate: startDateSampleValue,
betweenEndDate: endDateSampleValue
};
dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-advanced-between"] .mdc-radio__native-control');
dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-between"] .mdc-radio__native-control');
dateRangeTypeRadioButton.click();
component.betweenStartDateFormControl.setValue(startDateSampleValue);
component.betweenEndDateFormControl.setValue(endDateSampleValue);

4
lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
View File

@@ -104,11 +104,7 @@ export class SearchPropertiesComponent implements OnInit, AfterViewChecked, Sear
const extraFreeSpace = 20;
this._fileSizeOperatorsMaxWidth = Math.max(...this._fileSizeOperators.map((operator) =>
this.getOperatorNameWidth(operator, this.getCanvasFont(this.fileSizeOperatorSelectElement.nativeElement)))) +
<<<<<<< Updated upstream
this.fileSizeOperatorSelectElement.nativeElement.querySelector('.mat-mdc-select-arrow').clientWidth +
=======
this.fileSizeOperatorSelectElement.nativeElement.querySelector('.mat-mdc-select-arrow-wrapper').clientWidth +
>>>>>>> Stashed changes
extraFreeSpace;
});
}