Fix duplicate fonts in Geonode MapStore Client - GeoStory Edit Mode #9686
Conversation
web/client/configs/localConfig.json
Outdated
| "family": "Times New Roman" | ||
| }, | ||
| { | ||
| "family": "Titillium Web", |
There was a problem hiding this comment.
@mumairr I don't think we want to include Trillium in MapStore. Are you sure about this hardcoded list?
There was a problem hiding this comment.
@giohappy no we don't and we shouldn't. It was merely to support the idea of changes requested in the PR.
Should I remove this?
There was a problem hiding this comment.
@mumairr yes please remove those font in the default configuration, just mention in the PR description to add this to properly test the fixes, thanks
There was a problem hiding this comment.
The font configuration is still here, please restore the localConfig
web/client/configs/localConfig.json
Outdated
| "family": "Times New Roman" | ||
| }, | ||
| { | ||
| "family": "Titillium Web", |
There was a problem hiding this comment.
@mumairr yes please remove those font in the default configuration, just mention in the PR description to add this to properly test the fixes, thanks
| @@ -317,7 +317,8 @@ export default (state = INITIAL_STATE, action) => { | |||
| } | |||
|
|
|||
| if (isArray(oldElement) && isArray(newElement) && mode === "merge") { | |||
| newElement = [ ...oldElement, ...newElement ]; | |||
| // check for options to filter unique options | |||
| newElement = (options?.uniqueByKey) ? uniqBy([ ...oldElement, ...newElement ], options.uniqueByKey) : [...oldElement, ...newElement ]; | |||
There was a problem hiding this comment.
please add also a test for the reducer, thanks
There was a problem hiding this comment.
Got it, working on it.
There was a problem hiding this comment.
I'm not seeing the test in the reducers but a new one in the plugin, please add a new unit test for this case in the reducer https://github.com/geosolutions-it/MapStore2/blob/master/web/client/reducers/__tests__/geostory-test.js
|
Custom fonts removed from localconfig, appended in PR description. Reducer test added for the GeoStory Plugin |
web/client/configs/localConfig.json
Outdated
| "family": "Times New Roman" | ||
| }, | ||
| { | ||
| "family": "Titillium Web", |
There was a problem hiding this comment.
The font configuration is still here, please restore the localConfig
@mumairr please take a look to these comments: |
On it Stefano |
|
test for reducer added, removed from geostory plugin. |
|
@ElenaGallo please test in dev and let us know if we can backport on 2022.02.xx for geonode-mapstore-client, thanks |
|
Test passed, @mumairr please backport on 2022.02.xx for geonode-mapstore-client. Thanks |
|
@ElenaGallo Thanks Elena. @allyoucanmap Stefano, backport PR is available at #9759 |
Description
Please check if the PR fulfills these requirements
What kind of change does this PR introduce? (check one with "x", remove the others)
Issue
What is the current behavior?
Fix GeoNode/geonode-mapstore-client#1593
What is the new behavior?
When passing custom fonts, an object with unique identifier is passed to check & restrict duplicate entries inside GeoStory plugin in edit mode
Breaking change
Does this PR introduce a breaking change? (check one with "x", remove the other)
Other useful information
Issue was only reproducible on Geonode MapStore Client due to async loading of GeoStory component
Custom fonts should be added to localconfig under GeoStory -> cfg:
{
"name": "GeoStory",
"cfg": {
"fontFamilies": [
{
"family": "Arial"
},
{
"family": "Georgia"
},
{
"family": "Impact"
},
{
"family": "Tahoma"
},
{
"family": "Times New Roman"
},
{
"family": "Titillium Web",
"src": "https://fonts.googleapis.com/css2?family=Titillium+Web"
},
{
"family": "Verdana"
}
]
}
}