Merge pull request #1991 from eclipse-ditto/ui-website-update-depende…

…ncies update JS dependencies for website + Ditto UI
eclipse-ditto · Aug 26, 2024 · ec4c8c7 · ec4c8c7
2 parents e4ce12e + ad5988a
commit ec4c8c7
Show file tree

Hide file tree

Showing 8 changed files with 1,388 additions and 1,960 deletions.
diff --git a/documentation/src/main/resources/_includes/head.html b/documentation/src/main/resources/_includes/head.html
@@ -8,15 +8,15 @@
 <link rel="stylesheet" href="{{ "css/syntax.css" }}">
 <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" crossorigin="anonymous">
 <link rel="stylesheet" href="css/modern-business.css">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" crossorigin="anonymous">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/css/bootstrap.min.css" crossorigin="anonymous">
 <link rel="stylesheet" href="css/customstyles.css">
 <link rel="stylesheet" href="css/boxshadowproperties.css">
 <link rel="stylesheet" href="css/theme-ditto.css">
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700">
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/2.0.0/anchor.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/2.1.0/anchor.min.js" crossorigin="anonymous"></script>
 <script src="{{ "js/toc.js" }}"></script>
 <script src="{{ "js/customscripts.js" }}"></script>
 

diff --git a/documentation/src/main/resources/js/customscripts.js b/documentation/src/main/resources/js/customscripts.js
@@ -10,13 +10,13 @@ $(function () {
     $(document).ready(function() {
         $("#mysidebar li.subfolders > a").click(function (e) {
             e.preventDefault();
-            var theUl = $(this).parent().select("ul");
-            if (!theUl.hasClass("open")) {
-                theUl.addClass("open");
-                theUl.removeClass("closed");
+            var theLi = $(this).parent();
+            if (!theLi.hasClass("open")) {
+                theLi.addClass("open");
+                theLi.removeClass("closed");
             } else {
-                theUl.addClass("closed");
-                theUl.removeClass("open");
+                theLi.addClass("closed");
+                theLi.removeClass("open");
             }
         });
         $("#collapseAll").click(function(e) {

diff --git a/ui/index.html b/ui/index.html
@@ -16,8 +16,10 @@
     <title>Eclipse Ditto™ explorer</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.1/font/bootstrap-icons.min.css"
-        integrity="sha512-oAvZuuYVzkcTc2dH5z1ZJup5OmSQ000qlfRvuoTTiyTBjwX1faoyearj8KdMq0LgsBTHMrRuMek7s+CxF8yE+w=="
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
+          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css"
+        integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ=="
         crossorigin="anonymous"
         referrerpolicy="no-referrer" />
     <link rel="icon" type="image/png"
@@ -29,8 +31,8 @@
     <link rel="icon" type="image/png"
         href="https://raw.githubusercontent.com/eclipse/ditto/master/documentation/src/main/resources/images/favicon-96x96.png"
         sizes="96x96">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.19.0/ace.min.js"
-        integrity="sha512-7ar5DoGr5xiRstr9B0e9BkQAc42juvRXosAEAXuOKZSL/4C93WpIFthgzZibRAau0kB0NJszECL02exq3IPc/w=="
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.35.4/ace.min.js"
+        integrity="sha512-H7UCM6x96TJikYn0n4wC+PVBshBTfF8N9gKvSr3nmXahYW3kGYFvxE/v1Q2Qp8b8NFUS6H6MfDvZO6V6YATzjw=="
         crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script type="module" src="./dist/main.js"></script>
     <link rel="stylesheet" href="./dist/main.css" />
@@ -54,27 +56,27 @@
             <div class="collapse navbar-collapse" id="mainNavbar">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0 px-4 align-items-end">
                     <li class="nav-item" id="tabThings">
-                        <a class="nav-link active" data-bs-target="#collapseThings:not(.show)" data-bs-toggle="collapse">
+                        <a class="nav-link active" data-bs-target="#collapseThings" data-bs-toggle="collapse">
                             Things
                         </a>
                     </li>
                     <li class="nav-item" id="tabPolicies">
-                        <a class="nav-link" data-bs-target="#collapsePolicies:not(.show)" data-bs-toggle="collapse">
+                        <a class="nav-link" data-bs-target="#collapsePolicies" data-bs-toggle="collapse">
                             Policies
                         </a>
                     </li>
                     <li class="nav-item" id="tabConnections" data-auth="devOps">
-                        <a class="nav-link" data-bs-target="#collapseConnections:not(.show)" data-bs-toggle="collapse">
+                        <a class="nav-link" data-bs-target="#collapseConnections" data-bs-toggle="collapse">
                             Connections
                         </a>
                     </li>
                     <li class="nav-item" id="tabOperations" data-auth="devOps">
-                        <a class="nav-link" data-bs-target="#collapseOperations:not(.show)" data-bs-toggle="collapse">
+                        <a class="nav-link" data-bs-target="#collapseOperations" data-bs-toggle="collapse">
                             Operations
                         </a>
                     </li>
                     <li class="nav-item" id="tabEnvironments">
-                        <a class="nav-link" data-bs-target="#collapseSettings:not(.show)" data-bs-toggle="collapse">
+                        <a class="nav-link" data-bs-target="#collapseSettings" data-bs-toggle="collapse">
                             Environments
                         </a>
                     </li>

diff --git a/ui/modules/operations/servicesLogging.html b/ui/modules/operations/servicesLogging.html
@@ -25,12 +25,11 @@ <h5 data-bs-toggle="collapse" data-bs-target="#servicesLogging">Ditto Services L
         <div class="col-md-12 resizable_flex_column">
             <div id="divLoggers"></div>
             <template id="templateLogger">
-                <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
-                    integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
-                    crossorigin="anonymous">
-                <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css"
+                <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
+                      integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+                <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css"
                     rel="stylesheet"
-                    integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
+                    integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ=="
                     crossorigin="anonymous" referrerpolicy="no-referrer" />
                 <link href="./dist/main.css" rel="stylesheet" />
 

diff --git a/ui/modules/utils.ts b/ui/modules/utils.ts
@@ -319,6 +319,7 @@ export function confirm(message, action, callback) {
 export function createAceEditor(domId, sessionMode, readOnly = false, wrap = false) {
   const result = ace.edit(domId);
   result.setOption('wrap', wrap);
+  result.setOption('useWorker', false);
   result.session.setMode(sessionMode);
   if (readOnly) {
     result.setReadOnly(true);

diff --git a/ui/modules/utils/crudToolbar.html b/ui/modules/utils/crudToolbar.html
@@ -1,7 +1,7 @@
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
-  integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css" rel="stylesheet"
-  integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
+      integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" rel="stylesheet"
+  integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ=="
   crossorigin="anonymous" referrerpolicy="no-referrer" />
 <link href="./dist/main.css" rel="stylesheet" />
 <div class="resizable_flex_column px-1" id="divRoot">