From 47e9499e6b01bd53e2bc08e97d0561b9a15a9a46 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Mon, 23 Oct 2023 12:21:33 +0530 Subject: [PATCH 01/25] [ACS-6107] Removed date range component from ADF content-services --- .../components/search-date-range.component.md | 88 ------ .../search-date-range.component.html | 49 ---- .../search-date-range.component.scss | 5 - .../search-date-range.component.spec.ts | 267 ------------------ .../search-date-range.component.ts | 240 ---------------- 5 files changed, 649 deletions(-) delete mode 100644 docs/content-services/components/search-date-range.component.md delete mode 100644 lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.html delete mode 100644 lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.scss delete mode 100644 lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts diff --git a/docs/content-services/components/search-date-range.component.md b/docs/content-services/components/search-date-range.component.md deleted file mode 100644 index 2b8a3f21792..00000000000 --- a/docs/content-services/components/search-date-range.component.md +++ /dev/null @@ -1,88 +0,0 @@ ---- -Title: Search date range component -Added: v2.4.0 -Status: Active -Last reviewed: 2018-06-11 ---- - -# [Search date range component](../../../lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts "Defined in search-date-range.component.ts") - -Implements a [search widget](../../../lib/content-services/src/lib/search/search-widget.interface.ts) for the [Search Filter component](search-filter.component.md). - -![Date Range Widget](../../docassets/images/search-date-range.png) - -## Basic usage - -```json -{ - "search": { - "categories": [ - { - "id": "createdDateRange", - "name": "Created Date (range)", - "enabled": true, - "component": { - "selector": "date-range", - "settings": { - "field": "cm:created" - } - } - } - ] - } -} -``` - -### Settings - -| Name | Type | Description | -| ---- | ---- | ----------- | -| field | string | Field to apply the query to. Required value | -| dateFormat | string | Date format. Dates used by the datepicker are [Moment.js](https://momentjs.com/docs/#/parsing/string-format/) instances, so you can use any date format supported by Moment. Default is 'DD/MM/YYYY'. | -| maxDate | string | A fixed date or the string `"today"` that will set the maximum searchable date. Default is no maximum. | -| hideDefaultAction | boolean | Show/hide the [widget](../../../lib/testing/src/lib/core/pages/form/widgets/widget.ts) actions. By default is false. | - -## Details - -This component lets the user select a range between two dates based on the particular `field`. -See the [Search filter component](search-filter.component.md) for full details of how to use widgets -in a search query. - -### Custom date format - -You can set the date range picker to work with any date format your app requires. You can use -any date format supported by [Moment.js](https://momentjs.com/docs/#/parsing/string-format/) -in the `dateFormat` and in the `maxDate` setting: - -```json -{ - "search": { - "categories": [ - { - "id": "createdDateRange", - "name": "Created Date (range)", - "enabled": true, - "component": { - "selector": "date-range", - "settings": { - "field": "cm:created", - "dateFormat": "DD-MMM-YY", - "maxDate": "02-Mar-20" - } - } - } - ] - } -} -``` - -## See also - -- [Search Configuration Guide](../../user-guide/search-configuration-guide.md) -- [Search filter chips component](search-filter-chips.component.md) -- [Search filter component](search-filter.component.md) -- [Search check list component](search-check-list.component.md) -- [Search number range component](search-number-range.component.md) -- [Search radio component](search-radio.component.md) -- [Search slider component](search-slider.component.md) -- [Search text component](search-text.component.md) 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 844af86d453..00000000000 --- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.html +++ /dev/null @@ -1,49 +0,0 @@ -
- - {{ 'SEARCH.FILTER.RANGE.SELECT-FROM-DATE' | translate }} - - - - - {{ getFromValidationMessage() | translate: { requiredFormat: datePickerFormat } }} - - - - - {{ 'SEARCH.FILTER.RANGE.SELECT-TO-DATE' | translate }} - - - - - {{ getToValidationMessage() | translate: { requiredFormat: datePickerFormat } }} - - - -
- - -
-
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 aa124f9143e..00000000000 --- 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 index 806b5556402..e69de29bb2d 100644 --- 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 @@ -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 7c06504e560..00000000000 --- 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; - } -} From 258c5da087f406037d8314348afc5b87a2fad97e Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Mon, 23 Oct 2023 12:22:14 +0530 Subject: [PATCH 02/25] [ACS-6107] Removed references of date range component in code --- demo-shell/src/app.config.json | 23 +++++-------------- .../src/lib/search/public-api.ts | 1 - .../src/lib/search/search.module.ts | 3 --- .../search/services/search-filter.service.ts | 2 -- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/demo-shell/src/app.config.json b/demo-shell/src/app.config.json index 69aa469585d..ae78ef05a93 100644 --- a/demo-shell/src/app.config.json +++ b/demo-shell/src/app.config.json @@ -310,19 +310,6 @@ } } }, - { - "id": "createdDateRange", - "name": "Created Date (range)", - "enabled": true, - "component": { - "selector": "date-range", - "settings": { - "field": "cm:created", - "dateFormat": "DD-MMM-YY", - "maxDate": "today" - } - } - }, { "id": "createdModifiedDateRange", "name": "Date", @@ -746,15 +733,17 @@ { "id": "createdDateRange", "name": "SEARCH.SEARCH_HEADER.FILTERS.DATE.TITLE", - "columnKey": "createdAt", "enabled": true, "component": { - "selector": "date-range", + "selector": "date-range-advanced", "settings": { "allowUpdateOnChange": false, + "dateFormat": "dd-MMM-yy", + "maxDate": "today", "field": "cm:created", - "dateFormat": "DD-MMM-YY", - "maxDate": "today" + "displayedLabelsByField": { + "cm:created": "Created Date" + } } } } diff --git a/lib/content-services/src/lib/search/public-api.ts b/lib/content-services/src/lib/search/public-api.ts index 6e2b1b90897..2379ad7e53b 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'; diff --git a/lib/content-services/src/lib/search/search.module.ts b/lib/content-services/src/lib/search/search.module.ts index ffc3b52cb2e..42913689e7a 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'; @@ -84,7 +83,6 @@ import { SearchFacetTabbedContentComponent } from './components/search-filter-ch SearchNumberRangeComponent, SearchPanelComponent, SearchCheckListComponent, - SearchDateRangeComponent, SearchDatetimeRangeComponent, SearchSortingPickerComponent, SearchFilterContainerComponent, @@ -119,7 +117,6 @@ import { SearchFacetTabbedContentComponent } from './components/search-filter-ch SearchNumberRangeComponent, SearchPanelComponent, SearchCheckListComponent, - SearchDateRangeComponent, SearchDatetimeRangeComponent, SearchSortingPickerComponent, SearchFilterContainerComponent, 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 491bf471bfb..5be08e16c44 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,7 +21,6 @@ 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'; @@ -45,7 +44,6 @@ export class SearchFilterService { properties: SearchPropertiesComponent, 'number-range': SearchNumberRangeComponent, 'check-list': SearchCheckListComponent, - 'date-range': SearchDateRangeComponent, 'datetime-range': SearchDatetimeRangeComponent, 'logical-filter': SearchLogicalFilterComponent, 'autocomplete-chips': SearchFilterAutocompleteChipsComponent, From c157c63588d99cc79e71698bd8a7037772aa2111 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Mon, 23 Oct 2023 12:24:17 +0530 Subject: [PATCH 03/25] [ACS-6107] Updated documentation to replace occurrences of date range component with date-range-advanced-tabbed component --- docs/README.md | 117 +++++++++--------- .../components/search-check-list.component.md | 2 +- ...earch-chip-autocomplete-input.component.md | 2 +- ...ch-date-range-advanced-tabbed.component.md | 1 - ...rch-filter-autocomplete-chips.component.md | 2 +- .../search-filter-chips.component.md | 2 +- .../components/search-filter.component.md | 2 +- .../search-logical-filter.component.md | 2 +- .../search-number-range.component.md | 2 +- .../components/search-properties.component.md | 2 +- .../components/search-radio.component.md | 2 +- .../components/search-slider.component.md | 2 +- .../components/search-text.component.md | 2 +- .../interfaces/search-widget.interface.md | 2 +- .../services/search-query-builder.service.md | 2 +- docs/user-guide/search-configuration-guide.md | 18 +-- docs/versionIndex.md | 2 +- 17 files changed, 81 insertions(+), 83 deletions(-) diff --git a/docs/README.md b/docs/README.md index 392baec2620..eea5140aef6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -263,66 +263,65 @@ for more information about installing and using the source code. ### Components -| Name | Description | Source link | -| ---- | ----------- | ----------- | -| [Add Permission Dialog Component](content-services/components/add-permission-dialog.component.md) | Displays a dialog to search for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts) | -| [Add Permission Panel Component](content-services/components/add-permission-panel.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts) | -| [Add Permission Component](content-services/components/add-permission.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts) | -| [Alfresco Viewer component](content-services/components/alfresco-viewer.component.md) | Displays content from an ACS repository. | [Source](../lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts) | -| [Aspect List Dialog component](content-services/components/aspect-list-dialog.component.md) | Allows a user to choose aspects for a node. | [Source](../lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts) | -| [Aspect List component](content-services/components/aspect-list.component.md) | This component will show in an expandable row list with checkboxes all the aspect of a node, if a node id is given, or otherwise a complete list. | | -| The aspect are filtered via the app.config.json in this way : | [Source](../lib/content-services/src/lib/aspect-list/aspect-list.component.ts) | | -| [Breadcrumb Component](content-services/components/breadcrumb.component.md) | Indicates the current position within a navigation hierarchy. | [Source](../lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts) | -| [Content Action component](content-services/components/content-action.component.md) | Adds options to a Document List actions menu for a particular content type. | [Source](../lib/content-services/src/lib/document-list/components/content-action/content-action.component.ts) | -| [Content Metadata Card component](content-services/components/content-metadata-card.component.md) | Displays and edits metadata related to a node. | [Source](../lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts) | -| [Content Node Selector Panel component](content-services/components/content-node-selector-panel.component.md) | Opens a Content Node Selector in its own dialog window. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts) | -| [Content Node Selector component](content-services/components/content-node-selector.component.md) | Allows a user to select items from a Content Services repository. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts) | -| [Content Type Dialog component](content-services/components/content-type-dialog.component.md) | Confirm dialog when user changes content type of a node. | [Source](../lib/content-services/src/lib/content-type/content-type-dialog.component.ts) | -| [Content User Info component](content-services/components/content-user-info.component.md) | Shows user information for CONTENT and CONTENT_SSO mode. | [Source](../lib/content-services/src/lib/content-user-info/content-user-info.component.ts) | -| [Document List component](content-services/components/document-list.component.md) | Displays the documents from a repository. | [Source](../lib/content-services/src/lib/document-list/components/document-list.component.ts) | -| [Dropdown Breadcrumb Component](content-services/components/dropdown-breadcrumb.component.md) | Indicates the current position within a navigation hierarchy using a dropdown menu. | [Source](../lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts) | -| [File Uploading Dialog Component](content-services/components/file-uploading-dialog.component.md) | Shows a dialog listing all the files uploaded with the Upload Button or Drag Area components. | [Source](../lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts) | -| [Like component](content-services/components/like.component.md) | Allows a user to add "likes" to an item. | [Source](../lib/content-services/src/lib/social/like.component.ts) | -| [Node Comments Component](content-services/components/node-comments.component.md) | Displays comments from users involved in a specified content and allows an involved user to add a comment to a content. | [Source](../lib/content-services/src/lib/node-comments/node-comments.component.ts) | -| [Permission List Component](content-services/components/permission-list.component.md) | Shows node permissions as a table. | [Source](../lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts) | -| [Rating component](content-services/components/rating.component.md) | Allows a user to add and remove rating to an item. | [Source](../lib/content-services/src/lib/social/rating.component.ts) | -| [Search check list component](content-services/components/search-check-list.component.md) | Implements a checklist widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts) | -| [Search Chip Input Component](content-services/components/search-chip-input.component.md) | Displays input for providing phrases display as "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-input/search-chip-input.component.ts) | -| [Search Chip Autocomplete Input component](content-services/components/search-chip-autocomplete-input.component.md) | Displays an input with autocomplete options. | [Source](../lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts) | -| [Search Chip List Component](content-services/components/search-chip-list.component.md) | Displays search criteria as a set of "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts) | -| [Search Date Range Advanced Component](content-services/components/search-date-range-advanced.component.md) | Displays a UI to configure different kinds of search criteria around date. Options are 'Anyytime', 'In the last' and 'Between' | [Source](../lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts) | -| [Search control component](content-services/components/search-control.component.md) | Displays a input text that shows find-as-you-type suggestions. | [Source](../lib/content-services/src/lib/search/components/search-control.component.ts) | -| [Search date range component](content-services/components/search-date-range.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts) | -| [Search date range advanced tabbed component](content-services/components/search-date-range-advanced-tabbed.component.md) | Implements a tabbed advanced search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts) | -| [Search datetime range component](content-services/components/search-datetime-range.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts) | -| [Search Filter Autocomplete Chips component](content-services/components/search-filter-autocomplete-chips.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts) | -| [Search Filter Chips component](content-services/components/search-filter-chips.component.md) | Represents a chip based container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.ts) | -| [Search Filter component](content-services/components/search-filter.component.md) | Represents a main container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | -| [Search Filter Tabbed component](content-services/components/search-filter-tabbed.component.md) | Represents a container component for creating tabbed layout. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | -| [Search Form component](content-services/components/search-form.component.md) | Search Form screenshot | [Source](../lib/content-services/src/lib/search/components/search-form/search-form.component.ts) | -| [Search Logical Filter component](content-services/components/search-logical-filter.component.md) | Displays 3 chip inputs each representing different logical condition for search query. | [Source](../lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.ts) | -| [Search Properties component](content-services/components/search-properties.component.md) | Allows to search by file size and type.| [Source](../lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts) | -| [Search number range component](content-services/components/search-number-range.component.md) | Implements a number range widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts) | -| [Search radio component](content-services/components/search-radio.component.md) | Implements a radio button list widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts) | -| [Search slider component](content-services/components/search-slider.component.md) | Implements a numeric slider widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts) | -| [Search Sorting Picker Component](content-services/components/search-sorting-picker.component.md) | Provides an ability to select one of the predefined sorting definitions for search results: | [Source](../lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.ts) | -| [Search text component](content-services/components/search-text.component.md) | Implements a text input widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-text/search-text.component.ts) | -| [Search component](content-services/components/search.component.md) | Searches items for supplied search terms. | [Source](../lib/content-services/src/lib/search/components/search.component.ts) | -| [Sites Dropdown component](content-services/components/sites-dropdown.component.md) | Displays a dropdown menu to show and interact with the sites of the current user. | [Source](../lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts) | -| [Tag Node Actions List component](content-services/components/tag-actions.component.md) | Shows available actions for tags. | [Source](../lib/content-services/src/lib/tag/tag-actions.component.ts) | -| [Tag List component](content-services/components/tag-list.component.md) | Shows tags for an item. | [Source](../lib/content-services/src/lib/tag/tag-list.component.ts) | -| [Tag Node List component](content-services/components/tag-node-list.component.md) | Shows tags for a node. | [Source](../lib/content-services/src/lib/tag/tag-node-list.component.ts) | +| Name | Description | Source link | +| ---- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------| ----------- | +| [Add Permission Dialog Component](content-services/components/add-permission-dialog.component.md) | Displays a dialog to search for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts) | +| [Add Permission Panel Component](content-services/components/add-permission-panel.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts) | +| [Add Permission Component](content-services/components/add-permission.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts) | +| [Alfresco Viewer component](content-services/components/alfresco-viewer.component.md) | Displays content from an ACS repository. | [Source](../lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts) | +| [Aspect List Dialog component](content-services/components/aspect-list-dialog.component.md) | Allows a user to choose aspects for a node. | [Source](../lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts) | +| [Aspect List component](content-services/components/aspect-list.component.md) | This component will show in an expandable row list with checkboxes all the aspect of a node, if a node id is given, or otherwise a complete list. | | +| The aspect are filtered via the app.config.json in this way : | [Source](../lib/content-services/src/lib/aspect-list/aspect-list.component.ts) | | +| [Breadcrumb Component](content-services/components/breadcrumb.component.md) | Indicates the current position within a navigation hierarchy. | [Source](../lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts) | +| [Content Action component](content-services/components/content-action.component.md) | Adds options to a Document List actions menu for a particular content type. | [Source](../lib/content-services/src/lib/document-list/components/content-action/content-action.component.ts) | +| [Content Metadata Card component](content-services/components/content-metadata-card.component.md) | Displays and edits metadata related to a node. | [Source](../lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts) | +| [Content Node Selector Panel component](content-services/components/content-node-selector-panel.component.md) | Opens a Content Node Selector in its own dialog window. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts) | +| [Content Node Selector component](content-services/components/content-node-selector.component.md) | Allows a user to select items from a Content Services repository. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts) | +| [Content Type Dialog component](content-services/components/content-type-dialog.component.md) | Confirm dialog when user changes content type of a node. | [Source](../lib/content-services/src/lib/content-type/content-type-dialog.component.ts) | +| [Content User Info component](content-services/components/content-user-info.component.md) | Shows user information for CONTENT and CONTENT_SSO mode. | [Source](../lib/content-services/src/lib/content-user-info/content-user-info.component.ts) | +| [Document List component](content-services/components/document-list.component.md) | Displays the documents from a repository. | [Source](../lib/content-services/src/lib/document-list/components/document-list.component.ts) | +| [Dropdown Breadcrumb Component](content-services/components/dropdown-breadcrumb.component.md) | Indicates the current position within a navigation hierarchy using a dropdown menu. | [Source](../lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts) | +| [File Uploading Dialog Component](content-services/components/file-uploading-dialog.component.md) | Shows a dialog listing all the files uploaded with the Upload Button or Drag Area components. | [Source](../lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts) | +| [Like component](content-services/components/like.component.md) | Allows a user to add "likes" to an item. | [Source](../lib/content-services/src/lib/social/like.component.ts) | +| [Node Comments Component](content-services/components/node-comments.component.md) | Displays comments from users involved in a specified content and allows an involved user to add a comment to a content. | [Source](../lib/content-services/src/lib/node-comments/node-comments.component.ts) | +| [Permission List Component](content-services/components/permission-list.component.md) | Shows node permissions as a table. | [Source](../lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts) | +| [Rating component](content-services/components/rating.component.md) | Allows a user to add and remove rating to an item. | [Source](../lib/content-services/src/lib/social/rating.component.ts) | +| [Search check list component](content-services/components/search-check-list.component.md) | Implements a checklist widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts) | +| [Search Chip Input Component](content-services/components/search-chip-input.component.md) | Displays input for providing phrases display as "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-input/search-chip-input.component.ts) | +| [Search Chip Autocomplete Input component](content-services/components/search-chip-autocomplete-input.component.md) | Displays an input with autocomplete options. | [Source](../lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts) | +| [Search Chip List Component](content-services/components/search-chip-list.component.md) | Displays search criteria as a set of "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts) | +| [Search control component](content-services/components/search-control.component.md) | Displays a input text that shows find-as-you-type suggestions. | [Source](../lib/content-services/src/lib/search/components/search-control.component.ts) | +| [Search Date Range Advanced Component](content-services/components/search-date-range-advanced.component.md) | Displays a UI to configure different kinds of search criteria around date. Options are 'Anytime', 'In the last' and 'Between' | [Source](../lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts) | +| [Search date range advanced tabbed component](content-services/components/search-date-range-advanced-tabbed.component.md) | Implements a tabbed advanced search widget for the Search Date Range Advanced component. | [Source](../lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts) | +| [Search datetime range component](content-services/components/search-datetime-range.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts) | +| [Search Filter Autocomplete Chips component](content-services/components/search-filter-autocomplete-chips.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts) | +| [Search Filter Chips component](content-services/components/search-filter-chips.component.md) | Represents a chip based container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.ts) | +| [Search Filter component](content-services/components/search-filter.component.md) | Represents a main container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | +| [Search Filter Tabbed component](content-services/components/search-filter-tabbed.component.md) | Represents a container component for creating tabbed layout. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | +| [Search Form component](content-services/components/search-form.component.md) | Search Form screenshot | [Source](../lib/content-services/src/lib/search/components/search-form/search-form.component.ts) | +| [Search Logical Filter component](content-services/components/search-logical-filter.component.md) | Displays 3 chip inputs each representing different logical condition for search query. | [Source](../lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.ts) | +| [Search Properties component](content-services/components/search-properties.component.md) | Allows to search by file size and type. | [Source](../lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts) | +| [Search number range component](content-services/components/search-number-range.component.md) | Implements a number range widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts) | +| [Search radio component](content-services/components/search-radio.component.md) | Implements a radio button list widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts) | +| [Search slider component](content-services/components/search-slider.component.md) | Implements a numeric slider widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts) | +| [Search Sorting Picker Component](content-services/components/search-sorting-picker.component.md) | Provides an ability to select one of the predefined sorting definitions for search results: | [Source](../lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.ts) | +| [Search text component](content-services/components/search-text.component.md) | Implements a text input widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-text/search-text.component.ts) | +| [Search component](content-services/components/search.component.md) | Searches items for supplied search terms. | [Source](../lib/content-services/src/lib/search/components/search.component.ts) | +| [Sites Dropdown component](content-services/components/sites-dropdown.component.md) | Displays a dropdown menu to show and interact with the sites of the current user. | [Source](../lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts) | +| [Tag Node Actions List component](content-services/components/tag-actions.component.md) | Shows available actions for tags. | [Source](../lib/content-services/src/lib/tag/tag-actions.component.ts) | +| [Tag List component](content-services/components/tag-list.component.md) | Shows tags for an item. | [Source](../lib/content-services/src/lib/tag/tag-list.component.ts) | +| [Tag Node List component](content-services/components/tag-node-list.component.md) | Shows tags for a node. | [Source](../lib/content-services/src/lib/tag/tag-node-list.component.ts) | | [Tags Creator component](content-services/components/tags-creator.component.md) | Allows to create multiple tags. That component contains input and two lists. Top list is all created tags, bottom list is searched tags based on input's value. | [Source](../lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts) | -| [Tree View component](content-services/components/tree-view.component.md) | Shows the folder and subfolders of a node as a tree view. | [Source](../lib/content-services/src/lib/tree-view/components/tree-view.component.ts) | -| [Tree component](content-services/components/tree.component.md) | Shows the nodes in tree structure, each node containing children is collapsible/expandable. Can be integrated with any datasource extending Tree service. | [Source](../lib/content-services/src/lib/tree/components/tree.component.ts) | -| [Upload Button Component](content-services/components/upload-button.component.md) | Activates a file upload. | [Source](../lib/content-services/src/lib/upload/components/upload-button.component.ts) | -| [Upload Drag Area Component](content-services/components/upload-drag-area.component.md) | Adds a drag and drop area to upload files to ACS. | [Source](../lib/content-services/src/lib/upload/components/upload-drag-area.component.ts) | -| [Upload Version Button Component (Workaround)](content-services/components/upload-version-button.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Activates a file version upload. | [Source](../lib/content-services/src/lib/upload/components/upload-version-button.component.ts) | -| [Version Comparison Component](content-services/components/version-comparison.component.md) | Displays the side by side comparison between the current target node (type, name, icon) and the new file that should update it's version. | [Source](../lib/content-services/src/lib/version-manager/version-comparison.component.ts) | -| [Version List component](content-services/components/version-list.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node in a Version Manager component. | [Source](../lib/content-services/src/lib/version-manager/version-list.component.ts) | -| [Version Manager Component](content-services/components/version-manager.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node with the ability to upload a new version. | [Source](../lib/content-services/src/lib/version-manager/version-manager.component.ts) | -| [Version Upload component](content-services/components/version-upload.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the new version's minor/major changes and the optional comment of a node in a Version Manager component. | [Source](../lib/content-services/src/lib/version-manager/version-upload.component.ts) | -| [Webscript component](content-services/components/webscript.component.md) | Provides access to Webscript features. | [Source](../lib/content-services/src/lib/webscript/webscript.component.ts) | +| [Tree View component](content-services/components/tree-view.component.md) | Shows the folder and subfolders of a node as a tree view. | [Source](../lib/content-services/src/lib/tree-view/components/tree-view.component.ts) | +| [Tree component](content-services/components/tree.component.md) | Shows the nodes in tree structure, each node containing children is collapsible/expandable. Can be integrated with any datasource extending Tree service. | [Source](../lib/content-services/src/lib/tree/components/tree.component.ts) | +| [Upload Button Component](content-services/components/upload-button.component.md) | Activates a file upload. | [Source](../lib/content-services/src/lib/upload/components/upload-button.component.ts) | +| [Upload Drag Area Component](content-services/components/upload-drag-area.component.md) | Adds a drag and drop area to upload files to ACS. | [Source](../lib/content-services/src/lib/upload/components/upload-drag-area.component.ts) | +| [Upload Version Button Component (Workaround)](content-services/components/upload-version-button.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Activates a file version upload. | [Source](../lib/content-services/src/lib/upload/components/upload-version-button.component.ts) | +| [Version Comparison Component](content-services/components/version-comparison.component.md) | Displays the side by side comparison between the current target node (type, name, icon) and the new file that should update it's version. | [Source](../lib/content-services/src/lib/version-manager/version-comparison.component.ts) | +| [Version List component](content-services/components/version-list.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node in a Version Manager component. | [Source](../lib/content-services/src/lib/version-manager/version-list.component.ts) | +| [Version Manager Component](content-services/components/version-manager.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node with the ability to upload a new version. | [Source](../lib/content-services/src/lib/version-manager/version-manager.component.ts) | +| [Version Upload component](content-services/components/version-upload.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the new version's minor/major changes and the optional comment of a node in a Version Manager component. | [Source](../lib/content-services/src/lib/version-manager/version-upload.component.ts) | +| [Webscript component](content-services/components/webscript.component.md) | Provides access to Webscript features. | [Source](../lib/content-services/src/lib/webscript/webscript.component.ts) | ### Directives diff --git a/docs/content-services/components/search-check-list.component.md b/docs/content-services/components/search-check-list.component.md index 8bab674223d..dae9ec1c162 100644 --- a/docs/content-services/components/search-check-list.component.md +++ b/docs/content-services/components/search-check-list.component.md @@ -76,7 +76,7 @@ items in the list. - [Search Configuration Guide](../../user-guide/search-configuration-guide.md) - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-chip-autocomplete-input.component.md b/docs/content-services/components/search-chip-autocomplete-input.component.md index 7c08e82acaf..81e022f71ad 100644 --- a/docs/content-services/components/search-chip-autocomplete-input.component.md +++ b/docs/content-services/components/search-chip-autocomplete-input.component.md @@ -50,7 +50,7 @@ Represents an input with autocomplete options. - [Search Filter Autocomplete Chips component](search-filter-autocomplete-chips.component.md) - [Search Logical Filter component](search-logical-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-date-range-advanced-tabbed.component.md b/docs/content-services/components/search-date-range-advanced-tabbed.component.md index de189e4d5d4..bb8b32c0431 100644 --- a/docs/content-services/components/search-date-range-advanced-tabbed.component.md +++ b/docs/content-services/components/search-date-range-advanced-tabbed.component.md @@ -105,7 +105,6 @@ The queries generated by this filter when using the 'In the last' or 'Between' o - [Search Query Builder service](../services/search-query-builder.service.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-filter-autocomplete-chips.component.md b/docs/content-services/components/search-filter-autocomplete-chips.component.md index ea41f1ade39..e0760a0d4ee 100644 --- a/docs/content-services/components/search-filter-autocomplete-chips.component.md +++ b/docs/content-services/components/search-filter-autocomplete-chips.component.md @@ -59,7 +59,7 @@ See the [Search Chip Autocomplete Input component](search-chip-autocomplete-inpu - [Search Chip Autocomplete Input component](search-chip-autocomplete-input.component.md) - [Search Chip Input component](search-chip-input.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-filter-chips.component.md b/docs/content-services/components/search-filter-chips.component.md index a9c7c1c0a9d..105d08203e4 100644 --- a/docs/content-services/components/search-filter-chips.component.md +++ b/docs/content-services/components/search-filter-chips.component.md @@ -70,7 +70,7 @@ here is the [example configuration](https://github.com/Alfresco/alfresco-ng2-com - [Search Query Builder service](../services/search-query-builder.service.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-filter.component.md b/docs/content-services/components/search-filter.component.md index 86d457d3100..0e885180076 100644 --- a/docs/content-services/components/search-filter.component.md +++ b/docs/content-services/components/search-filter.component.md @@ -36,7 +36,7 @@ to build and execute the query. - [Search Sorting Picker Component](search-sorting-picker.component.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search date range advanced component](search-date-range-advanced.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) diff --git a/docs/content-services/components/search-logical-filter.component.md b/docs/content-services/components/search-logical-filter.component.md index a5c79ae7da0..cf2124b0afc 100644 --- a/docs/content-services/components/search-logical-filter.component.md +++ b/docs/content-services/components/search-logical-filter.component.md @@ -52,7 +52,7 @@ This component lets the user provide logical conditions to apply to each `field` - [Search Query Builder service](../services/search-query-builder.service.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-number-range.component.md b/docs/content-services/components/search-number-range.component.md index 7cc9f17467f..e882223237e 100644 --- a/docs/content-services/components/search-number-range.component.md +++ b/docs/content-services/components/search-number-range.component.md @@ -75,7 +75,7 @@ cm:content.size:[0 TO 100] - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-properties.component.md b/docs/content-services/components/search-properties.component.md index 24865a5be68..4514671f9ef 100644 --- a/docs/content-services/components/search-properties.component.md +++ b/docs/content-services/components/search-properties.component.md @@ -54,7 +54,7 @@ Allows to search by file size and type. - [Search Query Builder service](../services/search-query-builder.service.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-radio.component.md b/docs/content-services/components/search-radio.component.md index 0903ac39138..d26cd4c944c 100644 --- a/docs/content-services/components/search-radio.component.md +++ b/docs/content-services/components/search-radio.component.md @@ -66,7 +66,7 @@ buttons as appropriate. - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search slider component](search-slider.component.md) - [Search text component](search-text.component.md) diff --git a/docs/content-services/components/search-slider.component.md b/docs/content-services/components/search-slider.component.md index d23e4914bc0..61568b6ff48 100644 --- a/docs/content-services/components/search-slider.component.md +++ b/docs/content-services/components/search-slider.component.md @@ -73,7 +73,7 @@ or zero and the corresponsing query fragment is removed from the query. - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search text component](search-text.component.md) diff --git a/docs/content-services/components/search-text.component.md b/docs/content-services/components/search-text.component.md index 219cdcde7df..ceafe81f553 100644 --- a/docs/content-services/components/search-text.component.md +++ b/docs/content-services/components/search-text.component.md @@ -63,7 +63,7 @@ details of how to use widgets in a search query. - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range component](search-date-range.component.md) +- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/interfaces/search-widget.interface.md b/docs/content-services/interfaces/search-widget.interface.md index 86dc9feeaaf..709b90f2b2a 100644 --- a/docs/content-services/interfaces/search-widget.interface.md +++ b/docs/content-services/interfaces/search-widget.interface.md @@ -186,7 +186,7 @@ and pass custom attributes, if your component supports them: - [Search filter component](../components/search-filter.component.md) - [Search check list component](../components/search-check-list.component.md) -- [Search date range component](../components/search-date-range.component.md) +- [Search date range advanced tabbed component](../components/search-date-range-advanced-tabbed.component.md) - [Search number range component](../components/search-number-range.component.md) - [Search radio component](../components/search-radio.component.md) - [Search slider component](../components/search-slider.component.md) diff --git a/docs/content-services/services/search-query-builder.service.md b/docs/content-services/services/search-query-builder.service.md index 67d0e719eca..080acd27996 100644 --- a/docs/content-services/services/search-query-builder.service.md +++ b/docs/content-services/services/search-query-builder.service.md @@ -139,7 +139,7 @@ constructor(queryBuilder: SearchQueryBuilderService) { - [Search Form Component](../components/search-form.component.md) - [Search Widget interface](../interfaces/search-widget.interface.md) - [Search check list component](../components/search-check-list.component.md) -- [Search date range component](../components/search-date-range.component.md) +- [Search date range advanced tabbed component](../components/search-date-range-advanced-tabbed.component.md) - [Search number range component](../components/search-number-range.component.md) - [Search radio component](../components/search-radio.component.md) - [Search slider component](../components/search-slider.component.md) diff --git a/docs/user-guide/search-configuration-guide.md b/docs/user-guide/search-configuration-guide.md index fc19870b2fd..4bacef85e43 100644 --- a/docs/user-guide/search-configuration-guide.md +++ b/docs/user-guide/search-configuration-guide.md @@ -294,14 +294,14 @@ The Search Filter supports a number of widgets out of the box, each implemented by an ADF component. The `selector` property specifies which [widget](../../lib/content-services/src/lib/search/models/search-widget.interface.ts) is used for a category: -| [`Widget`](../../lib/content-services/src/lib/search/models/search-widget.interface.ts) name | Selector | Description | -| ------------------------------------------------------------------------------- | -------- | ----------- | -| [Check List](../content-services/components/search-check-list.component.md) | `check-list` | Toggles individual query fragments for the search | -| [Date Range](../content-services/components/search-date-range.component.md) | `date-range` | Specifies a range f dates that a field may contain | -| [Number Range](../content-services/components/search-number-range.component.md) | `number-range` | Specifies a range of numeric values that a field may contain | -| [Radio List](../content-services/components/search-radio.component.md) | `radio` | Selects one query fragment from a list of options | -| [Slider](../content-services/components/search-slider.component.md) | `slider` | Selects a single numeric value in a given range that a field may contain | -| [Text](../content-services/components/search-text.component.md) | `text` | Specifies a text value that a field may contain | +| [`Widget`](../../lib/content-services/src/lib/search/models/search-widget.interface.ts) name | Selector | Description | +|----------------------------------------------------------------------------------------------| -------- |------------------------------------------------------------------------------| +| [Check List](../content-services/components/search-check-list.component.md) | `check-list` | Toggles individual query fragments for the search | +| [Date Range](../content-services/components/search-date-range-advanced.component.md) | `date-range` | Specifies a varities of options for selecting dates that a field may contain | +| [Number Range](../content-services/components/search-number-range.component.md) | `number-range` | Specifies a range of numeric values that a field may contain | +| [Radio List](../content-services/components/search-radio.component.md) | `radio` | Selects one query fragment from a list of options | +| [Slider](../content-services/components/search-slider.component.md) | `slider` | Selects a single numeric value in a given range that a field may contain | +| [Text](../content-services/components/search-text.component.md) | `text` | Specifies a text value that a field may contain | See the individual [Search Widget](../interfaces/search-widget.interface.md) pages for full details of their usage and settings. @@ -589,7 +589,7 @@ then be added in each node entry response. An example partial response is shown - [Search Form Component](../content-services/components/search-form.component.md) - [Search Widget interface](../interfaces/search-widget.interface.md) - [Search check list component](../content-services/components/search-check-list.component.md) -- [Search date range component](../content-services/components/search-date-range.component.md) +- [Search date range advanced tabbed component](../content-services/components/search-date-range-advanced-tabbed.component.md) - [Search number range component](../content-services/components/search-number-range.component.md) - [Search radio component](../content-services/components/search-radio.component.md) - [Search slider component](../content-services/components/search-slider.component.md) diff --git a/docs/versionIndex.md b/docs/versionIndex.md index 17441938d3f..6049c08c21e 100644 --- a/docs/versionIndex.md +++ b/docs/versionIndex.md @@ -385,7 +385,7 @@ backend services have been tested with each released version of ADF. - [Info drawer tab component](core/components/info-drawer-tab.component.md) - [Node permission dialog service](content-services/services/node-permission-dialog.service.md) - [Search check list component](content-services/components/search-check-list.component.md) -- [Search date range component](content-services/components/search-date-range.component.md) +- Search date range component - [Search filter service](content-services/services/search-filter.service.md) - [Search number range component](content-services/components/search-number-range.component.md) - [Search radio component](content-services/components/search-radio.component.md) From 2415564960235f70a9c7df419f3958ce89293099 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Mon, 23 Oct 2023 13:48:59 +0530 Subject: [PATCH 04/25] [ACS-6107] Renamed DateRangeAdvanced to DateRange. Renamed DateRangeAdvancedTabbed to DateRangeTabbed --- demo-shell/src/app.config.json | 4 +- docs/README.md | 4 +- .../components/search-check-list.component.md | 2 +- ...earch-chip-autocomplete-input.component.md | 2 +- .../search-date-range-advanced.component.md | 47 ------------------ ... => search-date-range-tabbed.component.md} | 14 +++--- .../components/search-date-range.component.md | 47 ++++++++++++++++++ ...rch-filter-autocomplete-chips.component.md | 2 +- .../search-filter-chips.component.md | 2 +- .../search-filter-tabbed.component.md | 2 +- .../components/search-filter.component.md | 4 +- .../search-logical-filter.component.md | 2 +- .../search-number-range.component.md | 2 +- .../components/search-properties.component.md | 2 +- .../components/search-radio.component.md | 2 +- .../components/search-slider.component.md | 2 +- .../components/search-text.component.md | 2 +- .../interfaces/search-widget.interface.md | 2 +- .../services/search-query-builder.service.md | 2 +- .../images/search-date-range-advanced.png | Bin 8199 -> 0 bytes ...abbed.png => search-date-range-tabbed.png} | Bin docs/docassets/images/search-date-range.png | Bin 12063 -> 8199 bytes docs/user-guide/search-configuration-guide.md | 4 +- docs/versionIndex.md | 4 +- e2e/search/search.config.ts | 2 +- .../search-date-range-tabbed.component.html} | 4 +- ...earch-date-range-tabbed.component.spec.ts} | 44 ++++++++-------- .../search-date-range-tabbed.component.ts} | 30 +++++------ .../search-date-range}/date-range-type.ts | 0 .../search-date-range}/in-last-date-type.ts | 0 .../search-date-range.component.html} | 0 .../search-date-range.component.scss} | 2 +- .../search-date-range.component.spec.ts} | 12 ++--- .../search-date-range.component.ts} | 18 +++---- .../search-date-range/search-date-range.ts} | 2 +- .../src/lib/search/public-api.ts | 2 +- .../src/lib/search/search.module.ts | 11 ++-- .../search/services/search-filter.service.ts | 6 +-- 38 files changed, 143 insertions(+), 144 deletions(-) delete mode 100644 docs/content-services/components/search-date-range-advanced.component.md rename docs/content-services/components/{search-date-range-advanced-tabbed.component.md => search-date-range-tabbed.component.md} (85%) create mode 100644 docs/content-services/components/search-date-range.component.md delete mode 100644 docs/docassets/images/search-date-range-advanced.png rename docs/docassets/images/{search-date-range-advanced-tabbed.png => search-date-range-tabbed.png} (100%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.html => search-date-range-tabbed/search-date-range-tabbed.component.html} (85%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.spec.ts => search-date-range-tabbed/search-date-range-tabbed.component.spec.ts} (84%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts => search-date-range-tabbed/search-date-range-tabbed.component.ts} (83%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced => search-date-range-tabbed/search-date-range}/date-range-type.ts (100%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced => search-date-range-tabbed/search-date-range}/in-last-date-type.ts (100%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.html => search-date-range-tabbed/search-date-range/search-date-range.component.html} (100%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.scss => search-date-range-tabbed/search-date-range/search-date-range.component.scss} (93%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.spec.ts => search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts} (97%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts => search-date-range-tabbed/search-date-range/search-date-range.component.ts} (92%) rename lib/content-services/src/lib/search/components/{search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.ts => search-date-range-tabbed/search-date-range/search-date-range.ts} (95%) diff --git a/demo-shell/src/app.config.json b/demo-shell/src/app.config.json index ae78ef05a93..5008c449445 100644 --- a/demo-shell/src/app.config.json +++ b/demo-shell/src/app.config.json @@ -315,7 +315,7 @@ "name": "Date", "enabled": true, "component": { - "selector": "date-range-advanced", + "selector": "date-range", "settings": { "dateFormat": "dd-MMM-yy", "maxDate": "today", @@ -735,7 +735,7 @@ "name": "SEARCH.SEARCH_HEADER.FILTERS.DATE.TITLE", "enabled": true, "component": { - "selector": "date-range-advanced", + "selector": "date-range", "settings": { "allowUpdateOnChange": false, "dateFormat": "dd-MMM-yy", diff --git a/docs/README.md b/docs/README.md index eea5140aef6..a5f54744b87 100644 --- a/docs/README.md +++ b/docs/README.md @@ -291,8 +291,8 @@ for more information about installing and using the source code. | [Search Chip Autocomplete Input component](content-services/components/search-chip-autocomplete-input.component.md) | Displays an input with autocomplete options. | [Source](../lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts) | | [Search Chip List Component](content-services/components/search-chip-list.component.md) | Displays search criteria as a set of "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts) | | [Search control component](content-services/components/search-control.component.md) | Displays a input text that shows find-as-you-type suggestions. | [Source](../lib/content-services/src/lib/search/components/search-control.component.ts) | -| [Search Date Range Advanced Component](content-services/components/search-date-range-advanced.component.md) | Displays a UI to configure different kinds of search criteria around date. Options are 'Anytime', 'In the last' and 'Between' | [Source](../lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts) | -| [Search date range advanced tabbed component](content-services/components/search-date-range-advanced-tabbed.component.md) | Implements a tabbed advanced search widget for the Search Date Range Advanced component. | [Source](../lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts) | +| [Search Date Range Component](content-services/components/search-date-range.component.md) | Displays a UI to configure different kinds of search criteria around date. Options are 'Anytime', 'In the last' and 'Between' | [Source](../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.ts) | +| [Search Date Range Tabbed component](content-services/components/search-date-range-tabbed.component.md) | Implements a tabbed advanced search widget for the Search Date Range component. | [Source](../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.ts) | | [Search datetime range component](content-services/components/search-datetime-range.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts) | | [Search Filter Autocomplete Chips component](content-services/components/search-filter-autocomplete-chips.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts) | | [Search Filter Chips component](content-services/components/search-filter-chips.component.md) | Represents a chip based container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.ts) | diff --git a/docs/content-services/components/search-check-list.component.md b/docs/content-services/components/search-check-list.component.md index dae9ec1c162..7f7af61d202 100644 --- a/docs/content-services/components/search-check-list.component.md +++ b/docs/content-services/components/search-check-list.component.md @@ -76,7 +76,7 @@ items in the list. - [Search Configuration Guide](../../user-guide/search-configuration-guide.md) - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-chip-autocomplete-input.component.md b/docs/content-services/components/search-chip-autocomplete-input.component.md index 81e022f71ad..e2a638762a3 100644 --- a/docs/content-services/components/search-chip-autocomplete-input.component.md +++ b/docs/content-services/components/search-chip-autocomplete-input.component.md @@ -50,7 +50,7 @@ Represents an input with autocomplete options. - [Search Filter Autocomplete Chips component](search-filter-autocomplete-chips.component.md) - [Search Logical Filter component](search-logical-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-date-range-advanced.component.md b/docs/content-services/components/search-date-range-advanced.component.md deleted file mode 100644 index 231365e3f21..00000000000 --- a/docs/content-services/components/search-date-range-advanced.component.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -Title: Search date range advanced component -Added: v6.2.0 -Status: Active -Last reviewed: 2023-07-10 ---- - -# [Search date range advanced component](../../../lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts "Defined in search-date-range-advanced.component.ts") - -Represents an advanced date range component for -the [SearchAdvancedDateRangeTabbedComponent](search-date-range-advanced-tabbed.component.md). - -![Date Range Advanced Widget](../../docassets/images/search-date-range-advanced.png) - -## Basic usage - -```html - - -``` - -## Class Members - -### Properties - -| Name | Type | Description | -|--------------|-------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| field | string | Field to apply the query to. Required value | -| maxDate | string | A fixed date (default format: dd-MMM-yy) or the string `"today"` that will set the maximum searchable date. Default is today. | -| dateFormat | string | Date format. Dates used by the datepicker are Javascript Date objects, using [date-fns](https://date-fns.org/v2.30.0/docs/format) for formatting, so you can use any date format supported by the library. Default is 'dd-MMM-yy (sample date - 07-Jun-23) | -| initialValue | SearchDateRangeAdvanced | Initial value for the component | - -### Events - -| Name | Type | Description | -|---------------------|------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------| -| changed | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`>` | Emitted whenever a change is made in the component values. Emits the changes being made in the component. | -| valid | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`` | Emitted whenever a change is made in the component values. Emits a flag indicating whether the current state of the component is valid or not. | - -## Details - -This component lets the user choose a variety of options to perform date related operations. - -- Anytime - No date related data will be returned. This option is selected by default -- In the last - Allows user to perform date related operations over a period of time. The user can select the length of the period from current time, -as well as its unit. Currently, 3 units are supported - Days, Weeks, and Months. -- Between - Allows the user to select a range of dates to perform operations on. diff --git a/docs/content-services/components/search-date-range-advanced-tabbed.component.md b/docs/content-services/components/search-date-range-tabbed.component.md similarity index 85% rename from docs/content-services/components/search-date-range-advanced-tabbed.component.md rename to docs/content-services/components/search-date-range-tabbed.component.md index bb8b32c0431..d92d362f984 100644 --- a/docs/content-services/components/search-date-range-advanced-tabbed.component.md +++ b/docs/content-services/components/search-date-range-tabbed.component.md @@ -1,16 +1,16 @@ --- -Title: Search date range advanced tabbed component +Title: Search date range tabbed component Added: v6.2.0 Status: Active Last reviewed: 2023-07-10 --- -# [Search date range advanced tabbed component](../../../lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts "Defined in search-date-range-advanced-tabbed.component.ts") +# [Search date range tabbed component](../../../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.ts "Defined in search-date-range-tabbed.component.ts") Represents a tabbed advanced date range [search widget](../../../lib/content-services/src/lib/search/models/search-widget.interface.ts) for the [Search Filter component](search-filter.component.md). -![Date Range Advanced Widget](../../docassets/images/search-date-range-advanced-tabbed.png) +![Date Range Tabbed Widget](../../docassets/images/search-date-range-tabbed.png) ## Basic usage @@ -23,7 +23,7 @@ the [Search Filter component](search-filter.component.md). "name": "Date", "enabled": true, "component": { - "selector": "date-range-advanced", + "selector": "date-range", "settings": { "dateFormat": "dd-MMM-yy", "maxDate": "today", @@ -51,7 +51,7 @@ the [Search Filter component](search-filter.component.md). ## Details -This component creates a tabbed layout where each tab consists of the [SearchDateRangeAdvanced](./search-date-range-advanced-tabbed.component.md) component, which allows user to create a query containing multiple date related queries in one go. +This component creates a tabbed layout where each tab consists of the [SearchDateRange](./search-date-range-tabbed.component.md) component, which allows user to create a query containing multiple date related queries in one go. See the [Search filter component](search-filter.component.md) for full details of how to use widgets in a search query. @@ -70,7 +70,7 @@ in the `dateFormat` and in the `maxDate` setting: "name": "Date", "enabled": true, "component": { - "selector": "date-range-advanced", + "selector": "date-range", "settings": { "dateFormat": "dd-MMM-yy", "maxDate": "02-May-23", @@ -87,7 +87,7 @@ in the `dateFormat` and in the `maxDate` setting: } ``` -The [SearchDateRangeAdvanced](./search-date-range-advanced-tabbed.component.md) component allows 3 different kinds of date related operations to be performed. +The [SearchDateRange](./search-date-range.component.md) component allows 3 different kinds of date related operations to be performed. Based on what information is provided to that component, this component will create different kinds of queries - - Anytime - No date filters are applied on the `field`. This option is selected by default diff --git a/docs/content-services/components/search-date-range.component.md b/docs/content-services/components/search-date-range.component.md new file mode 100644 index 00000000000..ba0183eb910 --- /dev/null +++ b/docs/content-services/components/search-date-range.component.md @@ -0,0 +1,47 @@ +--- +Title: Search date range component +Added: v6.2.0 +Status: Active +Last reviewed: 2023-07-10 +--- + +# [Search date range component](../../../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.ts "Defined in search-date-range.component.ts") + +Represents a date range component for +the [SearchDateRangeTabbedComponent](search-date-range-tabbed.component.md). + +![Date Range Widget](../../docassets/images/search-date-range.png) + +## Basic usage + +```html + + +``` + +## Class Members + +### Properties + +| Name | Type | Description | +|--------------|-----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| field | string | Field to apply the query to. Required value | +| maxDate | string | A fixed date (default format: dd-MMM-yy) or the string `"today"` that will set the maximum searchable date. Default is today. | +| dateFormat | string | Date format. Dates used by the datepicker are Javascript Date objects, using [date-fns](https://date-fns.org/v2.30.0/docs/format) for formatting, so you can use any date format supported by the library. Default is 'dd-MMM-yy (sample date - 07-Jun-23) | +| initialValue | SearchDateRange | Initial value for the component | + +### Events + +| Name | Type | Description | +|---------------------|----------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------| +| changed | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`>` | Emitted whenever a change is made in the component values. Emits the changes being made in the component. | +| valid | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`` | Emitted whenever a change is made in the component values. Emits a flag indicating whether the current state of the component is valid or not. | + +## Details + +This component lets the user choose a variety of options to perform date related operations. + +- Anytime - No date related data will be returned. This option is selected by default +- In the last - Allows user to perform date related operations over a period of time. The user can select the length of the period from current time, +as well as its unit. Currently, 3 units are supported - Days, Weeks, and Months. +- Between - Allows the user to select a range of dates to perform operations on. diff --git a/docs/content-services/components/search-filter-autocomplete-chips.component.md b/docs/content-services/components/search-filter-autocomplete-chips.component.md index e0760a0d4ee..a6136cc6e8c 100644 --- a/docs/content-services/components/search-filter-autocomplete-chips.component.md +++ b/docs/content-services/components/search-filter-autocomplete-chips.component.md @@ -59,7 +59,7 @@ See the [Search Chip Autocomplete Input component](search-chip-autocomplete-inpu - [Search Chip Autocomplete Input component](search-chip-autocomplete-input.component.md) - [Search Chip Input component](search-chip-input.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-filter-chips.component.md b/docs/content-services/components/search-filter-chips.component.md index 105d08203e4..a7cb4d467d5 100644 --- a/docs/content-services/components/search-filter-chips.component.md +++ b/docs/content-services/components/search-filter-chips.component.md @@ -70,7 +70,7 @@ here is the [example configuration](https://github.com/Alfresco/alfresco-ng2-com - [Search Query Builder service](../services/search-query-builder.service.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-filter-tabbed.component.md b/docs/content-services/components/search-filter-tabbed.component.md index 404ade13980..28b6d672867 100644 --- a/docs/content-services/components/search-filter-tabbed.component.md +++ b/docs/content-services/components/search-filter-tabbed.component.md @@ -34,7 +34,7 @@ with the name input property being assigned the value of whatever name should be - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) - [Search date range component](search-date-range.component.md) -- [Search date range advanced component](search-date-range-advanced.component.md) +- [Search date range component](search-date-range.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-filter.component.md b/docs/content-services/components/search-filter.component.md index 0e885180076..f7a79322e1f 100644 --- a/docs/content-services/components/search-filter.component.md +++ b/docs/content-services/components/search-filter.component.md @@ -36,8 +36,8 @@ to build and execute the query. - [Search Sorting Picker Component](search-sorting-picker.component.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) -- [Search date range advanced component](search-date-range-advanced.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) +- [Search date range component](search-date-range.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-logical-filter.component.md b/docs/content-services/components/search-logical-filter.component.md index cf2124b0afc..05b69b526bf 100644 --- a/docs/content-services/components/search-logical-filter.component.md +++ b/docs/content-services/components/search-logical-filter.component.md @@ -52,7 +52,7 @@ This component lets the user provide logical conditions to apply to each `field` - [Search Query Builder service](../services/search-query-builder.service.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-number-range.component.md b/docs/content-services/components/search-number-range.component.md index e882223237e..e2a5562f4cd 100644 --- a/docs/content-services/components/search-number-range.component.md +++ b/docs/content-services/components/search-number-range.component.md @@ -75,7 +75,7 @@ cm:content.size:[0 TO 100] - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-properties.component.md b/docs/content-services/components/search-properties.component.md index 4514671f9ef..274a083c47e 100644 --- a/docs/content-services/components/search-properties.component.md +++ b/docs/content-services/components/search-properties.component.md @@ -54,7 +54,7 @@ Allows to search by file size and type. - [Search Query Builder service](../services/search-query-builder.service.md) - [Search Widget Interface](../interfaces/search-widget.interface.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/components/search-radio.component.md b/docs/content-services/components/search-radio.component.md index d26cd4c944c..bd193a051ed 100644 --- a/docs/content-services/components/search-radio.component.md +++ b/docs/content-services/components/search-radio.component.md @@ -66,7 +66,7 @@ buttons as appropriate. - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search slider component](search-slider.component.md) - [Search text component](search-text.component.md) diff --git a/docs/content-services/components/search-slider.component.md b/docs/content-services/components/search-slider.component.md index 61568b6ff48..d66b9d0c914 100644 --- a/docs/content-services/components/search-slider.component.md +++ b/docs/content-services/components/search-slider.component.md @@ -73,7 +73,7 @@ or zero and the corresponsing query fragment is removed from the query. - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search text component](search-text.component.md) diff --git a/docs/content-services/components/search-text.component.md b/docs/content-services/components/search-text.component.md index ceafe81f553..3b58a1f581a 100644 --- a/docs/content-services/components/search-text.component.md +++ b/docs/content-services/components/search-text.component.md @@ -63,7 +63,7 @@ details of how to use widgets in a search query. - [Search filter chips component](search-filter-chips.component.md) - [Search filter component](search-filter.component.md) - [Search check list component](search-check-list.component.md) -- [Search date range advanced tabbed component](search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](search-date-range-tabbed.component.md) - [Search number range component](search-number-range.component.md) - [Search radio component](search-radio.component.md) - [Search slider component](search-slider.component.md) diff --git a/docs/content-services/interfaces/search-widget.interface.md b/docs/content-services/interfaces/search-widget.interface.md index 709b90f2b2a..3156516e200 100644 --- a/docs/content-services/interfaces/search-widget.interface.md +++ b/docs/content-services/interfaces/search-widget.interface.md @@ -186,7 +186,7 @@ and pass custom attributes, if your component supports them: - [Search filter component](../components/search-filter.component.md) - [Search check list component](../components/search-check-list.component.md) -- [Search date range advanced tabbed component](../components/search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](../components/search-date-range-tabbed.component.md) - [Search number range component](../components/search-number-range.component.md) - [Search radio component](../components/search-radio.component.md) - [Search slider component](../components/search-slider.component.md) diff --git a/docs/content-services/services/search-query-builder.service.md b/docs/content-services/services/search-query-builder.service.md index 080acd27996..8b0e6e1ceaa 100644 --- a/docs/content-services/services/search-query-builder.service.md +++ b/docs/content-services/services/search-query-builder.service.md @@ -139,7 +139,7 @@ constructor(queryBuilder: SearchQueryBuilderService) { - [Search Form Component](../components/search-form.component.md) - [Search Widget interface](../interfaces/search-widget.interface.md) - [Search check list component](../components/search-check-list.component.md) -- [Search date range advanced tabbed component](../components/search-date-range-advanced-tabbed.component.md) +- [Search date range tabbed component](../components/search-date-range-tabbed.component.md) - [Search number range component](../components/search-number-range.component.md) - [Search radio component](../components/search-radio.component.md) - [Search slider component](../components/search-slider.component.md) diff --git a/docs/docassets/images/search-date-range-advanced.png b/docs/docassets/images/search-date-range-advanced.png deleted file mode 100644 index 90d17bca04b2b77bead93e319c5e11a46214de69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8199 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 diff --git a/docs/docassets/images/search-date-range-advanced-tabbed.png b/docs/docassets/images/search-date-range-tabbed.png similarity index 100% rename from docs/docassets/images/search-date-range-advanced-tabbed.png rename to docs/docassets/images/search-date-range-tabbed.png diff --git a/docs/docassets/images/search-date-range.png b/docs/docassets/images/search-date-range.png index 6325cc98f8e6f6d602eca2b6c3c813ae6dd1120f..90d17bca04b2b77bead93e319c5e11a46214de69 100644 GIT binary patch literal 8199 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 literal 12063 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 - [Search Properties component](content-services/components/search-properties.component.md) -- [Search Date Range Advanced Component](content-services/components/search-date-range-advanced.component.md) -- [Search Date Range Advanced Tabbed Component](content-services/components/search-date-range-advanced-tabbed.component.md) +- [Search Date Range Advanced Component](content-services/components/search-date-range.component.md) +- [Search Date Range Tabbed Component](content-services/components/search-date-range-tabbed.component.md) - [Search Filter Tabbed Component](content-services/components/search-filter-tabbed.component.md) - [Search Facet Chip Tabbed Component](content-services/components/search-facet-chip-tabbed.md) - [Date Time Pipe](core/pipes/date-time.pipe.md) diff --git a/e2e/search/search.config.ts b/e2e/search/search.config.ts index 323641551c8..aa2c946d82c 100644 --- a/e2e/search/search.config.ts +++ b/e2e/search/search.config.ts @@ -182,7 +182,7 @@ export class SearchConfiguration { name: 'Date', enabled: true, component: { - selector: 'date-range-advanced', + selector: 'date-range', settings: { dateFormat: 'dd-MMM-yy', maxDate: 'today', diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.html b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.html similarity index 85% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.html rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.html index 45047255aa2..e60cb73b470 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.html +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.html @@ -1,6 +1,6 @@ - - + diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.spec.ts similarity index 84% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.spec.ts rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.spec.ts index c57141917e8..d1af0e06887 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.spec.ts @@ -19,12 +19,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { SearchDateRangeAdvanced } from './search-date-range-advanced/search-date-range-advanced'; +import { SearchDateRange } from './search-date-range/search-date-range'; import { SearchFilterTabbedComponent } from '../search-filter-tabbed/search-filter-tabbed.component'; -import { SearchDateRangeAdvancedComponent } from './search-date-range-advanced/search-date-range-advanced.component'; -import { SearchDateRangeAdvancedTabbedComponent } from './search-date-range-advanced-tabbed.component'; -import { DateRangeType } from './search-date-range-advanced/date-range-type'; -import { InLastDateType } from './search-date-range-advanced/in-last-date-type'; +import { SearchDateRangeComponent } from './search-date-range/search-date-range.component'; +import { SearchDateRangeTabbedComponent } from './search-date-range-tabbed.component'; +import { DateRangeType } from './search-date-range/date-range-type'; +import { InLastDateType } from './search-date-range/in-last-date-type'; import { endOfDay, endOfToday, @@ -44,10 +44,10 @@ import { export class MockSearchFilterTabbedComponent {} @Component({ - selector: 'adf-search-date-range-advanced', + selector: 'adf-search-date-range', template: `` }) -export class MockSearchDateRangeAdvancedComponent { +export class MockSearchDateRangeComponent { @Input() dateFormat: string; @Input() @@ -55,39 +55,39 @@ export class MockSearchDateRangeAdvancedComponent { @Input() field: string; @Input() - initialValue: SearchDateRangeAdvanced; + initialValue: SearchDateRange; @Output() - changed = new EventEmitter>(); + changed = new EventEmitter>(); @Output() valid = new EventEmitter(); } -describe('SearchDateRangeAdvancedTabbedComponent', () => { - let component: SearchDateRangeAdvancedTabbedComponent; - let fixture: ComponentFixture; - let betweenMockData: SearchDateRangeAdvanced; - let inLastMockData: SearchDateRangeAdvanced; - let anyMockDate: SearchDateRangeAdvanced; +describe('SearchDateRangeTabbedComponent', () => { + let component: SearchDateRangeTabbedComponent; + let fixture: ComponentFixture; + let betweenMockData: SearchDateRange; + let inLastMockData: SearchDateRange; + let anyMockDate: SearchDateRange; beforeEach(() => { TestBed.configureTestingModule({ - declarations: [SearchDateRangeAdvancedTabbedComponent, SearchFilterTabbedComponent, SearchDateRangeAdvancedComponent], + declarations: [SearchDateRangeTabbedComponent, SearchFilterTabbedComponent, SearchDateRangeComponent], imports: [ TranslateModule.forRoot(), ContentTestingModule ], providers: [ { provide: SearchFilterTabbedComponent, useClass: MockSearchFilterTabbedComponent }, - { provide: SearchDateRangeAdvancedComponent, useClass: MockSearchDateRangeAdvancedComponent } + { provide: SearchDateRangeComponent, useClass: MockSearchDateRangeComponent } ] }); - fixture = TestBed.createComponent(SearchDateRangeAdvancedTabbedComponent); + fixture = TestBed.createComponent(SearchDateRangeTabbedComponent); component = fixture.componentInstance; - component.id = 'dateRangeAdvanced'; + component.id = 'dateRange'; component.context = { queryFragments: { - dateRangeAdvanced: '' + dateRange: '' }, update: jasmine.createSpy('update') } as any; @@ -219,7 +219,7 @@ describe('SearchDateRangeAdvancedTabbedComponent', () => { const inLastStartDate = startOfWeek(subWeeks(new Date(), 5)); const query = `createdDate:['${formatISO(startOfDay(betweenMockData.betweenStartDate))}' TO '${formatISO(endOfDay(betweenMockData.betweenEndDate))}']` + ` AND modifiedDate:['${formatISO(startOfDay(inLastStartDate))}' TO '${formatISO(endOfToday())}']`; - expect(component.context.queryFragments['dateRangeAdvanced']).toEqual(query); + expect(component.context.queryFragments['dateRange']).toEqual(query); expect(component.context.update).toHaveBeenCalled(); }); @@ -230,7 +230,7 @@ describe('SearchDateRangeAdvancedTabbedComponent', () => { expect(component.combinedQuery).toBe(''); expect(component.combinedDisplayValue).toBe(''); expect(component.displayValue$.next).toHaveBeenCalledWith(''); - expect(component.context.queryFragments['dateRangeAdvanced']).toEqual(''); + expect(component.context.queryFragments['dateRange']).toEqual(''); expect(component.context.update).toHaveBeenCalled(); }); }); diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.ts similarity index 83% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.ts index 2e20e2b6105..62fb962ac2c 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.ts @@ -17,12 +17,12 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { Subject } from 'rxjs'; -import { SearchDateRangeAdvanced } from './search-date-range-advanced/search-date-range-advanced'; -import { DateRangeType } from './search-date-range-advanced/date-range-type'; +import { DateRangeType } from './search-date-range/date-range-type'; +import { SearchDateRange } from './search-date-range/search-date-range'; import { SearchWidget } from '../../models/search-widget.interface'; import { SearchWidgetSettings } from '../../models/search-widget-settings.interface'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; -import { InLastDateType } from './search-date-range-advanced/in-last-date-type'; +import { InLastDateType } from './search-date-range/in-last-date-type'; import { TranslationService } from '@alfresco/adf-core'; import { endOfDay, @@ -38,14 +38,14 @@ import { } from 'date-fns'; @Component({ - selector: 'adf-search-date-range-advanced-tabbed', - templateUrl: './search-date-range-advanced-tabbed.component.html', + selector: 'adf-search-date-range-tabbed', + templateUrl: './search-date-range-tabbed.component.html', encapsulation: ViewEncapsulation.None }) -export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnInit { +export class SearchDateRangeTabbedComponent implements SearchWidget, OnInit { displayValue$ = new Subject(); id: string; - startValue: SearchDateRangeAdvanced = { + startValue: SearchDateRange = { dateRangeType: DateRangeType.ANY, inLastValueType: InLastDateType.DAYS, inLastValue: undefined, @@ -59,7 +59,7 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI combinedQuery: string; combinedDisplayValue: string; - private value: { [key: string]: Partial } = {}; + private value: { [key: string]: Partial } = {}; private queryMapByField: Map = new Map(); private displayValueMapByField: Map = new Map(); @@ -69,7 +69,7 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI this.fields = this.settings?.field.split(',').map(field => field.trim()); } - getCurrentValue(): { [key: string]: Partial } { + getCurrentValue(): { [key: string]: Partial } { return this.value; } @@ -86,7 +86,7 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI this.submitValues(); } - setValue(value: { [key: string]: SearchDateRangeAdvanced }) { + setValue(value: { [key: string]: SearchDateRange }) { this.value = value; } @@ -97,13 +97,13 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI this.context.update(); } } - onDateRangedValueChanged(value: Partial, field: string) { + onDateRangedValueChanged(value: Partial, field: string) { this.value[field] = value; this.updateQuery(value, field); this.updateDisplayValue(value, field); } - private generateQuery(value: Partial, field: string): string { + private generateQuery(value: Partial, field: string): string { let query = ''; let startDate: Date; let endDate: Date; @@ -136,7 +136,7 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI return query; } - private generateDisplayValue(value: Partial): string { + private generateDisplayValue(value: Partial): string { let displayValue = ''; if (value.dateRangeType === DateRangeType.IN_LAST && value.inLastValue) { displayValue = this.translateService.instant(`SEARCH.DATE_RANGE_ADVANCED.IN_LAST_DISPLAY_LABELS.${value.inLastValueType}`, { @@ -148,7 +148,7 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI return displayValue; } - private updateQuery(value: Partial, field: string) { + private updateQuery(value: Partial, field: string) { this.combinedQuery = ''; this.queryMapByField.set(field, this.generateQuery(value, field)); this.queryMapByField.forEach((query: string) => { @@ -158,7 +158,7 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI }); } - private updateDisplayValue(value: Partial, field: string) { + private updateDisplayValue(value: Partial, field: string) { this.combinedDisplayValue = ''; this.displayValueMapByField.set(field, this.generateDisplayValue(value)); this.displayValueMapByField.forEach((displayValue: string, fieldForDisplayLabel: string) => { diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/date-range-type.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/date-range-type.ts similarity index 100% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/date-range-type.ts rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/date-range-type.ts diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/in-last-date-type.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/in-last-date-type.ts similarity index 100% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/in-last-date-type.ts rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/in-last-date-type.ts diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.html b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html similarity index 100% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.html rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.scss b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss similarity index 93% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.scss rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss index cc2c68873b1..0d5b6f35e01 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.scss +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss @@ -1,4 +1,4 @@ -adf-search-date-range-advanced { +adf-search-date-range { .adf-search-date-range-container { margin-top: 20px; padding: 10px; diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts similarity index 97% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.spec.ts rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts index fa570f6c6be..8b939c778ad 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts @@ -19,27 +19,27 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../../../../testing/content.testing.module'; -import { SearchDateRangeAdvancedComponent } from './search-date-range-advanced.component'; +import { SearchDateRangeComponent } from './search-date-range.component'; import { addDays, endOfToday, format, parse, startOfYesterday, subDays } from 'date-fns'; import { Validators } from '@angular/forms'; -describe('SearchDateRangeAdvancedComponent', () => { - let component: SearchDateRangeAdvancedComponent; - let fixture: ComponentFixture; +describe('SearchDateRangeComponent', () => { + let component: SearchDateRangeComponent; + let fixture: ComponentFixture; const startDateSampleValue = parse('05-Jun-23', 'dd-MMM-yy', new Date()); const endDateSampleValue = parse('07-Jun-23', 'dd-MMM-yy', new Date()); beforeEach(() => { TestBed.configureTestingModule({ - declarations: [SearchDateRangeAdvancedComponent], + declarations: [SearchDateRangeComponent], imports: [ TranslateModule.forRoot(), ContentTestingModule ] }); - fixture = TestBed.createComponent(SearchDateRangeAdvancedComponent); + fixture = TestBed.createComponent(SearchDateRangeComponent); component = fixture.componentInstance; component.field = 'test-field'; component.dateFormat = 'dd-MMM-yy'; diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.ts similarity index 92% rename from lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts rename to lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.ts index d0792a9c196..e5a0ad85b33 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.ts @@ -22,7 +22,7 @@ import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatDateFormats } from ' import { DateFnsAdapter, MAT_DATE_FNS_FORMATS } from '@angular/material-date-fns-adapter'; import { InLastDateType } from './in-last-date-type'; import { DateRangeType } from './date-range-type'; -import { SearchDateRangeAdvanced } from './search-date-range-advanced'; +import { SearchDateRange } from './search-date-range'; import { FormBuilder, UntypedFormControl, Validators } from '@angular/forms'; import { takeUntil } from 'rxjs/operators'; import { UserPreferencesService, UserPreferenceValues, DateFnsUtils } from '@alfresco/adf-core'; @@ -30,17 +30,17 @@ import { UserPreferencesService, UserPreferenceValues, DateFnsUtils } from '@alf const DEFAULT_DATE_DISPLAY_FORMAT = 'dd-MMM-yy'; @Component({ - selector: 'adf-search-date-range-advanced', - templateUrl: './search-date-range-advanced.component.html', - styleUrls: ['./search-date-range-advanced.component.scss'], + selector: 'adf-search-date-range', + templateUrl: './search-date-range.component.html', + styleUrls: ['./search-date-range.component.scss'], providers: [ { provide: DateAdapter, useClass: DateFnsAdapter, deps: [ MAT_DATE_LOCALE ] }, { provide: MAT_DATE_FORMATS, useValue: MAT_DATE_FNS_FORMATS } ], encapsulation: ViewEncapsulation.None, - host: {class: 'adf-search-date-range-advanced'} + host: {class: 'adf-search-date-range'} }) -export class SearchDateRangeAdvancedComponent implements OnInit, OnDestroy { +export class SearchDateRangeComponent implements OnInit, OnDestroy { @Input() dateFormat = DEFAULT_DATE_DISPLAY_FORMAT; @Input() @@ -48,18 +48,18 @@ export class SearchDateRangeAdvancedComponent implements OnInit, OnDestroy { @Input() field: string; @Input() - set initialValue(value: SearchDateRangeAdvanced) { + set initialValue(value: SearchDateRange) { if (value) { this.form.patchValue(value); } } @Output() - changed = new EventEmitter>(); + changed = new EventEmitter>(); @Output() valid = new EventEmitter(); - form = this.formBuilder.group({ + form = this.formBuilder.group({ 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 a51e0d96b2a..f26ad9fb323 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/public-api.ts b/lib/content-services/src/lib/search/public-api.ts index 2379ad7e53b..71a6ae4ca72 100644 --- a/lib/content-services/src/lib/search/public-api.ts +++ b/lib/content-services/src/lib/search/public-api.ts @@ -62,7 +62,7 @@ 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-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 42913689e7a..ce75e0ca48b 100644 --- a/lib/content-services/src/lib/search/search.module.ts +++ b/lib/content-services/src/lib/search/search.module.ts @@ -52,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'; @@ -96,8 +96,8 @@ import { SearchFacetTabbedContentComponent } from './components/search-filter-ch ResetSearchDirective, SearchPropertiesComponent, SearchFilterTabbedComponent, - SearchDateRangeAdvancedComponent, - SearchDateRangeAdvancedTabbedComponent, + SearchDateRangeComponent, + SearchDateRangeTabbedComponent, SearchFilterTabDirective, SearchFacetChipTabbedComponent, SearchFacetTabbedContentComponent @@ -126,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 5be08e16c44..3693e91499a 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 @@ -25,9 +25,7 @@ import { SearchDatetimeRangeComponent } from '../components/search-datetime-rang 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' @@ -47,7 +45,7 @@ export class SearchFilterService { 'datetime-range': SearchDatetimeRangeComponent, 'logical-filter': SearchLogicalFilterComponent, 'autocomplete-chips': SearchFilterAutocompleteChipsComponent, - 'date-range-advanced': SearchDateRangeAdvancedTabbedComponent + 'date-range': SearchDateRangeTabbedComponent }; } From 2607b76c7c85890887865273f634e089deb3ccd6 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 25 Oct 2023 12:10:31 +0530 Subject: [PATCH 05/25] [ACS-6107] Fixed missing export of SearchDateRangeTabbedComponent --- lib/content-services/src/lib/search/public-api.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/content-services/src/lib/search/public-api.ts b/lib/content-services/src/lib/search/public-api.ts index 71a6ae4ca72..953706c1768 100644 --- a/lib/content-services/src/lib/search/public-api.ts +++ b/lib/content-services/src/lib/search/public-api.ts @@ -63,6 +63,7 @@ export * from './components/search-filter-chips/search-filter-menu-card/search-f 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-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'; From 39ceb192c55cc046af4f1340541d2e4dc74f5f17 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 25 Oct 2023 12:33:15 +0530 Subject: [PATCH 06/25] [ACS-6107] Replaced occurrences of date-range-advanced with date-range in HTML and Unit Tests automation ids --- .../search-date-range.component.html | 22 +++++----- .../search-date-range.component.spec.ts | 44 +++++++++---------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html index 55ff6bee57f..97895d63078 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html @@ -1,41 +1,41 @@

- + {{ 'SEARCH.DATE_RANGE_ADVANCED.OPTIONS.ANYTIME' | translate }} - + {{ 'SEARCH.DATE_RANGE_ADVANCED.OPTIONS.IN_LAST' | translate }} {{ 'SEARCH.DATE_RANGE_ADVANCED.ERROR.IN_LAST' | translate }} - - {{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.DAYS' | translate }} - {{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.WEEKS' | translate }} - {{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.MONTHS' | translate }} + + {{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.DAYS' | translate }} + {{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.WEEKS' | translate }} + {{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.MONTHS' | translate }} - + {{ 'SEARCH.DATE_RANGE_ADVANCED.OPTIONS.BETWEEN' | translate }} + data-automation-id="date-range-between-start-input" [formControl]="betweenStartDateFormControl" (change)="dateChanged($event, betweenStartDateFormControl)"> + data-automation-id="date-range-between-end-input" [formControl]="betweenEndDateFormControl" (change)="dateChanged($event, betweenEndDateFormControl)"> - + {{ 'SEARCH.DATE_RANGE_ADVANCED.ERROR.START_DATE.INVALID_FORMAT' | translate }} diff --git a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts index 8b939c778ad..e74171cace9 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts @@ -64,7 +64,7 @@ describe('SearchDateRangeComponent', () => { }; const selectDropdownOption = (itemId: string) => { - const matSelect = fixture.debugElement.query(By.css('[data-automation-id="date-range-advanced-in-last-dropdown"]')).nativeElement; + const matSelect = fixture.debugElement.query(By.css('[data-automation-id="date-range-in-last-dropdown"]')).nativeElement; matSelect.click(); fixture.detectChanges(); const matOption = fixture.debugElement.query(By.css(`[data-automation-id="${itemId}"]`)).nativeElement; @@ -131,20 +131,20 @@ describe('SearchDateRangeComponent', () => { it('should not be able to set zero or negative values in In the last input field', () => { component.form.controls.dateRangeType.setValue(component.DateRangeType.IN_LAST); fixture.detectChanges(); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-in-last-input', '-5'); - let inLastInputFieldValue = getElementBySelector('[data-automation-id="date-range-advanced-in-last-input"]').value; + enterValueInInputFieldAndTriggerEvent('date-range-in-last-input', '-5'); + let inLastInputFieldValue = getElementBySelector('[data-automation-id="date-range-in-last-input"]').value; expect(inLastInputFieldValue).toBe('5'); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-in-last-input', '0'); - inLastInputFieldValue = getElementBySelector('[data-automation-id="date-range-advanced-in-last-input"]').value; + enterValueInInputFieldAndTriggerEvent('date-range-in-last-input', '0'); + inLastInputFieldValue = getElementBySelector('[data-automation-id="date-range-in-last-input"]').value; expect(inLastInputFieldValue).toBe(''); }); it('should give an invalid date error when manually setting a start date and an end date that are not in the correct format', () => { component.form.controls.dateRangeType.setValue(component.DateRangeType.BETWEEN); fixture.detectChanges(); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-between-start-input', 'invalid-date-input', 'change'); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-between-end-input', 'invalid-date-input', 'change'); + enterValueInInputFieldAndTriggerEvent('date-range-between-start-input', 'invalid-date-input', 'change'); + enterValueInInputFieldAndTriggerEvent('date-range-between-end-input', 'invalid-date-input', 'change'); expect(component.form.controls.betweenStartDate.errors.invalidDate).toBeTrue(); expect(component.form.controls.betweenEndDate.errors.invalidDate).toBeTrue(); }); @@ -154,7 +154,7 @@ describe('SearchDateRangeComponent', () => { fixture.detectChanges(); component.form.controls.betweenEndDate.setValue(new Date()); const startDate = format(addDays(component.form.controls.betweenEndDate.value, 3), component.dateFormat); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-between-start-input', startDate, 'change'); + enterValueInInputFieldAndTriggerEvent('date-range-between-start-input', startDate, 'change'); expect(component.form.controls.betweenEndDate.errors.invalidDate).toBeTrue(); }); @@ -163,7 +163,7 @@ describe('SearchDateRangeComponent', () => { fixture.detectChanges(); component.form.controls.betweenStartDate.setValue(new Date()); const endDate = format(subDays(component.form.controls.betweenStartDate.value, 3), component.dateFormat); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-between-end-input', endDate, 'change'); + enterValueInInputFieldAndTriggerEvent('date-range-between-end-input', endDate, 'change'); expect(component.form.controls.betweenEndDate.errors.invalidDate).toBeTrue(); }); @@ -171,7 +171,7 @@ describe('SearchDateRangeComponent', () => { component.form.controls.dateRangeType.setValue(component.DateRangeType.BETWEEN); fixture.detectChanges(); const endDate = format(addDays(component.convertedMaxDate, 3), component.dateFormat); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-between-end-input', endDate, 'change'); + enterValueInInputFieldAndTriggerEvent('date-range-between-end-input', endDate, 'change'); expect(component.form.controls.betweenEndDate.errors.invalidDate).toBeTrue(); }); @@ -179,8 +179,8 @@ describe('SearchDateRangeComponent', () => { spyOn(component.valid, 'emit'); component.form.controls.dateRangeType.setValue(component.DateRangeType.IN_LAST); fixture.detectChanges(); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-in-last-input', ''); - selectDropdownOption('date-range-advanced-in-last-option-weeks'); + enterValueInInputFieldAndTriggerEvent('date-range-in-last-input', ''); + selectDropdownOption('date-range-in-last-option-weeks'); expect(component.valid.emit).toHaveBeenCalledWith(false); component.form.controls.dateRangeType.setValue(component.DateRangeType.BETWEEN); @@ -192,8 +192,8 @@ describe('SearchDateRangeComponent', () => { spyOn(component.valid, 'emit'); component.form.controls.dateRangeType.setValue(component.DateRangeType.IN_LAST); fixture.detectChanges(); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-in-last-input', '5'); - selectDropdownOption('date-range-advanced-in-last-option-weeks'); + enterValueInInputFieldAndTriggerEvent('date-range-in-last-input', '5'); + selectDropdownOption('date-range-in-last-option-weeks'); expect(component.valid.emit).toHaveBeenCalledWith(true); component.form.controls.dateRangeType.setValue(component.DateRangeType.BETWEEN); @@ -213,10 +213,10 @@ describe('SearchDateRangeComponent', () => { betweenStartDate: undefined, betweenEndDate: undefined }; - let dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-advanced-in-last"] .mat-radio-input'); + let dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-in-last"] .mat-radio-input'); dateRangeTypeRadioButton.click(); - selectDropdownOption('date-range-advanced-in-last-option-weeks'); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-in-last-input', ''); + selectDropdownOption('date-range-in-last-option-weeks'); + enterValueInInputFieldAndTriggerEvent('date-range-in-last-input', ''); expect(component.changed.emit).not.toHaveBeenCalledWith(value); component.form.patchValue({ @@ -234,7 +234,7 @@ describe('SearchDateRangeComponent', () => { betweenStartDate: '', betweenEndDate: '' }; - dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-advanced-between"] .mat-radio-input'); + dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-between"] .mat-radio-input'); dateRangeTypeRadioButton.click(); fixture.detectChanges(); expect(component.changed.emit).not.toHaveBeenCalledWith(value); @@ -249,10 +249,10 @@ describe('SearchDateRangeComponent', () => { betweenStartDate: null, betweenEndDate: null }; - let dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-advanced-in-last"] .mat-radio-input'); + let dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-in-last"] .mat-radio-input'); dateRangeTypeRadioButton.click(); - selectDropdownOption('date-range-advanced-in-last-option-weeks'); - enterValueInInputFieldAndTriggerEvent('date-range-advanced-in-last-input', '5'); + selectDropdownOption('date-range-in-last-option-weeks'); + enterValueInInputFieldAndTriggerEvent('date-range-in-last-input', '5'); fixture.detectChanges(); expect(component.changed.emit).toHaveBeenCalledWith(value); @@ -271,7 +271,7 @@ describe('SearchDateRangeComponent', () => { betweenStartDate: startDateSampleValue, betweenEndDate: endDateSampleValue }; - dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-advanced-between"] .mat-radio-input'); + dateRangeTypeRadioButton = getElementBySelector('[data-automation-id="date-range-between"] .mat-radio-input'); dateRangeTypeRadioButton.click(); component.betweenStartDateFormControl.setValue(startDateSampleValue); component.betweenEndDateFormControl.setValue(endDateSampleValue); From 1f8c1fb4397480660cb964e43b040daa8ff34a8e Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 25 Oct 2023 12:55:05 +0530 Subject: [PATCH 07/25] [ACS-6107] Documentation corrections --- .../components/search-date-range-tabbed.component.md | 5 ++--- .../components/search-date-range.component.md | 3 +-- docs/user-guide/search-configuration-guide.md | 12 ++++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/content-services/components/search-date-range-tabbed.component.md b/docs/content-services/components/search-date-range-tabbed.component.md index d92d362f984..60a5e737d46 100644 --- a/docs/content-services/components/search-date-range-tabbed.component.md +++ b/docs/content-services/components/search-date-range-tabbed.component.md @@ -7,8 +7,7 @@ Last reviewed: 2023-07-10 # [Search date range tabbed component](../../../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.ts "Defined in search-date-range-tabbed.component.ts") -Represents a tabbed advanced date range [search widget](../../../lib/content-services/src/lib/search/models/search-widget.interface.ts) for -the [Search Filter component](search-filter.component.md). +Represents a tabbed date range [search widget](../../../lib/content-services/src/lib/search/models/search-widget.interface.ts) for the [Search Filter component](search-filter.component.md). ![Date Range Tabbed Widget](../../docassets/images/search-date-range-tabbed.png) @@ -51,7 +50,7 @@ the [Search Filter component](search-filter.component.md). ## Details -This component creates a tabbed layout where each tab consists of the [SearchDateRange](./search-date-range-tabbed.component.md) component, which allows user to create a query containing multiple date related queries in one go. +This component creates a tabbed layout where each tab consists of the [SearchDateRange](./search-date-range.component.md) component, which allows user to create a query containing multiple date related queries in one go. See the [Search filter component](search-filter.component.md) for full details of how to use widgets in a search query. diff --git a/docs/content-services/components/search-date-range.component.md b/docs/content-services/components/search-date-range.component.md index ba0183eb910..b19d3cc042e 100644 --- a/docs/content-services/components/search-date-range.component.md +++ b/docs/content-services/components/search-date-range.component.md @@ -7,8 +7,7 @@ Last reviewed: 2023-07-10 # [Search date range component](../../../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.ts "Defined in search-date-range.component.ts") -Represents a date range component for -the [SearchDateRangeTabbedComponent](search-date-range-tabbed.component.md). +Represents a date range component for the [SearchDateRangeTabbedComponent](search-date-range-tabbed.component.md). ![Date Range Widget](../../docassets/images/search-date-range.png) diff --git a/docs/user-guide/search-configuration-guide.md b/docs/user-guide/search-configuration-guide.md index 17bd38abff2..aef85fbc0ef 100644 --- a/docs/user-guide/search-configuration-guide.md +++ b/docs/user-guide/search-configuration-guide.md @@ -296,12 +296,12 @@ a category: | [`Widget`](../../lib/content-services/src/lib/search/models/search-widget.interface.ts) name | Selector | Description | |----------------------------------------------------------------------------------------------| -------- |------------------------------------------------------------------------------| -| [Check List](../content-services/components/search-check-list.component.md) | `check-list` | Toggles individual query fragments for the search | -| [Date Range](../content-services/components/search-date-range.component.md) | `date-range` | Specifies a varities of options for selecting dates that a field may contain | -| [Number Range](../content-services/components/search-number-range.component.md) | `number-range` | Specifies a range of numeric values that a field may contain | -| [Radio List](../content-services/components/search-radio.component.md) | `radio` | Selects one query fragment from a list of options | -| [Slider](../content-services/components/search-slider.component.md) | `slider` | Selects a single numeric value in a given range that a field may contain | -| [Text](../content-services/components/search-text.component.md) | `text` | Specifies a text value that a field may contain | +| [Check List](../content-services/components/search-check-list.component.md) | `check-list` | Toggles individual query fragments for the search | +| [Date Range](../content-services/components/search-date-range.component.md) | `date-range` | Specifies a varities of options for selecting dates that a field may contain | +| [Number Range](../content-services/components/search-number-range.component.md) | `number-range` | Specifies a range of numeric values that a field may contain | +| [Radio List](../content-services/components/search-radio.component.md) | `radio` | Selects one query fragment from a list of options | +| [Slider](../content-services/components/search-slider.component.md) | `slider` | Selects a single numeric value in a given range that a field may contain | +| [Text](../content-services/components/search-text.component.md) | `text` | Specifies a text value that a field may contain | See the individual [Search Widget](../interfaces/search-widget.interface.md) pages for full details of their usage and settings. From fbdc7152b64cc1716cbcbe705df7c97091e6ae80 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 25 Oct 2023 12:55:30 +0530 Subject: [PATCH 08/25] [ACS-6107] Reverted unneeded documentation formatting --- docs/README.md | 112 ++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/docs/README.md b/docs/README.md index a5f54744b87..343cfe4844b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -265,63 +265,63 @@ for more information about installing and using the source code. | Name | Description | Source link | | ---- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------| ----------- | -| [Add Permission Dialog Component](content-services/components/add-permission-dialog.component.md) | Displays a dialog to search for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts) | -| [Add Permission Panel Component](content-services/components/add-permission-panel.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts) | -| [Add Permission Component](content-services/components/add-permission.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts) | -| [Alfresco Viewer component](content-services/components/alfresco-viewer.component.md) | Displays content from an ACS repository. | [Source](../lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts) | -| [Aspect List Dialog component](content-services/components/aspect-list-dialog.component.md) | Allows a user to choose aspects for a node. | [Source](../lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts) | -| [Aspect List component](content-services/components/aspect-list.component.md) | This component will show in an expandable row list with checkboxes all the aspect of a node, if a node id is given, or otherwise a complete list. | | -| The aspect are filtered via the app.config.json in this way : | [Source](../lib/content-services/src/lib/aspect-list/aspect-list.component.ts) | | -| [Breadcrumb Component](content-services/components/breadcrumb.component.md) | Indicates the current position within a navigation hierarchy. | [Source](../lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts) | -| [Content Action component](content-services/components/content-action.component.md) | Adds options to a Document List actions menu for a particular content type. | [Source](../lib/content-services/src/lib/document-list/components/content-action/content-action.component.ts) | -| [Content Metadata Card component](content-services/components/content-metadata-card.component.md) | Displays and edits metadata related to a node. | [Source](../lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts) | -| [Content Node Selector Panel component](content-services/components/content-node-selector-panel.component.md) | Opens a Content Node Selector in its own dialog window. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts) | -| [Content Node Selector component](content-services/components/content-node-selector.component.md) | Allows a user to select items from a Content Services repository. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts) | -| [Content Type Dialog component](content-services/components/content-type-dialog.component.md) | Confirm dialog when user changes content type of a node. | [Source](../lib/content-services/src/lib/content-type/content-type-dialog.component.ts) | -| [Content User Info component](content-services/components/content-user-info.component.md) | Shows user information for CONTENT and CONTENT_SSO mode. | [Source](../lib/content-services/src/lib/content-user-info/content-user-info.component.ts) | -| [Document List component](content-services/components/document-list.component.md) | Displays the documents from a repository. | [Source](../lib/content-services/src/lib/document-list/components/document-list.component.ts) | -| [Dropdown Breadcrumb Component](content-services/components/dropdown-breadcrumb.component.md) | Indicates the current position within a navigation hierarchy using a dropdown menu. | [Source](../lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts) | -| [File Uploading Dialog Component](content-services/components/file-uploading-dialog.component.md) | Shows a dialog listing all the files uploaded with the Upload Button or Drag Area components. | [Source](../lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts) | -| [Like component](content-services/components/like.component.md) | Allows a user to add "likes" to an item. | [Source](../lib/content-services/src/lib/social/like.component.ts) | -| [Node Comments Component](content-services/components/node-comments.component.md) | Displays comments from users involved in a specified content and allows an involved user to add a comment to a content. | [Source](../lib/content-services/src/lib/node-comments/node-comments.component.ts) | -| [Permission List Component](content-services/components/permission-list.component.md) | Shows node permissions as a table. | [Source](../lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts) | -| [Rating component](content-services/components/rating.component.md) | Allows a user to add and remove rating to an item. | [Source](../lib/content-services/src/lib/social/rating.component.ts) | -| [Search check list component](content-services/components/search-check-list.component.md) | Implements a checklist widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts) | -| [Search Chip Input Component](content-services/components/search-chip-input.component.md) | Displays input for providing phrases display as "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-input/search-chip-input.component.ts) | -| [Search Chip Autocomplete Input component](content-services/components/search-chip-autocomplete-input.component.md) | Displays an input with autocomplete options. | [Source](../lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts) | -| [Search Chip List Component](content-services/components/search-chip-list.component.md) | Displays search criteria as a set of "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts) | -| [Search control component](content-services/components/search-control.component.md) | Displays a input text that shows find-as-you-type suggestions. | [Source](../lib/content-services/src/lib/search/components/search-control.component.ts) | -| [Search Date Range Component](content-services/components/search-date-range.component.md) | Displays a UI to configure different kinds of search criteria around date. Options are 'Anytime', 'In the last' and 'Between' | [Source](../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.ts) | -| [Search Date Range Tabbed component](content-services/components/search-date-range-tabbed.component.md) | Implements a tabbed advanced search widget for the Search Date Range component. | [Source](../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.ts) | -| [Search datetime range component](content-services/components/search-datetime-range.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts) | -| [Search Filter Autocomplete Chips component](content-services/components/search-filter-autocomplete-chips.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts) | -| [Search Filter Chips component](content-services/components/search-filter-chips.component.md) | Represents a chip based container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.ts) | -| [Search Filter component](content-services/components/search-filter.component.md) | Represents a main container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | -| [Search Filter Tabbed component](content-services/components/search-filter-tabbed.component.md) | Represents a container component for creating tabbed layout. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | -| [Search Form component](content-services/components/search-form.component.md) | Search Form screenshot | [Source](../lib/content-services/src/lib/search/components/search-form/search-form.component.ts) | -| [Search Logical Filter component](content-services/components/search-logical-filter.component.md) | Displays 3 chip inputs each representing different logical condition for search query. | [Source](../lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.ts) | -| [Search Properties component](content-services/components/search-properties.component.md) | Allows to search by file size and type. | [Source](../lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts) | -| [Search number range component](content-services/components/search-number-range.component.md) | Implements a number range widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts) | -| [Search radio component](content-services/components/search-radio.component.md) | Implements a radio button list widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts) | -| [Search slider component](content-services/components/search-slider.component.md) | Implements a numeric slider widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts) | -| [Search Sorting Picker Component](content-services/components/search-sorting-picker.component.md) | Provides an ability to select one of the predefined sorting definitions for search results: | [Source](../lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.ts) | -| [Search text component](content-services/components/search-text.component.md) | Implements a text input widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-text/search-text.component.ts) | -| [Search component](content-services/components/search.component.md) | Searches items for supplied search terms. | [Source](../lib/content-services/src/lib/search/components/search.component.ts) | -| [Sites Dropdown component](content-services/components/sites-dropdown.component.md) | Displays a dropdown menu to show and interact with the sites of the current user. | [Source](../lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts) | -| [Tag Node Actions List component](content-services/components/tag-actions.component.md) | Shows available actions for tags. | [Source](../lib/content-services/src/lib/tag/tag-actions.component.ts) | -| [Tag List component](content-services/components/tag-list.component.md) | Shows tags for an item. | [Source](../lib/content-services/src/lib/tag/tag-list.component.ts) | -| [Tag Node List component](content-services/components/tag-node-list.component.md) | Shows tags for a node. | [Source](../lib/content-services/src/lib/tag/tag-node-list.component.ts) | +| [Add Permission Dialog Component](content-services/components/add-permission-dialog.component.md) | Displays a dialog to search for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts) | +| [Add Permission Panel Component](content-services/components/add-permission-panel.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts) | +| [Add Permission Component](content-services/components/add-permission.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts) | +| [Alfresco Viewer component](content-services/components/alfresco-viewer.component.md) | Displays content from an ACS repository. | [Source](../lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts) | +| [Aspect List Dialog component](content-services/components/aspect-list-dialog.component.md) | Allows a user to choose aspects for a node. | [Source](../lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts) | +| [Aspect List component](content-services/components/aspect-list.component.md) | This component will show in an expandable row list with checkboxes all the aspect of a node, if a node id is given, or otherwise a complete list. | | +| The aspect are filtered via the app.config.json in this way : | [Source](../lib/content-services/src/lib/aspect-list/aspect-list.component.ts) | | +| [Breadcrumb Component](content-services/components/breadcrumb.component.md) | Indicates the current position within a navigation hierarchy. | [Source](../lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts) | +| [Content Action component](content-services/components/content-action.component.md) | Adds options to a Document List actions menu for a particular content type. | [Source](../lib/content-services/src/lib/document-list/components/content-action/content-action.component.ts) | +| [Content Metadata Card component](content-services/components/content-metadata-card.component.md) | Displays and edits metadata related to a node. | [Source](../lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts) | +| [Content Node Selector Panel component](content-services/components/content-node-selector-panel.component.md) | Opens a Content Node Selector in its own dialog window. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts) | +| [Content Node Selector component](content-services/components/content-node-selector.component.md) | Allows a user to select items from a Content Services repository. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts) | +| [Content Type Dialog component](content-services/components/content-type-dialog.component.md) | Confirm dialog when user changes content type of a node. | [Source](../lib/content-services/src/lib/content-type/content-type-dialog.component.ts) | +| [Content User Info component](content-services/components/content-user-info.component.md) | Shows user information for CONTENT and CONTENT_SSO mode. | [Source](../lib/content-services/src/lib/content-user-info/content-user-info.component.ts) | +| [Document List component](content-services/components/document-list.component.md) | Displays the documents from a repository. | [Source](../lib/content-services/src/lib/document-list/components/document-list.component.ts) | +| [Dropdown Breadcrumb Component](content-services/components/dropdown-breadcrumb.component.md) | Indicates the current position within a navigation hierarchy using a dropdown menu. | [Source](../lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts) | +| [File Uploading Dialog Component](content-services/components/file-uploading-dialog.component.md) | Shows a dialog listing all the files uploaded with the Upload Button or Drag Area components. | [Source](../lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts) | +| [Like component](content-services/components/like.component.md) | Allows a user to add "likes" to an item. | [Source](../lib/content-services/src/lib/social/like.component.ts) | +| [Node Comments Component](content-services/components/node-comments.component.md) | Displays comments from users involved in a specified content and allows an involved user to add a comment to a content. | [Source](../lib/content-services/src/lib/node-comments/node-comments.component.ts) | +| [Permission List Component](content-services/components/permission-list.component.md) | Shows node permissions as a table. | [Source](../lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts) | +| [Rating component](content-services/components/rating.component.md) | Allows a user to add and remove rating to an item. | [Source](../lib/content-services/src/lib/social/rating.component.ts) | +| [Search check list component](content-services/components/search-check-list.component.md) | Implements a checklist widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts) | +| [Search Chip Input Component](content-services/components/search-chip-input.component.md) | Displays input for providing phrases display as "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-input/search-chip-input.component.ts) | +| [Search Chip Autocomplete Input component](content-services/components/search-chip-autocomplete-input.component.md) | Displays an input with autocomplete options. | [Source](../lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts) | +| [Search Chip List Component](content-services/components/search-chip-list.component.md) | Displays search criteria as a set of "chips". | [Source](../lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts) | +| [Search control component](content-services/components/search-control.component.md) | Displays a input text that shows find-as-you-type suggestions. | [Source](../lib/content-services/src/lib/search/components/search-control.component.ts) | +| [Search Date Range Component](content-services/components/search-date-range.component.md) | Displays a UI to configure different kinds of search criteria around date. Options are 'Anytime', 'In the last' and 'Between' | [Source](../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.ts) | +| [Search Date Range Tabbed component](content-services/components/search-date-range-tabbed.component.md) | Implements a tabbed advanced search widget for the Search Date Range component. | [Source](../lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.ts) | +| [Search datetime range component](content-services/components/search-datetime-range.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts) | +| [Search Filter Autocomplete Chips component](content-services/components/search-filter-autocomplete-chips.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts) | +| [Search Filter Chips component](content-services/components/search-filter-chips.component.md) | Represents a chip based container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.ts) | +| [Search Filter component](content-services/components/search-filter.component.md) | Represents a main container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | +| [Search Filter Tabbed component](content-services/components/search-filter-tabbed.component.md) | Represents a container component for creating tabbed layout. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | +| [Search Form component](content-services/components/search-form.component.md) | Search Form screenshot | [Source](../lib/content-services/src/lib/search/components/search-form/search-form.component.ts) | +| [Search Logical Filter component](content-services/components/search-logical-filter.component.md) | Displays 3 chip inputs each representing different logical condition for search query. | [Source](../lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.ts) | +| [Search Properties component](content-services/components/search-properties.component.md) | Allows to search by file size and type. | [Source](../lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts) | +| [Search number range component](content-services/components/search-number-range.component.md) | Implements a number range widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts) | +| [Search radio component](content-services/components/search-radio.component.md) | Implements a radio button list widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts) | +| [Search slider component](content-services/components/search-slider.component.md) | Implements a numeric slider widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts) | +| [Search Sorting Picker Component](content-services/components/search-sorting-picker.component.md) | Provides an ability to select one of the predefined sorting definitions for search results: | [Source](../lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.ts) | +| [Search text component](content-services/components/search-text.component.md) | Implements a text input widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-text/search-text.component.ts) | +| [Search component](content-services/components/search.component.md) | Searches items for supplied search terms. | [Source](../lib/content-services/src/lib/search/components/search.component.ts) | +| [Sites Dropdown component](content-services/components/sites-dropdown.component.md) | Displays a dropdown menu to show and interact with the sites of the current user. | [Source](../lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts) | +| [Tag Node Actions List component](content-services/components/tag-actions.component.md) | Shows available actions for tags. | [Source](../lib/content-services/src/lib/tag/tag-actions.component.ts) | +| [Tag List component](content-services/components/tag-list.component.md) | Shows tags for an item. | [Source](../lib/content-services/src/lib/tag/tag-list.component.ts) | +| [Tag Node List component](content-services/components/tag-node-list.component.md) | Shows tags for a node. | [Source](../lib/content-services/src/lib/tag/tag-node-list.component.ts) | | [Tags Creator component](content-services/components/tags-creator.component.md) | Allows to create multiple tags. That component contains input and two lists. Top list is all created tags, bottom list is searched tags based on input's value. | [Source](../lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts) | -| [Tree View component](content-services/components/tree-view.component.md) | Shows the folder and subfolders of a node as a tree view. | [Source](../lib/content-services/src/lib/tree-view/components/tree-view.component.ts) | -| [Tree component](content-services/components/tree.component.md) | Shows the nodes in tree structure, each node containing children is collapsible/expandable. Can be integrated with any datasource extending Tree service. | [Source](../lib/content-services/src/lib/tree/components/tree.component.ts) | -| [Upload Button Component](content-services/components/upload-button.component.md) | Activates a file upload. | [Source](../lib/content-services/src/lib/upload/components/upload-button.component.ts) | -| [Upload Drag Area Component](content-services/components/upload-drag-area.component.md) | Adds a drag and drop area to upload files to ACS. | [Source](../lib/content-services/src/lib/upload/components/upload-drag-area.component.ts) | -| [Upload Version Button Component (Workaround)](content-services/components/upload-version-button.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Activates a file version upload. | [Source](../lib/content-services/src/lib/upload/components/upload-version-button.component.ts) | -| [Version Comparison Component](content-services/components/version-comparison.component.md) | Displays the side by side comparison between the current target node (type, name, icon) and the new file that should update it's version. | [Source](../lib/content-services/src/lib/version-manager/version-comparison.component.ts) | -| [Version List component](content-services/components/version-list.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node in a Version Manager component. | [Source](../lib/content-services/src/lib/version-manager/version-list.component.ts) | -| [Version Manager Component](content-services/components/version-manager.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node with the ability to upload a new version. | [Source](../lib/content-services/src/lib/version-manager/version-manager.component.ts) | -| [Version Upload component](content-services/components/version-upload.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the new version's minor/major changes and the optional comment of a node in a Version Manager component. | [Source](../lib/content-services/src/lib/version-manager/version-upload.component.ts) | -| [Webscript component](content-services/components/webscript.component.md) | Provides access to Webscript features. | [Source](../lib/content-services/src/lib/webscript/webscript.component.ts) | +| [Tree View component](content-services/components/tree-view.component.md) | Shows the folder and subfolders of a node as a tree view. | [Source](../lib/content-services/src/lib/tree-view/components/tree-view.component.ts) | +| [Tree component](content-services/components/tree.component.md) | Shows the nodes in tree structure, each node containing children is collapsible/expandable. Can be integrated with any datasource extending Tree service. | [Source](../lib/content-services/src/lib/tree/components/tree.component.ts) | +| [Upload Button Component](content-services/components/upload-button.component.md) | Activates a file upload. | [Source](../lib/content-services/src/lib/upload/components/upload-button.component.ts) | +| [Upload Drag Area Component](content-services/components/upload-drag-area.component.md) | Adds a drag and drop area to upload files to ACS. | [Source](../lib/content-services/src/lib/upload/components/upload-drag-area.component.ts) | +| [Upload Version Button Component (Workaround)](content-services/components/upload-version-button.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Activates a file version upload. | [Source](../lib/content-services/src/lib/upload/components/upload-version-button.component.ts) | +| [Version Comparison Component](content-services/components/version-comparison.component.md) | Displays the side by side comparison between the current target node (type, name, icon) and the new file that should update it's version. | [Source](../lib/content-services/src/lib/version-manager/version-comparison.component.ts) | +| [Version List component](content-services/components/version-list.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node in a Version Manager component. | [Source](../lib/content-services/src/lib/version-manager/version-list.component.ts) | +| [Version Manager Component](content-services/components/version-manager.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node with the ability to upload a new version. | [Source](../lib/content-services/src/lib/version-manager/version-manager.component.ts) | +| [Version Upload component](content-services/components/version-upload.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the new version's minor/major changes and the optional comment of a node in a Version Manager component. | [Source](../lib/content-services/src/lib/version-manager/version-upload.component.ts) | +| [Webscript component](content-services/components/webscript.component.md) | Provides access to Webscript features. | [Source](../lib/content-services/src/lib/webscript/webscript.component.ts) | ### Directives From f8787358ba2788ba276668521dd3347d365e76cf Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 25 Oct 2023 12:56:34 +0530 Subject: [PATCH 09/25] [ACS-6107] Reverted unneeded documentation formatting --- docs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 343cfe4844b..26e666ce812 100644 --- a/docs/README.md +++ b/docs/README.md @@ -263,8 +263,8 @@ for more information about installing and using the source code. ### Components -| Name | Description | Source link | -| ---- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------| ----------- | +| Name | Description | Source link | +| ---- |-------------| ----------- | | [Add Permission Dialog Component](content-services/components/add-permission-dialog.component.md) | Displays a dialog to search for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts) | | [Add Permission Panel Component](content-services/components/add-permission-panel.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts) | | [Add Permission Component](content-services/components/add-permission.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts) | From 7f1edb4a78653a2906435157b72c94b39b57ed5a Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 25 Oct 2023 13:02:49 +0530 Subject: [PATCH 10/25] [ACS-6107] Reverted unneeded documentation formatting --- docs/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index 26e666ce812..ba6be556e19 100644 --- a/docs/README.md +++ b/docs/README.md @@ -264,7 +264,7 @@ for more information about installing and using the source code. ### Components | Name | Description | Source link | -| ---- |-------------| ----------- | +| ---- | ----------- | ----------- | | [Add Permission Dialog Component](content-services/components/add-permission-dialog.component.md) | Displays a dialog to search for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts) | | [Add Permission Panel Component](content-services/components/add-permission-panel.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts) | | [Add Permission Component](content-services/components/add-permission.component.md) | Searches for people or groups to add to the current node permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts) | @@ -297,10 +297,10 @@ for more information about installing and using the source code. | [Search Filter Autocomplete Chips component](content-services/components/search-filter-autocomplete-chips.component.md) | Implements a search widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts) | | [Search Filter Chips component](content-services/components/search-filter-chips.component.md) | Represents a chip based container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.ts) | | [Search Filter component](content-services/components/search-filter.component.md) | Represents a main container component for custom search and faceted search settings. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | -| [Search Filter Tabbed component](content-services/components/search-filter-tabbed.component.md) | Represents a container component for creating tabbed layout. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | +| [Search Filter Tabbed component](content-services/components/search-filter-tabbed.component.md) | Represents a container component for creating tabbed layout. | [Source](../lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts) | | [Search Form component](content-services/components/search-form.component.md) | Search Form screenshot | [Source](../lib/content-services/src/lib/search/components/search-form/search-form.component.ts) | | [Search Logical Filter component](content-services/components/search-logical-filter.component.md) | Displays 3 chip inputs each representing different logical condition for search query. | [Source](../lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.ts) | -| [Search Properties component](content-services/components/search-properties.component.md) | Allows to search by file size and type. | [Source](../lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts) | +| [Search Properties component](content-services/components/search-properties.component.md) | Allows to search by file size and type.| [Source](../lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts) | | [Search number range component](content-services/components/search-number-range.component.md) | Implements a number range widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts) | | [Search radio component](content-services/components/search-radio.component.md) | Implements a radio button list widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts) | | [Search slider component](content-services/components/search-slider.component.md) | Implements a numeric slider widget for the Search Filter component. | [Source](../lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts) | From eb2c92084299c9e529b30270cdd04d7c02ac225a Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 25 Oct 2023 16:45:33 +0530 Subject: [PATCH 11/25] [ACS-6107] Migrated unneeded E2E test case to unit test --- .../components/search-date-range.e2e.ts | 23 ------------------- .../search-date-range.component.spec.ts | 14 ++++++++++- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index 0acac3afab1..c3b80eedd4b 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/e2e/search/components/search-date-range.e2e.ts @@ -49,29 +49,6 @@ describe('Search Date Range Filter', () => { await browser.refresh(); }); - it('[C277119] FROM and TO dates should depend on each other', async () => { - await dateRangeFilter.checkFromDateToggleIsDisplayed(); - const fromDatePicker = await dateRangeFilter.openFromDatePicker(); - await fromDatePicker.checkDatesAfterDateAreDisabled(new Date()); - await fromDatePicker.closeDatePicker(); - - await dateRangeFilter.checkToDateToggleIsDisplayed(); - let datePickerTo = await dateRangeFilter.openToDatePicker(); - - await datePickerTo.checkDatesAfterDateAreDisabled(new Date()); - await datePickerTo.closeDatePicker(); - - await dateRangeFilter.checkFromDateToggleIsDisplayed(); - const datePickerFrom = await dateRangeFilter.openFromDatePicker(); - await datePickerFrom.selectTodayDate(); - await datePickerFrom.checkDatePickerIsNotDisplayed(); - - await dateRangeFilter.checkToDateToggleIsDisplayed(); - datePickerTo = await dateRangeFilter.openToDatePicker(); - await datePickerTo.checkDatesBeforeDateAreDisabled(new Date()); - await datePickerTo.checkDatesAfterDateAreDisabled(new Date()); - }); - it('[C277107] Should be able to apply a date range', async () => { await dateRangeFilter.checkFromDateToggleIsDisplayed(); const datePickerToday = await dateRangeFilter.openFromDatePicker(); diff --git a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts index e74171cace9..a29356ef9b1 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts @@ -41,7 +41,7 @@ describe('SearchDateRangeComponent', () => { fixture = TestBed.createComponent(SearchDateRangeComponent); component = fixture.componentInstance; - component.field = 'test-field'; + component.field = 'test-field'; component.dateFormat = 'dd-MMM-yy'; component.maxDate = 'today'; component.form.setValue({ @@ -175,6 +175,18 @@ describe('SearchDateRangeComponent', () => { expect(component.form.controls.betweenEndDate.errors.invalidDate).toBeTrue(); }); + it('should not be able to select a date after the max date when selecting the BETWEEN option', async () => { + component.form.controls.dateRangeType.setValue(component.DateRangeType.BETWEEN); + component.maxDate = 'today'; + fixture.detectChanges(); + getElementBySelector('[data-automation-id="date-range-between-datepicker-toggle"]').click(); + fixture.detectChanges(); + + const afterDate = format(addDays(new Date(), 1), 'MMM d, yyyy'); + const afterDateItem = document.querySelector(`.mat-calendar-body-cell[aria-label="${afterDate}"]`); + expect(afterDateItem.getAttribute('aria-disabled')).toBeTruthy(); + }); + it('should emit valid as false when form is invalid', () => { spyOn(component.valid, 'emit'); component.form.controls.dateRangeType.setValue(component.DateRangeType.IN_LAST); From 9f390df1a6b88086e797504fdc6ab7b3f87bb363 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 25 Oct 2023 17:30:19 +0530 Subject: [PATCH 12/25] [ACS-6107] Removed search-date-range E2E --- .../components/search-date-range.e2e.ts | 84 ------------------- e2e/search/pages/search-filters.page.ts | 18 ---- 2 files changed, 102 deletions(-) delete mode 100644 e2e/search/components/search-date-range.e2e.ts diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts deleted file mode 100644 index c3b80eedd4b..00000000000 --- a/e2e/search/components/search-date-range.e2e.ts +++ /dev/null @@ -1,84 +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 { BrowserActions, DataTableComponentPage, LoginPage } from '@alfresco/adf-testing'; -import { browser, ElementFinder } from 'protractor'; -import { SearchBarPage } from '../pages/search-bar.page'; -import { SearchFiltersPage } from '../pages/search-filters.page'; -import { SearchResultsPage } from '../pages/search-results.page'; -import { format, parse, addDays } from 'date-fns'; - -describe('Search Date Range Filter', () => { - const loginPage = new LoginPage(); - const searchBarPage = new SearchBarPage(); - const searchFilters = new SearchFiltersPage(); - const dateRangeFilter = searchFilters.createdDateRangeFilterPage(); - const searchResults = new SearchResultsPage(); - const dataTable = new DataTableComponentPage(); - - beforeAll(async () => { - await loginPage.loginWithProfile('admin'); - - await searchBarPage.checkSearchIconIsVisible(); - await searchBarPage.clickOnSearchIcon(); - await searchBarPage.enterTextAndPressEnter('*'); - await searchResults.dataTable.waitTillContentLoaded(); - }); - - beforeEach(async () => { - await searchFilters.checkCreatedRangeFilterIsDisplayed(); - await searchFilters.clickCreatedRangeFilterHeader(); - await searchFilters.checkCreatedRangeFilterIsExpanded(); - }); - - afterEach(async () => { - await browser.refresh(); - }); - - it('[C277107] Should be able to apply a date range', async () => { - await dateRangeFilter.checkFromDateToggleIsDisplayed(); - const datePickerToday = await dateRangeFilter.openFromDatePicker(); - await datePickerToday.selectTodayDate(); - await datePickerToday.checkDatePickerIsNotDisplayed(); - let fromDate = await dateRangeFilter.getFromDate(); - fromDate = format(parse(fromDate, 'd-MMM-yy', new Date()), 'dd-MM-yy'); - - await dateRangeFilter.checkApplyButtonIsDisabled(); - - await dateRangeFilter.checkToDateToggleIsDisplayed(); - const toDatePicker = await dateRangeFilter.openToDatePicker(); - - await toDatePicker.selectTodayDate(); - await toDatePicker.checkDatePickerIsNotDisplayed(); - let toDate = await dateRangeFilter.getToDate(); - toDate = format(addDays(parse(toDate, 'dd-MMM-yy', new Date()), 1), 'dd-MM-yy'); - - await dateRangeFilter.checkApplyButtonIsEnabled(); - await dateRangeFilter.clickApplyButton(); - - await searchResults.sortByCreated('ASC'); - - const results = (await dataTable.geCellElementDetail('Created')) as ElementFinder[]; - for (const currentResult of results) { - const currentDate = await BrowserActions.getAttribute(currentResult, 'title'); - const currentDateFormatted = parse(currentDate, 'MMM dd, yyyy, h:mm:ss a', new Date()); - - await expect(currentDateFormatted <= parse(toDate, 'dd-MM-yy', new Date())).toBe(true); - await expect(currentDateFormatted >= parse(fromDate, 'dd-MM-yy', new Date())).toBe(true); - } - }); -}); diff --git a/e2e/search/pages/search-filters.page.ts b/e2e/search/pages/search-filters.page.ts index dab086f9501..a0d3f664917 100644 --- a/e2e/search/pages/search-filters.page.ts +++ b/e2e/search/pages/search-filters.page.ts @@ -17,7 +17,6 @@ import { BrowserVisibility, - DateRangeFilterPage, NumberRangeFilterPage, SearchCategoriesPage, SearchCheckListPage, @@ -36,7 +35,6 @@ export class SearchFiltersPage { fileSizeFilter = $('[data-automation-id="expansion-panel-SEARCH.FACET_FIELDS.SIZE"]'); nameFilter = $('[data-automation-id="expansion-panel-Name"]'); checkListFilter = $('[data-automation-id="expansion-panel-Check List"]'); - createdDateRangeFilter = $('[data-automation-id="expansion-panel-Created Date (range)"]'); typeFilter = $('[data-automation-id="expansion-panel-Type"]'); sizeRangeFilter = $('[data-automation-id="expansion-panel-Content Size (range)"]'); sizeSliderFilter = $('[data-automation-id="expansion-panel-Content Size"]'); @@ -56,10 +54,6 @@ export class SearchFiltersPage { return SearchCategoriesPage.numberRangeFilter(this.sizeRangeFilter); } - createdDateRangeFilterPage(): DateRangeFilterPage { - return SearchCategoriesPage.dateRangeFilter(this.createdDateRangeFilter); - } - textFiltersPage(): SearchTextPage { return SearchCategoriesPage.textFiltersPage(this.nameFilter); } @@ -156,18 +150,6 @@ export class SearchFiltersPage { await this.searchCategoriesPage.checkFilterIsExpanded(this.checkListFilter); } - async checkCreatedRangeFilterIsDisplayed(): Promise { - await this.searchCategoriesPage.checkFilterIsDisplayed(this.createdDateRangeFilter); - } - - async clickCreatedRangeFilterHeader(): Promise { - await this.searchCategoriesPage.clickFilterHeader(this.createdDateRangeFilter); - } - - async checkCreatedRangeFilterIsExpanded(): Promise { - await this.searchCategoriesPage.checkFilterIsExpanded(this.createdDateRangeFilter); - } - async checkTypeFilterIsDisplayed(): Promise { await this.searchCategoriesPage.checkFilterIsDisplayed(this.typeFilter); } From 0e4a00ea76d00fc6e7b9bfd5150c7fa8d8684311 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Mon, 30 Oct 2023 10:43:38 +0530 Subject: [PATCH 13/25] [ACS-6107] Resolved PR comments. Removed date-range-filter.page.ts. Removed unused translation keys. Updated documentation to refer proper comment name --- docs/versionIndex.md | 2 +- lib/content-services/src/lib/i18n/en.json | 48 +++--- .../pages/search/date-range-filter.page.ts | 141 ------------------ .../pages/search/public-api.ts | 1 - .../pages/search/search-categories.page.ts | 5 - 5 files changed, 24 insertions(+), 173 deletions(-) diff --git a/docs/versionIndex.md b/docs/versionIndex.md index a94b68fe241..508a0a902cc 100644 --- a/docs/versionIndex.md +++ b/docs/versionIndex.md @@ -57,7 +57,7 @@ backend services have been tested with each released version of ADF. - [Search Properties component](content-services/components/search-properties.component.md) -- [Search Date Range Advanced Component](content-services/components/search-date-range.component.md) +- [Search Date Range Component](content-services/components/search-date-range.component.md) - [Search Date Range Tabbed Component](content-services/components/search-date-range-tabbed.component.md) - [Search Filter Tabbed Component](content-services/components/search-filter-tabbed.component.md) - [Search Facet Chip Tabbed Component](content-services/components/search-facet-chip-tabbed.md) diff --git a/lib/content-services/src/lib/i18n/en.json b/lib/content-services/src/lib/i18n/en.json index 2d6e5b5bd6f..def0dce4cc4 100644 --- a/lib/content-services/src/lib/i18n/en.json +++ b/lib/content-services/src/lib/i18n/en.json @@ -319,9 +319,7 @@ "FROM": "From", "TO": "To", "FROM-DATE": "From", - "TO-DATE": "To", - "SELECT-FROM-DATE": "Select From Date", - "SELECT-TO-DATE": "Select To Date" + "TO-DATE": "To" }, "VALIDATION": { "REQUIRED-VALUE": "Required value", @@ -378,14 +376,14 @@ } }, "UNKNOWN_CONFIGURATION": "Unknown Configuration", - "SEARCH_HEADER" : { - "TITLE":"Filter", + "SEARCH_HEADER": { + "TITLE": "Filter", "TYPE": "Type", "FILTER_BY": "Filter by {{ category }}", "CLEAR": "Clear", "APPLY": "Apply", - "FILTERS" : { - "NAME" : { + "FILTERS": { + "NAME": { "TITLE": "Name", "PLACEHOLDER": "Enter the name" }, @@ -395,14 +393,14 @@ "DOCUMENT": "Document" }, "SIZE": { - "TITLE" : "Content Size (range)", + "TITLE": "Content Size (range)", "SMALL": "Small", "MEDIUM": "Medium", "LARGE": "Large", "HUGE": "Huge" }, - "DATE" :{ - "TITLE" : "Created Date (range)" + "DATE": { + "TITLE": "Created Date (range)" } } }, @@ -493,15 +491,15 @@ "ADD_TAG_TOOLTIP": "Add tag" }, "CONTENT_TYPE": { - "DIALOG" :{ - "TITLE" : "Change content type", + "DIALOG": { + "TITLE": "Change content type", "DESCRIPTION": "Making this change to the content type will permanently add some properties and stored metadata to the document.", "CONFIRM": "Are you sure you want to change the content type?", "CANCEL": "CANCEL", "APPLY": "SAVE CHANGES", "VIEW_DETAILS": "View details", - "PROPERTY" :{ - "NAME" : "Name", + "PROPERTY": { + "NAME": "Name", "DESCRIPTION": "Description", "DATA_TYPE": "Data type" } @@ -524,7 +522,7 @@ "LINK-WITH-EXPIRY-SETTINGS": "New link has been generated with expiry settings", "EXPIRES": "Expires on", "LINK-EXPIRY-DATE": "Link Expiry Date", - "EXPIRATION-LABEL" : "Expiration Date", + "EXPIRATION-LABEL": "Expiration Date", "EXPIRATION-PLACEHOLDER": "MM/DD/YYYY", "CLIPBOARD-MESSAGE": "Link copied to the clipboard", "CLOSE": "Close", @@ -666,19 +664,19 @@ "ARIA_LABEL": "Open {{ name }}" } }, - "ADF-ASPECT-LIST" : { + "ADF-ASPECT-LIST": { "PROPERTY_NAME": "Property Name", "DESCRIPTION": "Description", "DATA_TYPE": "Data Type", - "DIALOG" : { - "TITLE" : "Customize Properties", - "DESCRIPTION": "Manage the properties associated with selected file(s). Choose from property aspects listed below, to expose and apply additional metadata and functionality", - "RESET": "Reset", - "CLEAR": "Clear", - "CANCEL": "Cancel", - "APPLY": "Apply", - "OVER-TABLE-MESSAGE" : "Select property aspects", - "SELECTED": "Selected" + "DIALOG": { + "TITLE": "Customize Properties", + "DESCRIPTION": "Manage the properties associated with selected file(s). Choose from property aspects listed below, to expose and apply additional metadata and functionality", + "RESET": "Reset", + "CLEAR": "Clear", + "CANCEL": "Cancel", + "APPLY": "Apply", + "OVER-TABLE-MESSAGE": "Select property aspects", + "SELECTED": "Selected" } }, "NODE_COUNTER": { 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 index 0290b587330..e69de29bb2d 100644 --- 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 @@ -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 f8d39165d5d..a204757827a 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 d411f17e10e..b4320d71f5f 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); } From 3f9f08a0ea0436e6f2f2677dda52fac390ee1916 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 1 Nov 2023 14:54:27 +0530 Subject: [PATCH 14/25] [ACS-6107] Updated documentation for SearchDateRange component to mention the change from original configuration to the newer configuration --- .../content-services/components/search-date-range.component.md | 3 +++ docs/versionIndex.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/content-services/components/search-date-range.component.md b/docs/content-services/components/search-date-range.component.md index b19d3cc042e..6370579e4c7 100644 --- a/docs/content-services/components/search-date-range.component.md +++ b/docs/content-services/components/search-date-range.component.md @@ -11,6 +11,9 @@ Represents a date range component for the [SearchDateRangeTabbedComponent](searc ![Date Range Widget](../../docassets/images/search-date-range.png) +NOTE: As of v6.4.0, the settings configuration for the SearchDateRangeComponent have changed. If you have been using this component since +before that release, please ensure that your component configuration is updated according to the new settings listed below. + ## Basic usage ```html diff --git a/docs/versionIndex.md b/docs/versionIndex.md index 508a0a902cc..5eec057894a 100644 --- a/docs/versionIndex.md +++ b/docs/versionIndex.md @@ -385,7 +385,7 @@ backend services have been tested with each released version of ADF. - [Info drawer tab component](core/components/info-drawer-tab.component.md) - [Node permission dialog service](content-services/services/node-permission-dialog.service.md) - [Search check list component](content-services/components/search-check-list.component.md) -- Search date range component +- [Search date range component](content-services/components/search-date-range.component.md) - [Search filter service](content-services/services/search-filter.service.md) - [Search number range component](content-services/components/search-number-range.component.md) - [Search radio component](content-services/components/search-radio.component.md) From cbbaa3f6b143852b3a1def3324ed0ad0b17db351 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 1 Nov 2023 14:56:54 +0530 Subject: [PATCH 15/25] [ACS-6107] Corrected wrong version in documentation --- docs/content-services/components/search-date-range.component.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content-services/components/search-date-range.component.md b/docs/content-services/components/search-date-range.component.md index 6370579e4c7..537b56f1c27 100644 --- a/docs/content-services/components/search-date-range.component.md +++ b/docs/content-services/components/search-date-range.component.md @@ -11,7 +11,7 @@ Represents a date range component for the [SearchDateRangeTabbedComponent](searc ![Date Range Widget](../../docassets/images/search-date-range.png) -NOTE: As of v6.4.0, the settings configuration for the SearchDateRangeComponent have changed. If you have been using this component since +NOTE: As of v6.5.0, the settings configuration for the original SearchDateRangeComponent have changed. If you have been using this component since before that release, please ensure that your component configuration is updated according to the new settings listed below. ## Basic usage From d617fcb704d5971fece95d79ca6ba5c719f79032 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Tue, 5 Dec 2023 14:53:56 +0530 Subject: [PATCH 16/25] [ci:force] From c32ed62ac56ed14ddcc6577948a4a3d465a05804 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Tue, 5 Dec 2023 15:15:27 +0530 Subject: [PATCH 17/25] [ACS-6107] Removed unneeded file --- .../search-date-range/search-date-range.component.spec.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts 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 e69de29bb2d..00000000000 From 35735765c83fdd746d3184a7da170a06ce9e0c53 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Tue, 5 Dec 2023 15:39:45 +0530 Subject: [PATCH 18/25] [ACS-6107] Updated unit tests and mock data after rebase --- lib/content-services/src/lib/mock/search-filter-mock.ts | 5 ++++- .../search-datetime-range.component.spec.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/content-services/src/lib/mock/search-filter-mock.ts b/lib/content-services/src/lib/mock/search-filter-mock.ts index 7baef06f3f7..d16cbb94714 100644 --- a/lib/content-services/src/lib/mock/search-filter-mock.ts +++ b/lib/content-services/src/lib/mock/search-filter-mock.ts @@ -375,7 +375,10 @@ export const searchFilter = { selector: 'date-range', settings: { field: 'cm:created', - dateFormat: 'DD-MMM-YY' + dateFormat: 'DD-MMM-YY', + displayedLabelsByField: { + 'cm:created': 'Created Date (range)' + } } } }, diff --git a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts index 62a7b89e06c..34c82d14e30 100644 --- a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts @@ -180,7 +180,7 @@ describe('SearchDatetimeRangeComponent', () => { to: toInGmt }, true); - const expectedQuery = `cm:created:['2021-02-24T15:00:00.000Z' TO '2021-02-28T13:00:59.000Z']`; + const expectedQuery = `cm:created:['2021-02-24T20:30:00.000Z' TO '2021-02-28T18:30:59.000Z']`; expect(context.queryFragments[component.id]).toEqual(expectedQuery); expect(context.update).toHaveBeenCalled(); From 5859ada9211f36999231e92874c000f04a9d4777 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Tue, 5 Dec 2023 16:08:47 +0530 Subject: [PATCH 19/25] [ci:force] From 9b6626b6563b30fcc3dcf15b86eb10ee3386b00d Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Tue, 5 Dec 2023 17:10:10 +0530 Subject: [PATCH 20/25] [ACS-6107] Revert unneeded change. Remove unneeded file --- .../search-datetime-range.component.spec.ts | 2 +- .../content-services/pages/search/date-range-filter.page.ts | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 lib/testing/src/lib/protractor/content-services/pages/search/date-range-filter.page.ts diff --git a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts index 34c82d14e30..62a7b89e06c 100644 --- a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts @@ -180,7 +180,7 @@ describe('SearchDatetimeRangeComponent', () => { to: toInGmt }, true); - const expectedQuery = `cm:created:['2021-02-24T20:30:00.000Z' TO '2021-02-28T18:30:59.000Z']`; + const expectedQuery = `cm:created:['2021-02-24T15:00:00.000Z' TO '2021-02-28T13:00:59.000Z']`; expect(context.queryFragments[component.id]).toEqual(expectedQuery); expect(context.update).toHaveBeenCalled(); 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 e69de29bb2d..00000000000 From 14fdee8c297352ac16631f3f7eee0213d3e5e9af Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 6 Dec 2023 13:07:17 +0530 Subject: [PATCH 21/25] [ci:force] From 821dbc9a58ca51038621117678abc841fa1609d8 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 6 Dec 2023 15:25:57 +0530 Subject: [PATCH 22/25] [ACS-6107] Updated E2E search config --- e2e/search/search.config.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/e2e/search/search.config.ts b/e2e/search/search.config.ts index aa2c946d82c..bdc4dce6cc1 100644 --- a/e2e/search/search.config.ts +++ b/e2e/search/search.config.ts @@ -155,7 +155,10 @@ export class SearchConfiguration { selector: 'date-range', settings: { field: 'cm:created', - dateFormat: 'DD-MMM-YY' + dateFormat: 'DD-MMM-YY', + displayedLabelsByField: { + 'cm:created': 'Created Date' + } } } }, From 7bef1eba836dd9e74e52421b34209ca343bebf61 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 6 Dec 2023 15:27:37 +0530 Subject: [PATCH 23/25] [ci:force] From 79b0c7060f5f42f6fdff912683f52755e2071720 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 6 Dec 2023 16:15:15 +0530 Subject: [PATCH 24/25] [ACS-6107] Updated E2E expects after component changes --- e2e/search/components/search-radio.e2e.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/e2e/search/components/search-radio.e2e.ts b/e2e/search/components/search-radio.e2e.ts index 5d7e2e17253..a5cff1f4753 100644 --- a/e2e/search/components/search-radio.e2e.ts +++ b/e2e/search/components/search-radio.e2e.ts @@ -155,7 +155,7 @@ describe('Search Radio Component', () => { await searchFiltersPage.clickTypeFilterHeader(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(13); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(16); await navigationBarPage.navigateToContentServices(); @@ -170,7 +170,7 @@ describe('Search Radio Component', () => { await searchFiltersPage.clickTypeFilterHeader(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(13); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(16); await navigationBarPage.navigateToContentServices(); jsonFile.categories[5].component.settings.pageSize = 9; @@ -184,7 +184,7 @@ describe('Search Radio Component', () => { await searchFiltersPage.clickTypeFilterHeader(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(12); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(15); await searchFiltersPage.typeFiltersPage().checkShowMoreButtonIsDisplayed(); await searchFiltersPage.typeFiltersPage().checkShowLessButtonIsNotDisplayed(); @@ -213,21 +213,21 @@ describe('Search Radio Component', () => { await searchFiltersPage.clickTypeFilterHeader(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(8); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(11); await searchFiltersPage.typeFiltersPage().checkShowMoreButtonIsDisplayed(); await searchFiltersPage.typeFiltersPage().checkShowLessButtonIsNotDisplayed(); await searchFiltersPage.typeFiltersPage().clickShowMoreButton(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(13); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(16); await searchFiltersPage.typeFiltersPage().checkShowMoreButtonIsNotDisplayed(); await searchFiltersPage.typeFiltersPage().checkShowLessButtonIsDisplayed(); await searchFiltersPage.typeFiltersPage().clickShowLessButton(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(8); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(11); await searchFiltersPage.typeFiltersPage().checkShowMoreButtonIsDisplayed(); await searchFiltersPage.typeFiltersPage().checkShowLessButtonIsNotDisplayed(); @@ -244,21 +244,21 @@ describe('Search Radio Component', () => { await searchFiltersPage.clickTypeFilterHeader(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(8); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(11); await searchFiltersPage.typeFiltersPage().checkShowMoreButtonIsDisplayed(); await searchFiltersPage.typeFiltersPage().checkShowLessButtonIsNotDisplayed(); await searchFiltersPage.typeFiltersPage().clickShowMoreButton(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(13); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(16); await searchFiltersPage.typeFiltersPage().checkShowMoreButtonIsNotDisplayed(); await searchFiltersPage.typeFiltersPage().checkShowLessButtonIsDisplayed(); await searchFiltersPage.typeFiltersPage().clickShowLessButton(); - await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(8); + await expect(await searchFiltersPage.typeFiltersPage().getRadioButtonsNumberOnPage()).toBe(11); await searchFiltersPage.typeFiltersPage().checkShowMoreButtonIsDisplayed(); await searchFiltersPage.typeFiltersPage().checkShowLessButtonIsNotDisplayed(); From e06b83c623d899d1616dd2f132d77ad4e5052333 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 6 Dec 2023 16:19:41 +0530 Subject: [PATCH 25/25] [ci:force]