Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2279 (#3923)

Jason Kent442b41957bbc
diff --git a/web/js/containers/info.js b/web/js/containers/info.js
index db9bff378..af35c5276 100644
--- a/web/js/containers/info.js
+++ b/web/js/containers/info.js
@@ -23,6 +23,7 @@ import GlobalSettings from '../components/global-settings/global-settings';
function InfoList (props) {
const {
sendFeedback,
+ feedbackEnabled,
feedbackIsInitiated,
globalSettingsClick,
aboutClick,
@@ -94,14 +95,16 @@ function InfoList (props) {
sendFeedback(feedbackIsInitiated, isMobile);
},
};
+
+ const feedbackEntry = {
+ text: 'Send feedback',
+ iconClass: 'ui-icon',
+ iconName: 'envelope',
+ id: 'send_feedback_info_item',
+ ...feedbackAction,
+ };
+
const arr = [
- {
- text: 'Send feedback',
- iconClass: 'ui-icon',
- iconName: 'envelope',
- id: 'send_feedback_info_item',
- ...feedbackAction,
- },
{
text: 'Settings',
iconClass: 'ui-icon',
@@ -129,6 +132,10 @@ function InfoList (props) {
},
];
+ if (feedbackEnabled) {
+ arr.push(feedbackEntry);
+ }
+
// limit explore for larger device displays
if (window.innerWidth >= 740
&& window.innerHeight >= 615) {
@@ -159,8 +166,10 @@ function mapStateToProps(state) {
ui, feedback, tour, notifications, config, models, browser,
} = state;
const { isDistractionFreeModeActive } = ui;
+ const { features: { feedback: feedbackEnabled } } = config;
return {
+ feedbackEnabled,
feedbackIsInitiated: feedback.isInitiated,
isDistractionFreeModeActive,
isTourActive: tour.active,
@@ -237,6 +246,7 @@ InfoList.propTypes = {
aboutClick: PropTypes.func,
globalSettingsClick: PropTypes.func,
config: PropTypes.object,
+ feedbackEnabled: PropTypes.bool,
feedbackIsInitiated: PropTypes.bool,
isDistractionFreeModeActive: PropTypes.bool,
isMobile: PropTypes.bool,
diff --git a/web/js/containers/share.js b/web/js/containers/share.js
index 072b6b19b..346167fd9 100644
--- a/web/js/containers/share.js
+++ b/web/js/containers/share.js
@@ -221,7 +221,7 @@ class ShareLinkContainer extends Component {
)
renderLinkTab = () => {
- const { shortLink } = this.props;
+ const { shortLink, urlShortening } = this.props;
const {
activeTab,
isShort,
@@ -243,13 +243,15 @@ class ShareLinkContainer extends Component {
Copy URL to share link.
</p>
{' '}
- <Checkbox
- label="Shorten link"
- id="wv-link-shorten"
- onCheck={this.onToggleShorten}
- checked={isShort}
- disabled={!shortLink.isLoading}
- />
+ {urlShortening && (
+ <Checkbox
+ label="Shorten link"
+ id="wv-link-shorten"
+ onCheck={this.onToggleShorten}
+ checked={isShort}
+ disabled={!shortLink.isLoading}
+ />
+ )}
</>
)}
</TabPane>
@@ -338,9 +340,12 @@ function mapStateToProps(state) {
browser, config, shortLink, sidebar, tour,
} = state;
+ const { features: { urlShortening } } = config;
const isMobile = browser.lessThan.medium;
const embedDisableNavLink = sidebar.activeTab === 'download' || tour.active;
+
return {
+ urlShortening,
embedDisableNavLink,
isMobile,
shortLink,
@@ -369,4 +374,5 @@ ShareLinkContainer.propTypes = {
requestShortLinkAction: PropTypes.func,
selectedDate: PropTypes.object,
shortLink: PropTypes.object,
+ urlShortening: PropTypes.bool,
};