mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2026-09-09 18:02:54 +00:00
[ACS-4985] Added configuration to merge created and modified date filters into a single date filter (#3324)
* ACS-4985 Prepared configuration for created and modified dates in search * [ACS-4985] Updated search filter configuration for ACA to include the new SearchDateRangeAdvancedTabbed component * [ACS-4985] Added date-fns adapter to alfresco content app * [ACS-4985] Added failing e2e test cases to protractor.excludes.json * [ACS-4985] Removed unused Created Date/Modified Date entries from i18n files after rebase * [ACS-4985] Removed .env-original (file not required) * [ACS-4985] Updated protractor.excludes.json * [ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix missed test case * Revert "[ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix missed test case" This reverts commitd1cd0ee3de. * [ACS-4985] Empty commit to trigger finalise job * Revert "[ACS-4794] Fix missed test case" This reverts commitd1cd0ee3de. --------- Co-authored-by: Aleksander Sklorz <Aleksander.Sklorz@hyland.com>
This commit is contained in:
co-authored by
Aleksander Sklorz
parent
38d68193bd
commit
174d7b61ee
@@ -1452,32 +1452,19 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "createdDateRange",
|
||||
"name": "SEARCH.CATEGORIES.CREATED_DATE",
|
||||
"id": "createdModifiedDateRange",
|
||||
"name": "SEARCH.CATEGORIES.DATE",
|
||||
"enabled": true,
|
||||
"component": {
|
||||
"selector": "date-range",
|
||||
"selector": "date-range-advanced",
|
||||
"settings": {
|
||||
"allowUpdateOnChange": false,
|
||||
"hideDefaultAction": true,
|
||||
"field": "cm:created",
|
||||
"dateFormat": "DD-MMM-YY",
|
||||
"maxDate": "today"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "modifiedDateRange",
|
||||
"name": "SEARCH.CATEGORIES.MODIFIED_DATE",
|
||||
"enabled": true,
|
||||
"component": {
|
||||
"selector": "date-range",
|
||||
"settings": {
|
||||
"allowUpdateOnChange": false,
|
||||
"hideDefaultAction": true,
|
||||
"field": "cm:modified",
|
||||
"dateFormat": "DD-MMM-YY",
|
||||
"maxDate": "today"
|
||||
"field": "cm:created,cm:modified",
|
||||
"dateFormat": "dd-MMM-yy",
|
||||
"maxDate": "today",
|
||||
"displayedLabelsByField": {
|
||||
"cm:created": "SEARCH.CATEGORIES.DATE_TABS.CREATED",
|
||||
"cm:modified": "SEARCH.CATEGORIES.DATE_TABS.MODIFIED"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -1650,16 +1637,17 @@
|
||||
},
|
||||
{
|
||||
"id": "createdDateRange",
|
||||
"name": "SEARCH.CATEGORIES.CREATED_DATE",
|
||||
"name": "SEARCH.CATEGORIES.DATE",
|
||||
"enabled": true,
|
||||
"component": {
|
||||
"selector": "date-range",
|
||||
"selector": "date-range-advanced",
|
||||
"settings": {
|
||||
"allowUpdateOnChange": false,
|
||||
"hideDefaultAction": true,
|
||||
"field": "cm:created",
|
||||
"dateFormat": "DD-MMM-YY",
|
||||
"maxDate": "today"
|
||||
"dateFormat": "dd-MMM-yy",
|
||||
"maxDate": "today",
|
||||
"displayedLabelsByField": {
|
||||
"cm:created": "SEARCH.CATEGORIES.DATE_TABS.CREATED"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -1785,32 +1773,21 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "createdDateRange",
|
||||
"name": "SEARCH.CATEGORIES.CREATED_DATE",
|
||||
"id": "createdModifiedDateRange",
|
||||
"name": "SEARCH.CATEGORIES.DATE",
|
||||
"enabled": true,
|
||||
"component": {
|
||||
"selector": "date-range",
|
||||
"selector": "date-range-advanced",
|
||||
"settings": {
|
||||
"allowUpdateOnChange": false,
|
||||
"hideDefaultAction": true,
|
||||
"field": "cm:created",
|
||||
"dateFormat": "DD-MMM-YY",
|
||||
"maxDate": "today"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "modifiedDateRange",
|
||||
"name": "SEARCH.CATEGORIES.MODIFIED_DATE",
|
||||
"enabled": true,
|
||||
"component": {
|
||||
"selector": "date-range",
|
||||
"settings": {
|
||||
"allowUpdateOnChange": false,
|
||||
"hideDefaultAction": true,
|
||||
"field": "cm:modified",
|
||||
"dateFormat": "DD-MMM-YY",
|
||||
"maxDate": "today"
|
||||
"field": "cm:created,cm:modified",
|
||||
"dateFormat": "dd-MMM-yy",
|
||||
"maxDate": "today",
|
||||
"displayedLabelsByField": {
|
||||
"cm:created": "SEARCH.CATEGORIES.DATE_TABS.CREATED",
|
||||
"cm:modified": "SEARCH.CATEGORIES.DATE_TABS.MODIFIED"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user