From 45e5efdd83981597d954a598c4a13eb92e492e03 Mon Sep 17 00:00:00 2001
From: lrlunin <lunin@campus.tu-berlin.de>
Date: Fri, 4 Aug 2023 13:42:10 +0200
Subject: [PATCH] froze jupyterlab and notebook versions due to the bugs

---
 VERSION                                       |  2 +-
 mbi-div-b-notebook-base/Dockerfile            |  6 ++---
 .../plugin.jupyterlab-settings                |  3 ---
 .../shortcuts.jupyterlab-settings             |  9 -------
 .../settings.jupyterlab-settings              | 26 -------------------
 5 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 mbi-div-b-notebook-base/data/user-settings/@jupyter-widgets/jupyterlab-manager/plugin.jupyterlab-settings
 delete mode 100644 mbi-div-b-notebook-base/data/user-settings/@jupyterlab/shortcuts-extension/shortcuts.jupyterlab-settings
 delete mode 100644 mbi-div-b-notebook-base/data/user-settings/jupyterlab_code_formatter/settings.jupyterlab-settings

diff --git a/VERSION b/VERSION
index 3a4036f..53a75d6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.5
+0.2.6
diff --git a/mbi-div-b-notebook-base/Dockerfile b/mbi-div-b-notebook-base/Dockerfile
index c39fb9e..df820e9 100644
--- a/mbi-div-b-notebook-base/Dockerfile
+++ b/mbi-div-b-notebook-base/Dockerfile
@@ -49,6 +49,9 @@ RUN chmod +x /tmp/scripts/install-slsdetector-package.sh && /tmp/scripts/install
 USER ${NB_UID}
 #Install Python 3 packages
 RUN mamba install --yes \
+    # due to the bug in previos version of notebook need to be fixed with the version below
+    'jupyterlab=4.0.4' \
+    'notebook=7.0.2' \
     'altair' \
     'beautifulsoup4' \
     'bokeh' \
@@ -108,9 +111,6 @@ RUN pip install --no-cache-dir udkm1Dsim \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"
 
-# copying "new default" settings like black code formatter
-COPY --chown=${NB_UID}:${NB_UID} data/user-settings /home/${NB_USER}/.jupyter/lab/user-settings
-
 # jupyterlab-code-formatter needs to be configured
 # https://jupyterlab-code-formatter.readthedocs.io/configuration.html
 # see more for jupyterhub https://jupyterlab-code-formatter.readthedocs.io/jupyterhub.html
diff --git a/mbi-div-b-notebook-base/data/user-settings/@jupyter-widgets/jupyterlab-manager/plugin.jupyterlab-settings b/mbi-div-b-notebook-base/data/user-settings/@jupyter-widgets/jupyterlab-manager/plugin.jupyterlab-settings
deleted file mode 100644
index 88487a7..0000000
--- a/mbi-div-b-notebook-base/data/user-settings/@jupyter-widgets/jupyterlab-manager/plugin.jupyterlab-settings
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "saveState":true
-}
\ No newline at end of file
diff --git a/mbi-div-b-notebook-base/data/user-settings/@jupyterlab/shortcuts-extension/shortcuts.jupyterlab-settings b/mbi-div-b-notebook-base/data/user-settings/@jupyterlab/shortcuts-extension/shortcuts.jupyterlab-settings
deleted file mode 100644
index 4df7aad..0000000
--- a/mbi-div-b-notebook-base/data/user-settings/@jupyterlab/shortcuts-extension/shortcuts.jupyterlab-settings
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "shortcuts":[{
-        "command": "jupyterlab_code_formatter:black",
-        "keys": [
-            "Ctrl Shift F"
-        ],
-        "selector": ".jp-Notebook.jp-mod-editMode"
-    }]
-}
\ No newline at end of file
diff --git a/mbi-div-b-notebook-base/data/user-settings/jupyterlab_code_formatter/settings.jupyterlab-settings b/mbi-div-b-notebook-base/data/user-settings/jupyterlab_code_formatter/settings.jupyterlab-settings
deleted file mode 100644
index 597cf0b..0000000
--- a/mbi-div-b-notebook-base/data/user-settings/jupyterlab_code_formatter/settings.jupyterlab-settings
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "preferences": {
-        "default_formatter": {
-            "python": [
-                "black"
-            ],
-        }
-    },
-    "black": {
-        "line_length": 88,
-        "string_normalization": true
-    },
-    
-    "styler": {},
-    "formatOnSave": true,
-    "cacheFormatters": false,
-    "astyle": {
-        "args": []
-    },
-    "ruff": {
-        "args": [
-            "--select=I"
-        ]
-    },
-    "suppressFormatterErrors": false,
-}
\ No newline at end of file