Skip to content

Commit

Permalink
Merge pull request #16 from eea/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
tiberiuichim authored Jan 6, 2023
2 parents 92cb41d + 0de4fe1 commit 01b788a
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 6 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### [1.0.2](https://github.com/eea/volto-globalsearch/compare/1.0.1...1.0.2) - 29 December 2022

#### :hammer_and_wrench: Others

- Revert "Automated release 1.0.2" [Alin Voinea - [`2164d79`](https://github.com/eea/volto-globalsearch/commit/2164d798ab3a71fca4769a37aa0f9116f032c16a)]
- Tweak Published filter [Tiberiu Ichim - [`8e4bafa`](https://github.com/eea/volto-globalsearch/commit/8e4bafa53658b84fac3cc5434680128d891ab427)]
- Make last 2 years default [Tiberiu Ichim - [`ff765e2`](https://github.com/eea/volto-globalsearch/commit/ff765e24a1d93c60f091aeffa7c3156d8fb98e49)]
- Add compact listing, placeholder for now [Tiberiu Ichim - [`3f6104f`](https://github.com/eea/volto-globalsearch/commit/3f6104fb1725f7e3c22736a30629f64e4882242a)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`8120264`](https://github.com/eea/volto-globalsearch/commit/812026495c31b272e6ae6415642cf1a6b2f783cf)]
- yarn 3 [Alin Voinea - [`b61ad50`](https://github.com/eea/volto-globalsearch/commit/b61ad5075a79bebfce1044a6cd4978c92d98fbdc)]
### [1.0.1](https://github.com/eea/volto-globalsearch/compare/1.0.0...1.0.1) - 16 November 2022

#### :hammer_and_wrench: Others
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pipeline {
NAMESPACE = "@eeacms"
SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,circularity.eea.europa.eu"
DEPENDENCIES = ""
VOLTO = "alpha"
VOLTO = ""
}

stages {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-globalsearch",
"version": "1.0.1",
"version": "1.0.2",
"description": "@eeacms/volto-globalsearch: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand All @@ -21,12 +21,12 @@
"@eeacms/volto-listing-block"
],
"dependencies": {
"@eeacms/volto-searchlib": "*",
"@eeacms/volto-listing-block": "*"
"@eeacms/volto-listing-block": "*",
"@eeacms/volto-searchlib": "*"
},
"devDependencies": {
"@plone/scripts": "*",
"@cypress/code-coverage": "^3.10.0",
"@plone/scripts": "*",
"babel-plugin-transform-class-properties": "^6.24.1",
"md5": "^2.3.0"
},
Expand Down
3 changes: 2 additions & 1 deletion src/config/facets.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ const facets = [
dateRangeFacet({
field: 'issued.date',
label: ' ',
activeFilterLabel: 'Published',
isFilter: true, // filters don't need facet options to show up
showInFacetsList: false,
showInSecondaryFacetsList: true,
Expand All @@ -234,7 +235,7 @@ const facets = [
],
factory: 'DropdownRangeFilter',
default: {
values: ['All time'],
values: ['Last 2 years'],
type: 'any',
},
}),
Expand Down
25 changes: 25 additions & 0 deletions src/config/views.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,19 @@ export default {
item: 'CardItem',
},
},
{
id: 'compactListing',
title: 'Compact listing',
icon: 'th',
render: null,
isDefault: false,
factories: {
view: 'HorizontalCard.Group',
item: 'HorizontalCardItem',
},
},
],

cardViewParams: {
urlField: 'about',
titleField: 'title',
Expand All @@ -51,6 +63,19 @@ export default {
clusterIcons,
},

compactListingViewParams: {
urlField: 'about',
titleField: 'title',
metatypeField: 'objectProvides',
descriptionField: 'description',
tagsField: 'topic',
issuedField: 'issued',
enabled: false,
getThumbnailUrl: 'getGlobalsearchThumbUrl',
getIconUrl: 'getGlobalsearchIconUrl',
clusterIcons,
},

initialView: {
factory: 'TilesLandingPage',
tilesLandingPageParams: {
Expand Down

0 comments on commit 01b788a

Please sign in to comment.