From ee758603a07749ba99823c35685e88ed31b7163e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Wed, 18 Dec 2024 16:37:34 +0100 Subject: [PATCH 01/11] Modify Cadastrapp button icon --- assets/img/cadastrapp_icon.svg | 59 ++++++++++++++++++++++++++++++ js/extension/cadastrapp.css | 4 ++ js/extension/plugins/Extension.jsx | 5 ++- 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 assets/img/cadastrapp_icon.svg diff --git a/assets/img/cadastrapp_icon.svg b/assets/img/cadastrapp_icon.svg new file mode 100644 index 0000000..f00272b --- /dev/null +++ b/assets/img/cadastrapp_icon.svg @@ -0,0 +1,59 @@ + + + + + + + + + + diff --git a/js/extension/cadastrapp.css b/js/extension/cadastrapp.css index 0d3ffc7..9d81d3e 100644 --- a/js/extension/cadastrapp.css +++ b/js/extension/cadastrapp.css @@ -340,4 +340,8 @@ input.request-obj-double.form-control{ display: flex; justify-content: center; margin: 10px 0 10px 0; +} + + button.active .cadastrappIcon { + filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(140deg) brightness(105%) contrast(104%); } \ No newline at end of file diff --git a/js/extension/plugins/Extension.jsx b/js/extension/plugins/Extension.jsx index a45fd2c..d5cbb41 100644 --- a/js/extension/plugins/Extension.jsx +++ b/js/extension/plugins/Extension.jsx @@ -7,6 +7,7 @@ import Message from "@mapstore/components/I18N/Message"; import Main from './cadastrapp/Main'; import init from '../enhancers/init'; import { CONTROL_NAME } from '../constants'; +import cadastrapp_icon from '../../../assets/img/cadastrapp_icon.svg'; import {setUp} from '../actions/cadastrapp'; @@ -47,14 +48,14 @@ export default { name: "cadastrapp", position: 1050, text: , - icon: , + icon: , doNotHide: true, action: toggleControl.bind(null, CONTROL_NAME, null), priority: 2 }, SidebarMenu: { name: "cadastrapp", - icon: , + icon: , tooltip: "cadastrapp.title", text: , doNotHide: true, From 8f0a5f6703c1f515985746cc9ba386480424eda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Fri, 20 Dec 2024 09:33:35 +0100 Subject: [PATCH 02/11] Add USERS search tool and group owner and co-owners --- assets/img/owners.svg | 62 +++++++++++++++++++ assets/translations/data.en-US.json | 3 + assets/translations/data.fr-FR.json | 3 + js/extension/cadastrapp.css | 2 +- js/extension/constants.js | 1 + .../plugins/cadastrapp/SearchSection.jsx | 22 +++++-- .../cadastrapp/toolbar/SearchTools.jsx | 15 ++++- .../plugins/cadastrapp/toolbar/TButton.jsx | 3 +- 8 files changed, 103 insertions(+), 8 deletions(-) create mode 100644 assets/img/owners.svg diff --git a/assets/img/owners.svg b/assets/img/owners.svg new file mode 100644 index 0000000..7370d63 --- /dev/null +++ b/assets/img/owners.svg @@ -0,0 +1,62 @@ + + + + + + + + + + diff --git a/assets/translations/data.en-US.json b/assets/translations/data.en-US.json index 7a8450e..54d006f 100644 --- a/assets/translations/data.en-US.json +++ b/assets/translations/data.en-US.json @@ -181,6 +181,9 @@ "coProprietaire": { "tooltip": "Co-owner" }, + "rechercheProprietaires": { + "tooltip": "Owner and co-owner" + }, "bordereauparcellaire": { "title": "Plot information", "basemap": "Choose baseMap", diff --git a/assets/translations/data.fr-FR.json b/assets/translations/data.fr-FR.json index 7745f1b..01ff5d0 100644 --- a/assets/translations/data.fr-FR.json +++ b/assets/translations/data.fr-FR.json @@ -181,6 +181,9 @@ "coProprietaire": { "tooltip": "Co-propriétaire" }, + "rechercheProprietaires": { + "tooltip": "Propiétaires et co-propiétaires" + }, "bordereauparcellaire": { "title": "Bordereau parcellaire", "basemap": "Fond de plan", diff --git a/js/extension/cadastrapp.css b/js/extension/cadastrapp.css index 9d81d3e..b31033a 100644 --- a/js/extension/cadastrapp.css +++ b/js/extension/cadastrapp.css @@ -342,6 +342,6 @@ input.request-obj-double.form-control{ margin: 10px 0 10px 0; } - button.active .cadastrappIcon { +button.active .cadastrappIcon { filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(140deg) brightness(105%) contrast(104%); } \ No newline at end of file diff --git a/js/extension/constants.js b/js/extension/constants.js index 1f31002..ae63347 100644 --- a/js/extension/constants.js +++ b/js/extension/constants.js @@ -23,6 +23,7 @@ export const SELECTION_TYPES = { */ export const SEARCH_TOOLS = { PLOT: "PLOT", + OWNERS: "OWNERS", OWNER: "OWNER", COOWNER: "COOWNER" }; diff --git a/js/extension/plugins/cadastrapp/SearchSection.jsx b/js/extension/plugins/cadastrapp/SearchSection.jsx index 6eadbd7..6262efc 100644 --- a/js/extension/plugins/cadastrapp/SearchSection.jsx +++ b/js/extension/plugins/cadastrapp/SearchSection.jsx @@ -15,6 +15,7 @@ import { search, ownersSearch, clearOwners } from '../../actions/cadastrapp'; import { SEARCH_TOOLS } from '../../constants'; +import SearchTools from './toolbar/SearchTools'; const mapSearchLoadingToProps = createSelector( searchLoadingSelector, @@ -60,12 +61,25 @@ export default function SearchSection({ case SEARCH_TOOLS.PLOT: return (); + case SEARCH_TOOLS.OWNERS: case SEARCH_TOOLS.OWNER: - return (<>); + return ( + <> +
+ +
+ + + ); case SEARCH_TOOLS.COOWNER: - return (<>); + return ( + <> +
+ +
+ + + ); default: return null; diff --git a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx index 671ae72..35748f9 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx @@ -7,6 +7,7 @@ import TButton from './TButton'; import { connect } from 'react-redux'; import { Tooltip } from "react-bootstrap"; import Message from "@mapstore/components/I18N/Message"; +import owners from "../../../../../assets/img/owners.svg"; /* ["zoom-to", "search-plots", "Plots Search"], @@ -20,6 +21,10 @@ const BUTTONS_SETTINGS = { glyph: "search", tooltip: tooltip("search", "cadastrapp.parcelle.tooltip") }, + [SEARCH_TOOLS.OWNERS]: { + glyph: , + tooltip: tooltip("users", "cadastrapp.rechercheProprietaires.tooltip") + }, [SEARCH_TOOLS.OWNER]: { glyph: "user", tooltip: tooltip("user", "cadastrapp.proprietaire.tooltip") @@ -39,12 +44,17 @@ const BUTTONS_SETTINGS = { * Implements Search tools buttons. * They are mutually exclusive and allow to select the needed search form. */ -function SearchTools({ authLevel = {}, currentTool, onClick = () => { } }) { +function SearchTools({ authLevel = {}, currentTool, onClick = () => { }, owners = false }) { const { isCNIL1, isCNIL2 } = authLevel; - + if (currentTool === "OWNERS") currentTool = "OWNER"; + return <> { Object.keys(SEARCH_TOOLS) + .filter(k => owners ? + [SEARCH_TOOLS.OWNER, SEARCH_TOOLS.COOWNER].includes(k) : + [SEARCH_TOOLS.PLOT, SEARCH_TOOLS.OWNERS].includes(k) + ) .filter(k => { if (isCNIL1 || isCNIL2) { return true; @@ -57,6 +67,7 @@ function SearchTools({ authLevel = {}, currentTool, onClick = () => { } }) { return ( isActive ? onClick() : onClick(toolName)} />); }) diff --git a/js/extension/plugins/cadastrapp/toolbar/TButton.jsx b/js/extension/plugins/cadastrapp/toolbar/TButton.jsx index 145c059..05338fb 100644 --- a/js/extension/plugins/cadastrapp/toolbar/TButton.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/TButton.jsx @@ -12,6 +12,7 @@ export default ({ glyph, bsStyle, tooltip = , + isCustom, ...props }) => { return ( @@ -19,7 +20,7 @@ export default ({ {...props} bsStyle={bsStyle || "primary"} className="square-button"> - + {isCustom ? glyph : } ); }; From 4e423cdf3b458bf0518b3687b44ca5c41aeb0106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Fri, 20 Dec 2024 11:10:14 +0100 Subject: [PATCH 03/11] remove cadastrapp icon to create a specific branch for issue 175 --- assets/img/cadastrapp_icon.svg | 59 ------------------------------ js/extension/cadastrapp.css | 4 -- js/extension/plugins/Extension.jsx | 5 +-- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 assets/img/cadastrapp_icon.svg diff --git a/assets/img/cadastrapp_icon.svg b/assets/img/cadastrapp_icon.svg deleted file mode 100644 index f00272b..0000000 --- a/assets/img/cadastrapp_icon.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - diff --git a/js/extension/cadastrapp.css b/js/extension/cadastrapp.css index b31033a..0d3ffc7 100644 --- a/js/extension/cadastrapp.css +++ b/js/extension/cadastrapp.css @@ -340,8 +340,4 @@ input.request-obj-double.form-control{ display: flex; justify-content: center; margin: 10px 0 10px 0; -} - -button.active .cadastrappIcon { - filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(140deg) brightness(105%) contrast(104%); } \ No newline at end of file diff --git a/js/extension/plugins/Extension.jsx b/js/extension/plugins/Extension.jsx index d5cbb41..a45fd2c 100644 --- a/js/extension/plugins/Extension.jsx +++ b/js/extension/plugins/Extension.jsx @@ -7,7 +7,6 @@ import Message from "@mapstore/components/I18N/Message"; import Main from './cadastrapp/Main'; import init from '../enhancers/init'; import { CONTROL_NAME } from '../constants'; -import cadastrapp_icon from '../../../assets/img/cadastrapp_icon.svg'; import {setUp} from '../actions/cadastrapp'; @@ -48,14 +47,14 @@ export default { name: "cadastrapp", position: 1050, text: , - icon: , + icon: , doNotHide: true, action: toggleControl.bind(null, CONTROL_NAME, null), priority: 2 }, SidebarMenu: { name: "cadastrapp", - icon: , + icon: , tooltip: "cadastrapp.title", text: , doNotHide: true, From 19b223d036b0cd74910a5a57aa4fc0698d620308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Mon, 23 Dec 2024 16:42:19 +0100 Subject: [PATCH 04/11] fix custom icon svg build import --- .../img => js/extension/assets}/owners.svg | 0 .../cadastrapp/toolbar/SearchTools.jsx | 5 +- .../cadastrapp/toolbar/toolbarIcons.js | 59 +++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) rename {assets/img => js/extension/assets}/owners.svg (100%) create mode 100644 js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js diff --git a/assets/img/owners.svg b/js/extension/assets/owners.svg similarity index 100% rename from assets/img/owners.svg rename to js/extension/assets/owners.svg diff --git a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx index 35748f9..a6d77c8 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx @@ -7,7 +7,7 @@ import TButton from './TButton'; import { connect } from 'react-redux'; import { Tooltip } from "react-bootstrap"; import Message from "@mapstore/components/I18N/Message"; -import owners from "../../../../../assets/img/owners.svg"; +import { owners } from './toolbarIcons'; /* ["zoom-to", "search-plots", "Plots Search"], @@ -15,6 +15,7 @@ import owners from "../../../../../assets/img/owners.svg"; ["user", "coownership", "Co-ownership data Search"], */ +const svgDataUrl = `data:image/svg+xml;utf8,${encodeURIComponent(owners)}`; const tooltip = (id, msgId) => ; const BUTTONS_SETTINGS = { [SEARCH_TOOLS.PLOT]: { @@ -22,7 +23,7 @@ const BUTTONS_SETTINGS = { tooltip: tooltip("search", "cadastrapp.parcelle.tooltip") }, [SEARCH_TOOLS.OWNERS]: { - glyph: , + glyph: , tooltip: tooltip("users", "cadastrapp.rechercheProprietaires.tooltip") }, [SEARCH_TOOLS.OWNER]: { diff --git a/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js b/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js new file mode 100644 index 0000000..54cd137 --- /dev/null +++ b/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js @@ -0,0 +1,59 @@ +export const owners = ` + + + + + +` \ No newline at end of file From bb1d38471db3a95bb7f99623e6db97ab954b5310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Mon, 23 Dec 2024 17:11:36 +0100 Subject: [PATCH 05/11] lint --- js/extension/components/search/PlotSearch.jsx | 2 +- .../plugins/cadastrapp/SearchSection.jsx | 28 +++++++++---------- .../cadastrapp/toolbar/SearchTools.jsx | 21 +++++++------- .../cadastrapp/toolbar/SelectionTools.jsx | 3 +- .../cadastrapp/toolbar/toolbarIcons.js | 4 +-- 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/js/extension/components/search/PlotSearch.jsx b/js/extension/components/search/PlotSearch.jsx index 3a3d23e..e2dfa88 100644 --- a/js/extension/components/search/PlotSearch.jsx +++ b/js/extension/components/search/PlotSearch.jsx @@ -21,7 +21,7 @@ export default function PlotsSearch({onSearch = () => {}, loading}) { return (

-
+
-
- -
- - - ); + <> +
+ +
+ + + ); case SEARCH_TOOLS.COOWNER: return ( - <> -
- -
- - - ); + <> +
+ +
+ + + ); default: return null; diff --git a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx index a6d77c8..aa4d65d 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx @@ -7,7 +7,7 @@ import TButton from './TButton'; import { connect } from 'react-redux'; import { Tooltip } from "react-bootstrap"; import Message from "@mapstore/components/I18N/Message"; -import { owners } from './toolbarIcons'; +import { ownersIcon } from './toolbarIcons'; /* ["zoom-to", "search-plots", "Plots Search"], @@ -15,7 +15,7 @@ import { owners } from './toolbarIcons'; ["user", "coownership", "Co-ownership data Search"], */ -const svgDataUrl = `data:image/svg+xml;utf8,${encodeURIComponent(owners)}`; +const svgDataUrl = `data:image/svg+xml;utf8,${encodeURIComponent(ownersIcon)}`; const tooltip = (id, msgId) => ; const BUTTONS_SETTINGS = { [SEARCH_TOOLS.PLOT]: { @@ -48,25 +48,24 @@ const BUTTONS_SETTINGS = { function SearchTools({ authLevel = {}, currentTool, onClick = () => { }, owners = false }) { const { isCNIL1, isCNIL2 } = authLevel; if (currentTool === "OWNERS") currentTool = "OWNER"; - return <> { Object.keys(SEARCH_TOOLS) - .filter(k => owners ? + .filter(k => owners ? [SEARCH_TOOLS.OWNER, SEARCH_TOOLS.COOWNER].includes(k) : [SEARCH_TOOLS.PLOT, SEARCH_TOOLS.OWNERS].includes(k) ) - .filter(k => { - if (isCNIL1 || isCNIL2) { - return true; - } - return [SEARCH_TOOLS.PLOT].includes(k); // allowed for normal users. - }) + // .filter(k => { + // if (isCNIL1 || isCNIL2) { + // return true; + // } + // return [SEARCH_TOOLS.PLOT].includes(k); // allowed for normal users. + // }) .map(k => SEARCH_TOOLS[k]) .map(toolName => { const isActive = toolName === currentTool; return ( isActive ? onClick() : onClick(toolName)} diff --git a/js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx index 5f50431..fe9d360 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx @@ -42,7 +42,7 @@ const BUTTONS_SETTINGS = { * Implement the selection tools. * They are mutually exclusive and allow to start a selection on map. */ -function SelectionTools({ foncier = true, currentTool="POINT", onClick = () => {} }) { +function SelectionTools({ foncier = true, currentTool = "POINT", onClick = () => {} }) { return <> { Object.keys(SELECTION_TYPES) @@ -56,7 +56,6 @@ function SelectionTools({ foncier = true, currentTool="POINT", onClick = () => { // if the current selection button is clicked, it turns off selection onClick={() => { isActive ? onClick() : onClick(toolName); - setCurrentTool(toolName); }} />); }) diff --git a/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js b/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js index 54cd137..2202118 100644 --- a/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js +++ b/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js @@ -1,4 +1,4 @@ -export const owners = ` -` \ No newline at end of file +`; From a72cace507ca19d75a4c9888a16b8ce0b0b49bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Tue, 24 Dec 2024 10:32:26 +0100 Subject: [PATCH 06/11] change owners icon colors --- js/extension/cadastrapp.css | 6 +++++- .../plugins/cadastrapp/toolbar/SearchTools.jsx | 17 ++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/js/extension/cadastrapp.css b/js/extension/cadastrapp.css index 0d3ffc7..6bbe721 100644 --- a/js/extension/cadastrapp.css +++ b/js/extension/cadastrapp.css @@ -340,4 +340,8 @@ input.request-obj-double.form-control{ display: flex; justify-content: center; margin: 10px 0 10px 0; -} \ No newline at end of file +} + +.btn-active .ownersIcon { + filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(140deg) brightness(105%) contrast(104%); +} diff --git a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx index aa4d65d..4ddd35d 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx @@ -55,17 +55,20 @@ function SearchTools({ authLevel = {}, currentTool, onClick = () => { }, owners [SEARCH_TOOLS.OWNER, SEARCH_TOOLS.COOWNER].includes(k) : [SEARCH_TOOLS.PLOT, SEARCH_TOOLS.OWNERS].includes(k) ) - // .filter(k => { - // if (isCNIL1 || isCNIL2) { - // return true; - // } - // return [SEARCH_TOOLS.PLOT].includes(k); // allowed for normal users. - // }) + .filter(k => { + if (isCNIL1 || isCNIL2) { + return true; + } + return [SEARCH_TOOLS.PLOT].includes(k); // allowed for normal users. + }) .map(k => SEARCH_TOOLS[k]) .map(toolName => { const isActive = toolName === currentTool; return ( isActive ? onClick() : onClick(toolName)} From d069661117dd6cbe8310af043ba9cd64d9fd0893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Tue, 24 Dec 2024 11:37:33 +0100 Subject: [PATCH 07/11] modify TButton custom and fix class name --- js/extension/cadastrapp.css | 2 +- js/extension/components/search/PlotSearch.jsx | 2 +- .../plugins/cadastrapp/SearchSection.jsx | 4 ++-- .../plugins/cadastrapp/toolbar/SearchTools.jsx | 16 ++++++++-------- .../plugins/cadastrapp/toolbar/TButton.jsx | 7 ++++++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/js/extension/cadastrapp.css b/js/extension/cadastrapp.css index 6bbe721..d0af3d1 100644 --- a/js/extension/cadastrapp.css +++ b/js/extension/cadastrapp.css @@ -336,7 +336,7 @@ input.request-obj-double.form-control{ user-select: text; } -.selectionToolsButton { +.cadastrapp_selectionToolsButton { display: flex; justify-content: center; margin: 10px 0 10px 0; diff --git a/js/extension/components/search/PlotSearch.jsx b/js/extension/components/search/PlotSearch.jsx index e2dfa88..8420e44 100644 --- a/js/extension/components/search/PlotSearch.jsx +++ b/js/extension/components/search/PlotSearch.jsx @@ -21,7 +21,7 @@ export default function PlotsSearch({onSearch = () => {}, loading}) { return (

-
+
-
+
@@ -74,7 +74,7 @@ export default function SearchSection({ case SEARCH_TOOLS.COOWNER: return ( <> -
+
diff --git a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx index 4ddd35d..39bb214 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx @@ -23,7 +23,8 @@ const BUTTONS_SETTINGS = { tooltip: tooltip("search", "cadastrapp.parcelle.tooltip") }, [SEARCH_TOOLS.OWNERS]: { - glyph: , + imgSrc: svgDataUrl, + cls: "ownersIcon", tooltip: tooltip("users", "cadastrapp.rechercheProprietaires.tooltip") }, [SEARCH_TOOLS.OWNER]: { @@ -55,12 +56,12 @@ function SearchTools({ authLevel = {}, currentTool, onClick = () => { }, owners [SEARCH_TOOLS.OWNER, SEARCH_TOOLS.COOWNER].includes(k) : [SEARCH_TOOLS.PLOT, SEARCH_TOOLS.OWNERS].includes(k) ) - .filter(k => { - if (isCNIL1 || isCNIL2) { - return true; - } - return [SEARCH_TOOLS.PLOT].includes(k); // allowed for normal users. - }) + // .filter(k => { + // if (isCNIL1 || isCNIL2) { + // return true; + // } + // return [SEARCH_TOOLS.PLOT].includes(k); // allowed for normal users. + // }) .map(k => SEARCH_TOOLS[k]) .map(toolName => { const isActive = toolName === currentTool; @@ -70,7 +71,6 @@ function SearchTools({ authLevel = {}, currentTool, onClick = () => { }, owners ? "active" : ""} {...BUTTONS_SETTINGS[toolName]} - isCustom = {toolName === "OWNERS"} onClick={() => isActive ? onClick() : onClick(toolName)} />); }) diff --git a/js/extension/plugins/cadastrapp/toolbar/TButton.jsx b/js/extension/plugins/cadastrapp/toolbar/TButton.jsx index 05338fb..57fbc87 100644 --- a/js/extension/plugins/cadastrapp/toolbar/TButton.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/TButton.jsx @@ -10,6 +10,8 @@ import { */ export default ({ glyph, + imgSrc, + cls, bsStyle, tooltip = , isCustom, @@ -20,7 +22,10 @@ export default ({ {...props} bsStyle={bsStyle || "primary"} className="square-button"> - {isCustom ? glyph : } + {imgSrc ? + : + + } ); }; From e602d6dfae9fcf38e10c1220ba7e60cc72d23f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Tue, 24 Dec 2024 11:57:00 +0100 Subject: [PATCH 08/11] uncomment code --- .../plugins/cadastrapp/toolbar/SearchTools.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx index 39bb214..5b03464 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx @@ -56,12 +56,12 @@ function SearchTools({ authLevel = {}, currentTool, onClick = () => { }, owners [SEARCH_TOOLS.OWNER, SEARCH_TOOLS.COOWNER].includes(k) : [SEARCH_TOOLS.PLOT, SEARCH_TOOLS.OWNERS].includes(k) ) - // .filter(k => { - // if (isCNIL1 || isCNIL2) { - // return true; - // } - // return [SEARCH_TOOLS.PLOT].includes(k); // allowed for normal users. - // }) + .filter(k => { + if (isCNIL1 || isCNIL2) { + return true; + } + return [SEARCH_TOOLS.PLOT].includes(k); // allowed for normal users. + }) .map(k => SEARCH_TOOLS[k]) .map(toolName => { const isActive = toolName === currentTool; From db8340f18dabf798d81ec78df20cdd2e62888a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Tue, 24 Dec 2024 12:17:23 +0100 Subject: [PATCH 09/11] fix selection tool by default --- js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx index fe9d360..16aa7f3 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SelectionTools.jsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useEffect } from 'react'; import { SELECTION_TYPES } from '../../../constants'; import { toggleSelectionTool } from '../../../actions/cadastrapp'; import { currentSelectionToolSelector } from '../../../selectors/cadastrapp'; @@ -42,7 +42,8 @@ const BUTTONS_SETTINGS = { * Implement the selection tools. * They are mutually exclusive and allow to start a selection on map. */ -function SelectionTools({ foncier = true, currentTool = "POINT", onClick = () => {} }) { +function SelectionTools({ foncier = true, currentTool, onClick = () => {} }) { + useEffect(() => onClick("POINT"), []); return <> { Object.keys(SELECTION_TYPES) From 6ee6f6d5217a15dc288a4b4ad7aff11b8982f86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= Date: Thu, 2 Jan 2025 11:02:59 +0100 Subject: [PATCH 10/11] modify plot search icon color to maintain the overall consistency of cadastrapp --- js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx index 5b03464..a585819 100644 --- a/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx +++ b/js/extension/plugins/cadastrapp/toolbar/SearchTools.jsx @@ -66,8 +66,8 @@ function SearchTools({ authLevel = {}, currentTool, onClick = () => { }, owners .map(toolName => { const isActive = toolName === currentTool; return ( Date: Fri, 17 Jan 2025 12:50:01 +0100 Subject: [PATCH 11/11] clean svg code --- js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js b/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js index 2202118..92c5cf1 100644 --- a/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js +++ b/js/extension/plugins/cadastrapp/toolbar/toolbarIcons.js @@ -6,7 +6,6 @@ export const ownersIcon = `