Skip to content

Commit

Permalink
Added an option to allow hiding the clean-mode controls in Anchor plu…
Browse files Browse the repository at this point in the history
…gin, closes #1108.
  • Loading branch information
jacobwod committed Jun 20, 2022
1 parent c4978af commit d79f03d
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 24 deletions.
19 changes: 19 additions & 0 deletions new-admin/src/views/tools/anchor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ var defaultState = {
target: "toolbar",
instruction: "",
visibleAtStart: false,
allowCreatingCleanUrls: true,
visibleForGroups: [],
};

Expand All @@ -47,6 +48,7 @@ class ToolOptions extends Component {
height: tool.options.height,
instruction: tool.options.instruction,
visibleAtStart: tool.options.visibleAtStart,
allowCreatingCleanUrls: tool.options.allowCreatingCleanUrls,
visibleForGroups: tool.options.visibleForGroups
? tool.options.visibleForGroups
: [],
Expand Down Expand Up @@ -116,6 +118,7 @@ class ToolOptions extends Component {
height: this.state.height,
instruction: this.state.instruction,
visibleAtStart: this.state.visibleAtStart,
allowCreatingCleanUrls: this.state.allowCreatingCleanUrls,
visibleForGroups: this.state.visibleForGroups.map(
Function.prototype.call,
String.prototype.trim
Expand Down Expand Up @@ -343,6 +346,22 @@ class ToolOptions extends Component {
 
<label htmlFor="visibleAtStart">Synlig vid start</label>
</div>
<div>
<input
id="allowCreatingCleanUrls"
name="allowCreatingCleanUrls"
type="checkbox"
onChange={(e) => {
this.handleInputChange(e);
}}
checked={this.state.allowCreatingCleanUrls}
/>
&nbsp;
<label htmlFor="allowCreatingCleanUrls">
Visa väljare som låter användare skapa "rena" länkar
(`clean=true`)
</label>
</div>
<div>
<label htmlFor="instruction">
Instruktion{" "}
Expand Down
3 changes: 2 additions & 1 deletion new-client/src/plugins/Anchor/Anchor.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class Anchor extends React.PureComponent {
icon: <ShareIcon />,
title: "Dela",
description: "Skapa en länk och dela det du ser i kartan med andra",
height: 332,
height: "dynamic",
width: 512,
top: undefined,
left: undefined,
Expand All @@ -68,6 +68,7 @@ class Anchor extends React.PureComponent {
cleanUrl={this.state.cleanUrl}
localObserver={this.localObserver}
model={this.anchorModel}
options={this.props.options}
toggleCleanUrl={this.toggleCleanUrl}
/>
</BaseWindowPlugin>
Expand Down
50 changes: 27 additions & 23 deletions new-client/src/plugins/Anchor/AnchorView.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ class AnchorView extends React.PureComponent {
};

render() {
const allowCreatingCleanUrls =
this.props.options.allowCreatingCleanUrls ?? true;
return (
<Box sx={{ width: "100%" }}>
<Grid container item spacing={2} columns={12}>
Expand All @@ -74,30 +76,32 @@ class AnchorView extends React.PureComponent {
</Typography>
</Grid>
</Grid>
<Box sx={{ ml: { xs: 0, sm: 3 } }}>
<Grid container item spacing={2} columns={12}>
<Grid item xs={12}>
<RadioGroup
aria-label="copy-url"
name="copy-url"
onChange={this.props.toggleCleanUrl}
>
<FormControlLabel
checked={!this.props.cleanUrl}
value="default"
control={<Radio color="primary" />}
label="Skapa länk till karta"
/>
<FormControlLabel
checked={this.props.cleanUrl}
value="clean"
control={<Radio color="primary" />}
label="Skapa länk till karta utan verktyg etc."
/>
</RadioGroup>
{allowCreatingCleanUrls && (
<Box sx={{ ml: { xs: 0, sm: 3 } }}>
<Grid container item spacing={2} columns={12}>
<Grid item xs={12}>
<RadioGroup
aria-label="copy-url"
name="copy-url"
onChange={this.props.toggleCleanUrl}
>
<FormControlLabel
checked={!this.props.cleanUrl}
value="default"
control={<Radio color="primary" />}
label="Skapa länk till karta"
/>
<FormControlLabel
checked={this.props.cleanUrl}
value="clean"
control={<Radio color="primary" />}
label="Skapa länk till karta utan verktyg etc."
/>
</RadioGroup>
</Grid>
</Grid>
</Grid>
</Box>
</Box>
)}
<Box sx={{ ml: { xs: 0, sm: 7 }, mr: { xs: 0, sm: 7 } }}>
<Grid container item spacing={2} columns={12}>
<Grid item xs={12}>
Expand Down

0 comments on commit d79f03d

Please sign in to comment.