diff --git a/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx b/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx index 6fa2aee5..23870e63 100644 --- a/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx +++ b/src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx @@ -103,10 +103,36 @@ const waterPollutants = [ }, ]; +const allAirPollutants = airPollutants.map((pol) => pol.key); +const allWaterPollutants = waterPollutants.map((pol) => pol.key); +const allPollutants = [...allAirPollutants, ...allWaterPollutants]; + const pollutants = { - Air: airPollutants, - Water: waterPollutants, - 'Air,Water': [...airPollutants, ...waterPollutants], + Air: [ + { + key: allAirPollutants.join(','), + value: allAirPollutants.join(','), + text: 'All pollutants', + }, + ...airPollutants, + ], + Water: [ + { + key: allWaterPollutants.join(','), + value: allWaterPollutants.join(','), + text: 'All pollutants', + }, + ...waterPollutants, + ], + 'Air,Water': [ + { + key: allPollutants.join(','), + value: allPollutants.join(','), + text: 'All pollutants', + }, + ...airPollutants, + ...waterPollutants, + ], }; // ============== @@ -204,6 +230,9 @@ const components = { if (!search.analysisPollutantType && countryGroups?.[0]?.key) { initialQueryParameters.analysisPollutantType = 'Air'; } + if (!search.analysisPollutant && countryGroups?.[0]?.key) { + initialQueryParameters.analysisPollutant = allAirPollutants.join(','); + } if (Object.keys(initialQueryParameters).length > 0) { setQueryParam({ queryParam: { @@ -298,6 +327,9 @@ const components = { if (!search.analysisPollutantType && countries?.[0]?.key) { initialQueryParameters.analysisPollutantType = 'Air'; } + if (!search.analysisPollutant && countries?.[0]?.key) { + initialQueryParameters.analysisPollutant = allAirPollutants.join(','); + } if (Object.keys(initialQueryParameters).length > 0) { setQueryParam({ queryParam: { diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx index c769fad1..4e1ce5d4 100644 --- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx +++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx @@ -26,8 +26,6 @@ import mapPlaceholder from '~/components/manage/Blocks/DiscodataOpenlayersMapBlo // STYLES import 'ol/ol.css'; import './style.css'; -import { containsExtent } from 'ol/extent'; -import { VOID } from 'ol/functions'; const splitBy = (arr, delimiter) => { if (Array.isArray(arr)) { @@ -69,6 +67,8 @@ let Map, Control, defaultsControls, defaultsInteractions, + containsExtent, + VOID, DragRotateAndZoom; let OL_LOADED = false; @@ -178,6 +178,8 @@ const OpenlayersMapView = (props) => { Control = require('ol/control/Control.js').default; defaultsControls = require('ol/control.js').defaults; defaultsInteractions = require('ol/interaction.js').defaults; + containsExtent = require('ol/extent.js').containsExtent; + VOID = require('ol/functions').VOID; DragRotateAndZoom = require('ol/interaction.js').DragRotateAndZoom; OL_LOADED = true; } @@ -807,7 +809,7 @@ const OpenlayersMapView = (props) => { sitesSource = new VectorSource({ loader: function (extent, resolution, projection) { if (mounted.current && firstFilteringDone.current) { - var url = `https://services.arcgis.com/LcQjj2sL7Txk9Lag/arcgis/rest/services/SiteMap/FeatureServer/0/query/?f=json&returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=${encodeURIComponent( + let url = `https://services.arcgis.com/LcQjj2sL7Txk9Lag/arcgis/rest/services/SiteMap/FeatureServer/0/query/?f=json&returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=${encodeURIComponent( '{"xmin":' + extent[0] + ',"ymin":' + @@ -846,7 +848,7 @@ const OpenlayersMapView = (props) => { if (error) { console.log(error.message); } else { - var features = esrijsonFormat.readFeatures(response, { + let features = esrijsonFormat.readFeatures(response, { featureProjection: projection, }); if (features.length > 0) { @@ -866,16 +868,16 @@ const OpenlayersMapView = (props) => { maxZoom: zoomSwitch, }); - if(this.resolution && this.resolution != resolution){ + if (this.resolution && this.resolution !== resolution) { this.loadedExtentsRtree_.clear(); } - var z = tileGrid.getZForResolution(resolution); - var tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z); + let z = tileGrid.getZForResolution(resolution); + let tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z); /** @type {Array} */ - var extents = []; + let extents = []; /** @type {import("./tilecoord.js").TileCoord} */ - var tileCoord = [z, 0, 0]; + let tileCoord = [z, 0, 0]; for ( tileCoord[1] = tileRange.minX; tileCoord[1] <= tileRange.maxX; @@ -894,12 +896,12 @@ const OpenlayersMapView = (props) => { }); sitesSource.loadFeatures = function (extent, resolution, projection) { - var loadedExtentsRtree = this.loadedExtentsRtree_; - var extentsToLoad = this.strategy_(extent, resolution); + let loadedExtentsRtree = this.loadedExtentsRtree_; + let extentsToLoad = this.strategy_(extent, resolution); this.loading = false; - var _loop_1 = function (i, ii) { - var extentToLoad = extentsToLoad[i]; - var alreadyLoaded = loadedExtentsRtree.forEachInExtent( + let _loop_1 = function (i, ii) { + let extentToLoad = extentsToLoad[i]; + let alreadyLoaded = loadedExtentsRtree.forEachInExtent( extentToLoad, /** * @param {{extent: import("../extent.js").Extent}} object Object. @@ -918,8 +920,8 @@ const OpenlayersMapView = (props) => { this_1.loading = this_1.loader_ !== VOID; } }; - var this_1 = this; - for (var i = 0, ii = extentsToLoad.length; i < ii; ++i) { + let this_1 = this; + for (let i = 0, ii = extentsToLoad.length; i < ii; ++i) { _loop_1(i, ii); } this.resolution = resolution; @@ -929,7 +931,7 @@ const OpenlayersMapView = (props) => { if (hasRegionsFeatures) { regionsSource = new VectorSource({ loader: function (extent, resolution, projection) { - var url = `https://services.arcgis.com/LcQjj2sL7Txk9Lag/ArcGIS/rest/services/ly_IED_SiteClusters_WM/FeatureServer/0/query/?f=json&returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=${encodeURIComponent( + let url = `https://services.arcgis.com/LcQjj2sL7Txk9Lag/ArcGIS/rest/services/ly_IED_SiteClusters_WM/FeatureServer/0/query/?f=json&returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=${encodeURIComponent( '{"xmin":' + extent[0] + ',"ymin":' + @@ -954,7 +956,7 @@ const OpenlayersMapView = (props) => { if (error) { console.log(error.message); } else { - var features = esrijsonFormat.readFeatures(response, { + let features = esrijsonFormat.readFeatures(response, { featureProjection: projection, }); if (features.length > 0) { diff --git a/src/components/manage/Blocks/SiteBlocks/PermitingAuthority.jsx b/src/components/manage/Blocks/SiteBlocks/PermitingAuthority.jsx new file mode 100644 index 00000000..20a42421 --- /dev/null +++ b/src/components/manage/Blocks/SiteBlocks/PermitingAuthority.jsx @@ -0,0 +1,90 @@ +import React from 'react'; +import Icon from '@plone/volto/components/theme/Icon/Icon'; +import RenderTable from './RenderTable'; +import cx from 'classnames'; +import infoSVG from '@plone/volto/icons/info.svg'; + +const PermitingAuthority = (props) => { + const permitingAuthority = props.permitingAuthority; + + return ( +
+
+

