From cacfa5ff0615c6c379bbd8864c8290696224effd Mon Sep 17 00:00:00 2001
From: roypaulin <roy.paulin@microfocus.com>
Date: Thu, 11 Apr 2024 22:20:21 +0200
Subject: [PATCH 1/3] Update extensions

---
 Makefile                                      |   6 +-
 README.md                                     |   1 +
 bin/verticapylab                              |  23 +-
 .../extensions-v2/vertica_tools/src/icon.tsx  |  43 ++-
 .../extensions-v2/vertica_tools/src/index.ts  |  92 ++++++-
 .../vertica_tools/src/launcher.tsx            |  24 +-
 .../vertica_tools/style/icons/admintools.svg  |   1 +
 .../vertica_tools/style/icons/course1.svg     |  37 +++
 .../style/icons/grafana-icon.svg              |   1 +
 .../vertica_tools/style/{ => icons}/query.svg |   0
 .../vertica_tools/style/icons/rocket.svg      |   1 +
 .../vertica_tools/style/icons/vertica2.svg    |  13 +
 .../style/{ => icons}/verticapy.svg           |   0
 .../vertica_tools/style/icons/vsql.svg        |   1 +
 .../extensions-v2/vertica_tools/yarn.lock     | 250 ++++++++++++++++++
 docker-verticapy/requirements.txt             |   2 +-
 16 files changed, 465 insertions(+), 30 deletions(-)
 create mode 100644 docker-verticapy/extensions-v2/vertica_tools/style/icons/admintools.svg
 create mode 100644 docker-verticapy/extensions-v2/vertica_tools/style/icons/course1.svg
 create mode 100644 docker-verticapy/extensions-v2/vertica_tools/style/icons/grafana-icon.svg
 rename docker-verticapy/extensions-v2/vertica_tools/style/{ => icons}/query.svg (100%)
 create mode 100644 docker-verticapy/extensions-v2/vertica_tools/style/icons/rocket.svg
 create mode 100644 docker-verticapy/extensions-v2/vertica_tools/style/icons/vertica2.svg
 rename docker-verticapy/extensions-v2/vertica_tools/style/{ => icons}/verticapy.svg (100%)
 create mode 100644 docker-verticapy/extensions-v2/vertica_tools/style/icons/vsql.svg

diff --git a/Makefile b/Makefile
index 05d96034..baa3fffd 100644
--- a/Makefile
+++ b/Makefile
@@ -123,10 +123,8 @@ verticapylab-start: etc/VerticaPyLab.conf ## Start a jupyterlab
 		  fi; \
 	    fi; \
 	    docker container rm "$$VERTICAPYLAB_CONTAINER_NAME" >/dev/null 2>&1; \
-	    bin/verticapylab; \
-	else \
-	  echo "$$VERTICAPYLAB_CONTAINER_NAME is already running"; \
-	fi
+	fi; \
+	bin/verticapylab;
 
 # this builds the image from the python base image for the purposes of
 # testing it locally before pushing it to dockerhub
diff --git a/README.md b/README.md
index 3c67f573..e377ef3e 100644
--- a/README.md
+++ b/README.md
@@ -157,6 +157,7 @@ A Vertica database. To get a simple single-node Vertica CE database, see the [Ve
     ```
     make verticapylab-start
     ```
+    Note: If the container already exists, this command will simply display the link to access verticapylab
 
 2. Open the displayed link in a browser.
 3. To stop the container:
diff --git a/bin/verticapylab b/bin/verticapylab
index 643ecee7..7048cdcc 100755
--- a/bin/verticapylab
+++ b/bin/verticapylab
@@ -31,7 +31,7 @@ function usage {
     exit 1
 }
 
-while getopts "p:c:i:h" opt; do
+while getopts "p:c:v:i:h" opt; do
     case ${opt} in
         h)
             usage
@@ -55,6 +55,21 @@ while getopts "p:c:i:h" opt; do
     esac
 done
 
+# Get the basic URL and remap the hostname and port
+if  [[ $VERTICAPYLAB_BIND_ADDRESS == 0.0.0.0 ]]; then
+  url_host=$(hostname)
+else
+  url_host="$VERTICAPYLAB_BIND_ADDRESS"
+fi
+
+if docker exec -i "$VERTICAPYLAB_CONTAINER_NAME" true 2>/dev/null; then
+  echo "$VERTICAPYLAB_CONTAINER_NAME is already running"
+  URL=$(docker logs "$VERTICAPYLAB_CONTAINER_NAME" 2>&1 | grep -Eo 'http[s]?://[0-9.]+:8888/.*' | head -n 1 | sed "s/[0-9.]*:8888/$url_host:$VERTICAPYLAB_PORT/")
+  echo "Copy and paste this URL in browser:"
+  echo "    $URL"
+  exit 0
+fi
+
 if [[ ${TEST_MODE^^} == "YES" ]]; then
   VERTICAPYLAB_IMG_VERSION=$VERSION
 fi
@@ -149,12 +164,6 @@ while ! docker logs -n 5 "$VERTICAPYLAB_CONTAINER_NAME" 2>&1 | grep 'Or copy and
   sleep 1
 done
 
-# Get the basic URL and remap the hostname and port
-if  [[ $VERTICAPYLAB_BIND_ADDRESS == 0.0.0.0 ]]; then
-  url_host=$(hostname)
-else
-  url_host="$VERTICAPYLAB_BIND_ADDRESS"
-fi
 URL=$(docker logs "$VERTICAPYLAB_CONTAINER_NAME" 2>&1 | grep -Eo 'http[s]?://[0-9.]+:8888/.*' | head -n 1 | sed "s/[0-9.]*:8888/$url_host:$VERTICAPYLAB_PORT/")
 # This checks the kernel name to set the correct command to open the link in browser,
 # because Linux systems will use xdg-open while MacOs will use open
diff --git a/docker-verticapy/extensions-v2/vertica_tools/src/icon.tsx b/docker-verticapy/extensions-v2/vertica_tools/src/icon.tsx
index 2d4c3e56..99119e3a 100644
--- a/docker-verticapy/extensions-v2/vertica_tools/src/icon.tsx
+++ b/docker-verticapy/extensions-v2/vertica_tools/src/icon.tsx
@@ -1,7 +1,18 @@
 import { LabIcon } from '@jupyterlab/ui-components';
 
