Skip to content

Commit ed2ce61

Browse files
committed
Include service desk link
1 parent acaa0f6 commit ed2ce61

File tree

1 file changed

+43
-38
lines changed

1 file changed

+43
-38
lines changed

ui/app/components/NavBar.js

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { selectIsLoggedIn } from "../selectors";
1010
import LocaleSelector from "./LocaleSelector";
1111
import RequirePermission from "./RequirePermission";
1212

13-
const NavBar = ({ isLoggedIn, login, logout }) =>
13+
const NavBar = ({ isLoggedIn, login, logout }) => (
1414
<Navbar>
1515
<Navbar.Header>
1616
<Navbar.Brand>
@@ -20,16 +20,6 @@ const NavBar = ({ isLoggedIn, login, logout }) =>
2020
</Navbar.Brand>
2121
</Navbar.Header>
2222
<Nav className="pull-right">
23-
<li>
24-
<NavLink to="/">
25-
<FormattedMessage id="ui.about" defaultMessage="About" />
26-
</NavLink>
27-
</li>
28-
<li>
29-
<NavLink to="/learn">
30-
<FormattedMessage id="ui.help" defaultMessage="Learn" />
31-
</NavLink>
32-
</li>
3323
<RequirePermission>
3424
<li>
3525
<NavLink to="/exports/new">
@@ -44,17 +34,14 @@ const NavBar = ({ isLoggedIn, login, logout }) =>
4434
</li>
4535
<li>
4636
<NavLink to="/configurations">
47-
<FormattedMessage
48-
id="ui.configurations"
49-
defaultMessage="Configs"
50-
/>
37+
<FormattedMessage id="ui.configurations" defaultMessage="Configs" />
5138
</NavLink>
5239
</li>
5340
<RequirePermission
5441
required={[
5542
"jobs.add_partnerexportregion",
5643
"jobs.change_partnerexportregion",
57-
"jobs.delete_partnerexportregion"
44+
"jobs.delete_partnerexportregion",
5845
]}
5946
>
6047
<li>
@@ -67,7 +54,7 @@ const NavBar = ({ isLoggedIn, login, logout }) =>
6754
required={[
6855
"jobs.add_hdxexportregion",
6956
"jobs.change_hdxexportregion",
70-
"jobs.delete_hdxexportregion"
57+
"jobs.delete_hdxexportregion",
7158
]}
7259
>
7360
<li>
@@ -76,46 +63,64 @@ const NavBar = ({ isLoggedIn, login, logout }) =>
7663
</NavLink>
7764
</li>
7865
</RequirePermission>
79-
<RequirePermission
80-
required={[
81-
"auth.add_user"
82-
]}
83-
>
66+
<RequirePermission required={["auth.add_user"]}>
8467
<li>
8568
<a href="/admin">
8669
<FormattedMessage id="ui.admin" defaultMessage="Admin" />
8770
</a>
8871
</li>
8972
</RequirePermission>
90-
<RequirePermission
91-
required={[
92-
"auth.add_user"
93-
]}
94-
>
73+
<RequirePermission required={["auth.add_user"]}>
9574
<li>
9675
<NavLink to="/stats">
9776
<FormattedMessage id="ui.stats" defaultMessage="Stats" />
9877
</NavLink>
9978
</li>
10079
</RequirePermission>
80+
<li>
81+
<NavLink to="/">
82+
<FormattedMessage id="ui.about" defaultMessage="About" />
83+
</NavLink>
84+
</li>
85+
<li>
86+
<NavLink to="/learn">
87+
<FormattedMessage id="ui.help" defaultMessage="Learn" />
88+
</NavLink>
89+
</li>
90+
<li>
91+
<NavLink
92+
to={{
93+
pathname:
94+
"https://hotosm.atlassian.net/servicedesk/customer/portal/4",
95+
}}
96+
target="_blank"
97+
>
98+
<span title="For technical support click here">
99+
<FormattedMessage id="ui.support" defaultMessage="Support" />
100+
</span>
101+
</NavLink>
102+
</li>
101103
<NavItem>
102104
<LocaleSelector />
103105
</NavItem>
104106
<NavItem>
105-
{!isLoggedIn &&
106-
<Button bsStyle="danger" onClick={login}>
107-
<FormattedMessage id="ui.log_in" defaultMessage="Log In" />
108-
</Button>}
109-
{isLoggedIn &&
110-
<Button bsStyle="danger" onClick={logout}>
111-
<FormattedMessage id="ui.log_out" defaultMessage="Log Out" />
112-
</Button>}
107+
{!isLoggedIn && (
108+
<Button bsStyle="danger" onClick={login}>
109+
<FormattedMessage id="ui.log_in" defaultMessage="Log In" />
110+
</Button>
111+
)}
112+
{isLoggedIn && (
113+
<Button bsStyle="danger" onClick={logout}>
114+
<FormattedMessage id="ui.log_out" defaultMessage="Log Out" />
115+
</Button>
116+
)}
113117
</NavItem>
114118
</Nav>
115-
</Navbar>;
119+
</Navbar>
120+
);
116121

117-
const mapStateToProps = state => ({
118-
isLoggedIn: selectIsLoggedIn(state)
122+
const mapStateToProps = (state) => ({
123+
isLoggedIn: selectIsLoggedIn(state),
119124
});
120125

121126
export default connect(mapStateToProps, { login, logout })(NavBar);

0 commit comments

Comments
 (0)