5.1.5314

Author: ITHitBuild

Java/androidfsstorage/app/build.gradle

@@ -36,10 +36,10 @@ jarJar {
 
 node {
     // Version of node to use.
-    version = '4.6.0'
+    version = '12.22.7'
 
     // Version of npm to use.
-    npmVersion = '2.15.9'
+    npmVersion = '6.14.0'
 
     // Base URL for fetching node distributions (change if you have a mirror).
     distBaseUrl = 'https://nodejs.org/dist'

Java/deltav/pom.xml

@@ -284,7 +284,8 @@
                         </goals>
                         <configuration>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
-                            <nodeVersion>v4.6.0</nodeVersion>
+                            <nodeVersion>v12.22.7</nodeVersion>
+                            <npmVersion>6.14.0</npmVersion>
                         </configuration>
                     </execution>
                     <execution>

Java/deltav/src/main/webapp/WEB-INF/wwwroot/js/package-lock.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "webdav.client" : "latest"
+    "webdav.client": "latest"
   }
 }

Java/deltav/src/main/webapp/WEB-INF/wwwroot/js/package.json

@@ -243,7 +243,8 @@
                         </goals>
                         <configuration>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
-                            <nodeVersion>v4.6.0</nodeVersion>
+                            <nodeVersion>v12.22.7</nodeVersion>
+                            <npmVersion>6.14.0</npmVersion>
                         </configuration>
                     </execution>
                     <execution>

Java/filesystemstorage/pom.xml

@@ -414,6 +414,16 @@ header .versions {
         color: white;
         text-decoration: underline;
     }
+
+    .header-content .flex-column {
+        position: relative;
+        padding-bottom: 48px;
+    }
+
+        .header-content .flex-column .btn {
+            position: absolute;
+            bottom: 10px;
+        }
 /*End Header styles*/
 
 /*Start Main layout styles*/

Java/filesystemstorage/src/main/webapp/WEB-INF/wwwroot/css/webdav-layout.css

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "webdav.client" : "latest"
+    "webdav.client": "latest"
   }
 }

Java/filesystemstorage/src/main/webapp/WEB-INF/wwwroot/js/package-lock.json

