From 97bf9e3177af65d2909e80d000733958a0e72a9c Mon Sep 17 00:00:00 2001 From: Meriem-BenIsmail Date: Mon, 23 Dec 2024 14:48:04 +0100 Subject: [PATCH 1/7] bug --- Untitled.ipynb | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ Untitled1.ipynb | 61 +++++++++++++++++++++++++++++++ Untitled2.ipynb | 64 +++++++++++++++++++++++++++++++++ untitled.py | 1 + untitled.txt | 2 ++ 5 files changed, 223 insertions(+) create mode 100644 Untitled.ipynb create mode 100644 Untitled1.ipynb create mode 100644 Untitled2.ipynb create mode 100644 untitled.py create mode 100644 untitled.txt diff --git a/Untitled.ipynb b/Untitled.ipynb new file mode 100644 index 00000000..aabbe759 --- /dev/null +++ b/Untitled.ipynb @@ -0,0 +1,95 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 1, + "id": "7f99b95b-ca11-4dd6-b867-cd9a009a9b1a", + "metadata": {}, + "outputs": [], + "source": [ + "a = 1" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "id": "4e414031-58a3-451e-aed8-9e7ad8ac654c", + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "1" + ] + }, + "execution_count": 2, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "a" + ] + }, + { + "cell_type": "code", + "execution_count": 3, + "id": "8a46682c-748b-42d6-a06f-e68d420c70cb", + "metadata": {}, + "outputs": [], + "source": [ + "b =3" + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "id": "0801d97b-16bc-4cf6-8601-75df1dffd860", + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "3" + ] + }, + "execution_count": 4, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "b" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "c75e8677-1f3f-4414-9637-9a828934bd05", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.13.1" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} diff --git a/Untitled1.ipynb b/Untitled1.ipynb new file mode 100644 index 00000000..8019bb79 --- /dev/null +++ b/Untitled1.ipynb @@ -0,0 +1,61 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 1, + "id": "6a277c31-10df-44e8-b56d-e73a7b0a79cc", + "metadata": {}, + "outputs": [], + "source": [ + "a = 0" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "id": "a9fb3634-f9ab-496c-a53d-ee30bb19010f", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "0\n" + ] + } + ], + "source": [ + "print(a)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "5e68b147-6b2d-4394-b4f4-2562de492bb7", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.13.1" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} diff --git a/Untitled2.ipynb b/Untitled2.ipynb new file mode 100644 index 00000000..47e00781 --- /dev/null +++ b/Untitled2.ipynb @@ -0,0 +1,64 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 1, + "id": "41b1c965-9026-49b4-abe0-4b4fd992603a", + "metadata": {}, + "outputs": [], + "source": [ + "a =0" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "id": "f98b43a3-d0a4-4f68-b329-4eca3d90745b", + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "0" + ] + }, + "execution_count": 2, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "a" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "7ad744fa-2a6b-4cf3-bc9b-b9d79d7bf981", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.13.1" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} diff --git a/untitled.py b/untitled.py new file mode 100644 index 00000000..3ec9513a --- /dev/null +++ b/untitled.py @@ -0,0 +1 @@ +print('testing timeline with python file.') \ No newline at end of file diff --git a/untitled.txt b/untitled.txt new file mode 100644 index 00000000..d1d6ee37 --- /dev/null +++ b/untitled.txt @@ -0,0 +1,2 @@ +hello this is text file +is the timeline working ? \ No newline at end of file From 2c0abb9d4c094552ec9e4d96e46338f29a81a9f8 Mon Sep 17 00:00:00 2001 From: Meriem-BenIsmail Date: Mon, 6 Jan 2025 09:28:27 +0100 Subject: [PATCH 2/7] timeline displayed for documents other than notebooks. --- packages/docprovider-extension/src/filebrowser.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index 6f4177cd..56975492 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -262,13 +262,8 @@ export const statusBarTimeline: JupyterFrontEndPlugin = { currentWidget.context && typeof currentWidget.context.path === 'string' ) { - const documentId = - currentWidget.context.model.sharedModel.getState( - 'document_id' - ) as string; - return ( - !!documentId && !!currentWidget.context.model.collaborative - ); + const documentPath = currentWidget.context.path; + return documentPath.split(':')[0] === 'RTC'; } return false; } From 3f147601e01ee6690c8f929242e8aeebd1bbdf15 Mon Sep 17 00:00:00 2001 From: Meriem-BenIsmail Date: Mon, 6 Jan 2025 09:29:32 +0100 Subject: [PATCH 3/7] timeline displayed for documents other than notebooks. --- Untitled.ipynb | 95 ------------------------------------------------- Untitled1.ipynb | 61 ------------------------------- Untitled2.ipynb | 64 --------------------------------- untitled.py | 1 - untitled.txt | 2 -- 5 files changed, 223 deletions(-) delete mode 100644 Untitled.ipynb delete mode 100644 Untitled1.ipynb delete mode 100644 Untitled2.ipynb delete mode 100644 untitled.py delete mode 100644 untitled.txt diff --git a/Untitled.ipynb b/Untitled.ipynb deleted file mode 100644 index aabbe759..00000000 --- a/Untitled.ipynb +++ /dev/null @@ -1,95 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "id": "7f99b95b-ca11-4dd6-b867-cd9a009a9b1a", - "metadata": {}, - "outputs": [], - "source": [ - "a = 1" - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "id": "4e414031-58a3-451e-aed8-9e7ad8ac654c", - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "1" - ] - }, - "execution_count": 2, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "a" - ] - }, - { - "cell_type": "code", - "execution_count": 3, - "id": "8a46682c-748b-42d6-a06f-e68d420c70cb", - "metadata": {}, - "outputs": [], - "source": [ - "b =3" - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "id": "0801d97b-16bc-4cf6-8601-75df1dffd860", - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "3" - ] - }, - "execution_count": 4, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "b" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "c75e8677-1f3f-4414-9637-9a828934bd05", - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3 (ipykernel)", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.13.1" - } - }, - "nbformat": 4, - "nbformat_minor": 5 -} diff --git a/Untitled1.ipynb b/Untitled1.ipynb deleted file mode 100644 index 8019bb79..00000000 --- a/Untitled1.ipynb +++ /dev/null @@ -1,61 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "id": "6a277c31-10df-44e8-b56d-e73a7b0a79cc", - "metadata": {}, - "outputs": [], - "source": [ - "a = 0" - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "id": "a9fb3634-f9ab-496c-a53d-ee30bb19010f", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "0\n" - ] - } - ], - "source": [ - "print(a)" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "5e68b147-6b2d-4394-b4f4-2562de492bb7", - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3 (ipykernel)", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.13.1" - } - }, - "nbformat": 4, - "nbformat_minor": 5 -} diff --git a/Untitled2.ipynb b/Untitled2.ipynb deleted file mode 100644 index 47e00781..00000000 --- a/Untitled2.ipynb +++ /dev/null @@ -1,64 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "id": "41b1c965-9026-49b4-abe0-4b4fd992603a", - "metadata": {}, - "outputs": [], - "source": [ - "a =0" - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "id": "f98b43a3-d0a4-4f68-b329-4eca3d90745b", - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "0" - ] - }, - "execution_count": 2, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "a" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "7ad744fa-2a6b-4cf3-bc9b-b9d79d7bf981", - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3 (ipykernel)", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.13.1" - } - }, - "nbformat": 4, - "nbformat_minor": 5 -} diff --git a/untitled.py b/untitled.py deleted file mode 100644 index 3ec9513a..00000000 --- a/untitled.py +++ /dev/null @@ -1 +0,0 @@ -print('testing timeline with python file.') \ No newline at end of file diff --git a/untitled.txt b/untitled.txt deleted file mode 100644 index d1d6ee37..00000000 --- a/untitled.txt +++ /dev/null @@ -1,2 +0,0 @@ -hello this is text file -is the timeline working ? \ No newline at end of file From 81ec405ff39b3b56745a414ed33ce320e3b6683a Mon Sep 17 00:00:00 2001 From: Meriem-BenIsmail Date: Wed, 8 Jan 2025 17:14:28 +0100 Subject: [PATCH 4/7] remove rtc --- packages/docprovider-extension/src/filebrowser.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index 56975492..fc3934eb 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -262,8 +262,7 @@ export const statusBarTimeline: JupyterFrontEndPlugin = { currentWidget.context && typeof currentWidget.context.path === 'string' ) { - const documentPath = currentWidget.context.path; - return documentPath.split(':')[0] === 'RTC'; + return !!currentWidget.context.model.collaborative; } return false; } From ce233011003218ac3dbb36dc83c1671c497d9448 Mon Sep 17 00:00:00 2001 From: Meriem-BenIsmail Date: Thu, 9 Jan 2025 09:43:55 +0100 Subject: [PATCH 5/7] remove check for path --- packages/docprovider-extension/src/filebrowser.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index fc3934eb..6164fd46 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -257,11 +257,7 @@ export const statusBarTimeline: JupyterFrontEndPlugin = { const currentWidget = app.shell .currentWidget as DocumentWidget | null; - if ( - currentWidget && - currentWidget.context && - typeof currentWidget.context.path === 'string' - ) { + if (currentWidget && currentWidget.context) { return !!currentWidget.context.model.collaborative; } return false; From 606160afef5a14f3bb6b7af511cc11eefbc12404 Mon Sep 17 00:00:00 2001 From: Meriem-BenIsmail Date: Thu, 9 Jan 2025 10:18:54 +0100 Subject: [PATCH 6/7] suggested changes. --- packages/docprovider-extension/src/filebrowser.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index 6164fd46..84a98b2b 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -257,10 +257,8 @@ export const statusBarTimeline: JupyterFrontEndPlugin = { const currentWidget = app.shell .currentWidget as DocumentWidget | null; - if (currentWidget && currentWidget.context) { - return !!currentWidget.context.model.collaborative; - } - return false; + return currentWidget?.context?.model?.collaborative || false; + } }); } From 92d2d0c900511392692562219cdcec44b2c05ddb Mon Sep 17 00:00:00 2001 From: Meriem-BenIsmail Date: Thu, 9 Jan 2025 11:05:12 +0100 Subject: [PATCH 7/7] pre-commit --- packages/docprovider-extension/src/filebrowser.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index 84a98b2b..4815659c 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -257,8 +257,7 @@ export const statusBarTimeline: JupyterFrontEndPlugin = { const currentWidget = app.shell .currentWidget as DocumentWidget | null; - return currentWidget?.context?.model?.collaborative || false; - + return currentWidget?.context?.model?.collaborative || false; } }); }