From b8d617dc0568d60f6583c42f989da51ec80e9af6 Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Tue, 25 Jul 2023 12:51:17 +0400
Subject: [PATCH] Some fixes for Jupyter Notebook 7 (#1944)

* Some fixes for Jupyter Notebook 7

* Fix jupyter nbextension

* Remove explicit port setting
---
 base-notebook/Dockerfile  | 3 ++-
 docs/using/recipes.md     | 4 ++--
 scipy-notebook/Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile
index 0a097c6c..fafeb443 100644
--- a/base-notebook/Dockerfile
+++ b/base-notebook/Dockerfile
@@ -38,7 +38,8 @@ WORKDIR /tmp
 RUN mamba install --yes \
     'notebook' \
     'jupyterhub' \
-    'jupyterlab' && \
+    'jupyterlab' \
+    'nbclassic' && \
     jupyter notebook --generate-config && \
     mamba clean --all -f -y && \
     npm cache clean --force && \
diff --git a/docs/using/recipes.md b/docs/using/recipes.md
index 71af470f..e99e4a62 100644
--- a/docs/using/recipes.md
+++ b/docs/using/recipes.md
@@ -486,7 +486,7 @@ docker run -it --rm \
     start.sh jupyter notebook --NotebookApp.token=''
 ```
 
-## Enable nbextension spellchecker for markdown (or any other nbextension)
+## Enable nbclassic-extension spellchecker for markdown (or any other nbclassic-extension)
 
 NB: this works for classic notebooks only
 
@@ -499,7 +499,7 @@ USER ${NB_UID}
 RUN pip install --no-cache-dir jupyter_contrib_nbextensions && \
     jupyter contrib nbextension install --user && \
     # can modify or enable additional extensions here
-    jupyter nbextension enable spellchecker/main --user && \
+    jupyter nbclassic-extension enable spellchecker/main --user && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"
 ```
diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile
index c2c3bdb5..6338f42e 100644
--- a/scipy-notebook/Dockerfile
+++ b/scipy-notebook/Dockerfile
@@ -64,7 +64,7 @@ RUN mamba install --yes \
 # Install facets which does not have a pip or conda package at the moment
 WORKDIR /tmp
 RUN git clone https://github.com/PAIR-code/facets.git && \
-    jupyter nbextension install facets/facets-dist/ --sys-prefix && \
+    jupyter nbclassic-extension install facets/facets-dist/ --sys-prefix && \
     rm -rf /tmp/facets && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"