Use format SQL settings when creating new notebook (#115)

* create new settings

* workflow

remove snowflake tests

rm redshift snowflake

added load_extension

remove tests

serverapp

revert

jl version

removed newlines

insert btn

revert

revert

revert

test

original code

revert test

timeout

* force

newlines

newlines

newlines

.github/workflows/ci.yaml

@@ -36,9 +36,11 @@ jobs:
 
       - name: Lint
         run: |
+          python3 -m venv env
+          source env/bin/activate
           python3 -m pip install --upgrade pip
           python3 -m pip install --upgrade pkgmt nox
-          pkgmt lint
+          pkgmt lint --exclude env
 
       - name: Setup node
         uses: actions/setup-node@v3
@@ -48,6 +50,7 @@ jobs:
 
       - name: Test
         run: |
+          source env/bin/activate
           nox --session test --verbose
 
   ui-test:
@@ -81,6 +84,8 @@ jobs:
 
       - name: Install and test
         run: |
+          python3 -m venv path/to/venv
+          source path/to/venv/bin/activate
           python3 -m pip install --upgrade pip
           python3 -m pip install --upgrade nox
           SHARD=${{ matrix.shard }}

jupysql_plugin/__init__.py

@@ -5,3 +5,21 @@
 
 def _jupyter_labextension_paths():
     return [{"src": "labextension", "dest": "jupysql-plugin"}]
+
+
+def _jupyter_server_extension_points():
+    return [{"module": "jupysql_plugin"}]
+
+
+def _load_jupyter_server_extension(serverapp):
+    """
+    This function is called when the extension is loaded.
+    Parameters
+    ----------
+    server_app: jupyterlab.labapp.LabApp
+        JupyterLab application instance
+    """
+    serverapp.log.info(f"Registered {_module_name} server extension")
+
+
+load_jupyter_server_extension = _load_jupyter_server_extension

requirements.txt

@@ -1,4 +1,4 @@
-jupyterlab>=4,<4.0.12
+jupyterlab>=4
 build
 twine
 hatch

src/formatter/index.ts

@@ -28,6 +28,8 @@ export class FormattingExtension
     private notebookCodeFormatter: JupyterlabNotebookCodeFormatter;
     private formatSQLButton: ToolbarButton;
     private panel: NotebookPanel;
+    private extensionSettings: boolean;
+
 
     constructor(
         tracker: INotebookTracker
@@ -39,6 +41,7 @@ export class FormattingExtension
     }
 
     private _onSettingsChanged = (sender: any, settings: JupySQLSettings) => {
+        this.extensionSettings = settings.showFormatSQL;
         if (!settings.showFormatSQL) {
             this.formatSQLButton.parent = null;
         } else {
@@ -65,6 +68,11 @@ export class FormattingExtension
         this.formatSQLButton.node.setAttribute("data-testid", "format-btn");
 
         panel.toolbar.insertItem(10, 'formatSQL', this.formatSQLButton);
+        if (!this.extensionSettings) {
+            this.formatSQLButton.parent = null;
+        } else {
+            this.panel.toolbar.insertItem(10, 'formatSQL', this.formatSQLButton);
+        }
 
         return new DisposableDelegate(() => {
             this.formatSQLButton.dispose();
@@ -97,4 +105,4 @@ const plugin_formatting: JupyterFrontEndPlugin<void> = {
 };
 
 
-export { plugin_formatting }
+export { plugin_formatting }

ui-tests/tests/format_sql.test.ts

@@ -6,7 +6,7 @@ test('test format SQL', async ({ page }) => {
     await page.notebook.openByPath("sample.ipynb");
     await page.notebook.activate("sample.ipynb");
     await page.notebook.addCell("code", "%%sql\nselect * from table")
-    await page.getByTestId('format-btn').locator('button').click();
+    await page.getByTestId('format-btn').locator('button').click({ force: true });
     await page.waitForTimeout(2000);
 
     await expect(page.locator('body')).toContainText('SELECT');