-import verticapyIconSvg from '../style/verticapy.svg';
-import queryIconSvg from '../style/query.svg';
+import vsqlIconSvg from '../style/icons/vsql.svg';
+import verticapyIconSvg from '../style/icons/verticapy.svg';
+import queryIconSvg from '../style/icons/query.svg';
+import admintoolsIconSvg from '../style/icons/admintools.svg';
+import course1IconSvg from '../style/icons/course1.svg';
+import grafanaIconSvg from '../style/icons/grafana-icon.svg';
+import rocketIconSvg from '../style/icons/rocket.svg';
+import verticaIconSvg from '../style/icons/vertica2.svg';
+
+export const verticaIcon = new LabIcon({
+    name: 'vertica:verticaicon',
+    svgstr: verticaIconSvg
+  });
 
 export const verticapyIcon = new LabIcon({
     name: 'vertica:verticapyicon',
@@ -11,4 +22,30 @@ export const verticapyIcon = new LabIcon({
 export const queryIcon = new LabIcon({
     name: 'vertica:queryicon',
     svgstr: queryIconSvg
-});
\ No newline at end of file
+});
+
+export const admintoolsIcon = new LabIcon({
+    name: 'vertica:admintools',
+    svgstr: admintoolsIconSvg
+});
+
+export const vsqlIcon = new LabIcon({
+    name: 'vertica:vsql',
+    svgstr: vsqlIconSvg
+});
+
+export const course1Icon = new LabIcon({
+    name: 'vertica:course1',
+    svgstr: course1IconSvg
+});
+
+export const grafanaIcon = new LabIcon({
+    name: 'grafana:grafanaicon',
+    svgstr: grafanaIconSvg
+});
+
+export const rocketIcon = new LabIcon({
+    name: 'grafana:rocketicon',
+    svgstr: rocketIconSvg
+});
+
diff --git a/docker-verticapy/extensions-v2/vertica_tools/src/index.ts b/docker-verticapy/extensions-v2/vertica_tools/src/index.ts
index 00dfd195..17875bda 100644
--- a/docker-verticapy/extensions-v2/vertica_tools/src/index.ts
+++ b/docker-verticapy/extensions-v2/vertica_tools/src/index.ts
@@ -9,17 +9,33 @@ import { ICommandPalette, MainAreaWidget } from '@jupyterlab/apputils';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ITranslator } from '@jupyterlab/translation';
 import { launcherIcon, addIcon } from '@jupyterlab/ui-components';
-
 import { toArray } from '@lumino/algorithm';
 import { Widget } from '@lumino/widgets';
 
-import { Launcher } from './launcher';
-import { verticapyIcon, queryIcon } from './icon'
+import { Launcher, VERTICAPY_UI, VERTICAPY_LESSONS, VERTICA } from './launcher';
+import { verticapyIcon, queryIcon, course1Icon, grafanaIcon, rocketIcon } from './icon';
 
 namespace CommandIDs {
   export const createNew = 'launcher:create';
   export const openConnect = "launcher:connect";
   export const openQprof = "launcher:qprof";
+  export const openCourseDSE = 'launcher:open-dse';
+  export const openHelp = 'launcher:open-help';
+  export const openGrafanaExplorer = 'launcher:explorer';
+  export const openVerticaPerformanceDashboard = 'launcher:perf'
+}
+
+/**
+ * constants used by grafana commands
+ */
+
+namespace Grafana {
+  // 'PORT' will be overridden by the actual port used by the grafana container
+  export const port = "3000";
+
+  export const explorerPathName = "explore";
+
+  export const perfDashboardPathName = "d/vertica-perf/vertica-performance-dashboard";
 }
 
 const extension: JupyterFrontEndPlugin<ILauncher> = {
@@ -97,6 +113,48 @@ const extension: JupyterFrontEndPlugin<ILauncher> = {
       }
     });
 
