({
dateRangeType: DateRangeType.ANY,
inLastValueType: InLastDateType.DAYS,
inLastValue: undefined,
diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.ts
similarity index 95%
rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.ts
rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.ts
index a51e0d96b2..f26ad9fb32 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.ts
+++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.ts
@@ -18,7 +18,7 @@
import { DateRangeType } from './date-range-type';
import { InLastDateType } from './in-last-date-type';
-export interface SearchDateRangeAdvanced {
+export interface SearchDateRange {
dateRangeType: DateRangeType;
inLastValueType?: InLastDateType;
inLastValue?: string;
diff --git a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.html b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.html
deleted file mode 100644
index 844af86d45..0000000000
--- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
diff --git a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.scss b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.scss
deleted file mode 100644
index aa124f9143..0000000000
--- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.adf-search-date-range > form {
- display: inline-flex;
- flex-direction: column;
- width: 100%;
-}
diff --git a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts
deleted file mode 100644
index 806b555640..0000000000
--- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts
+++ /dev/null
@@ -1,267 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { SearchDateRangeComponent } from './search-date-range.component';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ContentTestingModule } from '../../../testing/content.testing.module';
-import { TranslateModule } from '@ngx-translate/core';
-import { MatDatepickerInputEvent } from '@angular/material/datepicker';
-import { startOfDay, endOfDay, isValid, addDays, format } from 'date-fns';
-
-describe('SearchDateRangeComponent', () => {
- let fixture: ComponentFixture;
- let component: SearchDateRangeComponent;
-
- const dateFormatFixture = 'dd-MMM-yy';
- const fromDate = new Date('2016-10-16');
- const toDate = new Date('2017-10-16');
-
- beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [TranslateModule.forRoot(), ContentTestingModule]
- });
- fixture = TestBed.createComponent(SearchDateRangeComponent);
- component = fixture.componentInstance;
- });
-
- afterEach(() => fixture.destroy());
-
- const getFromInput = () => fixture.debugElement.nativeElement.querySelector('[data-automation-id="date-range-from-input"]');
- const getToInput = () => fixture.debugElement.nativeElement.querySelector('[data-automation-id="date-range-to-input"]');
-
- it('should setup form elements on init', () => {
- fixture.detectChanges();
-
- expect(component.from).toBeDefined();
- expect(component.to).toBeDefined();
- expect(component.form).toBeDefined();
- });
-
- it('should setup form control with formatted valid date on change', () => {
- component.settings = { field: 'cm:created', dateFormat: dateFormatFixture };
- fixture.detectChanges();
-
- const date = new Date('20-feb-18');
- expect(isValid(date)).toBeTrue();
-
- component.onChangedHandler({ value: date } as MatDatepickerInputEvent, component.from);
- expect(component.from.value.toString()).toEqual(date.toString());
- });
-
- it('should NOT setup form control with invalid date on change', () => {
- component.settings = { field: 'cm:created', dateFormat: dateFormatFixture };
- fixture.detectChanges();
-
- const date = new Date('20.f.18');
- expect(isValid(date)).toBeFalse();
-
- component.onChangedHandler({ value: date } as MatDatepickerInputEvent, component.from);
- expect(component.from.value).not.toEqual(date);
- });
-
- it('should reset form', () => {
- fixture.detectChanges();
- component.form.setValue({ from: fromDate, to: toDate });
-
- expect(component.from.value).toEqual(fromDate);
- expect(component.to.value).toEqual(toDate);
-
- component.reset();
-
- expect(component.from.value).toBeNull();
- expect(component.to.value).toBeNull();
- expect(component.form.value).toEqual({ from: null, to: null });
- });
-
- it('should reset fromMaxDate on reset', () => {
- fixture.detectChanges();
- component.fromMaxDate = fromDate;
- component.reset();
-
- expect(component.fromMaxDate).toEqual(undefined);
- });
-
- it('should update query builder on reset', () => {
- const context: any = {
- queryFragments: {
- createdDateRange: 'query'
- },
- update: () => {}
- };
-
- component.id = 'createdDateRange';
- component.context = context;
-
- spyOn(context, 'update').and.stub();
-
- fixture.detectChanges();
- component.reset();
-
- expect(context.queryFragments.createdDateRange).toEqual('');
- expect(context.update).toHaveBeenCalled();
- });
-
- it('should update query builder on value changes', () => {
- const context: any = {
- queryFragments: {},
- update: () => {}
- };
-
- component.id = 'createdDateRange';
- component.context = context;
- component.settings = { field: 'cm:created' };
-
- spyOn(context, 'update').and.stub();
-
- fixture.detectChanges();
- component.apply(
- {
- from: fromDate,
- to: toDate
- },
- true
- );
-
- const startDate = startOfDay(fromDate).toISOString();
- const endDate = endOfDay(toDate).toISOString();
-
- const expectedQuery = `cm:created:['${startDate}' TO '${endDate}']`;
-
- expect(context.queryFragments[component.id]).toEqual(expectedQuery);
- expect(context.update).toHaveBeenCalled();
- });
-
- it('should show date-format error when Invalid found', async () => {
- fixture.detectChanges();
-
- const input = getFromInput();
- input.value = '10-f-18';
- input.dispatchEvent(new Event('input'));
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- expect(component.getFromValidationMessage()).toEqual('SEARCH.FILTER.VALIDATION.INVALID-DATE');
- });
-
- it('should hide date-format error when correcting input', async () => {
- fixture.detectChanges();
-
- const input = getFromInput();
- input.value = '10-f-18';
- input.dispatchEvent(new Event('input'));
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- expect(component.getFromValidationMessage()).toEqual('SEARCH.FILTER.VALIDATION.INVALID-DATE');
-
- input.value = '10-10-2018';
- input.dispatchEvent(new Event('input'));
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- expect(component.getFromValidationMessage()).toEqual('');
- });
-
- it('should show error for max date constraint', async () => {
- component.settings = { field: 'cm:created', maxDate: 'today' };
- fixture.detectChanges();
-
- const input = getFromInput();
- input.value = format(addDays(new Date(), 1), 'dd-MM-yyyy');
- input.dispatchEvent(new Event('input'));
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- expect(component.getFromValidationMessage()).toEqual('SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE');
- });
-
- it('should show error for required constraint', async () => {
- fixture.detectChanges();
-
- const fromInput = getFromInput();
- fromInput.value = '';
- fromInput.dispatchEvent(new Event('input'));
-
- const toInput = getToInput();
- toInput.value = '';
- toInput.dispatchEvent(new Event('input'));
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- expect(component.getFromValidationMessage()).toEqual('SEARCH.FILTER.VALIDATION.REQUIRED-VALUE');
- expect(component.getToValidationMessage()).toEqual('SEARCH.FILTER.VALIDATION.REQUIRED-VALUE');
- });
-
- it('should show error for incorrect date range', async () => {
- fixture.detectChanges();
-
- const fromInput = getFromInput();
- fromInput.value = '11-10-2018';
- fromInput.dispatchEvent(new Event('input'));
-
- const toInput = getToInput();
- toInput.value = '10-10-2018';
- toInput.dispatchEvent(new Event('input'));
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- expect(component.getFromValidationMessage()).toEqual('');
- expect(component.getToValidationMessage()).toEqual('SEARCH.FILTER.VALIDATION.NO-DAYS');
- });
-
- it('should not show date-format error when valid found', async () => {
- fixture.detectChanges();
-
- const input = getFromInput();
- input.value = '10-10-2018';
- input.dispatchEvent(new Event('input'));
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- expect(component.getFromValidationMessage()).toEqual('');
- });
-
- it('should have no maximum date by default', async () => {
- fixture.detectChanges();
- await fixture.whenStable();
-
- expect(component.maxDate).toBeUndefined();
- });
-
- it('should be able to set a fixed maximum date', async () => {
- component.settings = { field: 'cm:created', dateFormat: dateFormatFixture, maxDate: '10-Mar-20' };
- fixture.detectChanges();
-
- const expected = endOfDay(new Date(2020, 2, 10));
- expect(component.maxDate).toEqual(expected);
- });
-
- it('should be able to set the maximum date to today', async () => {
- component.settings = { field: 'cm:created', dateFormat: dateFormatFixture, maxDate: 'today' };
- fixture.detectChanges();
- const today = endOfDay(new Date());
-
- expect(component.maxDate).toEqual(today);
- });
-});
diff --git a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts
deleted file mode 100644
index 7c06504e56..0000000000
--- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
-import { ADF_DATE_FORMATS, AdfDateFnsAdapter } from '@alfresco/adf-core';
-import { SearchWidget } from '../../models/search-widget.interface';
-import { SearchWidgetSettings } from '../../models/search-widget-settings.interface';
-import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
-import { LiveErrorStateMatcher } from '../../forms/live-error-state-matcher';
-import { Subject } from 'rxjs';
-import { MatDatepickerInputEvent } from '@angular/material/datepicker';
-import { startOfDay, endOfDay, isBefore, isValid as isValidDate } from 'date-fns';
-
-export interface DateRangeValue {
- from: string;
- to: string;
-}
-
-const DEFAULT_FORMAT_DATE: string = 'DD/MM/YYYY';
-
-interface DateRangeForm {
- from: FormControl;
- to: FormControl;
-}
-
-@Component({
- selector: 'adf-search-date-range',
- templateUrl: './search-date-range.component.html',
- styleUrls: ['./search-date-range.component.scss'],
- providers: [
- { provide: MAT_DATE_FORMATS, useValue: ADF_DATE_FORMATS },
- { provide: DateAdapter, useClass: AdfDateFnsAdapter }
- ],
- encapsulation: ViewEncapsulation.None,
- host: { class: 'adf-search-date-range' }
-})
-export class SearchDateRangeComponent implements SearchWidget, OnInit {
- from: FormControl;
- to: FormControl;
-
- form: FormGroup;
- matcher = new LiveErrorStateMatcher();
-
- id: string;
- settings?: SearchWidgetSettings;
- context?: SearchQueryBuilderService;
- datePickerFormat: string;
- maxDate: Date;
- fromMaxDate: Date;
- isActive = false;
- startValue: any;
- enableChangeUpdate: boolean;
- displayValue$ = new Subject();
-
- constructor(private dateAdapter: DateAdapter) {}
-
- getFromValidationMessage(): string {
- return this.from.hasError('invalidOnChange') || this.hasParseError(this.from)
- ? 'SEARCH.FILTER.VALIDATION.INVALID-DATE'
- : this.from.hasError('matDatepickerMax')
- ? 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE'
- : this.from.hasError('required')
- ? 'SEARCH.FILTER.VALIDATION.REQUIRED-VALUE'
- : '';
- }
-
- getToValidationMessage(): string {
- return this.to.hasError('invalidOnChange') || this.hasParseError(this.to)
- ? 'SEARCH.FILTER.VALIDATION.INVALID-DATE'
- : this.to.hasError('matDatepickerMin')
- ? 'SEARCH.FILTER.VALIDATION.NO-DAYS'
- : this.to.hasError('matDatepickerMax')
- ? 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE'
- : this.to.hasError('required')
- ? 'SEARCH.FILTER.VALIDATION.REQUIRED-VALUE'
- : '';
- }
-
- ngOnInit() {
- this.datePickerFormat = this.settings?.dateFormat ? this.settings.dateFormat : DEFAULT_FORMAT_DATE;
-
- const customDateAdapter = this.dateAdapter as AdfDateFnsAdapter;
- customDateAdapter.displayFormat = this.datePickerFormat;
-
- const validators = Validators.compose([Validators.required]);
-
- if (this.settings?.maxDate) {
- if (this.settings.maxDate === 'today') {
- this.maxDate = endOfDay(this.dateAdapter.today());
- } else {
- this.maxDate = endOfDay(this.dateAdapter.parse(this.settings.maxDate, this.datePickerFormat));
- }
- }
-
- if (this.startValue) {
- const splitValue = this.startValue.split('||');
- const fromValue = this.dateAdapter.parse(splitValue[0], this.datePickerFormat);
- const toValue = this.dateAdapter.parse(splitValue[1], this.datePickerFormat);
- this.from = new FormControl(fromValue, validators);
- this.to = new FormControl(toValue, validators);
- } else {
- this.from = new FormControl(null, validators);
- this.to = new FormControl(null, validators);
- }
-
- this.form = new FormGroup({
- from: this.from,
- to: this.to
- });
-
- this.setFromMaxDate();
- this.enableChangeUpdate = this.settings?.allowUpdateOnChange ?? true;
- }
-
- apply(model: Partial<{ from: Date; to: Date }>, isValid: boolean) {
- if (isValid && this.id && this.context && this.settings && this.settings.field) {
- this.isActive = true;
-
- const start = startOfDay(model.from).toISOString();
- const end = endOfDay(model.to).toISOString();
-
- this.context.queryFragments[this.id] = `${this.settings.field}:['${start}' TO '${end}']`;
-
- this.updateDisplayValue();
- this.context.update();
- }
- }
-
- submitValues() {
- this.apply(this.form.value, this.form.valid);
- }
-
- hasValidValue(): boolean {
- return this.form.valid;
- }
-
- getCurrentValue(): DateRangeValue {
- return {
- from: this.dateAdapter.format(this.form.value.from, this.datePickerFormat),
- to: this.dateAdapter.format(this.form.value.from, this.datePickerFormat)
- };
- }
-
- updateDisplayValue(): void {
- if (this.form.invalid || this.form.pristine) {
- this.displayValue$.next('');
- } else {
- this.displayValue$.next(
- `${this.dateAdapter.format(this.form.value.from, this.datePickerFormat)} - ${this.dateAdapter.format(
- this.form.value.to,
- this.datePickerFormat
- )}`
- );
- }
- }
-
- setValue(parsedDate: string) {
- const splitValue = parsedDate.split('||');
- const fromValue = this.dateAdapter.parse(splitValue[0], this.datePickerFormat);
- const toValue = this.dateAdapter.parse(splitValue[1], this.datePickerFormat);
- this.from.setValue(fromValue);
- this.from.markAsDirty();
- this.from.markAsTouched();
- this.to.setValue(toValue);
- this.to.markAsDirty();
- this.to.markAsTouched();
- this.submitValues();
- }
-
- clear() {
- this.isActive = false;
- this.form.reset({
- from: null,
- to: null
- });
-
- if (this.id && this.context) {
- this.context.queryFragments[this.id] = '';
- if (this.enableChangeUpdate) {
- this.updateQuery();
- }
- }
-
- this.setFromMaxDate();
- }
-
- reset() {
- this.clear();
- this.updateQuery();
- }
-
- private updateQuery() {
- if (this.id && this.context) {
- this.updateDisplayValue();
- this.context.update();
- }
- }
-
- onChangedHandler(event: MatDatepickerInputEvent, formControl: FormControl) {
- const inputValue = event.value;
-
- if (isValidDate(inputValue)) {
- formControl.setValue(inputValue);
- } else if (inputValue) {
- formControl.setErrors({
- invalidOnChange: true
- });
- }
-
- this.setFromMaxDate();
- }
-
- hasParseError(formControl: FormControl): boolean {
- return formControl.hasError('matDatepickerParse') && formControl.getError('matDatepickerParse').text;
- }
-
- forcePlaceholder(event: any) {
- event.srcElement.click();
- }
-
- setFromMaxDate() {
- this.fromMaxDate = !this.to.value || (this.maxDate && isBefore(this.maxDate, this.to.value)) ? this.maxDate : this.to.value;
- }
-}
diff --git a/lib/content-services/src/lib/search/public-api.ts b/lib/content-services/src/lib/search/public-api.ts
index 6e2b1b9089..953706c176 100644
--- a/lib/content-services/src/lib/search/public-api.ts
+++ b/lib/content-services/src/lib/search/public-api.ts
@@ -47,7 +47,6 @@ export * from './components/search.component';
export * from './components/search-panel/search-panel.component';
export * from './components/search-check-list/search-check-list.component';
export * from './components/search-chip-list/search-chip-list.component';
-export * from './components/search-date-range/search-date-range.component';
export * from './components/search-filter/search-filter.component';
export * from './components/search-filter-container/search-filter-container.component';
export * from './components/search-number-range/search-number-range.component';
@@ -63,7 +62,8 @@ export * from './components/search-filter-chips/search-filter-chips.component';
export * from './components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component';
export * from './components/search-facet-field/search-facet-field.component';
export * from './components/search-logical-filter/search-logical-filter.component';
-export * from './components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component';
+export * from './components/search-date-range-tabbed/search-date-range/search-date-range.component';
+export * from './components/search-date-range-tabbed/search-date-range-tabbed.component';
export * from './components/search-filter-tabbed/search-filter-tabbed.component';
export * from './components/reset-search.directive';
export * from './components/search-chip-autocomplete-input/search-chip-autocomplete-input.component';
diff --git a/lib/content-services/src/lib/search/search.module.ts b/lib/content-services/src/lib/search/search.module.ts
index ffc3b52cb2..ce75e0ca48 100644
--- a/lib/content-services/src/lib/search/search.module.ts
+++ b/lib/content-services/src/lib/search/search.module.ts
@@ -37,7 +37,6 @@ import { SearchSliderComponent } from './components/search-slider/search-slider.
import { SearchNumberRangeComponent } from './components/search-number-range/search-number-range.component';
import { SearchPanelComponent } from './components/search-panel/search-panel.component';
import { SearchCheckListComponent } from './components/search-check-list/search-check-list.component';
-import { SearchDateRangeComponent } from './components/search-date-range/search-date-range.component';
import { SearchSortingPickerComponent } from './components/search-sorting-picker/search-sorting-picker.component';
import { SEARCH_QUERY_SERVICE_TOKEN } from './search-query-service.token';
import { SearchQueryBuilderService } from './services/search-query-builder.service';
@@ -53,8 +52,8 @@ import { SearchLogicalFilterComponent } from './components/search-logical-filter
import { ResetSearchDirective } from './components/reset-search.directive';
import { SearchPropertiesComponent } from './components/search-properties/search-properties.component';
import { SearchFilterTabbedComponent } from './components/search-filter-tabbed/search-filter-tabbed.component';
-import { SearchDateRangeAdvancedComponent } from './components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component';
-import { SearchDateRangeAdvancedTabbedComponent } from './components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component';
+import { SearchDateRangeComponent } from './components/search-date-range-tabbed/search-date-range/search-date-range.component';
+import { SearchDateRangeTabbedComponent } from './components/search-date-range-tabbed/search-date-range-tabbed.component';
import { SearchFilterTabDirective } from './components/search-filter-tabbed/search-filter-tab.directive';
import { SearchFacetChipTabbedComponent } from './components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component';
import { SearchFacetTabbedContentComponent } from './components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component';
@@ -84,7 +83,6 @@ import { SearchFacetTabbedContentComponent } from './components/search-filter-ch
SearchNumberRangeComponent,
SearchPanelComponent,
SearchCheckListComponent,
- SearchDateRangeComponent,
SearchDatetimeRangeComponent,
SearchSortingPickerComponent,
SearchFilterContainerComponent,
@@ -98,8 +96,8 @@ import { SearchFacetTabbedContentComponent } from './components/search-filter-ch
ResetSearchDirective,
SearchPropertiesComponent,
SearchFilterTabbedComponent,
- SearchDateRangeAdvancedComponent,
- SearchDateRangeAdvancedTabbedComponent,
+ SearchDateRangeComponent,
+ SearchDateRangeTabbedComponent,
SearchFilterTabDirective,
SearchFacetChipTabbedComponent,
SearchFacetTabbedContentComponent
@@ -119,7 +117,6 @@ import { SearchFacetTabbedContentComponent } from './components/search-filter-ch
SearchNumberRangeComponent,
SearchPanelComponent,
SearchCheckListComponent,
- SearchDateRangeComponent,
SearchDatetimeRangeComponent,
SearchSortingPickerComponent,
SearchFilterContainerComponent,
@@ -129,7 +126,8 @@ import { SearchFacetTabbedContentComponent } from './components/search-filter-ch
SearchFacetFieldComponent,
SearchLogicalFilterComponent,
SearchFilterTabbedComponent,
- SearchDateRangeAdvancedComponent,
+ SearchDateRangeComponent,
+ SearchDateRangeTabbedComponent,
ResetSearchDirective,
SearchFacetChipTabbedComponent,
SearchFacetTabbedContentComponent
diff --git a/lib/content-services/src/lib/search/services/search-filter.service.ts b/lib/content-services/src/lib/search/services/search-filter.service.ts
index 491bf471bf..3693e91499 100644
--- a/lib/content-services/src/lib/search/services/search-filter.service.ts
+++ b/lib/content-services/src/lib/search/services/search-filter.service.ts
@@ -21,14 +21,11 @@ import { SearchRadioComponent } from '../components/search-radio/search-radio.co
import { SearchSliderComponent } from '../components/search-slider/search-slider.component';
import { SearchNumberRangeComponent } from '../components/search-number-range/search-number-range.component';
import { SearchCheckListComponent } from '../components/search-check-list/search-check-list.component';
-import { SearchDateRangeComponent } from '../components/search-date-range/search-date-range.component';
import { SearchDatetimeRangeComponent } from '../components/search-datetime-range/search-datetime-range.component';
import { SearchLogicalFilterComponent } from '../components/search-logical-filter/search-logical-filter.component';
import { SearchFilterAutocompleteChipsComponent } from '../components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component';
import { SearchPropertiesComponent } from '../components/search-properties/search-properties.component';
-import {
- SearchDateRangeAdvancedTabbedComponent
-} from '../components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component';
+import { SearchDateRangeTabbedComponent } from '../components/search-date-range-tabbed/search-date-range-tabbed.component';
@Injectable({
providedIn: 'root'
@@ -45,11 +42,10 @@ export class SearchFilterService {
properties: SearchPropertiesComponent,
'number-range': SearchNumberRangeComponent,
'check-list': SearchCheckListComponent,
- 'date-range': SearchDateRangeComponent,
'datetime-range': SearchDatetimeRangeComponent,
'logical-filter': SearchLogicalFilterComponent,
'autocomplete-chips': SearchFilterAutocompleteChipsComponent,
- 'date-range-advanced': SearchDateRangeAdvancedTabbedComponent
+ 'date-range': SearchDateRangeTabbedComponent
};
}
diff --git a/lib/testing/src/lib/protractor/content-services/pages/search/date-range-filter.page.ts b/lib/testing/src/lib/protractor/content-services/pages/search/date-range-filter.page.ts
deleted file mode 100644
index 0290b58733..0000000000
--- a/lib/testing/src/lib/protractor/content-services/pages/search/date-range-filter.page.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { protractor, ElementFinder, $ } from 'protractor';
-import { DatePickerCalendarPage } from '../../../core/pages/material/date-picker-calendar.page';
-import { BrowserVisibility } from '../../../core/utils/browser-visibility';
-import { BrowserActions } from '../../../core/utils/browser-actions';
-
-export class DateRangeFilterPage {
- fromField = '[data-automation-id="date-range-from-input"]';
- fromDateToggle = '[data-automation-id="date-range-from-date-toggle"]';
- toField = '[data-automation-id="date-range-to-input"]';
- toDateToggle = '[data-automation-id="date-range-to-date-toggle"]';
- applyButton = '[data-automation-id="date-range-apply-btn"]';
- clearButton = '[data-automation-id="date-range-clear-btn"]';
- fromErrorMessage = '[data-automation-id="date-range-from-error"]';
- toErrorMessage = '[data-automation-id="date-range-to-error"]';
- filter: ElementFinder;
-
- constructor(filter: ElementFinder) {
- this.filter = filter;
- }
-
- async getFromDate(): Promise {
- return BrowserActions.getInputValue(this.filter.$(this.fromField));
- }
-
- async putFromDate(date): Promise {
- await this.checkFromFieldIsDisplayed();
- await BrowserActions.clearSendKeys(this.filter.$(this.fromField), date);
- await this.filter.$(this.fromField).sendKeys(protractor.Key.ENTER);
- }
-
- async getFromCalendarSelectedDate(): Promise {
- const datePicker = await this.openFromDatePicker();
- const selectedDate = await datePicker.getSelectedDate();
- await datePicker.closeDatePicker();
- return selectedDate;
- }
-
- async openFromDatePicker(): Promise {
- await BrowserActions.click(this.filter.$(this.fromDateToggle));
-
- const datePicker = new DatePickerCalendarPage();
- await datePicker.checkDatePickerIsDisplayed();
- return datePicker;
- }
-
- async openToDatePicker(): Promise {
- await BrowserActions.click(this.filter.$(this.toDateToggle));
- const datePicker = new DatePickerCalendarPage();
- await datePicker.checkDatePickerIsDisplayed();
- return datePicker;
- }
-
- async clickFromField(): Promise {
- await BrowserActions.click(this.filter.$(this.fromField));
- }
-
- async checkFromErrorMessageIsDisplayed(msg: string): Promise {
- await BrowserVisibility.waitUntilElementIsVisible(this.filter.$(this.fromErrorMessage));
- const text = await BrowserActions.getText(this.filter.$(this.fromErrorMessage));
- await expect(text).toEqual(msg);
- }
-
- async checkFromErrorMessageIsNotDisplayed(): Promise {
- await BrowserVisibility.waitUntilElementIsNotVisible(this.filter.$(this.fromErrorMessage));
- }
-
- async checkFromFieldIsDisplayed(): Promise {
- await BrowserVisibility.waitUntilElementIsVisible(this.filter.$(this.fromField));
- }
-
- async checkFromDateToggleIsDisplayed(): Promise {
- await BrowserVisibility.waitUntilElementIsVisible(this.filter.$(this.fromDateToggle));
- }
-
- async getToDate(): Promise {
- return BrowserActions.getInputValue(this.filter.$(this.toField));
- }
-
- async putToDate(date): Promise {
- await this.checkToFieldIsDisplayed();
- await BrowserActions.clearSendKeys($(this.toField), date);
- await this.filter.$(this.toField).sendKeys(protractor.Key.ENTER);
- }
-
- async clickToField(): Promise {
- await BrowserActions.click(this.filter.$(this.toField));
- }
-
- async checkToErrorMessageIsDisplayed(msg): Promise {
- await BrowserVisibility.waitUntilElementIsVisible(this.filter.$(this.toErrorMessage));
- const text = await BrowserActions.getText(this.filter.$(this.toErrorMessage));
- await expect(text).toEqual(msg);
- }
-
- async checkToFieldIsDisplayed(): Promise {
- await BrowserVisibility.waitUntilElementIsVisible(this.filter.$(this.toField));
- }
-
- async checkToDateToggleIsDisplayed(): Promise {
- await BrowserVisibility.waitUntilElementIsVisible(this.filter.$(this.toDateToggle));
- }
-
- async clickApplyButton(): Promise {
- await BrowserActions.click(this.filter.$(this.applyButton));
- }
-
- async checkApplyButtonIsDisplayed(): Promise {
- await BrowserVisibility.waitUntilElementIsVisible(this.filter.$(this.applyButton));
- }
-
- async checkApplyButtonIsEnabled(): Promise {
- const isEnabled = await this.filter.$(this.applyButton).isEnabled();
- await expect(isEnabled).toBe(true);
- }
-
- async checkApplyButtonIsDisabled(): Promise {
- const isEnabled = await this.filter.$(this.applyButton).isEnabled();
- await expect(isEnabled).toBe(false);
- }
-
- async checkClearButtonIsDisplayed(): Promise {
- await BrowserVisibility.waitUntilElementIsVisible(this.filter.$(this.clearButton));
- }
-}
diff --git a/lib/testing/src/lib/protractor/content-services/pages/search/public-api.ts b/lib/testing/src/lib/protractor/content-services/pages/search/public-api.ts
index f8d39165d5..a204757827 100644
--- a/lib/testing/src/lib/protractor/content-services/pages/search/public-api.ts
+++ b/lib/testing/src/lib/protractor/content-services/pages/search/public-api.ts
@@ -16,7 +16,6 @@
*/
export * from './search-categories.page';
-export * from './date-range-filter.page';
export * from './number-range-filter.page';
export * from './search-check-list.page';
export * from './search-radio.page';
diff --git a/lib/testing/src/lib/protractor/content-services/pages/search/search-categories.page.ts b/lib/testing/src/lib/protractor/content-services/pages/search/search-categories.page.ts
index d411f17e10..b4320d71f5 100644
--- a/lib/testing/src/lib/protractor/content-services/pages/search/search-categories.page.ts
+++ b/lib/testing/src/lib/protractor/content-services/pages/search/search-categories.page.ts
@@ -19,7 +19,6 @@ import { ElementFinder } from 'protractor';
import { SearchTextPage } from './search-text.page';
import { SearchCheckListPage } from './search-check-list.page';
import { SearchRadioPage } from './search-radio.page';
-import { DateRangeFilterPage } from './date-range-filter.page';
import { NumberRangeFilterPage } from './number-range-filter.page';
import { SearchSliderPage } from './search-slider.page';
import { BrowserActions } from '../../../core/utils/browser-actions';
@@ -39,10 +38,6 @@ export class SearchCategoriesPage {
return new SearchRadioPage(filter);
}
- static dateRangeFilter(filter: ElementFinder): DateRangeFilterPage {
- return new DateRangeFilterPage(filter);
- }
-
static numberRangeFilter(filter: ElementFinder): NumberRangeFilterPage {
return new NumberRangeFilterPage(filter);
}