#875: Style fix for card in list page and qgis featuregrid fix (#877)

(cherry picked from commit 467651de02584ac8e7c1b3f8f2e959fd1aa0c849)
regione-piemonte · Mar 17, 2021 · 107feb5 · 107feb5
1 parent 118744f
commit 107feb5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/frontend/assets/css/fullscreen.css b/frontend/assets/css/fullscreen.css
@@ -357,25 +357,25 @@ button.exporter-close.close {
     height: 100%
 }
 
-#fullscreen-container, #qgis-container .panel-primary > .panel-heading {
+#fullscreen-container .panel-primary > .panel-heading, #qgis-container .panel-primary > .panel-heading {
     color: #ffffff;
     background-color: #017f4f!important;
     border-color: #026641!important;
 }
-#fullscreen-container, #qgis-container .btn-default {
+#fullscreen-container .btn-default, #qgis-container .btn-default {
     color: #017f4f;
     background-color: #ffffff;
 }
-#fullscreen-container, #qgis-container .btn-default:hover{
+#fullscreen-container .btn-default:hover, #qgis-container .btn-default:hover{
     color: #017f4f
 }
 
-#fullscreen-container, #qgis-container .btn-primary{
+#fullscreen-container .btn-primary, #qgis-container .btn-primary{
     color: #ffffff;
     background-color: #007e4f;
     border-color: #026641;
 }
-#fullscreen-container, #qgis-container .btn-primary:hover{
+#fullscreen-container .btn-primary:hover, #qgis-container .btn-primary:hover{
     color: #017f4f;
     background-color: #e6e6e6;
     border-color: #adadad;
@@ -392,7 +392,7 @@ button.exporter-close.close {
      background-color: #017f4f;
 }
 
-#fullscreen-container, #qgis-container .rw-i {
+#fullscreen-container .rw-i, #qgis-container .rw-i {
     color: #017f4f !important;
 }
 
@@ -445,3 +445,8 @@ button.exporter-close.close {
     color: #017f4f !important;
     border: 1px solid #017f4f !important;
 }
+
+.label-sira, .value-sira, .ag-overlay-wrapper {
+    color: #000000;
+    font-size: 14px;
+}
diff --git a/frontend/js/components/QGisFeatureGrid.jsx b/frontend/js/components/QGisFeatureGrid.jsx
@@ -29,7 +29,7 @@ const {
 
 require('react-resizable/css/styles.css');
 require('./SiraFeatureGrid.css');
-
+const {setCurrentFeatureRowData} = require('../actions/featuregrid');
 module.exports = connect((state) => {
     const activeConfig = state.siradec.configOggetti[state.siradec.activeFeatureType] || {};
     return {
@@ -62,5 +62,6 @@ module.exports = connect((state) => {
     onQuery: loadFeaturesWithPagination,
     onConfigureQuery: loadGridModelWithPagination,
     cleanError: configureGridError,
-    setExportParams
+    setExportParams,
+    setFeatureRowData: setCurrentFeatureRowData
 })(require('./FeatureGrid'));
diff --git a/frontend/js/stores/qGisStore.js b/frontend/js/stores/qGisStore.js
@@ -10,7 +10,7 @@ const DebugUtils = require('@mapstore/utils/DebugUtils').default;
 const {combineReducers} = require('@mapstore/utils/PluginsUtils');
 const {connectRouter} = require( 'connected-react-router');
 const history  = require( '@mapstore/stores/History').default;
-
+const SiraUtils = require('../utils/SiraUtils');
 const SecurityUtils = require('@mapstore/utils/SecurityUtils');
 const assign = require('object-assign');
 module.exports = (initialState = {defaultState: {}, mobile: {}}, appReducers = {}, plugins) => {
@@ -39,5 +39,6 @@ module.exports = (initialState = {defaultState: {}, mobile: {}}, appReducers = {
     let store;
     store = DebugUtils.createDebugStore(rootReducer, defaultState);
     SecurityUtils.setStore(store);
+    SiraUtils.setStore(store);
     return store;
 };