fix: modify dag and workflow display in report to also work for big DAGs (snakemake#1517)

johanneskoester · web-flow · commit 1364dfbc9db5 · 2022-03-24T19:12:11.000+01:00
* dbg

* dbg

* fix bucket name

* delete kubernetes cluster if it cannot be setup properly
diff --git a/snakemake/report/template/components/content.js b/snakemake/report/template/components/content.js
@@ -21,11 +21,14 @@ class ContentDisplay extends React.Component {
             case "rulegraph":
                 return e(
                     "div",
-                    { className: "flex gap-3 p-3 items-start" },
-                    e(RuleGraph, { setView: setView }),
+                    { className: "flex gap-3 p-3 items-start w-screen" },
                     e(
                         "div",
-                        {},
+                        { className: "w-1/5" }
+                    ),
+                    e(
+                        "div",
+                        { className: "overflow-auto max-h-screen" },
                         e(
                             "div",
                             {
@@ -37,7 +40,8 @@ class ContentDisplay extends React.Component {
                             "div",
                             { id: "brand" }
                         )
-                    )
+                    ),
+                    e(RuleGraph, { setView: setView })
                 );
             case "stats":
                 return e(
diff --git a/snakemake/report/template/components/rule_graph.js b/snakemake/report/template/components/rule_graph.js
@@ -9,7 +9,7 @@ class RuleGraph extends React.Component {
     render() {
         return e(
             "div",
-            { id: "rulegraph" }
+            { id: "rulegraph", className: "overflow-auto max-h-screen" }
         )
     }
 
diff --git a/tests/test_google_lifesciences.py b/tests/test_google_lifesciences.py
@@ -76,7 +76,7 @@ def test_google_lifesciences():
 )
 @google_credentials
 def test_touch_remote_prefix():
-    bucket_name = "snakemake-testing-%s" % next(tempfile._get_candidate_names())
+    bucket_name = "snakemake-testing-%s-bucket" % next(tempfile._get_candidate_names())
     create_google_storage(bucket_name)
     storage_prefix = "test_touch_remote_prefix"
     workdir = dpath("test_touch_remote_prefix")
diff --git a/tests/test_kubernetes.py b/tests/test_kubernetes.py
@@ -14,13 +14,21 @@ def __init__(self):
             self.cluster = "t-{}".format(uuid.uuid4())
             self.bucket_name = self.cluster
 
-            shell(
-                """
-                gcloud container clusters create {self.cluster} --num-nodes 3 --scopes storage-rw --zone us-central1-a --machine-type n1-standard-2
-                gcloud container clusters get-credentials {self.cluster} --zone us-central1-a
-                gsutil mb gs://{self.bucket_name}
-                """
-            )
+            try:
+                shell(
+                    """
+                    gcloud container clusters create {self.cluster} --num-nodes 3 --scopes storage-rw --zone us-central1-a --machine-type n1-standard-2
+                    gcloud container clusters get-credentials {self.cluster} --zone us-central1-a
+                    gsutil mb gs://{self.bucket_name}
+                    """
+                )
+            except Exception as e:
+                try:
+                    self.delete()
+                except:
+                    # ignore errors during deletion
+                    pass
+                raise e
 
         def delete(self):
             shell(

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class RuleGraph extends React.Component {`
`9`	`9`	`render() {`
`10`	`10`	`return e(`
`11`	`11`	`"div",`
`12`		`- { id: "rulegraph" }`
	`12`	`+ { id: "rulegraph", className: "overflow-auto max-h-screen" }`
`13`	`13`	`)`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ def test_google_lifesciences():`
`76`	`76`	`)`
`77`	`77`	`@google_credentials`
`78`	`78`	`def test_touch_remote_prefix():`
`79`		`- bucket_name = "snakemake-testing-%s" % next(tempfile._get_candidate_names())`
	`79`	`+ bucket_name = "snakemake-testing-%s-bucket" % next(tempfile._get_candidate_names())`
`80`	`80`	`create_google_storage(bucket_name)`
`81`	`81`	`storage_prefix = "test_touch_remote_prefix"`
`82`	`82`	`workdir = dpath("test_touch_remote_prefix")`