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

Sync Fork Updates -10.17.24 #11

Merged
merged 17 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
7 changes: 6 additions & 1 deletion .github/ISSUE_TEMPLATE/release_steps.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ This steps have to be followed always when preparing a new release.
- [ ] for `geostore`, check if [here](https://maven.geo-solutions.it/it/geosolutions/geostore/geostore-webapp/) is present the version specified. Release procedure is specified in the [Readme.md](https://github.com/geosolutions-it/geostore) file of the project.
- [ ] for `http_proxy`, check if [here](https://maven.geo-solutions.it/proxy/http_proxy/) is present the version specified. Release procedure is specified in the [Readme.md](https://github.com/geosolutions-it/http-proxy) file of the project.
- [ ] for `mapfish-print` check if [here](https://maven.geo-solutions.it/proxy/http_proxy/) is present the version specified. Release procedure is specified in the [Readme.md](https://github.com/geosolutions-it/mapfish-print) file of the project.
- [ ] Check if dependencies of MapStore libraries and geostore libraries are the same (compare `src/pom.xml` in geostore e `pom.xml` in MapStore).

## New stable branch creation

Expand All @@ -42,7 +43,11 @@ This steps have to be followed always when preparing a new release.
- [ ] Check `pom.xml` dependencies are all in fixed stable versions ( no `-SNAPSHOT` usage release). If not, You use the action [`Update dependencies versions`](https://github.com/geosolutions-it/MapStore2/actions/workflows/update_dependencies_versions.yml) to fix them, setting:
- [ ] the branch to `YYYY.XX.xx`
- [ ] the of geostore, http_proxy and mapfish-print versions accordingly with the [MapStore release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars)
- [ ] Check that [MapStoreExtension](https://github.com/geosolutions-it/MapStoreExtension) repository is aligned and working
- [ ] Check that [MapStoreExtension](https://github.com/geosolutions-it/MapStoreExtension) repository is aligned and working.
- [ ] Run the [Submodule Update](https://github.com/geosolutions-it/MapStoreExtension/actions/workflows/submodules_update.yml) of [MapStoreExtension](https://github.com/geosolutions-it/MapStoreExtension) to generate the `SampleExtension.zip` to use for testing.
- [ ] Use workflow from `YYYY.XX.xx` branch
- [ ] Wait for completition
- [ ] Download the `Artifacts.zip` that contains `SampleExtension.zip` from the execution of the `checks` action on the branch `YYYY.XX.xx`. This can be used for tests.
- [ ] Test on QA [https://qa-mapstore.geosolutionsgroup.com/mapstore/](https://qa-mapstore.geosolutionsgroup.com/mapstore/)
- [ ] Test **everything**, not only the new features
- [ ] Test the creation of a standard project starting in from the stable branch and with the internal backend, so:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## [2024.02.00](https://github.com/geosolutions-it/MapStore2/tree/v2024.02.00) (2024-10-7)

- **[Full Changelog](https://github.com/geosolutions-it/MapStore2/compare/v2024.01.02...v2024.02.00)**
- **[Implemented enhancements](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222024.02.00%22+is%3Aclosed+label%3Aenhancement)**
- **[Fixed bugs](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222024.02.00%22+is%3Aclosed+label%3Abug)**
- **[Closed issues](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222024.02.00%22+is%3Aclosed)**

## [2024.01.02](https://github.com/geosolutions-it/MapStore2/tree/v2024.01.02) (2024-7-10)

- **[Full Changelog](https://github.com/geosolutions-it/MapStore2/compare/v2024.01.01...v2024.01.02)**
Expand Down
12 changes: 1 addition & 11 deletions build/docma-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,9 @@
"web/client/components/data/featuregrid/editors/NumberEditor.jsx",
"web/client/components/data/identify/GeocodeViewer.jsx",
"web/client/components/data/identify/IdentifyContainer.jsx",
"web/client/components/data/query/AutocompleteField.jsx",
"web/client/components/data/query/AutocompleteFieldHOC.jsx",
"web/client/components/map/leaflet/DrawSupport.jsx",
"web/client/components/plugins/PluginsContainer.jsx",
"web/client/components/mapcontrols/annotations/Annotations.jsx",
"web/client/components/mapcontrols/annotations/AnnotationsEditor.jsx",
"web/client/components/mapcontrols/annotations/AnnotationsConfig.js",
"web/client/components/misc/cardgrids/SideCard.jsx",
"web/client/components/misc/cardgrids/SideGrid.jsx",
"web/client/components/misc/enhancers/emptyState.jsx",
Expand All @@ -135,7 +132,6 @@
"web/client/components/misc/panels/DockablePanel.jsx",
"web/client/components/misc/panels/DockPanel.jsx",
"web/client/components/misc/panels/PanelHeader.jsx",
"web/client/components/misc/sidebar/Sidebar.jsx",
"web/client/components/misc/toolbar/Toolbar.jsx",
"web/client/components/misc/transfer/Transfer.jsx",
"web/client/components/misc/EmptyView.jsx",
Expand All @@ -152,7 +148,6 @@
"web/client/actions/index.jsdoc",
"web/client/actions/controls.js",
"web/client/actions/fullscreen.js",
"web/client/actions/globeswitcher.js",
"web/client/actions/maplayout.js",
"web/client/actions/map.js",
"web/client/actions/maps.js",
Expand All @@ -171,7 +166,6 @@
"web/client/reducers/index.jsdoc",
"web/client/reducers/controls.js",
"web/client/reducers/featuregrid.js",
"web/client/reducers/globeswitcher.js",
"web/client/reducers/mapInfo.js",
"web/client/reducers/maps.js",
"web/client/reducers/maptype.js",
Expand All @@ -186,7 +180,6 @@
"web/client/epics/featuregrid.js",
"web/client/epics/feedbackMask.js",
"web/client/epics/fullscreen.js",
"web/client/epics/globeswitcher.js",
"web/client/epics/maplayout.js",
"web/client/epics/maptype.js",
"web/client/epics/notifications.js",
Expand Down Expand Up @@ -270,8 +263,6 @@
"web/client/plugins/MapTemplates.jsx",
"web/client/plugins/MapViews.jsx",
"web/client/plugins/Measure.jsx",
"web/client/plugins/MeasurePanel.jsx",
"web/client/plugins/MeasureResults.jsx",
"web/client/plugins/MediaEditor.jsx",
"web/client/plugins/MetadataExplorer.jsx",
"web/client/plugins/MetadataInfo/index.jsx",
Expand Down Expand Up @@ -306,7 +297,6 @@
"web/client/plugins/Tutorial.jsx",
"web/client/plugins/UserExtensions.jsx",
"web/client/plugins/UserSession.jsx",
"web/client/plugins/Version.jsx",
"web/client/plugins/LayerDownload.jsx",
"web/client/plugins/Widgets.jsx",
"web/client/plugins/WidgetsBuilder.jsx",
Expand Down
2 changes: 1 addition & 1 deletion docs/developer-guide/integrations/users/openId.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ oidcOAuth2Config.internalRedirectUri=http://localhost:8080/mapstore
- `oidcOAuth2Config.globalLogoutEnabled`: (*optional*): if true (and the server supports it) invokes global logout on MapStore logout

!!! note
The `rolesClaim` and `groupsClaim` are optional. If you don't need to map roles or groups, you can omit them. At the moment, there is no mapping for roles and groups for the generic OIDC provider. If you need to map roles and groups, you can use the `keycloak` provider.
The only mandatory claim is the `email` or what you indicated in `oidcOAuth2Config.principalKey`. The `rolesClaim` and `groupsClaim` configurations are optional. If you don't need to map roles or groups, you can omit them. At the moment, there is no mapping for roles and groups for the generic OIDC provider. If you need to map roles and groups, you can use the `keycloak` provider.

#### Configure the MapStore front-end

Expand Down
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@
"@turf/point-on-surface": "4.1.0",
"@turf/polygon-to-linestring": "4.1.0",
"@znemz/cesium-navigation": "4.0.0",
"ag-grid-community": "20.2.0",
"ag-grid-react": "20.2.0",
"assert": "2.0.0",
"axios": "0.28.1",
"b64-to-blob": "1.2.19",
Expand All @@ -166,7 +164,6 @@
"chroma-js": "1.3.7",
"classnames": "2.2.5",
"codemirror": "5.65.16",
"colorbrewer": "1.0.0",
"concurrently": "6.4.0",
"connected-react-router": "6.3.2",
"d3-format": "3.1.0",
Expand Down Expand Up @@ -197,10 +194,8 @@
"intersection-observer": "0.7.0",
"intl": "1.2.2",
"ismobilejs": "0.5.0",
"istanbul-instrumenter-loader": "3.0.1",
"json-2-csv": "5.5.1",
"jsonlint-mod": "1.7.5",
"jsonpath": "1.1.1",
"jszip": "3.10.1",
"leaflet": "1.3.1",
"leaflet-draw": "1.0.2",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<ehcache-web.version>2.0.4</ehcache-web.version>
<commons-pool.version>1.5.4</commons-pool.version>
<jaxws-api.version>2.3.1</jaxws-api.version>
<spring.security.version>5.6.12</spring.security.version>
<spring.security.version>5.7.12</spring.security.version>
<log4j-version>2.19.0</log4j-version>
<jackson-version>2.16.1</jackson-version>
<json-patch.version>1.12</json-patch.version>
<json-lib.version>2.4.2-geoserver</json-lib.version>
<commons-io.version>2.7</commons-io.version>
<commons-io.version>2.14.0</commons-io.version>
<mime-util.version>2.1.3</mime-util.version>
</properties>

Expand Down
11 changes: 0 additions & 11 deletions project/standard/static/karma.conf.single-run.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,5 @@ module.exports = function karmaConfig(config) {
"@js": path.resolve(__dirname, "js")
}
});
testConfig.webpack.module.rules = [{
test: /\.jsx?$/,
exclude: /(__tests__|node_modules|legacy|libs\\Cesium|libs\\html2canvas)\\|(__tests__|node_modules|legacy|libs\/Cesium|libs\/html2canvas)\/|webpack\.js|utils\/(openlayers|leaflet)/,
enforce: "post",
use: [
{
loader: 'istanbul-instrumenter-loader',
options: { esModules: true }
}
]
}, ...testConfig.webpack.module.rules];
config.set(testConfig);
};
Loading