Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACS-5170] Change some facets to filters #3256

Merged
merged 3 commits into from
Jun 7, 2023
Merged

[ACS-5170] Change some facets to filters #3256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dc91c5
[ACS-5170] Change some facets to filters
MichalKinas Jun 6, 2023
ea5c82c
[ACS-5170] Remove unused translations
MichalKinas Jun 6, 2023
0427e68
[ACS-5170] Exclude e2es that will be fixed along with advanced search…
MichalKinas Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion e2e/protractor.excludes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,22 @@
"C213134": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
"C286252": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
"C284666": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
"C286269": "temp, see https://alfresco.atlassian.net/browse/ACS-5189"
"C286269": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
"C279186": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
"C279230": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
"C279231": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
"C279232": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
"C279233": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
"C279191": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
"C279192": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
"C279193": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
"C279195": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
"C280051": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
"C280052": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
"C279188": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
"C308042": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
"C279219": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
"C279221": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
"C279220": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
"C325006": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985"
}
180 changes: 78 additions & 102 deletions projects/aca-content/assets/app.extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,16 +1391,6 @@
"facetFields": {
"expanded": true,
"fields": [
{
"mincount": 1,
"field": "content.mimetype",
"label": "SEARCH.FACET_FIELDS.FILE_TYPE",
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"facetOrder": 100
}
},
{
"mincount": 1,
"field": "creator",
Expand All @@ -1420,70 +1410,9 @@
"hideDefaultAction": true,
"facetOrder": 300
}
},
{
"mincount": 1,
"field": "SITE",
"label": "SEARCH.FACET_FIELDS.LOCATION",
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"facetOrder": 400
}
},
{
"mincount": 1,
"field": "TAG",
"label": "Tags",
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"facetOrder": 600
}
},
{
"mincount": 1,
"field": "cm:categories",
"label": "SEARCH.FACET_FIELDS.CATEGORIES",
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"facetOrder": 700
}
}
]
},
"facetQueries": {
"label": "SEARCH.CATEGORIES.MODIFIED_DATE",
"expanded": true,
"queries": [
{
"label": "SEARCH.FACET_QUERIES.TODAY",
"query": "cm:modified:[TODAY to TODAY]"
},
{
"label": "SEARCH.FACET_QUERIES.THIS_WEEK",
"query": "cm:modified:[NOW/DAY-7DAYS TO NOW/DAY+1DAY]"
},
{
"label": "SEARCH.FACET_QUERIES.THIS_MONTH",
"query": "cm:modified:[NOW/DAY-1MONTH TO NOW/DAY+1DAY]"
},
{
"label": "SEARCH.FACET_QUERIES.LAST_6_MONTHS",
"query": "cm:modified:[NOW/DAY-6MONTHS TO NOW/DAY+1DAY]"
},
{
"label": "SEARCH.FACET_QUERIES.THIS_YEAR",
"query": "cm:modified:[NOW/DAY-1YEAR TO NOW/DAY+1DAY]"
}
],
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"facetOrder": 500
}
},
"categories": [
{
"id": "logic",
Expand Down Expand Up @@ -1542,6 +1471,69 @@
"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"
}
}
},
{
"id": "fileType",
"name": "SEARCH.FACET_FIELDS.FILE_TYPE",
"component": {
"selector": "",
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"field": "content.mimetype"
}
}
},
{
"id": "location",
"name": "SEARCH.FACET_FIELDS.LOCATION",
"component": {
"selector": "",
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"field": "SITE"
}
}
},
{
"id": "tag",
"name": "Tags",
"component": {
"selector": "",
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"field": "TAG"
}
}
},
{
"id": "categories",
"name": "SEARCH.FACET_FIELDS.CATEGORIES",
"component": {
"selector": "",
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true,
"field": "cm:categories"
}
}
}
]
},
Expand Down Expand Up @@ -1787,39 +1779,8 @@
"hideDefaultAction": true
}
}

]
},
"facetQueries": {
"label": "SEARCH.CATEGORIES.MODIFIED_DATE",
"expanded": true,
"queries": [
{
"label": "SEARCH.FACET_QUERIES.TODAY",
"query": "cm:modified:[TODAY to TODAY]"
},
{
"label": "SEARCH.FACET_QUERIES.THIS_WEEK",
"query": "cm:modified:[NOW/DAY-7DAYS TO NOW/DAY+1DAY]"
},
{
"label": "SEARCH.FACET_QUERIES.THIS_MONTH",
"query": "cm:modified:[NOW/DAY-1MONTH TO NOW/DAY+1DAY]"
},
{
"label": "SEARCH.FACET_QUERIES.LAST_6_MONTHS",
"query": "cm:modified:[NOW/DAY-6MONTHS TO NOW/DAY+1DAY]"
},
{
"label": "SEARCH.FACET_QUERIES.THIS_YEAR",
"query": "cm:modified:[NOW/DAY-1YEAR TO NOW/DAY+1DAY]"
}
],
"settings": {
"allowUpdateOnChange": false,
"hideDefaultAction": true
}
},
"categories": [
{
"id": "logic",
Expand Down Expand Up @@ -1849,6 +1810,21 @@
}
}
},
{
"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"
}
}
},
{
"id": "effectivnessFrom",
"name": "SEARCH.CATEGORIES.EFFECTIVITY_FROM",
Expand Down
7 changes: 0 additions & 7 deletions projects/aca-content/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,13 +569,6 @@
"EFFECTIVITY_TO": "Effectivity to",
"LOGIC": "Logic"
},
"FACET_QUERIES": {
"TODAY": "Today",
"THIS_WEEK": "This week",
"THIS_MONTH": "This month",
"LAST_6_MONTHS": "In the last 6 months",
"THIS_YEAR": "This year"
},
"SEARCH_HEADER" : {
"TITLE":"Filter",
"TYPE": "Type",
Expand Down