Update

eea · Nov 16, 2021 · 96e5463 · 96e5463
1 parent 07b74a5
commit 96e5463
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/src/components/manage/Blocks/FiltersBlock/schema.js b/src/components/manage/Blocks/FiltersBlock/schema.js
@@ -13,7 +13,7 @@ const providerSchema = {
     },
     url: {
       title: 'Provider url',
-      widget: 'url',
+      widget: 'object_by_path',
     },
   },
   required: [],

diff --git a/src/components/manage/Blocks/IndustryMap/index.js b/src/components/manage/Blocks/IndustryMap/index.js
@@ -127,14 +127,18 @@ export const getLocationExtent = (data) => {
 export const getSiteExtent = (data) => {
   const db_version =
     process.env.RAZZLE_DB_VERSION || config.settings.db_version || 'latest';
+
   return axios.get(
     `${config.settings.providerUrl}?${getEncodedQueryString(`SELECT
     MIN(shape_wm.STX) AS MIN_X,
     MIN(shape_wm.STY) AS MIN_Y,
     MAX(shape_wm.STX) AS MAX_X,
     MAX(shape_wm.STY) AS MAX_Y
     FROM [IED].[${db_version}].[SiteMap]
-    WHERE [siteName] COLLATE Latin1_General_CI_AI LIKE '%${data.text}%'`)}`,
+    WHERE [siteName] COLLATE Latin1_General_CI_AI LIKE '%${data.text.replace(
+      "'",
+      "''",
+    )}%'`)}`,
   );
 };
 

diff --git a/src/components/manage/Blocks/IndustryMap/schema.js b/src/components/manage/Blocks/IndustryMap/schema.js
@@ -13,7 +13,7 @@ const providerSchema = {
     },
     url: {
       title: 'Provider url',
-      widget: 'url',
+      widget: 'object_by_path',
     },
   },
   required: [],

diff --git a/src/components/manage/Blocks/NavigationBlock/View.jsx b/src/components/manage/Blocks/NavigationBlock/View.jsx
@@ -29,7 +29,11 @@ const View = ({ location, data, navigation }) => {
         {items.map((item) => (
           <Menu.Item
             key={item.url}
-            active={pathname.includes(getBaseUrl(item.url))}
+            active={
+              data.isExact
+                ? pathname === item.url
+                : pathname.includes(getBaseUrl(item.url))
+            }
           >
             <UniversalLink
               href={`${item.url}${location.search}`}

diff --git a/src/components/manage/Blocks/NavigationBlock/schema.js b/src/components/manage/Blocks/NavigationBlock/schema.js
@@ -25,7 +25,7 @@ export default {
     {
       id: 'default',
       title: 'Default',
-      fields: ['ignoreScroll', 'parent', 'pages'],
+      fields: ['ignoreScroll', 'isExact', 'parent', 'pages'],
     },
   ],
   properties: {
@@ -38,6 +38,10 @@ export default {
       schema: pagesSchema,
       widget: 'object_list',
     },
+    isExact: {
+      title: 'Is exact',
+      type: 'boolean',
+    },
     ignoreScroll: {
       title: 'Ignore scroll',
       type: 'boolean',

diff --git a/src/components/manage/Blocks/PollutantIndex/schema.js b/src/components/manage/Blocks/PollutantIndex/schema.js
@@ -13,7 +13,7 @@ const providerSchema = {
     },
     url: {
       title: 'Provider url',
-      widget: 'url',
+      widget: 'object_by_path',
     },
   },
   required: [],

diff --git a/src/components/manage/Blocks/SiteTableau/schema.js b/src/components/manage/Blocks/SiteTableau/schema.js
@@ -85,7 +85,7 @@ export default (config, provider_keys = []) => ({
     },
     provider_url: {
       title: 'Data provider',
-      widget: 'url',
+      widget: 'object_by_path',
     },
     allowedParams: {
       title: 'Allowed params',