drawio 14.8.0 (QuantStack#54)

bollwyvl · Jun 22, 2021 · f772592 · f772592
1 parent 6b3aef7
commit f772592
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,9 +13,9 @@
 
 #### @deathbeds/ipydrawio-notebook 1.1.1
 
-#### @deathbeds/ipydrawio-webpack 14.7.600
+#### @deathbeds/ipydrawio-webpack 14.8.000
 
-- upgrade to drawio v14.7.6 for layer enhancements and various bugfixes [#51]
+- upgrade to drawio v14.8.0 for layer enhancements and various bugfixes [#51]
 
 #### @deathbeds/ipydrawio-jupyter-templates 1.1.1
 

diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico
diff --git a/packages/ipydrawio-webpack/drawio b/packages/ipydrawio-webpack/drawio
diff --git a/packages/ipydrawio-webpack/lib/_static.js b/packages/ipydrawio-webpack/lib/_static.js
@@ -2733,6 +2733,7 @@ import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/softwar
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/software/class_2.xml';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/software/component.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/software/component.xml';
+import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/software/data_flow_1.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/software/data_flow_1.xml';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/software/database_1.png';
 import '!!file-loader?name=[path][name].[ext]&context=.!../dio/templates/software/database_1.xml';

diff --git a/packages/ipydrawio-webpack/package.json b/packages/ipydrawio-webpack/package.json
@@ -43,5 +43,5 @@
     "build:pre": "python scripts/patch.py && python scripts/static.py"
   },
   "types": "lib/index.d.ts",
-  "version": "14.7.600"
+  "version": "14.8.000"
 }
diff --git a/packages/ipydrawio/package.json b/packages/ipydrawio/package.json
@@ -19,7 +19,7 @@
     "json-schema-to-typescript": "^10.1.4"
   },
   "peerDependencies": {
-    "@deathbeds/ipydrawio-webpack": "^14.7.600",
+    "@deathbeds/ipydrawio-webpack": "^14.8.000",
     "@jupyter-widgets/base": "4",
     "@jupyter-widgets/controls": "3",
     "@jupyter-widgets/jupyterlab-manager": "3"

diff --git a/py_packages/ipydrawio-export/src/ipydrawio_export/manager.py b/py_packages/ipydrawio-export/src/ipydrawio_export/manager.py
@@ -176,6 +176,7 @@ def _pdf(self, pdf_request):
                 self.start_server()
                 time.sleep(self.init_wait_sec)
             try:
+                self.log.warning(f"[ipydrawio-export] exporting ({retries} retries)...")
                 res = self._session.post(self.url, timeout=None, data=data)
                 pdf_text = res.text
                 status_code = res.status_code

diff --git a/py_packages/ipydrawio-export/src/ipydrawio_export/vendor/draw-image-export2 b/py_packages/ipydrawio-export/src/ipydrawio_export/vendor/draw-image-export2
diff --git a/py_packages/ipydrawio/README.md b/py_packages/ipydrawio/README.md
@@ -19,7 +19,7 @@
 ```bash
 mamba install -c conda-forge ipydrawio  # recommended, or...
 conda install -c conda-forge ipydrawio  # or...
-pip install ipydrawio ipydrawio
+pip install ipydrawio
 ```
 
 ## Features
@@ -55,27 +55,60 @@ pip install ipydrawio ipydrawio
 
 ## Usage
 
+> Please see the [docs] for full information
+
 - Try on [![binder-badge][]][binder]
   - or follow the [Installation instructions](#installation) and **Start
     JupyterLab**
-- Import a `drawio` from [diagrams.net](https://diagrams.net) with the _[File
-  Manager][]_
-  - or create a new blank (or customized)
+- Open a diagram, by doing one of:
+  - Creating a
     <img src="https://raw.githubusercontent.com/deathbeds/ipydrawio/master/packages/ipydrawio/style/img/drawio.svg" width="24"/>
-    _Diagram_ from the [Launcher][]
+    Diagram\_ from the [Launcher][]
+  - Uploading a diagram created on [diagrams.net](https://diagrams.net) with the
+    _[File Manager][]_ and double clicking it
+  - Building diagrams by interactively computing in `IPython` with
+    `ipydrawio.Diagram`
+  - Use the `application/x-drawio` MIME renderer
 - Use the _[Command Palette][]_ to _Export Diagram_ to various formats
   - > **NOTE**: some of the built-in UI features of drawio don't work properly
     > inside an IFrame in JupyterLab, and are difficult to robustly disable:
     > please see _Diagram_ options available in the _Command Palette_ and
     > various _Main Menu_ menus.
-- Build interactive diagrams with `ipydrawio.Diagram` from `IPython`
-- Use the `application/x-drawio` MIME renderer
 
 ## Configuring
 
-- Change the _Diagram Theme_ from the _Settings_
+### UI Themes
+
+Your default theme can be changed in the JupyterLab Main Menu:
+
+- open _Settings_
+- open _Diagram Theme_
+- select your theme
+- all open documents will change to this theme (prompting if not saved)
+- all future documents will use this theme
+
+The different themes have some advantages and disadvantages:
+
+| theme     | default | full menu | layers | pages | light | dark | rough |
+| --------- | :-----: | :-------: | :----: | :---: | :---: | :--: | :---: |
+| `atlas`   |         |    ✔️     |   ✔️   |  ✔️   |  ✔️   |      |       |
+| `dark`    |         |    ✔️     |   ✔️   |  ✔️   |       |  ✔️  |       |
+| `kennedy` |         |    ✔️     |   ✔️   |  ✔️   |  ✔️   |      |       |
+| `min`     |   ✔️    |           |   ✔️   |  ✔️   |  ✔️   |  ⚙️  |       |
+| `sketch`  |         |           |   ✔️   |       |  ✔️   |  ⚙️  |  ✔️   |
+
+> Note that `rough` will change how many shapes look
+
+### Drawio Configuration and URL parameters
 
-> Use _Advanced Settings_ to modify drawio embedding parameters
+Use _Advanced Settings_ to modify drawio embedding parameters
+
+> See the [schema] for full details of the (known) supported options as well as
+> the [upstream docs] for all parameters, though IPyDrawio might not support
+> them... yet.
+
+[schema]: https://ipydrawio.readthedocs.io/en/stable/api/schema.html
+[upstream docs]: https://www.diagrams.net/doc/faq/supported-url-parameters
 
 ### PDF: Lab and Server extensions
 
@@ -99,6 +132,13 @@ headless browser, powered by [@jgraph/draw-image-export2], `puppeteer`, and
 > conda install -yc conda-forge ipydrawio-export
 > ```
 
+Once installed, you can use the in-browser tools _Export Diagram as PDF_ as well
+as the command line:
+
+```bash
+jupyter ipydrawio-export <name of document>
+```
+
 ## Open Source
 
 ### License

diff --git a/scripts/project.py b/scripts/project.py
@@ -181,9 +181,28 @@ def A_O(archive_id, url, cache_bust=CACHE_EPOCH):
 
 JS_PKG_NOT_META = {k: v for k, v in JS_PKG_JSON.items() if k.startswith("_")}
 
+
+def _norm_js_version(pkg):
+    """undo some package weirdness"""
+    v = pkg["version"]
+    final = ""
+    # alphas, beta use dashes
+    for dashed in v.split("-"):
+        if final:
+            final += "-"
+        for dotted in dashed.split("."):
+            if final:
+                final += "."
+            if re.findall(r"^\d+$", dotted):
+                final += str(int(dotted))
+            else:
+                final += dotted
+    return final
+
+
 JS_TARBALL = {
     k: JS_PKG_JSON[k].parent
-    / f"""{v["name"].replace('@', '').replace("/", "-")}-{v["version"]}.tgz"""
+    / f"""{v["name"].replace('@', '').replace("/", "-")}-{_norm_js_version(v)}.tgz"""
     for k, v in JS_PKG_DATA.items()
     if k not in JS_PKG_NOT_META
 }

diff --git a/yarn.lock b/yarn.lock
@@ -98,7 +98,7 @@
     "@jupyterlab/application" "3"
 
 "@deathbeds/ipydrawio-webpack@file:packages/ipydrawio-webpack":
-  version "14.7.600"
+  version "14.8.000"
   dependencies:
     "@jupyterlab/application" "3"