Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[explore] allow URL shortner even if no slice exist #4457

Merged
merged 1 commit into from
Feb 21, 2018
Merged

[explore] allow URL shortner even if no slice exist #4457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 17 additions & 21 deletions superset/assets/javascripts/explore/components/ExploreActionButtons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,28 @@ import { exportChart } from '../exploreUtils';

const propTypes = {
canDownload: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]).isRequired,
slice: PropTypes.object,
chartStatus: PropTypes.string,
latestQueryFormData: PropTypes.object,
queryResponse: PropTypes.object,
};

export default function ExploreActionButtons({
canDownload, slice, chartStatus, latestQueryFormData, queryResponse }) {
canDownload, chartStatus, latestQueryFormData, queryResponse }) {
const exportToCSVClasses = cx('btn btn-default btn-sm', {
'disabled disabledButton': !canDownload,
});
const doExportCSV = exportChart.bind(this, latestQueryFormData, 'csv');
const doExportChart = exportChart.bind(this, latestQueryFormData, 'json');

if (slice) {
return (
<div className="btn-group results" role="group">
<URLShortLinkButton latestQueryFormData={latestQueryFormData} />
return (
<div className="btn-group results" role="group">
{latestQueryFormData &&
<URLShortLinkButton latestQueryFormData={latestQueryFormData} />}

<EmbedCodeButton latestQueryFormData={latestQueryFormData} />
{latestQueryFormData &&
<EmbedCodeButton latestQueryFormData={latestQueryFormData} />}

{latestQueryFormData &&
<a
onClick={doExportChart}
className="btn btn-default btn-sm"
Expand All @@ -38,8 +39,8 @@ export default function ExploreActionButtons({
rel="noopener noreferrer"
>
<i className="fa fa-file-code-o" /> .json
</a>

</a>}
{latestQueryFormData &&
<a
onClick={doExportCSV}
className={exportToCSVClasses}
Expand All @@ -48,18 +49,13 @@ export default function ExploreActionButtons({
rel="noopener noreferrer"
>
<i className="fa fa-file-text-o" /> .csv
</a>

<DisplayQueryButton
queryResponse={queryResponse}
latestQueryFormData={latestQueryFormData}
chartStatus={chartStatus}
/>
</div>
);
}
return (
<DisplayQueryButton latestQueryFormData={latestQueryFormData} />
</a>}
<DisplayQueryButton
queryResponse={queryResponse}
latestQueryFormData={latestQueryFormData}
chartStatus={chartStatus}
/>
</div>
);
}

Expand Down
7 changes: 1 addition & 6 deletions superset/assets/spec/javascripts/explore/components/ExploreActionButtons_spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ import ExploreActionButtons from
describe('ExploreActionButtons', () => {
const defaultProps = {
canDownload: 'True',
slice: {
data: {
csv_endpoint: '',
json_endpoint: '',
},
},
latestQueryFormData: {},
queryEndpoint: 'localhost',
};

Expand Down