mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ACS-6107] Replaced SearchDateRange component with SearchDateRangeAdvanced Component (#9023)
* [ACS-6107] Removed date range component from ADF content-services * [ACS-6107] Removed references of date range component in code * [ACS-6107] Updated documentation to replace occurrences of date range component with date-range-advanced-tabbed component * [ACS-6107] Renamed DateRangeAdvanced to DateRange. Renamed DateRangeAdvancedTabbed to DateRangeTabbed * [ACS-6107] Fixed missing export of SearchDateRangeTabbedComponent * [ACS-6107] Replaced occurrences of date-range-advanced with date-range in HTML and Unit Tests automation ids * [ACS-6107] Documentation corrections * [ACS-6107] Reverted unneeded documentation formatting * [ACS-6107] Reverted unneeded documentation formatting * [ACS-6107] Reverted unneeded documentation formatting * [ACS-6107] Migrated unneeded E2E test case to unit test * [ACS-6107] Removed search-date-range E2E * [ACS-6107] Resolved PR comments. Removed date-range-filter.page.ts. Removed unused translation keys. Updated documentation to refer proper comment name * [ACS-6107] Updated documentation for SearchDateRange component to mention the change from original configuration to the newer configuration * [ACS-6107] Corrected wrong version in documentation * [ci:force] * [ACS-6107] Removed unneeded file * [ACS-6107] Updated unit tests and mock data after rebase * [ci:force] * [ACS-6107] Revert unneeded change. Remove unneeded file * [ci:force] * [ACS-6107] Updated E2E search config * [ci:force] * [ACS-6107] Updated E2E expects after component changes * [ci:force]
This commit is contained in:
swapnil-verma-gl
GitHub
@@ -1,107 +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('[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();
|
||||
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);
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -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();
|
||||
|
||||
@@ -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<void> {
|
||||
await this.searchCategoriesPage.checkFilterIsDisplayed(this.createdDateRangeFilter);
|
||||
}
|
||||
|
||||
async clickCreatedRangeFilterHeader(): Promise<void> {
|
||||
await this.searchCategoriesPage.clickFilterHeader(this.createdDateRangeFilter);
|
||||
}
|
||||
|
||||
async checkCreatedRangeFilterIsExpanded(): Promise<void> {
|
||||
await this.searchCategoriesPage.checkFilterIsExpanded(this.createdDateRangeFilter);
|
||||
}
|
||||
|
||||
async checkTypeFilterIsDisplayed(): Promise<void> {
|
||||
await this.searchCategoriesPage.checkFilterIsDisplayed(this.typeFilter);
|
||||
}
|
||||
|
||||
@@ -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'
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -182,7 +185,7 @@ export class SearchConfiguration {
|
||||
name: 'Date',
|
||||
enabled: true,
|
||||
component: {
|
||||
selector: 'date-range-advanced',
|
||||
selector: 'date-range',
|
||||
settings: {
|
||||
dateFormat: 'dd-MMM-yy',
|
||||
maxDate: 'today',
|
||||
|
||||
Reference in New Issue
Block a user