+    commands.addCommand(CommandIDs.openCourseDSE, {
+      label: 'Data Science Essentials',
+      icon: course1Icon,
+      execute: (args: any) => {
+        window.open('/voila/render/demos/enablement/Data%20Science%20Essentials/Data_Science_Essentials.ipynb?', '_blank');
+      }
+    });
+
+    commands.addCommand(CommandIDs.openHelp, {
+      label: 'Documentation',
+      icon: verticapyIcon,
+      execute: (args: any) => {
+        window.open('https://www.vertica.com/python/', '_blank');
+      }
+    });
+
+    let grafanaUrl = new URL(window.location.href);
+    grafanaUrl.port = Grafana.port;
+    // Create grafana explorer and vertica performance dashboard urls
+    let explorerUrl = new URL(grafanaUrl.href);
+    let perfDashboardUrl = new URL(grafanaUrl.href);
+    explorerUrl.pathname = Grafana.explorerPathName;
+    perfDashboardUrl.pathname = Grafana.perfDashboardPathName;
+    
+    commands.addCommand(CommandIDs.openGrafanaExplorer, {
+      label: 'Grafana',
+      caption: 'Open Grafana',
+      icon: grafanaIcon,
+      execute: (args: any) => {
+        window.open(explorerUrl.href, '_blank');
+      }
+    });
+
+    commands.addCommand(CommandIDs.openVerticaPerformanceDashboard, {
+      label: 'Performance',
+      caption: 'Open Performance Dashboard',
+      icon: rocketIcon,
+      execute: (args: any) => {
+        window.open(perfDashboardUrl.href, '_blank');
+      }
+    });
+
     // Add the command to the palette
     if (palette) {
       palette.addItem({
@@ -107,13 +165,37 @@ const extension: JupyterFrontEndPlugin<ILauncher> = {
 
     model.add({
       command: CommandIDs.openConnect,
-      category: 'VerticaPy UI',
+      category: VERTICAPY_UI,
       rank: 1
     });
 
     model.add({
       command: CommandIDs.openQprof,
-      category: 'VerticaPy UI',
+      category: VERTICAPY_UI,
+      rank: 2
+    });
+
+    model.add({
+      command: CommandIDs.openCourseDSE,
+      category: VERTICAPY_LESSONS,
+      rank: 1
+    });
+
+    model.add({
+      command: CommandIDs.openHelp,
+      category: VERTICAPY_LESSONS,
+      rank: 2
+    });
+
+    model.add({
+      command: CommandIDs.openGrafanaExplorer,
+      category: VERTICA,
+      rank: 1
+    });
+
+    model.add({
+      command: CommandIDs.openVerticaPerformanceDashboard,
+      category: VERTICA,
       rank: 2
     });
 
diff --git a/docker-verticapy/extensions-v2/vertica_tools/src/launcher.tsx b/docker-verticapy/extensions-v2/vertica_tools/src/launcher.tsx
index 8ec88334..81175fe6 100644
--- a/docker-verticapy/extensions-v2/vertica_tools/src/launcher.tsx
+++ b/docker-verticapy/extensions-v2/vertica_tools/src/launcher.tsx
@@ -8,18 +8,14 @@ import { LabIcon } from '@jupyterlab/ui-components';
 import { each } from '@lumino/algorithm';
 
 import * as React from 'react';
-import verticaIconSvg from '../style/verticapy.svg';
-
-export const verticaIcon = new LabIcon({
-    name: 'vertica:vertica',
-    svgstr: verticaIconSvg
-  });
+import { verticapyIcon, verticaIcon } from './icon';
 
 /**
  * The known categories of launcher items and their default ordering.
  */
-const VERTICA_CATEGORY = 'VerticaPy UI';
-// const VERTICAPY_LESSONS = 'VerticaPy Lessons';
+export const VERTICAPY_UI = 'VerticaPy UI';
+export const VERTICAPY_LESSONS = 'VerticaPy Lessons';
+export const VERTICA = 'Vertica'
 
 
 export class Launcher extends JupyterlabLauncher {
@@ -75,7 +71,9 @@ export class Launcher extends JupyterlabLauncher {
         const categories: React.ReactElement<any>[] = [];
 
         const knownCategories = [
-        VERTICA_CATEGORY,
+        VERTICAPY_UI,
+        VERTICAPY_LESSONS,
+        VERTICA,
         this._translator.__('Notebook'),
         this._translator.__('Console'),
         this._translator.__('Other')
@@ -86,7 +84,13 @@ export class Launcher extends JupyterlabLauncher {
         each(knownCategories, (category, index) => {
         React.Children.forEach(launcherCategories, cat => {
             if (cat.key === category) {
-            if (cat.key === VERTICA_CATEGORY) {
+            if (cat.key === VERTICAPY_UI) {
+                cat = this.replaceCategoryIcon(cat, verticapyIcon);
+            }
+            if (cat.key === VERTICAPY_LESSONS) {
+                cat = this.replaceCategoryIcon(cat, verticapyIcon);
+            }
+            if (cat.key === VERTICA) {
                 cat = this.replaceCategoryIcon(cat, verticaIcon);
             }
             categories.push(cat);
diff --git a/docker-verticapy/extensions-v2/vertica_tools/style/icons/admintools.svg b/docker-verticapy/extensions-v2/vertica_tools/style/icons/admintools.svg
new file mode 100644
index 00000000..e0bd2808
--- /dev/null
+++ b/docker-verticapy/extensions-v2/vertica_tools/style/icons/admintools.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 380.76 393.52"><defs><style>.n{fill:#231CA5;stroke:#000;stroke-width:.93px;}.n,.c{stroke-miterlimit:10;}.c{fill:#fff;stroke:#2f3d3f;stroke-width:1.66px;}</style></defs><rect class="n" x="46.04" y="50.03" width="295" height="295"/><g><path class="c" d="M105.24,279.29h-18.46l-2.53,12h-18.29l18.95-74.5h22.87l18.78,74.5h-18.7l-2.61-12Zm-14.54-18.47h10.62l-5.31-24.73-5.31,24.73Z"/><path class="c" d="M154.4,291.29v-5.43c-2.83,4.73-6.75,7.1-11.76,7.1s-9.35-2.42-12.37-7.25c-3.02-4.83-4.53-11.88-4.53-21.13,0-4.8,.44-9.09,1.31-12.89,.87-3.79,2.08-6.96,3.63-9.5,1.55-2.54,3.4-4.45,5.55-5.74,2.15-1.29,4.53-1.93,7.15-1.93,2.4,0,4.48,.56,6.25,1.67,1.77,1.11,3.14,2.54,4.12,4.28v-23.69h17.48v74.5h-16.82Zm-.73-28.38c0-3.76-.41-6.5-1.22-8.24-.82-1.67-2.1-2.5-3.84-2.5s-3.08,.89-4,2.66c-.93,1.77-1.39,4.68-1.39,8.71s.46,6.96,1.39,8.76c.93,1.81,2.26,2.71,4,2.71,1.63,0,2.88-.83,3.76-2.5,.49-.97,.83-2.12,1.02-3.44,.19-1.32,.29-2.89,.29-4.7v-1.46Z"/><path class="c" d="M202.9,234.53c2.56,0,4.8,.68,6.74,2.04,1.93,1.36,3.44,3.32,4.53,5.9,1.52-2.43,3.32-4.36,5.39-5.79,2.07-1.42,4.52-2.14,7.35-2.14,4.3,0,7.64,1.69,10,5.06,2.37,3.38,3.55,8.23,3.55,14.56v37.15h-17.48v-34.12c0-1.6-.24-2.73-.73-3.39-.49-.66-1.17-.99-2.04-.99-1.58,0-2.72,.66-3.43,1.98-.16,.35-.3,.77-.41,1.25-.11,.49-.16,1.15-.16,1.98v33.29h-17.48v-34.12c0-1.6-.24-2.73-.73-3.39-.49-.66-1.17-.99-2.04-.99-1.58,0-2.72,.66-3.43,1.98-.16,.35-.3,.77-.41,1.25-.11,.49-.16,1.15-.16,1.98v33.29h-17.48v-55.1h16.99v5.74c1.31-2.23,2.9-4.02,4.78-5.37,1.88-1.36,4.1-2.04,6.66-2.04Z"/><path class="c" d="M244.96,216.79h17.48v14.09h-17.48v-14.09Zm0,19.41h17.48v55.1h-17.48v-55.1Z"/><path class="c" d="M267.34,236.2h16.99v5.74c1.47-2.3,3.2-4.1,5.19-5.43,1.99-1.32,4.34-1.98,7.06-1.98,4.41,0,7.87,1.71,10.37,5.11,2.5,3.41,3.76,8.24,3.76,14.5v37.15h-17.48v-33.08c0-1.95-.3-3.34-.9-4.17-.6-.83-1.44-1.25-2.53-1.25-.93,0-1.76,.21-2.49,.63s-1.32,1.04-1.76,1.88c-.22,.42-.4,.92-.53,1.51-.14,.59-.2,1.41-.2,2.45v32.03h-17.48v-55.1Z"/></g><path class="c" d="M303.87,125.82c-.7,2.44-1.19,4.95-2.12,7.3-6.96,17.67-24.21,27.38-42.88,24.11-7.7-1.35-14.33-4.92-19.91-10.38-.94-.92-1.7-1.05-2.9-.62-27.96,10.19-55.94,20.35-83.91,30.51-9.95,3.61-19.87,7.32-29.87,10.78-14.5,5.02-28.96-5.28-29.62-19.95-.45-10,6.07-19.34,15.66-21.99,14.09-3.9,28.25-7.54,42.39-11.26,22.4-5.89,44.8-11.75,67.21-17.62,2.84-.74,5.67-1.52,8.52-2.22,1-.25,1.45-.76,1.65-1.78,3.93-20.44,22.37-33.84,42.96-31.13,8.26,1.09,15.36,4.72,21.45,10.38,.19,.18,.36,.39,.51,.59,.12,.16,.21,.35,.44,.72-2.81,.89-5.52,1.77-8.24,2.62-7.5,2.34-14.99,4.68-22.51,6.98-1.05,.32-1.54,.85-1.68,1.94-.71,5.35-1.51,10.68-2.2,16.03-.07,.58,.22,1.37,.62,1.81,3.62,4,7.33,7.92,10.96,11.91,.73,.81,1.41,.82,2.35,.52,9.44-2.97,18.9-5.91,28.34-8.88,.74-.23,1.43-.67,2.14-1.01l.64,.64Zm-194.81,51.85c5.92,3.15,13.48,.84,16.66-5.1,3.25-6.08,.92-13.64-5.21-16.86-5.92-3.11-13.42-.86-16.58,4.97-3.35,6.19-1.1,13.68,5.12,16.99Z"/></svg>
\ No newline at end of file
diff --git a/docker-verticapy/extensions-v2/vertica_tools/style/icons/course1.svg b/docker-verticapy/extensions-v2/vertica_tools/style/icons/course1.svg
new file mode 100644
index 00000000..844d5888
--- /dev/null
+++ b/docker-verticapy/extensions-v2/vertica_tools/style/icons/course1.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 53.867 53.867" style="enable-background:new 0 0 53.867 53.867;" xml:space="preserve">
+<polygon style="fill:#EFCE4A;" points="26.934,1.318 35.256,18.182 53.867,20.887 40.4,34.013 43.579,52.549 26.934,43.798 
+	10.288,52.549 13.467,34.013 0,20.887 18.611,18.182 "/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/docker-verticapy/extensions-v2/vertica_tools/style/icons/grafana-icon.svg b/docker-verticapy/extensions-v2/vertica_tools/style/icons/grafana-icon.svg
new file mode 100644
index 00000000..c7ea1c5d
--- /dev/null
+++ b/docker-verticapy/extensions-v2/vertica_tools/style/icons/grafana-icon.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="none"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"><path fill="url(#grafana-color-16__paint0_linear_2372_364)" d="M13.985 7.175a4.408 4.408 0 00-.138-.802 5.035 5.035 0 00-1.054-1.998 2.96 2.96 0 00-.366-.393c.198-.787-.245-1.468-.245-1.468-.764-.046-1.237.227-1.42.363-.031-.015-.062-.03-.092-.03-.122-.046-.26-.106-.397-.137-.138-.045-.275-.075-.413-.12-.137-.031-.29-.061-.443-.092-.03 0-.046 0-.076-.015C9.005 1.44 8.058 1 8.058 1 7.004 1.666 6.79 2.604 6.79 2.604s0 .015-.016.06l-.183.046c-.076.03-.168.06-.244.076-.077.03-.168.06-.245.09-.153.076-.32.152-.473.228-.153.09-.306.181-.443.272-.016-.015-.03-.015-.03-.015-1.467-.545-2.766.136-2.766.136-.122 1.544.58 2.528.733 2.71-.03.09-.06.196-.091.287a8.104 8.104 0 00-.245 1.09c0 .06-.015.106-.015.166C1.397 8.386 1 9.748 1 9.748c1.13 1.287 2.46 1.377 2.46 1.377.167.303.366.575.58.848.092.106.183.212.29.318a3.014 3.014 0 00.061 2.149c1.268.045 2.093-.545 2.261-.681.122.045.26.076.382.106.382.106.78.151 1.176.181h.49c.595.848 1.634.954 1.634.954.748-.772.779-1.544.779-1.71v-.015-.03-.03c.153-.107.305-.228.443-.35a5.37 5.37 0 00.779-.892c.015-.03.046-.06.061-.09.84.045 1.436-.515 1.436-.515-.138-.863-.642-1.287-.749-1.378l-.015-.015h-.015s-.015 0-.015-.015c0-.045.015-.106.015-.151 0-.091.015-.182.015-.288V9.4v-.166-.076-.152l-.015-.075c-.015-.091-.03-.197-.061-.288a3.506 3.506 0 00-.428-1.044 3.856 3.856 0 00-.718-.848 3.784 3.784 0 00-.901-.575 3.347 3.347 0 00-.993-.272c-.168-.015-.336-.03-.504-.03H9.37 9.204c-.092.015-.169.015-.26.03-.336.06-.642.181-.932.348-.275.166-.52.363-.718.605a2.579 2.579 0 00-.459.757 2.63 2.63 0 00-.183.817v.393c.015.137.046.273.077.394.076.258.183.485.336.666.137.197.32.348.504.485.183.12.382.212.58.272.199.06.382.076.565.076h.244c.031 0 .047 0 .062-.015.015 0 .046-.015.061-.015.046-.016.076-.016.122-.03l.23-.092a.869.869 0 00.198-.12c.015-.016.03-.03.046-.03a.129.129 0 00.015-.198c-.046-.06-.122-.075-.183-.03-.015.015-.03.015-.046.03-.046.03-.107.046-.168.06l-.183.046c-.03 0-.061.015-.092.015H8.73a1.519 1.519 0 01-.825-.378 1.452 1.452 0 01-.306-.378 1.655 1.655 0 01-.168-.485c-.015-.09-.015-.166-.015-.257v-.106-.03c0-.046.015-.091.015-.136.061-.364.26-.727.55-1 .077-.075.153-.136.23-.181.076-.06.167-.106.259-.151.092-.046.183-.076.29-.106a.993.993 0 01.306-.046h.321c.107.015.229.03.336.046.214.045.427.12.626.242.397.212.733.56.947.969.107.211.183.423.214.65.015.06.015.121.015.167v.363c0 .06-.015.121-.015.182 0 .06-.015.12-.03.181l-.046.182c-.03.121-.077.242-.123.363a3.183 3.183 0 01-.366.666 3.002 3.002 0 01-1.91 1.18c-.122.016-.26.03-.382.046h-.198c-.061 0-.138 0-.199-.015a3.637 3.637 0 01-.81-.151 4.068 4.068 0 01-.748-.303 4.098 4.098 0 01-1.696-1.695 4.398 4.398 0 01-.29-.742c-.076-.257-.107-.514-.137-.772v-.302-.091c0-.136.015-.258.03-.394s.046-.272.061-.393c.03-.137.061-.258.092-.394a5.33 5.33 0 01.275-.741c.214-.47.504-.893.855-1.226.092-.091.184-.167.275-.243.092-.075.184-.136.29-.211a5.39 5.39 0 01.306-.182c.046-.03.107-.045.153-.076a.26.26 0 01.076-.03.26.26 0 01.077-.03c.107-.046.229-.091.336-.121.03-.015.06-.015.091-.03.03-.016.061-.016.092-.03.061-.016.122-.031.168-.046.03-.015.061-.015.092-.015.03 0 .06-.016.091-.016.03 0 .061-.015.092-.015l.046-.015h.046c.03 0 .06-.015.091-.015.03 0 .061-.015.107-.015.03 0 .077-.015.107-.015h.764c.23.015.443.03.657.075.428.076.84.212 1.207.394.366.182.702.393.977.636l.046.045.046.045c.03.03.061.061.107.091l.092.091.091.09c.123.122.23.258.336.394.199.258.367.515.49.772.014.015.014.03.03.046.015.015.015.03.015.045l.046.09.046.092.045.09c.046.122.092.228.123.333.06.167.107.318.137.455.015.045.061.09.122.075a.104.104 0 00.107-.106c.092-.227.092-.393.077-.575z"></path><defs><linearGradient id="grafana-color-16__paint0_linear_2372_364" x1="7.502" x2="7.502" y1="18.142" y2="5.356" gradientUnits="userSpaceOnUse"><stop stop-color="#FFF200"></stop><stop offset="1" stop-color="#F15A29"></stop></linearGradient></defs></g></svg>
\ No newline at end of file
diff --git a/docker-verticapy/extensions-v2/vertica_tools/style/query.svg b/docker-verticapy/extensions-v2/vertica_tools/style/icons/query.svg
similarity index 100%
rename from docker-verticapy/extensions-v2/vertica_tools/style/query.svg
rename to docker-verticapy/extensions-v2/vertica_tools/style/icons/query.svg
diff --git a/docker-verticapy/extensions-v2/vertica_tools/style/icons/rocket.svg b/docker-verticapy/extensions-v2/vertica_tools/style/icons/rocket.svg
new file mode 100644
index 00000000..b38c4014
--- /dev/null
+++ b/docker-verticapy/extensions-v2/vertica_tools/style/icons/rocket.svg
@@ -0,0 +1 @@
+<svg fill="#f2680d" width="195px" height="195px" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" stroke="#f2680d" transform="rotate(0)"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"><title>ionicons-v5-p</title><path d="M477.64,38.26a4.75,4.75,0,0,0-3.55-3.66c-58.57-14.32-193.9,36.71-267.22,110a317,317,0,0,0-35.63,42.1c-22.61-2-45.22-.33-64.49,8.07C52.38,218.7,36.55,281.14,32.14,308a9.64,9.64,0,0,0,10.55,11.2L130,309.57a194.1,194.1,0,0,0,1.19,19.7,19.53,19.53,0,0,0,5.7,12L170.7,375a19.59,19.59,0,0,0,12,5.7,193.53,193.53,0,0,0,19.59,1.19l-9.58,87.2a9.65,9.65,0,0,0,11.2,10.55c26.81-4.3,89.36-20.13,113.15-74.5,8.4-19.27,10.12-41.77,8.18-64.27a317.66,317.66,0,0,0,42.21-35.64C441,232.05,491.74,99.74,477.64,38.26ZM294.07,217.93a48,48,0,1,1,67.86,0A47.95,47.95,0,0,1,294.07,217.93Z"></path><path d="M168.4,399.43c-5.48,5.49-14.27,7.63-24.85,9.46-23.77,4.05-44.76-16.49-40.49-40.52,1.63-9.11,6.45-21.88,9.45-24.88a4.37,4.37,0,0,0-3.65-7.45,60,60,0,0,0-35.13,17.12C50.22,376.69,48,464,48,464s87.36-2.22,110.87-25.75A59.69,59.69,0,0,0,176,403.09C176.37,398.91,171.28,396.42,168.4,399.43Z"></path></g></svg>
\ No newline at end of file
diff --git a/docker-verticapy/extensions-v2/vertica_tools/style/icons/vertica2.svg b/docker-verticapy/extensions-v2/vertica_tools/style/icons/vertica2.svg
new file mode 100644
index 00000000..ee2eb0eb
--- /dev/null
+++ b/docker-verticapy/extensions-v2/vertica_tools/style/icons/vertica2.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Vertica" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{fill:#0079EF;}
+	.st2{fill:#FFFFFF;}
+</style>
+<rect x="0" class="st1" width="256" height="256"/>
+<polygon class="st2" points="234.38,37.95 199.55,37.95 199.55,37.96 199.53,37.95 127.62,165.2 55.72,37.95 21.62,37.95 
+	127.7,225.67 216.92,67.75 "/>
+</svg>
diff --git a/docker-verticapy/extensions-v2/vertica_tools/style/verticapy.svg b/docker-verticapy/extensions-v2/vertica_tools/style/icons/verticapy.svg
similarity index 100%
rename from docker-verticapy/extensions-v2/vertica_tools/style/verticapy.svg
rename to docker-verticapy/extensions-v2/vertica_tools/style/icons/verticapy.svg
diff --git a/docker-verticapy/extensions-v2/vertica_tools/style/icons/vsql.svg b/docker-verticapy/extensions-v2/vertica_tools/style/icons/vsql.svg
new file mode 100644
index 00000000..ce86d73a
--- /dev/null
+++ b/docker-verticapy/extensions-v2/vertica_tools/style/icons/vsql.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 380.76 393.52"><defs><style>.b{fill:#02003C;stroke:#000;stroke-width:.93px;}.b,.c,.d{stroke-miterlimit:10;}.c{fill:none;stroke:#fff;stroke-width:7.84px;}.e,.d{fill:#fff;}.d{stroke:#2f3d3f;stroke-width:1.66px;}</style></defs><rect class="b" x="37.23" y="50.03" width="295" height="295"/><g><g><path class="d" d="M133.8,259.83c.42,3.54,1.5,6.23,3.27,8.09,1.76,1.86,4.45,2.79,8.04,2.79,2.91,0,5.03-.6,6.38-1.79,1.35-1.19,2.02-2.94,2.02-5.24,0-1.77-.47-3.18-1.4-4.24-.93-1.06-2.68-1.94-5.24-2.65l-10.07-2.52c-8.65-2.21-14.93-5.66-18.84-10.35-3.91-4.69-5.87-10.92-5.87-18.7,0-5.04,.74-9.48,2.23-13.33,1.49-3.85,3.6-7.1,6.33-9.75,2.73-2.65,6.05-4.64,9.97-5.97,3.91-1.33,8.29-1.99,13.13-1.99,5.26,0,9.81,.75,13.65,2.25,3.84,1.5,7.02,3.6,9.55,6.3,2.53,2.7,4.45,5.82,5.76,9.35,1.31,3.54,2.11,7.34,2.39,11.41l-22.94,2.65c-.62-3.45-1.64-5.81-3.06-7.1-1.42-1.28-3.44-1.92-6.07-1.92-2.84,0-4.88,.58-6.12,1.72-1.25,1.15-1.87,2.61-1.87,4.38,0,1.5,.47,2.74,1.4,3.71,.93,.97,2.72,1.81,5.35,2.52l9.97,2.65c4.5,1.24,8.32,2.72,11.47,4.44,3.15,1.72,5.71,3.78,7.68,6.17,1.97,2.39,3.41,5.11,4.31,8.16,.9,3.05,1.35,6.57,1.35,10.55,0,10.26-2.79,18.19-8.36,23.81-5.57,5.62-13.75,8.42-24.55,8.42-5.47,0-10.22-.78-14.27-2.32-4.05-1.55-7.42-3.78-10.12-6.7-2.7-2.92-4.76-6.48-6.18-10.68-1.42-4.2-2.27-8.91-2.54-14.13h23.25Z"/><path class="d" d="M215.71,293.65c-5.88,0-11.09-1.13-15.62-3.38-4.53-2.25-8.36-5.5-11.47-9.75-3.11-4.25-5.49-9.42-7.11-15.52-1.63-6.1-2.44-13-2.44-20.69s.79-14.61,2.39-20.76c1.59-6.15,3.98-11.41,7.16-15.78,3.18-4.38,7.11-7.74,11.78-10.08,4.67-2.34,10.09-3.51,16.25-3.51s11.35,1.13,15.99,3.38c4.64,2.25,8.53,5.5,11.68,9.75,3.15,4.24,5.52,9.37,7.11,15.39,1.59,6.01,2.39,12.78,2.39,20.29s-.8,14.44-2.39,20.49c-1.59,6.06-3.94,11.3-7.06,15.72l8.3,13.26-12.25,12.34-8.93-14.46c-4.84,2.21-10.1,3.32-15.78,3.32Zm.73-25.2h.88c.31,0,.67-.04,1.09-.13l-7.99-12.6,11.42-11.81,7.16,11.27c.21-1.5,.38-3.2,.52-5.11,.14-1.9,.21-3.82,.21-5.77,0-16.18-4.43-24.27-13.29-24.27s-13.29,8.09-13.29,24.27,4.43,24.14,13.29,24.14Z"/><path class="d" d="M258.99,196.56h23.56v68.84h31.04l-1.97,25.87h-52.63v-94.71Z"/></g><path class="d" d="M73.08,222.68l8.26,42.65,8.26-42.65h16.94l-15.31,64.39h-20.18l-15.17-64.39h17.22Z"/></g><rect class="e" x="137.96" y="96.05" width="34.06" height="69.59"/><polyline class="c" points="86.93 94.43 115.24 126.77 86.93 164.2"/></svg>
\ No newline at end of file
diff --git a/docker-verticapy/extensions-v2/vertica_tools/yarn.lock b/docker-verticapy/extensions-v2/vertica_tools/yarn.lock
index f6e7f6fd..15e56ff9 100644
--- a/docker-verticapy/extensions-v2/vertica_tools/yarn.lock
+++ b/docker-verticapy/extensions-v2/vertica_tools/yarn.lock
@@ -2149,6 +2149,35 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/apputils@npm:^4.2.6":
+  version: 4.2.6
+  resolution: "@jupyterlab/apputils@npm:4.2.6"
+  dependencies:
+    "@jupyterlab/coreutils": ^6.1.6
+    "@jupyterlab/observables": ^5.1.6
+    "@jupyterlab/rendermime-interfaces": ^3.9.6
+    "@jupyterlab/services": ^7.1.6
+    "@jupyterlab/settingregistry": ^4.1.6
+    "@jupyterlab/statedb": ^4.1.6
+    "@jupyterlab/statusbar": ^4.1.6
+    "@jupyterlab/translation": ^4.1.6
+    "@jupyterlab/ui-components": ^4.1.6
+    "@lumino/algorithm": ^2.0.1
+    "@lumino/commands": ^2.2.0
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/disposable": ^2.1.2
+    "@lumino/domutils": ^2.0.1
+    "@lumino/messaging": ^2.0.1
+    "@lumino/signaling": ^2.1.2
+    "@lumino/virtualdom": ^2.0.1
+    "@lumino/widgets": ^2.3.1
+    "@types/react": ^18.0.26
+    react: ^18.2.0
+    sanitize-html: ~2.7.3
+  checksum: 2ca507223fb1ca3a527ce6c544c6fc1433a0eef9a41db54031f1b159a3ef29f4908e7408c22ce0cbf6e8a2e46999ab3f9175e06df54412dd6f583a5bdf11fb6a
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/attachments@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/attachments@npm:4.1.1"
@@ -2320,6 +2349,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/coreutils@npm:^6.1.6":
+  version: 6.1.6
+  resolution: "@jupyterlab/coreutils@npm:6.1.6"
+  dependencies:
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/disposable": ^2.1.2
+    "@lumino/signaling": ^2.1.2
+    minimist: ~1.2.0
+    path-browserify: ^1.0.0
+    url-parse: ~1.5.4
+  checksum: f351f327f9c7ab14ac291e4ca85a8f4289dd315e9f2e68fc6acb52efab6c47fde158f65a83ba780c382665459995bad68c7b1f9c4ffef6b9038ac81252a3f07a
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/docmanager@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/docmanager@npm:4.1.1"
@@ -2481,6 +2524,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/nbformat@npm:^4.1.6":
+  version: 4.1.6
+  resolution: "@jupyterlab/nbformat@npm:4.1.6"
+  dependencies:
+    "@lumino/coreutils": ^2.1.2
+  checksum: 4ef43fdaaecec06732528753c5316adaa883c77ae86d129fb5d1f0542124acc0e7bb5692aae799463722b8c47ce8934356572c040d682e0ce41548eca3ca421b
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/notebook@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/notebook@npm:4.1.1"
@@ -2531,6 +2583,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/observables@npm:^5.1.6":
+  version: 5.1.6
+  resolution: "@jupyterlab/observables@npm:5.1.6"
+  dependencies:
+    "@lumino/algorithm": ^2.0.1
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/disposable": ^2.1.2
+    "@lumino/messaging": ^2.0.1
+    "@lumino/signaling": ^2.1.2
+  checksum: 930e53ca38dd08232ec46585acf8d49ebbef9628a792619fbf51a1da13f3249da24a7a8b24c34a2c7ce3fa50145a4e647b65e19275ea5ce92946a2ad805faa82
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/outputarea@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/outputarea@npm:4.1.1"
@@ -2563,6 +2628,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/rendermime-interfaces@npm:^3.9.6":
+  version: 3.9.6
+  resolution: "@jupyterlab/rendermime-interfaces@npm:3.9.6"
+  dependencies:
+    "@lumino/coreutils": ^1.11.0 || ^2.1.2
+    "@lumino/widgets": ^1.37.2 || ^2.3.1
+  checksum: 9dd08d4c71ece6e68e2972b4ce950153e2d38cc876208bb1f0e5d533daf50b062bd6aa1711c94934ea2a1f8445cf49dc6370cda80e1372b3fbede0d4534b0235
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/rendermime@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/rendermime@npm:4.1.1"
@@ -2602,6 +2677,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/services@npm:^7.1.6":
+  version: 7.1.6
+  resolution: "@jupyterlab/services@npm:7.1.6"
+  dependencies:
+    "@jupyter/ydoc": ^1.1.1
+    "@jupyterlab/coreutils": ^6.1.6
+    "@jupyterlab/nbformat": ^4.1.6
+    "@jupyterlab/settingregistry": ^4.1.6
+    "@jupyterlab/statedb": ^4.1.6
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/disposable": ^2.1.2
+    "@lumino/polling": ^2.1.2
+    "@lumino/properties": ^2.0.1
+    "@lumino/signaling": ^2.1.2
+    ws: ^8.11.0
+  checksum: ad47d3c9b211be4be3aad2714f3028e66ad381a6367a57f347644c693f055ee9c7655d15630a637d9181b42e89c2b8183675abc561c3959820a6bc03d3f2af12
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/settingregistry@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/settingregistry@npm:4.1.1"
@@ -2621,6 +2715,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/settingregistry@npm:^4.1.6":
+  version: 4.1.6
+  resolution: "@jupyterlab/settingregistry@npm:4.1.6"
+  dependencies:
+    "@jupyterlab/nbformat": ^4.1.6
+    "@jupyterlab/statedb": ^4.1.6
+    "@lumino/commands": ^2.2.0
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/disposable": ^2.1.2
+    "@lumino/signaling": ^2.1.2
+    "@rjsf/utils": ^5.13.4
+    ajv: ^8.12.0
+    json5: ^2.2.3
+  peerDependencies:
+    react: ">=16"
+  checksum: 93c1a4921a30243f2bd2c9591319e749e2f5cb5884f6962241857640afb6b67600cdba44fb308a23bffacc7defa3c6fc3d2ad15be52ff5946f0a8fd873b5fddd
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/statedb@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/statedb@npm:4.1.1"
@@ -2634,6 +2747,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/statedb@npm:^4.1.6":
+  version: 4.1.6
+  resolution: "@jupyterlab/statedb@npm:4.1.6"
+  dependencies:
+    "@lumino/commands": ^2.2.0
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/disposable": ^2.1.2
+    "@lumino/properties": ^2.0.1
+    "@lumino/signaling": ^2.1.2
+  checksum: 4aba49eeead6ac6306ec2d8146543230db9296e7bf088380290eb4b89698b66573c00ba630890b821047b584fc59716b64ba06a013d4698551adeaf20b034301
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/statusbar@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/statusbar@npm:4.1.1"
@@ -2650,6 +2776,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/statusbar@npm:^4.1.6":
+  version: 4.1.6
+  resolution: "@jupyterlab/statusbar@npm:4.1.6"
+  dependencies:
+    "@jupyterlab/ui-components": ^4.1.6
+    "@lumino/algorithm": ^2.0.1
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/disposable": ^2.1.2
+    "@lumino/messaging": ^2.0.1
+    "@lumino/signaling": ^2.1.2
+    "@lumino/widgets": ^2.3.1
+    react: ^18.2.0
+  checksum: ad8a7f366b8a3b3f1f6a4993a0b890192f5de99f0fe3b29aecb7a6474d568203798bee63b77012d4cfdc793b7b376ec8bd64b3c5e67cb26511b13801e7a75f77
+  languageName: node
+  linkType: hard
+
+"@jupyterlab/terminal@npm:^4.1.6":
+  version: 4.1.6
+  resolution: "@jupyterlab/terminal@npm:4.1.6"
+  dependencies:
+    "@jupyterlab/apputils": ^4.2.6
+    "@jupyterlab/services": ^7.1.6
+    "@jupyterlab/translation": ^4.1.6
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/domutils": ^2.0.1
+    "@lumino/messaging": ^2.0.1
+    "@lumino/widgets": ^2.3.1
+    xterm: ~5.1.0
+    xterm-addon-canvas: ~0.3.0
+    xterm-addon-fit: ~0.7.0
+    xterm-addon-web-links: ~0.8.0
+    xterm-addon-webgl: ~0.14.0
+  checksum: 22704365949aa624442de3ac21fc184f19083a1a1089be88267b4991c64226f4de6dbf550974f18bba8fc4d4e4d868acfd3f5e3bff9893f4c48fe77cecb1a7f3
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/testing@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/testing@npm:4.1.1"
@@ -2723,6 +2885,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/translation@npm:^4.1.6":
+  version: 4.1.6
+  resolution: "@jupyterlab/translation@npm:4.1.6"
+  dependencies:
+    "@jupyterlab/coreutils": ^6.1.6
+    "@jupyterlab/rendermime-interfaces": ^3.9.6
+    "@jupyterlab/services": ^7.1.6
+    "@jupyterlab/statedb": ^4.1.6
+    "@lumino/coreutils": ^2.1.2
+  checksum: 6de45e310d7ac83f2ed2e3e0c372ba71d087e597891d9e9a7ff791f6fc7fc3804d0d18dad5b152757c5a2b583d564ed7f4361561fa993be303e415a47e8b2fa6
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/ui-components@npm:^4.1.1":
   version: 4.1.1
   resolution: "@jupyterlab/ui-components@npm:4.1.1"
@@ -2754,6 +2929,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/ui-components@npm:^4.1.6":
+  version: 4.1.6
+  resolution: "@jupyterlab/ui-components@npm:4.1.6"
+  dependencies:
+    "@jupyter/react-components": ^0.15.2
+    "@jupyter/web-components": ^0.15.2
+    "@jupyterlab/coreutils": ^6.1.6
+    "@jupyterlab/observables": ^5.1.6
+    "@jupyterlab/rendermime-interfaces": ^3.9.6
+    "@jupyterlab/translation": ^4.1.6
+    "@lumino/algorithm": ^2.0.1
+    "@lumino/commands": ^2.2.0
+    "@lumino/coreutils": ^2.1.2
+    "@lumino/disposable": ^2.1.2
+    "@lumino/messaging": ^2.0.1
+    "@lumino/polling": ^2.1.2
+    "@lumino/properties": ^2.0.1
+    "@lumino/signaling": ^2.1.2
+    "@lumino/virtualdom": ^2.0.1
+    "@lumino/widgets": ^2.3.1
+    "@rjsf/core": ^5.13.4
+    "@rjsf/utils": ^5.13.4
+    react: ^18.2.0
+    react-dom: ^18.2.0
+    typestyle: ^2.0.4
+  peerDependencies:
+    react: ^18.2.0
+  checksum: f555138b2345aac6ee5c580b517fd563b55b8a6b33f132de362d559a514bbbec970bd690970676173872674f802a5dd9de7ac75b897a0a2b09d7428dddc3c04d
+  languageName: node
+  linkType: hard
+
 "@lezer/common@npm:^1.0.0, @lezer/common@npm:^1.0.2, @lezer/common@npm:^1.1.0, @lezer/common@npm:^1.2.0, @lezer/common@npm:^1.2.1":
   version: 1.2.1
   resolution: "@lezer/common@npm:1.2.1"
@@ -9993,6 +10199,7 @@ __metadata:
     "@jupyterlab/builder": ^4.0.0
     "@jupyterlab/launcher": ^4.1.1
     "@jupyterlab/mainmenu": ^4.1.1
+    "@jupyterlab/terminal": ^4.1.6
     "@jupyterlab/testutils": ^4.0.0
     "@lumino/algorithm": ^2.0.1
     "@types/jest": ^29.2.0
@@ -10438,6 +10645,49 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xterm-addon-canvas@npm:~0.3.0":
+  version: 0.3.0
+  resolution: "xterm-addon-canvas@npm:0.3.0"
+  peerDependencies:
+    xterm: ^5.0.0
+  checksum: 21eabd28a2718e775399f27e21922ec4e22528576ae88278ef39c68239119e4576eecd59cf0f1c76dfcbea0f82b779f8dbaf4ce38e04e648844c33ac7632d333
+  languageName: node
+  linkType: hard
+
+"xterm-addon-fit@npm:~0.7.0":
+  version: 0.7.0
+  resolution: "xterm-addon-fit@npm:0.7.0"
+  peerDependencies:
+    xterm: ^5.0.0
+  checksum: 512d41f80d6f9427ba02dab4e6fd642e94775a9cf7ef72ae4b55eab2a36856b5c67069bfc66b4af412fdce29a0842f9c6382af3672f0b514c4352dfd47defe8f
+  languageName: node
+  linkType: hard
+
+"xterm-addon-web-links@npm:~0.8.0":
+  version: 0.8.0
+  resolution: "xterm-addon-web-links@npm:0.8.0"
+  peerDependencies:
+    xterm: ^5.0.0
+  checksum: fe07572adfaa84ceeb961db3ae577aeb2342ea5dcd4948170d1b733ae8045693fab8808f9c63cc43a532b033ae95e63e62ac14bc2e34def764e68f6362ccae2b
+  languageName: node
+  linkType: hard
+
+"xterm-addon-webgl@npm:~0.14.0":
+  version: 0.14.0
+  resolution: "xterm-addon-webgl@npm:0.14.0"
+  peerDependencies:
+    xterm: ^5.0.0
+  checksum: 05f144c920660ad8122aa13564612b1ce71b92ba8f74b3387db3e39b616437659da36b7edf3aefe5900c59956cd6ca1272a0892248df751c8899a202befe019c
+  languageName: node
+  linkType: hard
+
+"xterm@npm:~5.1.0":
+  version: 5.1.0
+  resolution: "xterm@npm:5.1.0"
+  checksum: cbacbc9dc1bbcf21dabecff46856b43f2d5854b42c1bec4ea03a5720000f2a88d79b0da45b6c38213d6607474a1fbe66d5ff25fa120b7e9e60eeed964dd840a1
+  languageName: node
+  linkType: hard
+
 "y-protocols@npm:^1.0.5":
   version: 1.0.6
   resolution: "y-protocols@npm:1.0.6"
diff --git a/docker-verticapy/requirements.txt b/docker-verticapy/requirements.txt
index b529ff71..8981b3c4 100644
--- a/docker-verticapy/requirements.txt
+++ b/docker-verticapy/requirements.txt
@@ -1,4 +1,4 @@
-jupyterlab==4.0.7
+jupyterlab==4.1.5
 jupyterlab-lsp==5.0.0
 python-lsp-server[all]
 ipython==8.18.0

From c27a3466f2b69b9b0ffbbb7fb8b6b6acd8b22740 Mon Sep 17 00:00:00 2001
From: roypaulin <roy.paulin@microfocus.com>
Date: Fri, 12 Apr 2024 15:31:41 +0200
Subject: [PATCH 2/3] Fix TEST_MODE on mac

---
 Makefile               |  8 +++---
 bin/verticapylab       | 61 +++++++++++++++++++++++-------------------
 bin/verticapylab-build |  2 +-
 3 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index baa3fffd..d2d2fa51 100644
--- a/Makefile
+++ b/Makefile
@@ -110,12 +110,12 @@ vsql: ## Run a basic sanity test (optional -DQUERY="select 'whatever')
 .PHONY: verticapylab-start
 verticapylab-start: etc/VerticaPyLab.conf ## Start a jupyterlab
 	@source etc/VerticaPyLab.conf; \
-	if [[ $${TEST_MODE^^} == "YES" ]] ; then \
-	    VERTICAPYLAB_IMG_VERSION=$(VERSION); \
+	if [[ $$(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then \
+		VERTICAPYLAB_IMG_VERSION=$(VERSION); \
 	fi; \
 	if (($$(docker ps --no-trunc -q -f NAME="$$VERTICAPYLAB_CONTAINER_NAME" | wc -l)==0)); then \
 	    if [[ -z $$(docker image ls -q "opentext/$$VERTICAPYLAB_IMG:$$VERTICAPYLAB_IMG_VERSION" 2>&1) ]]; then \
-		  if [[ $${TEST_MODE^^} == "YES" ]] ; then \
+		  if [[ $$(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then \
 		    echo "Building image opentext/$$VERTICAPYLAB_IMG:$$VERTICAPYLAB_IMG_VERSION"; \
 		    TEST_MODE=yes $(MAKE) verticapylab-build; \
 		  else \
@@ -165,7 +165,7 @@ verticapylab-stop: ## Shut down the jupyterlab server and remove the container
 .PHONY: verticapylab-uninstall
 verticapylab-uninstall: ## Remove the verticapylab container and associated images.
 	@source etc/VerticaPyLab.conf; \
-	if [[ $${TEST_MODE^^} == "YES" ]] ; then \
+	if [[ $$(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then \
 		VERTICAPYLAB_IMG_VERSION=$(VERSION); \
 	fi; \
 	docker stop "$$VERTICAPYLAB_CONTAINER_NAME" >/dev/null 2>&1; \
diff --git a/bin/verticapylab b/bin/verticapylab
index 7048cdcc..281c51c4 100755
--- a/bin/verticapylab
+++ b/bin/verticapylab
@@ -62,15 +62,42 @@ else
   url_host="$VERTICAPYLAB_BIND_ADDRESS"
 fi
 
+function openURL() {
+  container=$1
+  host=$2
+  URL=$(docker logs "$container" 2>&1 | grep -Eo 'http[s]?://[0-9.]+:8888/.*' | head -n 1 | sed "s/[0-9.]*:8888/$host:$VERTICAPYLAB_PORT/")
+  # This checks the kernel name to set the correct command to open the link in browser,
+  # because Linux systems will use xdg-open while MacOs will use open
+  if [[ $OSTYPE == darwin* ]]; then # OSX uses different args for stat
+    OPEN_CMD=open
+  elif [[ $(uname -r) =~ WSL ]]; then
+    OPEN_CMD="$BIN/open"
+  else
+    OPEN_CMD=xdg-open
+  fi
+  # Open the correct url in browser. We know that the correct url is the second one.
+  # So even if in some cases a 3rd one is created this will not be affected
+  echo
+  echo "Waiting for url to open in browser..."
+  $OPEN_CMD "$URL" 2> /dev/null
+  if [[ $? -eq 0 ]]; then
+    echo
+    echo "If the link does not open or does not work, copy and paste this URL in browser:"
+  else
+    echo
+    echo "Copy and paste this URL in browser:"
+  fi
+  echo "    $URL"
+}
+
+# If the container already exists, open the url in the browser
 if docker exec -i "$VERTICAPYLAB_CONTAINER_NAME" true 2>/dev/null; then
   echo "$VERTICAPYLAB_CONTAINER_NAME is already running"
-  URL=$(docker logs "$VERTICAPYLAB_CONTAINER_NAME" 2>&1 | grep -Eo 'http[s]?://[0-9.]+:8888/.*' | head -n 1 | sed "s/[0-9.]*:8888/$url_host:$VERTICAPYLAB_PORT/")
-  echo "Copy and paste this URL in browser:"
-  echo "    $URL"
+  openURL $VERTICAPYLAB_CONTAINER_NAME $url_host
   exit 0
 fi
 
-if [[ ${TEST_MODE^^} == "YES" ]]; then
+if [[ $(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then
   VERTICAPYLAB_IMG_VERSION=$VERSION
 fi
 
@@ -137,7 +164,7 @@ Host $VERTICA_HOST_NAME $SSH_CONFIG_EXTRA_HOSTNAME
     User dbadmin
 " | docker exec -i "$VERTICAPYLAB_CONTAINER_NAME" bash -c 'umask 077; mkdir -p $HOME/.ssh; cat >> $HOME/.ssh/config'
 
-if [[ ${TEST_MODE^^} == "YES" ]]; then
+if [[ $(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YESo" ]] ; then
   trap ' tput setaf 1; echo "VerticaPy installation failed"; tput sgr0; ' EXIT
 
   echo "Uninstalling old VerticaPy"
@@ -164,26 +191,4 @@ while ! docker logs -n 5 "$VERTICAPYLAB_CONTAINER_NAME" 2>&1 | grep 'Or copy and
   sleep 1
 done
 
-URL=$(docker logs "$VERTICAPYLAB_CONTAINER_NAME" 2>&1 | grep -Eo 'http[s]?://[0-9.]+:8888/.*' | head -n 1 | sed "s/[0-9.]*:8888/$url_host:$VERTICAPYLAB_PORT/")
-# This checks the kernel name to set the correct command to open the link in browser,
-# because Linux systems will use xdg-open while MacOs will use open
-if [[ $OSTYPE == darwin* ]]; then # OSX uses different args for stat
-  OPEN_CMD=open
-elif [[ $(uname -r) =~ WSL ]]; then
-  OPEN_CMD="$BIN/open"
-else
-  OPEN_CMD=xdg-open
-fi
-# Open the correct url in browser. We know that the correct url is the second one.
-# So even if in some cases a 3rd one is created this will not be affected
-echo
-echo "Waiting for url to open in browser..."
-$OPEN_CMD "$URL" 2> /dev/null
-if [[ $? -eq 0 ]]; then
-  echo
-  echo "If the link does not open or does not work, copy and paste this URL in browser:"
-else
-  echo
-  echo "Copy and paste this URL in browser:"
-fi
-echo "    $URL"
+openURL $VERTICAPYLAB_CONTAINER_NAME $url_host
diff --git a/bin/verticapylab-build b/bin/verticapylab-build
index bce9da49..339b9453 100755
--- a/bin/verticapylab-build
+++ b/bin/verticapylab-build
@@ -16,7 +16,7 @@ fi
 # Load the configuration
 source $CONFIG_FILE || abort $? "Cannot load config file $CONFIG_FILE"
 
-if [[ ${TEST_MODE^^} == "YES" ]]; then
+if [[ $(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then
   VERTICAPYLAB_IMG_VERSION=$VERSION
 fi
 

From 3bf34eeab710d7fd95cb9b9a413c047c893ab7db Mon Sep 17 00:00:00 2001
From: roypaulin <roy.paulin@microfocus.com>
Date: Fri, 12 Apr 2024 15:53:03 +0200
Subject: [PATCH 3/3] Fix test

---
 Makefile         | 6 +++---
 bin/verticapylab | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d2d2fa51..92787607 100644
--- a/Makefile
+++ b/Makefile
@@ -110,12 +110,12 @@ vsql: ## Run a basic sanity test (optional -DQUERY="select 'whatever')
 .PHONY: verticapylab-start
 verticapylab-start: etc/VerticaPyLab.conf ## Start a jupyterlab
 	@source etc/VerticaPyLab.conf; \
-	if [[ $$(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then \
+	if [[ $$(tr '[:lower:]' '[:upper:]'<<< $${TEST_MODE}) == "YES" ]] ; then \
 		VERTICAPYLAB_IMG_VERSION=$(VERSION); \
 	fi; \
 	if (($$(docker ps --no-trunc -q -f NAME="$$VERTICAPYLAB_CONTAINER_NAME" | wc -l)==0)); then \
 	    if [[ -z $$(docker image ls -q "opentext/$$VERTICAPYLAB_IMG:$$VERTICAPYLAB_IMG_VERSION" 2>&1) ]]; then \
-		  if [[ $$(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then \
+		  if [[ $$(tr '[:lower:]' '[:upper:]'<<< $${TEST_MODE}) == "YES" ]] ; then \
 		    echo "Building image opentext/$$VERTICAPYLAB_IMG:$$VERTICAPYLAB_IMG_VERSION"; \
 		    TEST_MODE=yes $(MAKE) verticapylab-build; \
 		  else \
@@ -165,7 +165,7 @@ verticapylab-stop: ## Shut down the jupyterlab server and remove the container
 .PHONY: verticapylab-uninstall
 verticapylab-uninstall: ## Remove the verticapylab container and associated images.
 	@source etc/VerticaPyLab.conf; \
-	if [[ $$(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then \
+	if [[ $$(tr '[:lower:]' '[:upper:]'<<< $${TEST_MODE}) == "YES" ]] ; then \
 		VERTICAPYLAB_IMG_VERSION=$(VERSION); \
 	fi; \
 	docker stop "$$VERTICAPYLAB_CONTAINER_NAME" >/dev/null 2>&1; \
diff --git a/bin/verticapylab b/bin/verticapylab
index 281c51c4..2e70d29f 100755
--- a/bin/verticapylab
+++ b/bin/verticapylab
@@ -164,7 +164,7 @@ Host $VERTICA_HOST_NAME $SSH_CONFIG_EXTRA_HOSTNAME
     User dbadmin
 " | docker exec -i "$VERTICAPYLAB_CONTAINER_NAME" bash -c 'umask 077; mkdir -p $HOME/.ssh; cat >> $HOME/.ssh/config'
 
-if [[ $(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YESo" ]] ; then
+if [[ $(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then
   trap ' tput setaf 1; echo "VerticaPy installation failed"; tput sgr0; ' EXIT
 
   echo "Uninstalling old VerticaPy"