Skip to content

Commit

Permalink
Added dashboard, widgets, timeline and updated revision with new cata…
Browse files Browse the repository at this point in the history
…log (geosolutions-it#31)

* Added dashboard, widgets, timeline and updated revision with new catalog ui

* added dct temporal metadata for csw

* update config for dashboard catalog service

* updating mapstore2 revision

* removed use cors for "http://datigis.comune.fi.it"
  • Loading branch information
MV88 authored and Tobia Di Pisa committed Jun 25, 2019
1 parent 346b85f commit 071063a
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ backend/.project
backend/.settings
libs/Cesium/
web/src/main/webapp/WEB-INF/classes/geostore-spring-security.xml
web/ldap.properties
2 changes: 1 addition & 1 deletion MapStore2
Submodule MapStore2 updated 50 files
+17,345 −0 package-lock.json
+20 −1 web/client/actions/__tests__/catalog-test.js
+33 −0 web/client/actions/__tests__/controls-test.js
+1 −1 web/client/actions/__tests__/mapInfo-test.js
+57 −75 web/client/actions/catalog.js
+23 −2 web/client/actions/controls.js
+1 −1 web/client/actions/mapInfo.js
+201 −86 web/client/components/catalog/Catalog.jsx
+5 −4 web/client/components/catalog/RecordGrid.jsx
+136 −101 web/client/components/catalog/RecordItem.jsx
+9 −4 web/client/components/catalog/SharingLinks.jsx
+271 −162 web/client/components/catalog/__tests__/RecordItem-test.jsx
+ web/client/components/catalog/img/default.jpg
+2 −2 web/client/components/layout/BorderLayout.jsx
+45 −23 web/client/components/misc/cardgrids/SideCard.jsx
+25 −0 web/client/components/misc/cardgrids/__tests__/SideCard-test.jsx
+7 −3 web/client/components/misc/switch/SwitchPanel.jsx
+55 −0 web/client/components/misc/switch/SwitchToolbar.jsx
+6 −1 web/client/components/misc/switch/__tests__/SwitchPanel-test.jsx
+42 −0 web/client/components/misc/switch/__tests__/SwitchToolbar-test.jsx
+39 −38 web/client/components/misc/toolbar/Toolbar.jsx
+23 −1 web/client/epics/__tests__/maplayout-test.js
+3 −3 web/client/epics/maplayout.js
+1 −1 web/client/plugins/Annotations.jsx
+30 −15 web/client/plugins/MetadataExplorer.jsx
+0 −6 web/client/plugins/metadataexplorer/css/style.css
+72 −3 web/client/reducers/__tests__/catalog-test.js
+40 −9 web/client/reducers/catalog.js
+6 −1 web/client/reducers/controls.js
+11 −1 web/client/selectors/__tests__/locale-test.js
+1 −0 web/client/selectors/catalog.js
+3 −1 web/client/selectors/locale.js
+638 −0 web/client/test-resources/wmts/GetCapabilities-1.0.0_gs_2.15.xml
+456 −0 web/client/test-resources/wmts/GetCapabilities-rest.xml
+15 −0 web/client/themes/default/less/annotations.less
+50 −128 web/client/themes/default/less/catalog.less
+29 −8 web/client/themes/default/less/sidegrid.less
+10 −0 web/client/translations/data.de-DE
+10 −0 web/client/translations/data.en-US
+10 −0 web/client/translations/data.es-ES
+10 −1 web/client/translations/data.fr-FR
+10 −0 web/client/translations/data.hr-HR
+10 −0 web/client/translations/data.it-IT
+11 −1 web/client/translations/data.nl-NL
+10 −0 web/client/translations/data.pt-PT
+10 −0 web/client/translations/data.zh-ZH
+97 −44 web/client/utils/CatalogUtils.js
+52 −8 web/client/utils/TemplateUtils.js
+190 −0 web/client/utils/__tests__/CatalogUtils-test.js
+54 −7 web/client/utils/__tests__/TemplateUtils-test.js
4 changes: 4 additions & 0 deletions js/appConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ module.exports = {
name: "mapviewer",
path: "/viewer/:mapType/:mapId",
component: require('../MapStore2/web/client/product/pages/MapViewer')
}, {
name: "dashboard",
path: "/dashboard",
component: require('../MapStore2/web/client/product/pages/Dashboard')
}, {
name: "manager",
path: "/manager",
Expand Down
8 changes: 8 additions & 0 deletions js/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ module.exports = {
MapFooterPlugin: require('../MapStore2/web/client/plugins/MapFooter'),
AnnotationsPlugin: require('../MapStore2/web/client/plugins/Annotations'),
DetailsPlugin: require('../MapStore2/web/client/plugins/Details'),
Dashboard: require('../MapStore2/web/client/plugins/Dashboard'),
DashboardEditor: require('../MapStore2/web/client/plugins/DashboardEditor'),
WidgetsPlugin: require('../MapStore2/web/client/plugins/Widgets'),
WidgetsTrayPlugin: require('../MapStore2/web/client/plugins/WidgetsTray'),
WidgetsBuilderPlugin: require('../MapStore2/web/client/plugins/WidgetsBuilder'),
TimelinePlugin: require('../MapStore2/web/client/plugins/Timeline'),
FeedbackMaskPlugin: require('../MapStore2/web/client/plugins/FeedbackMask'),
NavMenu: require('../MapStore2/web/client/product/plugins/NavMenu'),
TOCItemsSettingsPlugin: require('../MapStore2/web/client/plugins/TOCItemsSettings')
},
requires: {
Expand Down
62 changes: 57 additions & 5 deletions localConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"http://sr-vm113-sitgn1",
"http://sr-vm277-sitgn2",
"http://datigis.comune.intranet",
"http://datigis.comune.fi.it",
"http://datigis2.comune.intranet"]
},
"geoStoreUrl": "/mapstore2/rest/geostore/",
Expand Down Expand Up @@ -371,7 +370,11 @@
"declineUrl" : "http://www.google.com"
}
},
"OmniBar", "Login", "Save", "SaveAs", "BurgerMenu", "Expander", "Undo", "Redo", "SearchServicesConfig", "ShapeFile"
"OmniBar", "Login", "Save", "SaveAs", "BurgerMenu", "Expander", "Undo", "Redo", "SearchServicesConfig", "ShapeFile",
"WidgetsBuilder", "Widgets", "WidgetsTray",
"Timeline",
"Playback",
"FeedbackMask"
],
"embedded": [{
"name": "Map",
Expand Down Expand Up @@ -473,7 +476,8 @@
}
}
}, "Cookie",
"OmniBar"
"OmniBar",
"FeedbackMask"
],
"common": [{
"name": "OmniBar",
Expand All @@ -490,8 +494,7 @@
{
"name": "CreateNewMap",
"cfg": {
"allowedRoles": ["ADMIN"],
"showNewDashboard": false
"allowedRoles": ["ADMIN"]
}
},
{
Expand All @@ -502,13 +505,62 @@
"limit": 12
}
}
}, {
"name": "Dashboards",
"cfg": {
"mapsOptions": {
"start": 0,
"limit": 12
},
"fluid": true
}
}, "Footer", {
"name": "Cookie",
"cfg": {
"externalCookieUrl" : "",
"declineUrl" : "http://www.google.com"
}
}],
"dashboard": [{
"name": "OmniBar",
"cfg": {
"containerPosition": "header",
"className": "navbar shadow navbar-home"
}
}, "Login", "Language", "NavMenu", "Attribution", "Home", {
"name": "DashboardEditor",
"cfg": {
"catalog": {
"url": "http://datigis.comune.fi.it/geoserver/csw",
"type": "csw",
"title": "GeoServer ComuneFI CSW",
"autoload": true
},
"containerPosition": "columns"
}
}, {
"name": "QueryPanel",
"cfg": {
"toolsOptions": {
"hideCrossLayer": true,
"hideSpatialFilter": true
},
"containerPosition": "columns"
}
}, "BurgerMenu", "Dashboard", "Notifications", {
"name": "Tutorial",
"cfg": {
"allowClicksThruHole": false,
"containerPosition": "header",
"preset": "dashboard_tutorial"
}
},
{
"name": "FeedbackMask",
"cfg": {
"containerPosition": "header"
}
}],
"manager": ["Header", "Redirect", "Manager", "Home", "UserManager", "GroupManager", "Footer"]
}
}

0 comments on commit 071063a

Please sign in to comment.