update queries and site search zoom

eea · Sep 21, 2020 · ea6e56f · ea6e56f
1 parent 55e1646
commit ea6e56f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -513,7 +513,7 @@ const OpenlayersMapView = (props) => {
       axios
         .get(
           encodeURI(
-            `${settings.providerUrl}?query=SELECT shape_wm.STX as x, shape_wm.STY as y from [IED].[latest].[SiteMap] WHERE siteName LIKE '%${stateRef.current.siteTerm}%' ORDER BY [Site_reporting_year] DESC`,
+            `${settings.providerUrl}?query=SELECT shape_wm.STX as x, shape_wm.STY as y, Site_reporting_year from [IED].[latest].[SiteMap] WHERE siteName LIKE '%${stateRef.current.siteTerm}%' ORDER BY [Site_reporting_year] DESC`,
           ),
         )
         .then((response) => {

diff --git a/src/components/manage/Blocks/FiltersBlock/View.jsx b/src/components/manage/Blocks/FiltersBlock/View.jsx
@@ -868,9 +868,9 @@ const View = ({ content, ...props }) => {
     let promises = [];
     const sqls = [
       {
-        query: `SELECT DISTINCT siteName FROM [IED].[latest].[SiteMap] WHERE [site] LIKE '%${data.value}%' ORDER BY [siteName]`,
+        query: `SELECT DISTINCT siteName FROM [IED].[latest].[SiteMap] WHERE [siteName] LIKE '%${data.value}%' ORDER BY [siteName]`,
         reqKey: 'results',
-        searchKey: 'site',
+        searchKey: 'siteName',
         updateState: setSitesResults,
       },
     ];