Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,11 @@ if (proxyConfig) {

for (const prox of proxyConfig) {
console.log(prox);
// Use https by default, but allow it to be disabled per-proxy
const useHttps = prox.https !== undefined ? prox.https : prox.site.startsWith('https://');
app.use(prox.local, proxy(prox.site, {
proxyReqPathResolver: req => req.originalUrl.replace(prox.local, ""),
https: true
https: useHttps
}));
}
}
Expand Down
4 changes: 3 additions & 1 deletion public/js/p3/widget/GridContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ define([
requireAuth: true,
max: 10000,
tooltip: 'Add selection to a new or existing group',
validContainerTypes: ['genome_data', 'sequence_data', 'feature_data', 'protein_data', 'transcriptomics_experiment_data', 'transcriptomics_gene_data', 'spgene_data']
validContainerTypes: ['genome_data', 'sequence_data', 'feature_data', 'protein_data', 'transcriptomics_experiment_data', 'transcriptomics_gene_data', 'spgene_data', 'structure_data']
},
function (selection, containerWidget) {
var dlg = new Dialog({ title: 'Add selected items to group' });
Expand All @@ -1532,6 +1532,8 @@ define([
type = 'feature_group';
} else if (containerWidget.containerType == 'transcriptomics_experiment_data') {
type = 'experiment_group';
} else if (containerWidget.containerType == 'structure_data') {
type = 'feature_group';
}

if (!type) {
Expand Down
3 changes: 2 additions & 1 deletion public/js/p3/widget/SelectionToGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ define([
idType: null,
inputType: null,
conversionTypes: {
feature_data: [{ label: 'Feature', value: 'feature_group' }, { label: 'Genome', value: 'genome_group' }]
feature_data: [{ label: 'Feature', value: 'feature_group' }, { label: 'Genome', value: 'genome_group' }],
structure_data: [{ label: 'Feature', value: 'feature_group' }, { label: 'Genome', value: 'genome_group' }]
},
selectType: false,
_setTypeAttr: function (t) {
Expand Down