diff --git a/components/OperonStructure.vue b/components/OperonStructure.vue index 9df846ba1bb7ae8dca9c9ac87b2b1355c9fdc90e..b1745a77019fb5981e348a59b1d30bbd38635a99 100644 --- a/components/OperonStructure.vue +++ b/components/OperonStructure.vue @@ -139,8 +139,23 @@ function drawGenes(genesGroup) { enter => { const g = enter.append("g") .classed("gene", true); - g.append("path").classed("gene", true) + g.append("path") + .classed("gene", true) + g.append("image") + .on("mouseover", function (event) { + console.log(event.srcElement) + d3.select(event.srcElement.previousSibling) + .attr("stroke-width", 4) + .attr("stroke", "darkred") + d3.select(event.srcElement).attr("cursor", "pointer") + }) + .on("mouseout", function (event) { + d3.select(event.srcElement.previousSibling) + .attr("stroke-width", 0) + .attr("stroke", null) + d3.select(event.srcElement).attr("cursor", "unset") + }) g.append("text") // .attr("fill", "white") .classed("gene-label", true) @@ -153,14 +168,12 @@ function drawGenes(genesGroup) { exit => exit.remove() ) genesSelection.attr("transform", d => `translate(${d.x},${d.y})`) - genesGroup.select("image") + genesSelection.select("image") .attr("href", d => d?.structImg) .attr("width", d => d.width) .attr("height", d => d.height) .on("click", function (event) { - console.log(event) const data = d3.select(this).data() - console.log(data) structureBasket.set(data.map(s => s.structPath)) }) diff --git a/components/content/PdockqMatrix.vue b/components/content/PdockqMatrix.vue index 90fdc8da07c48bd9670c35daca26c058efa6ca71..289b7739fb5e5bf0ad0834cfe772daaf8e1aba4a 100644 --- a/components/content/PdockqMatrix.vue +++ b/components/content/PdockqMatrix.vue @@ -164,11 +164,12 @@ function on(mark) { r.on("mouseover", function (event) { const elem = d3.select(event.srcElement) - const elemFill = d3.color(elem.attr("fill")).darker() - elem.attr("stroke-width", 4).attr("stroke", elemFill) + const fillColor = elem.attr("fill") + const elemFill = d3.color(fillColor).darker() + elem.attr("stroke-width", 4).attr("stroke", elemFill.toString()).attr("cursor", "pointer") }) r.on("mouseout", function (event) { - d3.select(event.srcElement).attr("stroke-width", undefined).attr("stroke", undefined) + d3.select(event.srcElement).attr("stroke-width", null).attr("stroke", null).attr("cursor", "unset") }) return g; diff --git a/deploy/df-wiki/values.yaml b/deploy/df-wiki/values.yaml index 01a770b0da047e2c0e370935fc47e27e175fdc62..5a8096dc40978373460562251148a750208ec8ba 100644 --- a/deploy/df-wiki/values.yaml +++ b/deploy/df-wiki/values.yaml @@ -36,7 +36,6 @@ securityContext: allowPrivilegeEscalation: false runAsUser: 101 runAsGroup: 101 - allowPrivilegeEscalation: false # capabilities: # drop: # - ALL diff --git a/packages/df-wiki-cli/df_wiki_cli/content/main.py b/packages/df-wiki-cli/df_wiki_cli/content/main.py index 14b323645810d072131e75274fd854f60cd149b7..227fbfd01a2aa35f6a5bbc29fb51c1f29005d3a1 100644 --- a/packages/df-wiki-cli/df_wiki_cli/content/main.py +++ b/packages/df-wiki-cli/df_wiki_cli/content/main.py @@ -616,7 +616,7 @@ def markdown( new_f_str = re.sub( r"#{2}\s+Structure.*?#{2}\s+Experimental\s+validation", - "## Structure\n\n### List predicted structures\n\n::article-structure\n::\n\n### pDockQ matrix\n\n::pdockq-matrix\n::\n\n## Experimental validation", + "## Structure\n\n::article-structure\n::\n\n## Experimental validation", all_file, flags=re.DOTALL | re.IGNORECASE, )