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

list queries in shared email #677

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

list queries in shared email #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f429bd0
list queries in shared email
Lazy-poet Aug 5, 2023
11f0bae
refactor to fix codeclimate issue
Lazy-poet Aug 5, 2023
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
2 changes: 1 addition & 1 deletion public/js/cloud_share_modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default class CloudShareModal extends React.Component {
renderResults() {
const { shareableurl } = this.state;

return <ShareURLComponent url={shareableurl} querydb={this.props.querydb} program={this.props.program} queryLength={this.props.queryLength} />;
return <ShareURLComponent url={shareableurl} querydb={this.props.querydb} program={this.props.program} queries={this.props.queries} />;
}

renderError() {
Expand Down
34 changes: 23 additions & 11 deletions public/js/mailto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,39 @@
export default function asMailtoHref(querydb, program, numQueries, url, isOpenAccess) {
export default function asMailtoHref(querydb, program, queries, url, isOpenAccess) {
const dbsArr = formatDatabases(querydb);
const mailto = composeEmail(dbsArr, program, numQueries, url, isOpenAccess);
const mailto = composeEmail(dbsArr, program, queries, url, isOpenAccess);
return encodeEmail(mailto);
}

function formatDatabases(querydb) {
return querydb
function listTop15Items (objArr, key){
return objArr
.slice(0, 15)
.map(db => ' ' + db.title);
.map(obj => `- ${obj[key]}`)
.join('\n');
}

function formatDatabases(querydb) {
return 'Databases:\n' + listTop15Items(querydb, 'title');
}

function composeEmail(dbsArr, program, numQueries, url, isOpenAccess) {
function listQueryIdentifiers(queries){
return 'Queries:\n' + listTop15Items(queries, 'id');
}

function composeEmail(dbsArr, program, queries, url, isOpenAccess) {
const upperProgram = program.toUpperCase();
const accessStatement = isOpenAccess ? '' : 'The link will work if you have access to that particular SequenceServer instance.';

const queryIdentifiers = listQueryIdentifiers(queries);
return `mailto:?subject=SequenceServer ${upperProgram} analysis results &body=Hello,

Here is a link to my recent ${upperProgram} analysis of ${numQueries} sequences.
Here is a link to my recent ${upperProgram} analysis of ${queries.length} sequences.
${url}

Below is a breakdown of the databases and queries used (up to 15 are shown for each).

The following databases were used (up to 15 are shown):
${dbsArr}

${dbsArr}

${queryIdentifiers}

${accessStatement}

Thank you for using SequenceServer, and please remember to cite our paper.
Expand Down
4 changes: 2 additions & 2 deletions public/js/share_url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState } from 'react';
import asMailtoHref from './mailto';

const ShareURLComponent = ({ querydb, program, queryLength, url }) => {
const ShareURLComponent = ({ querydb, program, queries, url }) => {
const [copied, setCopied] = useState(false);

const copyToClipboard = () => {
Expand All @@ -14,7 +14,7 @@ const ShareURLComponent = ({ querydb, program, queryLength, url }) => {
<input name="shareableUrl" type="text" value={url} readOnly />
<div className="actions">
<button className="btn btn-primary" onClick={copyToClipboard}>{copied ? 'Copied!' : 'Copy to Clipboard'}</button>
<a href={asMailtoHref(querydb, program, queryLength, url, true)}>Share via email</a>
<a href={asMailtoHref(querydb, program, queries, url, true)}>Share via email</a>
</div>
</div>
);
Expand Down
53 changes: 27 additions & 26 deletions public/js/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Component } from 'react';
// eslint-disable-next-line no-unused-vars
import { Component, Fragment } from 'react';
import _ from 'underscore';

import downloadFASTA from './download_fasta';
Expand Down Expand Up @@ -353,6 +354,7 @@ export default class extends Component {
}

sharingPanelJSX() {
const link_class = 'btn-link cursor-pointer';
return (
<div className="sharing-panel">
<div className="section-header-sidebar">
Expand All @@ -361,39 +363,38 @@ export default class extends Component {
</h4>
</div>
<ul className="nav">
{!this.props.cloudSharingEnabled &&
<li>
<a id="copyURL" className="btn-link copy-URL cursor-pointer" data-toggle="tooltip"
onClick={this.copyURL}>
<i className="fa fa-copy"></i> Copy URL to clipboard
</a>
</li>
}
{!this.props.cloudSharingEnabled &&
<li>
<a id="sendEmail" className="btn-link email-URL cursor-pointer" data-toggle="tooltip"
title="Send by email" href={asMailtoHref(this.props.data.querydb, this.props.data.program, this.props.data.queries.length, window.location.href)}
target="_blank" rel="noopener noreferrer">
<i className="fa fa-envelope"></i> Send by email
</a>
</li>
}
{this.props.cloudSharingEnabled &&
<li>
<button className="btn-link cloud-Post cursor-pointer" data-toggle="tooltip"
title="Upload results to SequenceServer Cloud where it will become accessable
{
!this.props.cloudSharingEnabled ?
<Fragment>
<li>
<a id="copyURL" className={`${link_class} copy-URL`} data-toggle="tooltip"
onClick={this.copyURL}>
<i className="fa fa-copy"></i> Copy URL to clipboard
</a>
</li>
<li>
<a id="sendEmail" className={`${link_class} email-URL`} data-toggle="tooltip"
title="Send by email" href={asMailtoHref(this.props.data.querydb, this.props.data.program, this.props.data.queries, window.location.href)}
target="_blank" rel="noopener noreferrer">
<i className="fa fa-envelope"></i> Send by email
</a>
</li>
</Fragment> :
<li>
<button id="shareToCloud" className={`${link_class} cloud-Post`} data-toggle="tooltip"
title="Upload results to SequenceServer Cloud where it will become accessable
to everyone who has a link." onClick={this.shareCloudInit}>
<i className="fa fa-cloud"></i> Share to cloud
</button>
</li>
<i className="fa fa-cloud"></i> Share to cloud
</button>
</li>
}
</ul>
{
<CloudShareModal
ref="cloudShareModal"
querydb={this.props.data.querydb}
program={this.props.data.program}
queryLength={this.props.data.queries.length}
queries={this.props.data.queries}
/>
}
</div>
Expand Down
Loading