Skip to content

#1387 unchecked expression sheet and radio button expression data source is… #1609

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

Merged
dondi merged 1 commit into from
Jul 13, 2026
Merged

#1387 unchecked expression sheet and radio button expression data source is… #1609

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
47 changes: 46 additions & 1 deletion web-client-classic/public/js/upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,48 @@ export const upload = function () {
return result;
};

var filenameWithExtension = function (mode, genes, edges, type, extension) {
var filename = $("#fileName").text();
var source = null;
var currentExtension = filename.match(/\.[^\.]+$/);
if (currentExtension && currentExtension.length) {
filename = filename.substr(0, filename.length - currentExtension[0].length);
}
if (mode === NETWORK_GRN_MODE && extension === "xlsx") {
const anyExpressionChecked = $("input[name=workbookSheets]:checked")
.toArray()
.some(
el =>
el.value && (el.value.includes("expression") || el.value.includes("sigma"))
);

if (anyExpressionChecked) {
source = $("input[name=expressionSource]:checked")[0].value;
if (source === "none") {
source = null;
} else if (source === "userInput") {
// only demos will have an expression source
source = grnState.workbook.expression.source
? grnState.workbook.expression.source
: "user-data";
}
} else {
source = null;
}
}

if (mode !== NETWORK_GRN_MODE) {
mode = "PPI";
}
if (mode !== null && genes !== null && edges !== null && type !== null) {
filename = `${mode.toUpperCase()}_${genes}-genes_${edges}-edges_${type}`;
}
if (source) {
filename = `${filename}_${source}`;
}
return `${filename}.${extension}`;
};

const download = (workbook, route, extension, sheetType) => {
const workbookToExport = flattenWorkbook(workbook, sheetType);
var workbookFilename = filenameWithExtension(
Expand Down Expand Up @@ -526,7 +568,10 @@ export const upload = function () {
<label for='exportExcelExpressionSource-noneRadio' id='exportExcelExpressionSource-none' class='export-radio-label'>None</label>
</li>
`;
if (Object.keys(grnState.workbook.expression).length > 0) {
if (
Object.keys(grnState.workbook.expression).length > 0 &&
grnState.workbook.expression.hasOwnProperty("source")
) {
const isChecked = grnState.nodeColoring.nodeColoringEnabled ? `checked="true"` : "";
result += `
<li>
Expand Down
Loading