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.

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

#6886: Configurable CSW filters #7220

Merged
merged 4 commits into from Sep 21, 2021

Conversation

dsuren1
Copy link
Contributor

@dsuren1 dsuren1 commented Aug 20, 2021

Description

This PR adds possibility to configure CSW filters from localConfig and from advanced settings of Catalog

Please check if the PR fulfills these requirements

What kind of change does this PR introduce? (check one with "x", remove the others)

  • Enhancement

Issue

What is the current behavior?
#6886 & #7084

What is the new behavior?
The CSW filter is configurable as below

  • staticFilter - filter is always applied, even when search text is NOT PRESENT
  • dynamicFilter - filter is used when search text is PRESENT and is applied in AND with staticFilter. The template is used with ${searchText} placeholder to append search string

Example

{ 
  filter: {
    staticFilter: "<ogc:Or><ogc:PropertyIsEqualTo><ogc:PropertyName>dc:type</ogc:PropertyName><ogc:Literal>dataset</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Or>",
    dynamicFilter: "<ogc:PropertyIsLike wildCard='*' singleChar='_' escapeChar='\\'><ogc:PropertyName>csw:AnyText</ogc:PropertyName><ogc:Literal>${searchText}*</ogc:Literal></ogc:PropertyIsLike>"
  }
}

Note: filter - For both static and dynamic filter, input only xml element contained within ogc:Filter (i.e. Do not enclose the filter value in ogc:Filter)

Breaking change

Does this PR introduce a breaking change? (check one with "x", remove the other)

  • Yes, and I documented them in migration notes
  • No

Other useful information

Copy link
Member

@offtherailz offtherailz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works well. Only one fix:

  • In dashboard, the advanced settings for catalog are shown, but the filter is not used.
CSW_filter_Dashboard.mp4

@offtherailz offtherailz merged commit 68218c3 into geosolutions-it:master Sep 21, 2021
@tdipisa
Copy link
Member

tdipisa commented Sep 22, 2021

@ElenaGallo please test this in DEV and let us know if we can backport to 2021.02.xx

@ElenaGallo
Copy link
Contributor

Test passed, @dsuren1 please backport to 2021.02.xx

dsuren1 added a commit to dsuren1/MapStore2 that referenced this pull request Sep 23, 2021
@offtherailz offtherailz removed the BackportNeeded Commits provided for an issue need to be backported to the milestone's stable branch label Sep 24, 2021
@tdipisa tdipisa linked an issue Sep 27, 2021 that may be closed by this pull request
10 tasks
@tdipisa tdipisa mentioned this pull request Sep 27, 2021
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make the CSW filter configurable
4 participants