Skip to content

Commit

Permalink
Merge pull request #242 from opendatakit/remove-tableau
Browse files Browse the repository at this point in the history
Remove Tableau from SubmissionAnalyze
  • Loading branch information
matthew-white authored Aug 8, 2019
2 parents 0f96e92 + 9d16b82 commit 978becb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
14 changes: 1 addition & 13 deletions src/components/submission/analyze.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ except according to the terms contained in the LICENSE file.
<a href="https://powerbi.microsoft.com/en-us/" target="_blank"
rel="noopener">
Microsoft Power BI</a>,
<a href="https://www.tableau.com/" target="_blank" rel="noopener">
Tableau</a>,
and
<a href="https://www.r-project.org" target="_blank" rel="noopener">
R</a>
Expand All @@ -43,9 +41,6 @@ except according to the terms contained in the LICENSE file.
<li :class="tabClass('microsoft')" role="presentation">
<a href="#" @click.prevent="setTool('microsoft')">Excel/Power BI</a>
</li>
<li :class="tabClass('tableau')" role="presentation">
<a href="#" @click.prevent="setTool('tableau')">Tableau</a>
</li>
<li :class="tabClass('r')" role="presentation">
<a href="#" @click.prevent="setTool('r')">R</a>
</li>
Expand All @@ -67,12 +62,6 @@ except according to the terms contained in the LICENSE file.
target="_blank" rel="noopener">
this page</a>.
</p>
<p v-else-if="tool === 'tableau'">
For help using OData with Tableau, see
<a href="https://onlinehelp.tableau.com/current/pro/desktop/en-us/examples_odata.html"
target="_blank" rel="noopener">
this page</a>.
</p>
<template v-else-if="tool === 'r'">
<p>
To access Central data from the free and popular
Expand Down Expand Up @@ -136,8 +125,7 @@ export default {
computed: {
...requestData(['form']),
oDataUrl() {
const base = `${window.location.origin}/v1/projects/${this.projectId}/forms/${this.form.encodedId()}.svc`;
return this.tool !== 'tableau' ? base : `${base}/Submissions?%24wkt=true`;
return `${window.location.origin}/v1/projects/${this.projectId}/forms/${this.form.encodedId()}.svc`;
}
},
watch: {
Expand Down
11 changes: 1 addition & 10 deletions test/components/submission/analyze.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,12 @@ describe('SubmissionAnalyze', () => {
});

it('renders the Excel/Power BI tab correctly', () =>
clickTab(modal, 'Tableau')
clickTab(modal, 'R')
.then(() => clickTab(modal, 'Excel/Power BI'))
.then(() => {
assertContent('Excel/Power BI', '', 'For help using OData with Excel,');
}));

it('renders the Tableau tab correctly', () =>
clickTab(modal, 'Tableau').then(() => {
assertContent(
'Tableau',
'/Submissions?%24wkt=true',
'For help using OData with Tableau,'
);
}));

it('renders the R tab correctly', () =>
clickTab(modal, 'R').then(() => {
assertContent('R', '', 'R statistics and analysis tool');
Expand Down

0 comments on commit 978becb

Please sign in to comment.