@@ -61,7 +61,7 @@
             this.$el.find('tbody').html(
                 aItems.map(function (oItem) {
                     var locked = oItem.ActiveLocks.length > 0
-                        ? ('<span class="ithit-grid-icon-locked"></span>' +
+                        ? ('<span class="ithit-grid-icon-locked" title="' + self._RenderLokedIconTooltip(oItem) + '"></span>' +
                             (oItem.ActiveLocks[0].LockScope === 'Shared' ? ('<span class="badge badge-pill badge-dark">' + oItem.ActiveLocks.length + '</span>') : ''))
                         : '';
                     /** @type {ITHit.WebDAV.Client.HierarchyItem} oItem */
@@ -109,6 +109,22 @@
             );
         },
 
+        /**
+        * @param {ITHit.WebDAV.Client.HierarchyItem} oItem
+        **/
+        _RenderLokedIconTooltip(oItem) {
+            var tooltipTitle = 'Exclusive lock: ' + oItem.ActiveLocks[0].Owner;
+            if (oItem.ActiveLocks[0].LockScope === 'Shared') {
+                var userNames = [];
+                tooltipTitle = 'Shared lock' + (oItem.ActiveLocks.length > 1 ? '(s)':'') + ': ';
+                for (var i = 0; i < oItem.ActiveLocks.length; i++) {
+                    userNames.push(oItem.ActiveLocks[i].Owner);
+                }
+                tooltipTitle += userNames.join(', ');
+            }
+            return tooltipTitle;
+        },
+
         /**
         * @param {ITHit.WebDAV.Client.HierarchyItem} oItem
         **/
@@ -154,7 +170,9 @@
             } else {
                 var $btnGroup = $('<div class="btn-group"></div>');
                 var displayRadioBtns = (isMicrosoftOfficeDocument && isGSuiteDocument);
-                $('<button type="button" class="btn btn-primary btn-sm btn-labeled btn-default-edit" title="' + (displayRadioBtns ? self._GetActionGroupBtnTooltipText() : 'Edit document with desktop associated application.') + '"><span class="btn-label"><i class="' +
+                var isExclusiveLocked = oItem.ActiveLocks.length > 0 && oItem.ActiveLocks[0].LockScope === 'Exclusive';
+                $('<button type="button" class="btn btn-primary btn-sm btn-labeled btn-default-edit" title="' + (displayRadioBtns ? self._GetActionGroupBtnTooltipText() : 'Edit document with desktop associated application.') +
+                    '"' + self._GetDisabledGroupBtnAttribute(isExclusiveLocked) + '><span class="btn-label"><i class="' +
                     (displayRadioBtns ? self._GetActionGroupBtnCssClass() : 'icon-edit') + '"></i></span><span class="d-none d-lg-inline-block btn-edit-label">Edit</span></button>')
                     .appendTo($btnGroup).on('click', function () {
                         var $radio = $(this).parent().find('input[type=radio]:checked');
@@ -169,7 +187,7 @@
                 var $dropdownToggle = $('<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="sr-only">Toggle Dropdown</span></button>')
                     .appendTo($btnGroup).prop("disabled", !isDavProtocolSupported && !isMicrosoftOfficeDocument);
 
-                this._RenderContextMenu(oItem, $btnGroup, isMicrosoftOfficeDocument, isGSuiteDocument, isDavProtocolSupported);
+                this._RenderContextMenu(oItem, $btnGroup, isMicrosoftOfficeDocument, isGSuiteDocument, isDavProtocolSupported, isExclusiveLocked);
 
                 $btnGroup.on('shown.bs.dropdown', function () {
                     self.ContextMenuID = oItem.Href;
@@ -203,6 +221,14 @@
             return tooltipText;
         },
 
+        _GetDisabledGroupBtnAttribute: function (isExclusiveLocked) {
+            var attribute = '';
+            if (this._defaultEditor == 'GSuiteEditor' && isExclusiveLocked) {
+                attribute = ' disabled="disabled"';
+            }
+            return attribute;
+        },
+
         _GetActionGroupBtnCssClass: function () {
             var cssClassName = 'icon-edit';
             switch (this._defaultEditor) {
@@ -217,7 +243,7 @@
             return cssClassName;
         },
 
-        _RenderContextMenu: function (oItem, $btnGroup, isMicrosoftOfficeDocument, isGSuiteDocument, isDavProtocolSupported) {
+        _RenderContextMenu: function (oItem, $btnGroup, isMicrosoftOfficeDocument, isGSuiteDocument, isDavProtocolSupported, isExclusiveLocked) {
             var self = this;
             var supportGSuiteFeature = oWebDAV.OptionsInfo.Features & ITHit.WebDAV.Client.Features.GSuite;
             var displayRadioBtns = (isMicrosoftOfficeDocument && isGSuiteDocument);

Java/filesystemstorage/src/main/webapp/WEB-INF/wwwroot/js/package.json

@@ -1,39 +1,53 @@
-if (location.protocol === "https:") {
+    if (location.protocol === "https:") {
     var socketSource = new WebSocket("wss://" + location.host + webDavSettings.WebSocketPath);
-} else {
+    } else {
     var socketSource = new WebSocket("ws://" + location.host + webDavSettings.WebSocketPath);
-}
+    }
 
 
-socketSource.addEventListener('message', function (e) {
-    var notifyObject = JSON.parse(e.data);
+    socketSource.addEventListener('message', function (e) {
+        var notifyObject = JSON.parse(e.data);
 
-    // Removing domain and trailing slash.
+        // Removing domain and trailing slash.
     var regExp = new RegExp("^\/" + webDavSettings.WebSocketPath + "|\/$", "g");
     var currentLocation = location.pathname.replace(regExp, '');
-    // Checking message type after receiving.
+        // Checking message type after receiving.
     if (notifyObject.eventType === "updated" || notifyObject.eventType === "created" || notifyObject.eventType === "locked" ||
         notifyObject.eventType === "unlocked") {
-        // Refresh folder structure if any item in this folder is updated or new item is created.
+            // Refresh folder structure if any item in this folder is updated or new item is created.
         if (notifyObject.itemPath.substring(0, notifyObject.itemPath.lastIndexOf('/')).toUpperCase() === currentLocation.toUpperCase()) {
-            WebDAVController.Reload();
-        }
+                WebDAVController.Reload();
+            }
     } else if (notifyObject.eventType === "moved") {
-        // Refresh folder structure if file or folder is moved.
+            // Refresh folder structure if file or folder is moved.
         if (notifyObject.itemPath.substring(0, notifyObject.itemPath.lastIndexOf('/')).toUpperCase() === currentLocation.toUpperCase() ||
             notifyObject.targetPath.substring(0, notifyObject.targetPath.lastIndexOf('/')).toUpperCase() === currentLocation.toUpperCase()) {
-            WebDAVController.Reload();
-        }
+                WebDAVController.Reload();
+            }
 
     } else if (notifyObject.eventType === "deleted") {
         if (notifyObject.itemPath.substring(0, notifyObject.itemPath.lastIndexOf('/')).toUpperCase() === currentLocation.toUpperCase()) {
-            // Refresh folder structure if any item in this folder is deleted.
-            WebDAVController.Reload();
+                // Refresh folder structure if any item in this folder is deleted.
+                WebDAVController.Reload();
         } else if (currentLocation.toUpperCase().indexOf(notifyObject.itemPath.toUpperCase()) === 0) {
-            // Redirect client to the root folder if current path is being deleted.
-            var originPath = location.origin + "/";
-            history.pushState({ Url: originPath }, '', originPath);
-            WebDAVController.NavigateFolder(originPath);
+                // Redirect client to the root folder if current path is being deleted.
+                var originPath = location.origin + "/";
+                history.pushState({ Url: originPath }, '', originPath);
+                WebDAVController.NavigateFolder(originPath);
+            }
         }
-    }
-}, false);
+    }, false);
+
+    socketSource.addEventListener('error', function (err) {
+        console.error('Socket encountered error: ', err.message, 'Closing socket');
+        socketSource.close();
+    });
+
+    socketSource.addEventListener('close', function (e) {
+        console.log('Socket is closed. Reconnect will be attempted in 5 seconds.', e.reason);
+        setTimeout(function () {
+            WebSocketConnect();
+        }, 5000);
+    });
+}
+WebSocketConnect();