From 6fb77cabc64c14dbfdef27bc8c55b0fe6dff39b9 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Wed, 13 Feb 2019 09:37:41 +0200
Subject: [PATCH 1/2] Moved to HelpTrigger

---
 .../app/components/ParameterMappingInput.jsx  | 15 ++-------
 client/app/services/HelpTrigger.jsx           | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 client/app/services/HelpTrigger.jsx

diff --git a/client/app/components/ParameterMappingInput.jsx b/client/app/components/ParameterMappingInput.jsx
index 9bf88329b8..d2b5f87d3e 100644
--- a/client/app/components/ParameterMappingInput.jsx
+++ b/client/app/components/ParameterMappingInput.jsx
@@ -18,16 +18,12 @@ import { ParameterValueInput } from '@/components/ParameterValueInput';
 import { ParameterMappingType } from '@/services/widget';
 import { clientConfig } from '@/services/auth';
 import { Query, Parameter } from '@/services/query';
+import HelpTrigger from '@/services/HelpTrigger';
 
 import './ParameterMappingInput.less';
 
 const { Option } = Select;
 
-const HELP_URL = [
-  'https://redash.io/help/user-guide/querying/query-parameters?source=dialog#Value-Source-Options',
-  'Guide: Value Source Options',
-];
-
 export const MappingType = {
   DashboardAddNew: 'dashboard-add-new',
   DashboardMapToExisting: 'dashboard-map-to-existing',
@@ -339,18 +335,11 @@ class MappingEditor extends React.Component {
 
   renderContent() {
     const { mapping, inputError } = this.state;
-    const [helpUrl, tooltip] = HELP_URL;
 
     return (
       <div className="parameter-mapping-editor">
         <header>
-          Edit Source and Value
-          {/* eslint-disable-next-line react/jsx-no-target-blank */}
-          <a href={helpUrl} target="_blank" rel="noopener">
-            <Tooltip title={tooltip}>
-              <Icon type="question-circle" />
-            </Tooltip>
-          </a>
+          Edit Source and Value <HelpTrigger type="VALUE_SOURCE_OPTIONS" />
         </header>
         <ParameterMappingInput
           mapping={mapping}
diff --git a/client/app/services/HelpTrigger.jsx b/client/app/services/HelpTrigger.jsx
new file mode 100644
index 0000000000..2626679cfb
--- /dev/null
+++ b/client/app/services/HelpTrigger.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Tooltip from 'antd/lib/tooltip';
+import Icon from 'antd/lib/icon';
+
+const BASE_URL = 'https://redash.io/help/user-guide/';
+const TYPES = {
+  VALUE_SOURCE_OPTIONS: [
+    'querying/query-parameters#Value-Source-Options',
+    'Value Source Options',
+  ],
+};
+
+export default class HelpTrigger extends React.PureComponent {
+  static propTypes = {
+    type: PropTypes.oneOf(Object.keys(TYPES)).isRequired,
+  }
+
+  render() {
+    const [path, tooltip] = TYPES[this.props.type];
+    const href = BASE_URL + path;
+    return (
+      <Tooltip title={`Guide: ${tooltip}`}>
+        {/* eslint-disable-next-line react/jsx-no-target-blank */}
+        <a href={href} target="_blank" rel="noopener">
+          <Icon type="question-circle" />
+        </a>
+      </Tooltip>
+    );
+  }
+}

From b29ffe60ed5a25a998f4c00b87a9453e567de814 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Wed, 13 Feb 2019 09:43:20 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Moved=20share=20dialog=20=E2=80=9CLearn=20m?=
 =?UTF-8?q?ore=E2=80=9D=20to=20HelpTrigger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/app/pages/dashboards/ShareDashboardDialog.jsx | 8 ++------
 client/app/services/HelpTrigger.jsx                  | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/app/pages/dashboards/ShareDashboardDialog.jsx b/client/app/pages/dashboards/ShareDashboardDialog.jsx
index 5d8569d58c..ddd47284f0 100644
--- a/client/app/pages/dashboards/ShareDashboardDialog.jsx
+++ b/client/app/pages/dashboards/ShareDashboardDialog.jsx
@@ -4,13 +4,12 @@ import PropTypes from 'prop-types';
 import Switch from 'antd/lib/switch';
 import Modal from 'antd/lib/modal';
 import Form from 'antd/lib/form';
-import Tooltip from 'antd/lib/tooltip';
 import { $http, toastr } from '@/services/ng';
 import { wrap as wrapDialog, DialogPropType } from '@/components/DialogWrapper';
 import InputWithCopy from '@/components/InputWithCopy';
+import HelpTrigger from '@/services/HelpTrigger';
 
 const API_SHARE_URL = 'api/dashboards/{id}/share';
-const HELP_URL = 'https://redash.io/help/user-guide/dashboards/sharing-dashboards?source=dialog';
 
 class ShareDashboardDialog extends React.Component {
   static propTypes = {
@@ -38,10 +37,7 @@ class ShareDashboardDialog extends React.Component {
         Share Dashboard
         <div className="modal-header-desc">
           Allow public access to this dashboard with a secret address.{' '}
-          <Tooltip title="Guide: Sharing and Embedding Dashboards">
-            { /* eslint-disable-next-line react/jsx-no-target-blank */}
-            <a href={HELP_URL} target="_blank" rel="noopener">Learn more</a>
-          </Tooltip>
+          <HelpTrigger type="SHARE_DASHBOARD" />
         </div>
       </React.Fragment>
     );
diff --git a/client/app/services/HelpTrigger.jsx b/client/app/services/HelpTrigger.jsx
index 2626679cfb..fef0d7228b 100644
--- a/client/app/services/HelpTrigger.jsx
+++ b/client/app/services/HelpTrigger.jsx
@@ -9,6 +9,10 @@ const TYPES = {
     'querying/query-parameters#Value-Source-Options',
     'Value Source Options',
   ],
+  SHARE_DASHBOARD: [
+    'dashboards/sharing-dashboards',
+    'Sharing and Embedding Dashboards',
+  ],
 };
 
 export default class HelpTrigger extends React.PureComponent {