From 17b5df296cd64955b5cd9f6b7a3eb5ccf1e28d17 Mon Sep 17 00:00:00 2001
From: Albert Backenhof <EXT_BPD@qlik.com>
Date: Fri, 31 May 2019 13:30:58 +0200
Subject: [PATCH] Moved Excel export to context menu

-Not showing context menu option for desktop
 users.

Issue: DEB-211
---
 assets/Excel.png                              | Bin 2281 -> 0 bytes
 src/export-button.jsx                         |  42 ------------------
 ...port-column-header.jsx => dim1-header.jsx} |  26 +++++------
 src/headers-table/index.jsx                   |   8 +---
 src/index.js                                  |  28 +++++++++---
 5 files changed, 38 insertions(+), 66 deletions(-)
 delete mode 100644 assets/Excel.png
 delete mode 100644 src/export-button.jsx
 rename src/headers-table/{export-column-header.jsx => dim1-header.jsx} (67%)

diff --git a/assets/Excel.png b/assets/Excel.png
deleted file mode 100644
index 715479c3d6adf001217ad431a55763c3a9941383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2281
zcmaJ@dpwl+8lNaR$_}|CY`q4#Y;!d;G#Lyt7>rzIm{c@oUS=?tW=1on8#TIYq(bRf
zIx-a7$Vo!ZhZ3p9?%Gb;(5&PvkxOi06FbwUJ%60e`*|<F=lML}?{oY9@tzC|4KOyc
zHiAGP#?(M^g!a2Z_ZS*z->ok***Zf?VM-%~2~rtL3_?g8VLS*>`K&}R0%UR0_C5qX
zArO5B9-S#=(n1JqAs@lg#USK-kroYsczVl4EOs&|1>(U(o`49OY;1-BJPr{SjiaGx
zB0rGJ3si`~NJS`}tw?5X<-okX08cqVOTY)EEI`gr5l9GfBJ2Y%L3`G@kucyxh%}i9
z`?Dw}Ee!Azia`K}aD%f^Xf%MwBhXkJ9*^DvU{Gib5~aQIa5R>H!xJ#>z{d-w%_im~
z5F*I_A9HCfB8)4QiU>%gOeRCf+z>)>A`-oI>sB2H1_Redz$Iw{DN7C)NbHvx$e@HR
z=82>{p#ab^vf_oQQX))S>7Om|MW1K|l8<B34h$)0iI8XnO4rhIAdU9_L;3tq(GqC{
z_*cFElUPDe6M@JGP$Enfv$cy$u-By$5&Xm;ODYu8g~F8ODTZ-{QlW$^6ajvbc)*#)
zV)Fz#hsy^9jYgmfBvO`u4N}QOn3e;<<8cTm4;0qV7l-!4xZ%)f3WkIs`;jO(iXVzX
zqHLw$ma$|ZJCzR#q{~>&Us%j%u{tsEMcT|{P|Vv0a{R?YKJcMw0`If6VEsSK_Yuqa
zd@ZQYVv*Wnkh<0W*Q%FYTK(vbpM<M5K1m-GX!S1E3VTRRKLvrT+DRpo=<?n?#=(?G
zhWS$MWNjapwX-g?;5?F5^Qtr?%O6mBoVglq6g(nI?{;j3bX%>uw~n&32c5Kblim*B
zcvX5U8M`?lLzR-jfTg_1`3c_H+u5Lw812~y-|c;ASo18~*x>uZg=tOWWdF>zxLI39
zWTe@~8?lbpV4kF~mE}8mM?&gDJupS-3ulgco8Vt8srf6-Sd$@vnsqA=n|Z<3n$Yzg
zrM<Respl5cP3#W*9_N4?+!0WZ)raEOobzW5IITQ6^}0Tta4|%4nA<<--H;xWE%!XV
z2lc?zDDzBE*<2Gdb8z0GB<No?hPDL&tL4?6&AAytZEu`fy}x|dZayX@<mKn@E$B*6
zJ>so}LUYV`$_0h#V4AX784y>!>D)6xKvb0F?Z(EE$4Pe72>7@+#pv$~hnDz9??MW@
zj!jRC^YZdU1tFW~4tV`GJ6lr|lkLxDn3n}PZ*ou?+K^K<QQg}G#~!^T2M4d2o|!qU
zIvNGLin7jj9~&J-CHGug?G~y*%~w?+l=q&;J?Ogt?)bGEh?pq*k$(wbjrBfG7J1kv
zx=44P+JwZfBl#4n4|00!OAHAFt>8WCL9EwpyjoRjzSze3c^3?qyLc~4<>Qcq&cI~l
zpB1T?-f@%vm}H%=+d#Mas_#%sO2W4t{~<i<?TztwaCcdV>!=9%uHi{T-Oc^gHsLN`
z54OaQh^1De)|GFMzjuCs@PXy}IGB=1p?CAFIs5g`uHZVtL*_SkQoBgwZnf1>Ot+$<
zq6<5^hlYlHn#>v_6%Y1uukko$1WNvu%-vsKbstyV&Q*@nqZuH>(9xH>Si8YW&yxzh
zhU+oD5w!1AQdyX@70L2(5pQGOd!sL6pwqtnOWz$@g!3H!eZ4AR>OFv6rDANq5~!)a
zbHZk_-zR{-TA>-a`%-;n-fQNYi$1)95tF3*<vkV8XXXa1#U;<58kk30mhNTP_fFol
zAE(_*LD{>1bwTMu+(57}cuQ=CcAPrzcaUk^5Ps}g@^EoSl7@`QwQ=2Ex#eO1o7CYR
zJCikc-rQQ#bQSve7sjJ}m2+A9psHF@`A<>W(by*0t4y|M^m;_x04*qj3Z<`ddJcXA
zom-kJZK&H|kiBA<IBYuMm^*xCM^M6Oh37zPt(k`=&9>21W;YcJ*&o|~?>dk_^_zny
zX~muCo2&Y|`noM9TE3qyVusy<%q7BB24<ZLKz9d@q|QEl##9_|srseqbm>@*c)Fy!
z<R$f7g#*;DP;K1JF+Xo_$#pP}sk^CHvA?B^QpUu}OtCJ;J$Y)<!|8Q$fqcL?&57~$
zs2PbiQIS`D#Nxcgj~$9v_4WD{P3B+hBBp27tZ%9AgalmDw?ApRtFl3P>q%c&I5WfX
zwqt$mxTV5tEJNLT>{y4f=Prf%&;eygb%mZxKj`^|OtxhWD(l2H)73w$p2fLNgq`-V
z{<6{OcZ!0!vF6Upy?O@+2vN;9t)ua=^KY}>cMfNiq!%JygkN-hF`SEYij&MXnm)R}
z#})g!%GM^^&g5@EbZ*DDu2xV@$Ns2|^dt)de*=@?wy=g9>+UDn4=J-~7KH^5p2{&B
zO)iAD_xCcJuPxHHyx3Ph0-G2e8?Wg+EMBBqz0RHrzDQcKUbEdme|&tr`FKFfwi`7C
z?@r|8#Fej&y}tfRXwhg{uq-1+mKGZu8+6Wb$v$D>eQ=3OWww9mWW;(ea@X12IhV>i
z<#l~s22a{9U%ouai%n^;X?)i=6pqSm`_-^e6<=&ysy-DNSm2A7bBlj=E*^Gv|KTM5
qVzFI&efy!GQZtL;DKl{^3?OHZn<tj;JJ_!K`Jhrl$yL64j{E_j&9gfI

diff --git a/src/export-button.jsx b/src/export-button.jsx
deleted file mode 100644
index fcd177f..0000000
--- a/src/export-button.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { exportXLS } from './excel-export';
-
-class ExportButton extends React.PureComponent {
-  constructor (props) {
-    super(props);
-    this.handleExport = this.handleExport.bind(this);
-  }
-
-  handleExport () {
-    const { component, excelExport, general } = this.props;
-    const { title, subtitle, footnote } = general;
-    if (excelExport) {
-      exportXLS(component.$element, title, subtitle, footnote);
-    }
-  }
-
-  render () {
-    const { excelExport } = this.props;
-    return excelExport === true && (
-      <input
-        className="icon-xls"
-        onClick={this.handleExport}
-        src="/Extensions/qlik-smart-pivot/Excel.png"
-        type="image"
-      />
-    );
-  }
-}
-
-ExportButton.defaultProps = {
-  excelExport: false
-};
-
-ExportButton.propTypes = {
-  component: PropTypes.shape({}).isRequired,
-  excelExport: PropTypes.bool,
-  general: PropTypes.shape({}).isRequired
-};
-
-export default ExportButton;
diff --git a/src/headers-table/export-column-header.jsx b/src/headers-table/dim1-header.jsx
similarity index 67%
rename from src/headers-table/export-column-header.jsx
rename to src/headers-table/dim1-header.jsx
index 61775ea..88ec470 100644
--- a/src/headers-table/export-column-header.jsx
+++ b/src/headers-table/dim1-header.jsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ExportButton from '../export-button.jsx';
 import { HEADER_FONT_SIZE } from '../initialize-transformed';
+import Tooltip from '../tooltip/index.jsx';
 
-const ExportColumnHeader = ({ component, baseCSS, general, title, allowExcelExport, hasSecondDimension, styling }) => {
+const Dim1Header = ({ component, baseCSS, title, hasSecondDimension, styling }) => {
+  const inEditState = component.inEditState();
   const rowSpan = hasSecondDimension ? 2 : 1;
   const isMediumFontSize = styling.headerOptions.fontSizeAdjustment === HEADER_FONT_SIZE.MEDIUM;
   const style = {
@@ -21,21 +22,20 @@ const ExportColumnHeader = ({ component, baseCSS, general, title, allowExcelExpo
       rowSpan={rowSpan}
       style={style}
     >
-      <ExportButton
-        component={component}
-        excelExport={allowExcelExport}
-        general={general}
-      />
-      {title}
+      <Tooltip
+        isTooltipActive={!inEditState}
+        styling={styling}
+        tooltipText={title}
+      >
+        {title}
+      </Tooltip>
     </th>
   );
 };
 
-ExportColumnHeader.propTypes = {
-  component: PropTypes.shape({}).isRequired,
-  allowExcelExport: PropTypes.bool.isRequired,
+Dim1Header.propTypes = {
   baseCSS: PropTypes.shape({}).isRequired,
-  general: PropTypes.shape({}).isRequired,
+  component: PropTypes.shape({}).isRequired,
   hasSecondDimension: PropTypes.bool.isRequired,
   styling: PropTypes.shape({
     headerOptions: PropTypes.shape({
@@ -45,4 +45,4 @@ ExportColumnHeader.propTypes = {
   title: PropTypes.string.isRequired
 };
 
-export default ExportColumnHeader;
+export default Dim1Header;
diff --git a/src/headers-table/index.jsx b/src/headers-table/index.jsx
index a9eeab6..1e9fe26 100644
--- a/src/headers-table/index.jsx
+++ b/src/headers-table/index.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ExportColumnHeader from './export-column-header.jsx';
+import Dim1Header from './dim1-header.jsx';
 import ColumnHeader from './column-header.jsx';
 import MeasurementColumnHeader from './measurement-column-header.jsx';
 import { injectSeparators } from '../utilities';
@@ -12,7 +12,6 @@ class HeadersTable extends React.PureComponent {
       columnSeparatorWidth,
       component,
       data,
-      general,
       isKpi,
       styling
     } = this.props;
@@ -43,11 +42,9 @@ class HeadersTable extends React.PureComponent {
           <tbody>
             <tr>
               {isKpi ?
-                <ExportColumnHeader
-                  allowExcelExport={general.allowExcelExport}
+                <Dim1Header
                   baseCSS={baseCSS}
                   component={component}
-                  general={general}
                   hasSecondDimension={hasSecondDimension}
                   styling={styling}
                   title={dimension1[0].name}
@@ -129,7 +126,6 @@ HeadersTable.propTypes = {
       measurements: PropTypes.array
     })
   }).isRequired,
-  general: PropTypes.shape({}).isRequired,
   component: PropTypes.shape({}).isRequired,
   styling: PropTypes.shape({
     headerOptions: PropTypes.shape({}),
diff --git a/src/index.js b/src/index.js
index fb1e5f5..b7a6d46 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,8 @@
 import definition from './definition';
+import { exportXLS } from './excel-export';
 import { initializeDataCube, initializeDesignList } from './dataset';
 import initializeStore from './store';
+import qlik from 'qlik';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Root from './root.jsx';
@@ -11,11 +13,6 @@ if (!window._babelPolyfill) { // eslint-disable-line no-underscore-dangle
 }
 
 export default {
-  controller: [
-    '$scope',
-    '$timeout',
-    function controller () {}
-  ],
   design: {
     dimensions: {
       max: 1,
@@ -88,5 +85,26 @@ export default {
     snapshotLayout.snapshotData.designList = await initializeDesignList(this, snapshotLayout);
     return snapshotLayout;
   },
+  getContextMenu: async function (obj, menu) {
+    const app = qlik.currApp(this);
+    const isPersonalResult = await app.global.isPersonalMode();
+    if (!this.$scope.layout.allowexportxls || (isPersonalResult && isPersonalResult.qReturn)) {
+      return menu;
+    }
+
+    menu.addItem({
+      translation: "Export as XLS",
+      tid: "export-excel",
+      icon: "export",
+      select: () => {
+        exportXLS(
+          this.$element,
+          this.$scope.layout.title,
+          this.$scope.layout.subtitle,
+          this.$scope.layout.footnote);
+      }
+    });
+    return menu;
+  },
   version: 1.0
 };