Permiting Authority

+ + + +
+ {permitingAuthority.length === 0 ? ( +

+ No information provided about permiting authority +

+ ) : ( + '' + )} + {permitingAuthority.length > 1 ? ( +
+ +
+ ) : permitingAuthority.length === 1 ? ( +
+
+
+

Permit updated

+

+ {permitingAuthority[0].permitUpdated || '-'} +

+
+
+

Permiting authority

+

+ {permitingAuthority[0].permitingAuthority || '-'} +

+
+
+
+
+

Permit available

+

+ {permitingAuthority[0].permitAvailable || '-'} +

+
+
+

Seveso

+

{permitingAuthority[0].seveso || '-'}

+
+
+
+
+

Status

+

+ {permitingAuthority[0].entityStatus || '-'} +

+
+
+
+ ) : ( + '' + )} +
+ ); +}; + +export default PermitingAuthority; diff --git a/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx index 7696e35a..cb240198 100644 --- a/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx +++ b/src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx @@ -32,7 +32,7 @@ const View = (props) => { ? facility .filter( (report) => - report.eprtrReportingYear === siteReportingYear && + report.euregReportingYears === siteReportingYear && report.facilityOrganizationName, ) .map((report) => ({ diff --git a/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx index a10cbaef..23fe8118 100644 --- a/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx +++ b/src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx @@ -35,7 +35,7 @@ const View = (props) => { ? data_1.euregReportingYears[siteReportingYear] .filter( (report) => - report.eprtrReportingYear === siteReportingYear && + report.euregReportingYears === siteReportingYear && report.organizationName, ) .map((report) => ({ diff --git a/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx b/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx index 0a20c83d..bc1b6cad 100644 --- a/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx +++ b/src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx @@ -69,6 +69,90 @@ const QueryBuilder = (props) => { }, }} /> + {/** + SITE DETAILS 3 + DB: Browse8Header + */} + + {/** + Permits + DB: Browse9Header_Permit + */} + + {/** + BAT Conclusions + DB: Browse9Header_BATConclusion + */} + + {/** + BAT Derogations + DB: Browse9Header_BATDerogation + */} + {/** LCP DETAILS DB: Browse10_Header diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/View.jsx deleted file mode 100644 index 1c6db459..00000000 --- a/src/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/View.jsx +++ /dev/null @@ -1,109 +0,0 @@ -import React from 'react'; -import { useHistory } from 'react-router-dom'; -import { compose } from 'redux'; -import { connect } from 'react-redux'; -import ReactTooltip from 'react-tooltip'; -import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions'; -import _uniqueId from 'lodash/uniqueId'; -import Icon from '@plone/volto/components/theme/Icon/Icon'; -import RenderTable from '../RenderTable'; -import moment from 'moment'; -import cx from 'classnames'; -import { getDate, getLonLat } from '../helpers'; -import infoSVG from '@plone/volto/icons/info.svg'; -import './style.css'; - -const View = (props) => { - const history = useHistory(); - const { - siteInspireId = null, - siteReportingYear = null, - } = props.discodata_query.search; - const { - site_details_1 = {}, - site_details_2 = {}, - } = props.discodata_resources.data; - const data_1 = site_details_1[siteInspireId] || null; - const data_2 = site_details_2[siteInspireId] || null; - const site = { - ...(data_1?.euregReportingYears?.[siteReportingYear]?.[0] || {}), - ...(data_2?.euregReportingYears?.[siteReportingYear]?.[0] || {}), - }; - const facilities = data_1?.facilities || {}; - - return props.mode === 'edit' ? ( -

Site details

- ) : ( -
- {Object.keys(site).length ? ( -
- {/* ABOUT THE ENTITY */} -
-

About the entity

- - - -
- {/* BAT CONCLUSION */} -
-

BAT conclusions

- - - -
- {/* OPERATING PERMIT */} -
-

Operating permit

- - - -
- {/* BAT DEROGATIONS */} -
-

BAT derogations

- - - -
- -
- ) : ( - '' - )} -
- ); -}; - -export default compose( - connect( - (state, props) => ({ - query: state.router.location.search, - discodata_query: state.discodata_query, - discodata_resources: state.discodata_resources, - }), - { - setQueryParam, - deleteQueryParam, - }, - ), -)(View); diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/Edit.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/Edit.jsx similarity index 100% rename from src/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/Edit.jsx rename to src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/Edit.jsx diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx new file mode 100644 index 00000000..66424318 --- /dev/null +++ b/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx @@ -0,0 +1,203 @@ +import React, { useState, useEffect } from 'react'; +import { useHistory } from 'react-router-dom'; +import { compose } from 'redux'; +import { connect } from 'react-redux'; +import ReactTooltip from 'react-tooltip'; +import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions'; +import _uniqueId from 'lodash/uniqueId'; +import Icon from '@plone/volto/components/theme/Icon/Icon'; +import RenderTable from '../RenderTable'; +import PermitingAuthority from '../PermitingAuthority'; +import moment from 'moment'; +import cx from 'classnames'; +import { getDate, getLonLat } from '../helpers'; +import infoSVG from '@plone/volto/icons/info.svg'; +import './style.css'; + +const View = (props) => { + const history = useHistory(); + const [aels, setAels] = useState(false); + const { + siteInspireId = null, + installationInspireId = null, + siteReportingYear = null, + } = props.discodata_query.search; + const { + permits = {}, + bat_derogations = {}, + bat_conclusions = {}, + } = props.discodata_resources.data; + + const data_permits = permits[siteInspireId] || null; + const data_bat_derogations = bat_derogations[siteInspireId] || null; + const data_bat_conclusions = bat_conclusions[siteInspireId] || null; + + const permitingAuthority = + siteReportingYear && data_permits?.euregReportingYears?.[siteReportingYear] + ? data_permits.euregReportingYears[siteReportingYear] + .filter( + (report) => + report.EUregReportingYear === siteReportingYear && + report.installationInspireId === installationInspireId, + ) + .map((report) => ({ + permitUpdated: getDate(report.permitUpdated), + permitingAuthority: report.permitingAuthority, + permitAvailable: report.permitAvailable, + seveso: report.seveso, + entityStatus: report.entityStatus, + })) + : []; + const batDerogations = + siteReportingYear && + data_bat_derogations?.euregReportingYears?.[siteReportingYear] + ? data_bat_derogations.euregReportingYears[siteReportingYear].filter( + (report) => + report.EUregReportingYear === siteReportingYear && + report.installationInspireId === installationInspireId, + ) + : []; + const batConclusions = + siteReportingYear && + data_bat_conclusions?.euregReportingYears?.[siteReportingYear] + ? data_bat_conclusions.euregReportingYears[siteReportingYear].filter( + (report) => + report.EUregReportingYear === siteReportingYear && + report.installationInspireId === installationInspireId && + report.BATConclusionName, + ) + : []; + + return props.mode === 'edit' ? ( +

Installation details

+ ) : ( +
+ {true ? ( +
+ {/* OPERATING PERMIT */} + + {/* BAT CONCLUSION */} +
+

BAT conclusions

+ + + +
+ {batConclusions.length || batDerogations.length ? ( +
+ {batConclusions.length + ? batConclusions.map((conclusion, index) => ( +
+
+

{conclusion.BATConclusionName}

+
+
+
+

Status

+

{conclusion.Status || '-'}

+
+
+

Status modified

+

+ {conclusion.StatusModifiedYear || '-'} +

+
+
+
+ )) + : ''} + {((aels && batDerogations.length) || !batConclusions.length) && ( +
+
+

+ BAT AELs +

+
+ {batDerogations.map((ael, index) => ( +
+ +
+
+

Start date

+

+ {getDate(ael.StartDate) || '-'} +

+
+
+

End date

+

{getDate(ael.EndDate)}

+
+
+
+
+

Status

+

{ael.Status || '-'}

+
+
+
+ ))} +
+ )} + {batDerogations.length && batConclusions.length ? ( + <> +
+
+ +
+ + ) : ( + '' + )} +
+ ) : ( +

No data

+ )} + + +
+ ) : ( + '' + )} +
+ ); +}; + +export default compose( + connect( + (state, props) => ({ + query: state.router.location.search, + discodata_query: state.discodata_query, + discodata_resources: state.discodata_resources, + }), + { + setQueryParam, + deleteQueryParam, + }, + ), +)(View); diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/style.css b/src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/style.css similarity index 100% rename from src/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/style.css rename to src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/style.css diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx index 4e8f9832..97c01ed7 100644 --- a/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx +++ b/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react'; +import React, { useState, useEffect } from 'react'; import { useHistory } from 'react-router-dom'; import { compose } from 'redux'; import { connect } from 'react-redux'; @@ -7,6 +7,7 @@ import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions'; import _uniqueId from 'lodash/uniqueId'; import Icon from '@plone/volto/components/theme/Icon/Icon'; import RenderTable from '../RenderTable'; +import PermitingAuthority from '../PermitingAuthority'; import moment from 'moment'; import cx from 'classnames'; import { getDate, getLonLat } from '../helpers'; @@ -15,21 +16,47 @@ import './style.css'; const View = (props) => { const history = useHistory(); + const [aels, setAels] = useState(false); const { siteInspireId = null, siteReportingYear = null, } = props.discodata_query.search; const { - site_details_1 = {}, - site_details_2 = {}, + site_details_3 = {}, + permits = {}, + bat_derogations = {}, + bat_conclusions = {}, } = props.discodata_resources.data; - const data_1 = site_details_1[siteInspireId] || null; - const data_2 = site_details_2[siteInspireId] || null; + const data_site = site_details_3[siteInspireId] || null; + const data_permits = permits[siteInspireId] || null; + const data_bat_derogations = bat_derogations[siteInspireId] || null; + const data_bat_conclusions = bat_conclusions[siteInspireId] || null; const site = { - ...(data_1?.euregReportingYears?.[siteReportingYear]?.[0] || {}), - ...(data_2?.euregReportingYears?.[siteReportingYear]?.[0] || {}), + ...(data_site?.euregReportingYears?.[siteReportingYear]?.[0] || {}), }; - const facilities = data_1?.facilities || {}; + + const permitingAuthority = + siteReportingYear && data_permits?.euregReportingYears?.[siteReportingYear] + ? data_permits.euregReportingYears[siteReportingYear] + .filter((report) => report.EUregReportingYear === siteReportingYear) + .map((report) => ({ + permitUpdated: getDate(report.permitUpdated), + permitingAuthority: report.permitingAuthority, + permitAvailable: report.permitAvailable, + seveso: report.seveso, + entityStatus: report.entityStatus, + })) + : []; + const batDerogations = + siteReportingYear && + data_bat_derogations?.euregReportingYears?.[siteReportingYear] + ? data_bat_derogations.euregReportingYears[siteReportingYear] + : []; + const batConclusions = + siteReportingYear && + data_bat_conclusions?.euregReportingYears?.[siteReportingYear] + ? data_bat_conclusions.euregReportingYears[siteReportingYear] + : []; return props.mode === 'edit' ? (

Site details

@@ -38,7 +65,7 @@ const View = (props) => { {Object.keys(site).length ? (
{/* ABOUT THE ENTITY */} -
+

About the entity

{ />
- {/* BAT CONCLUSION */} -
-

BAT conclusions

- - - +
+
+

Regulated activities

+

{site.regulatedActivities || '-'}

+
+
+

Status

+

{site.entityStatus || '-'}

+
+
+
+
+

seveso

+

{site.seveso || '-'}

+
{/* OPERATING PERMIT */} -
-

Operating permit

+ + {/* BAT CONCLUSION */} +
+

BAT conclusions

{ />
- {/* BAT DEROGATIONS */} -
-

BAT derogations

- - - +
+ {batConclusions.map((conclusion, index) => ( +
+
+

{conclusion.BATConclusionName}

+
+
+
+

Status

+

{conclusion.Status || '-'}

+
+
+

Status modified

+

+ {conclusion.StatusModifiedYear || '-'} +

+
+
+ {aels && batDerogations.length && ( +
+
+

BAT AELs

+
+ {batDerogations.map((ael, index) => + ael.BATAELName ? ( +
+ +
+
+

Start date

+

+ {getDate(ael.StartDate) || '-'} +

+
+
+

End date

+

{getDate(ael.EndDate)}

+
+
+
+
+

Status

+

{ael.Status || '-'}

+
+
+
+ ) : ( +

No information available

+ ), + )} +
+ )} +
+ ))} + {batDerogations?.length ? ( + <> +
+
+ +
+ + ) : ( + '' + )}
+
) : ( diff --git a/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/style.css b/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/style.css index 39ba3053..ee8c68ec 100644 --- a/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/style.css +++ b/src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/style.css @@ -2,6 +2,10 @@ color: #4296B2; } +.site-details h3.dark { + color: #000; +} + .site-details .header-tooltip { display: flex; align-items: center; @@ -36,3 +40,10 @@ .site-details .list li button:focus { outline: none; } + +.site-details .detail p { + word-break: break-all; + padding-left: 1rem; + padding-right: 1rem; + margin-left: -1rem; +} \ No newline at end of file diff --git a/src/components/manage/Blocks/SiteBlocks/RenderTable.jsx b/src/components/manage/Blocks/SiteBlocks/RenderTable.jsx index 586f80e8..16fe3df4 100644 --- a/src/components/manage/Blocks/SiteBlocks/RenderTable.jsx +++ b/src/components/manage/Blocks/SiteBlocks/RenderTable.jsx @@ -32,7 +32,7 @@ const RenderTable = (props) => {

diff --git a/src/components/manage/Blocks/SiteBlocks/style.css b/src/components/manage/Blocks/SiteBlocks/style.css index 90efcdff..36149e05 100644 --- a/src/components/manage/Blocks/SiteBlocks/style.css +++ b/src/components/manage/Blocks/SiteBlocks/style.css @@ -1,6 +1,5 @@ .industrial-site { overflow: auto; - margin-bottom: 1rem; } .industrial-site .ui.table thead th { diff --git a/src/localconfig.js b/src/localconfig.js index 9985b326..6026bb2e 100644 --- a/src/localconfig.js +++ b/src/localconfig.js @@ -64,8 +64,8 @@ import PollutantsFacilityDetailsView from '~/components/manage/Blocks/SiteBlocks import RegulatorySiteDetailsEdit from '~/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/Edit'; import RegulatorySiteDetailsView from '~/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View'; -import RegulatoryFacilityDetailsEdit from '~/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/Edit'; -import RegulatoryFacilityDetailsView from '~/components/manage/Blocks/SiteBlocks/RegulatoryFacilityDetails/View'; +import RegulatoryInstallationDetailsEdit from '~/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/Edit'; +import RegulatoryInstallationDetailsView from '~/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View'; import LcpDetailsEdit from '~/components/manage/Blocks/SiteBlocks/LcpDetails/Edit'; import LcpDetailsView from '~/components/manage/Blocks/SiteBlocks/LcpDetails/View'; @@ -306,12 +306,12 @@ export function applyConfig(voltoConfig) { icon: packSVG, }; - config.blocks.blocksConfig.eprtr_regulatory_facility_details = { - id: 'eprtr_regulatory_facility_details', - title: 'Eprtr Regulatory facility details', + config.blocks.blocksConfig.eprtr_regulatory_installation_details = { + id: 'eprtr_regulatory_installation_details', + title: 'Eprtr Regulatory installation details', group: 'eprtr_blocks', - view: RegulatoryFacilityDetailsView, - edit: RegulatoryFacilityDetailsEdit, + view: RegulatoryInstallationDetailsView, + edit: RegulatoryInstallationDetailsEdit, icon: packSVG, };