5.1.5402

Author: ITHitBuild

Java/androidfsstorage/app/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.moowork.node" version "1.2.0"
+    id "com.moowork.node" version "1.3.1"
 }
 apply plugin: 'com.android.application'
 apply plugin: 'ru.tinkoff.gradle.jarjar'
@@ -14,6 +14,10 @@ android {
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
     buildTypes {
         release {
             minifyEnabled true
@@ -30,16 +34,16 @@ android {
 jarJar {
     rules = [
             'stax-api-1.0.1.jar'        : 'javax.xml.** com.ithit.webdav.xml.@1',
-            'webdav-server-5.1.5291.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
+            'webdav-server-5.1.5402.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
     ]
 }
 
 node {
     // Version of node to use.
-    version = '12.22.7'
+    version = '16.14.2'
 
     // Version of npm to use.
-    npmVersion = '6.14.0'
+    npmVersion = '8.7.0'
 
     // Base URL for fetching node distributions (change if you have a mirror).
     distBaseUrl = 'https://nodejs.org/dist'
@@ -71,11 +75,11 @@ dependencies {
     implementation 'commons-io:commons-io:2.7'
     implementation 'com.google.code.gson:gson:2.7'
     implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation('com.ithit.webdav.integration:android-integration:5.1.5291', {
+    implementation('com.ithit.webdav.integration:android-integration:5.1.5402', {
         exclude group: 'org.nanohttpd', module: 'nanohttpd'
     })
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     jarJar 'stax:stax-api:1.0.1'
-    jarJar 'com.ithit.webdav:webdav-server:5.1.5291'
+    jarJar 'com.ithit.webdav:webdav-server:5.1.5402'
     testImplementation 'junit:junit:4.12'
 }

Java/androidfsstorage/app/src/main/assets/wwwroot/js/package-lock.json

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

Java/androidfsstorage/app/src/main/assets/wwwroot/js/package.json

@@ -88,7 +88,7 @@ This will download IT Hit WebDAV Ajax Library files into your project. Note that
 <p>On the diagram below you can see the classes in WebDAV DeltaV&nbsp;project.</p>
 <p><img id="__mcenew" alt="DeltaV diagram" src="https://www.webdavsystem.com/media/1561/deltavdiagram.png" rel="109210"></p>
 <p align="left">You can find more about&nbsp;building a server with versioning in&nbsp;<a title="DeltaV Server" href="https://www.webdavsystem.com/javaserver/doc/deltavserver/">Creating WebDAV Server with Versioning Support</a>&nbsp;article. You may also want to read&nbsp;<a title="Creating WebDAV Server" href="https://www.webdavsystem.com/javaserver/doc/">Creating a Class 1 WebDAV Server</a>&nbsp;and&nbsp;<a title="Class 2 / 3 Server" href="https://www.webdavsystem.com/javaserver/doc/create_class_2_webdav_server/">Creating Class 2 WebDAV Server</a>&nbsp;articles.</p>
-<h2>How Things Get Stored – Overview of the Oracle Back-end</h2>
+<h2>How Things Get Stored – Overview of the Oracle Back-end</h2>
 <p>The database consists of 5 entities as depicted in the figure below. 2 of them, Property and Lock, are identical to the tables found in&nbsp;<a title="WebDAV SQL" href="https://www.webdavsystem.com/javaserver/server_examples/sql_storage/">SqlStorage example</a>&nbsp;- Properties and Lock. The&nbsp;<span class="code">Repository</span>&nbsp;table contains additional fields:&nbsp;<span class="code">CREATORDISPLAYNAME</span>,&nbsp;<span class="code">CHANGENOTES</span>,&nbsp;<span class="code">CHECKEDOUT</span>,&nbsp;<span class="code">AUTOVERSION</span>,&nbsp;<span class="code">VERSIONCONTROLLED,</span> <span class="code">CHECKEDINDURINGUNLCOK</span>and&nbsp;<span class="code">CHECKEDINONFILECOMPLETE</span>.</p>
 <p><img id="__mcenew" alt="DeltaV DB diagram" src="https://www.webdavsystem.com/media/1560/deltavstoragedb.jpg" rel="109208"></p>
 <h3>Version table</h3>

Java/deltav/README.md

@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>deltav</artifactId>
-    <version>5.1.5291</version>
+    <version>5.1.5402</version>
     <packaging>war</packaging>
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>servlet-integration</artifactId>
-            <version>5.1.5291</version>
+            <version>5.1.5402</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -61,12 +61,12 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>1.23</version>
+            <version>1.28.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parsers</artifactId>
-            <version>1.23</version>
+            <version>1.28.1</version>
             <exclusions>
                 <exclusion>
                     <artifactId>cxf-core</artifactId>
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>5.1.5291</version>
+            <version>5.1.5402</version>
         </dependency>
 
         <dependency>
@@ -165,7 +165,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/deltav-5.1.5291/META-INF</outputDirectory>
+                            <outputDirectory>${project.build.directory}/deltav-5.1.5402/META-INF</outputDirectory>
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
@@ -244,7 +244,7 @@
                     <server>filesystem</server>
                     <port>11021</port>
                     <path>/</path>
-                    <warSourceDirectory>target/deltav-5.1.5291</warSourceDirectory>
+                    <warSourceDirectory>target/deltav-5.1.5402</warSourceDirectory>
                 </configuration>
             </plugin>
             <plugin>
@@ -275,7 +275,7 @@
 			<plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.6</version>				
+                <version>1.12.1</version>
                 <executions>
                     <execution>
                         <id>install node and npm</id>
@@ -284,8 +284,20 @@
                         </goals>
                         <configuration>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
-                            <nodeVersion>v12.22.7</nodeVersion>
-                            <npmVersion>6.14.0</npmVersion>
+                            <nodeVersion>v16.14.2</nodeVersion>
+                            <npmVersion>8.7.0</npmVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm update</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <arguments>update</arguments>
+                            <workingDirectory>src/main/webapp/WEB-INF/wwwroot/js</workingDirectory>
+                            <installDirectory>c:\temp\</installDirectory>
                         </configuration>
                     </execution>
                     <execution>

Java/deltav/pom.xml

@@ -143,10 +143,10 @@ <h3>Connect with WebDAV Client</h3>
 
                         </div>
                         <div class="text-right">
-                            <button class="pause-all-button btn btn-outline-primary" title="Pause all  upload">Pause upload</button>
-                            <button class="play-all-button btn btn-outline-primary" title="Resume all  upload">Resume upload</button>
+                            <button class="pause-all-button btn btn-outline-primary" title="Pause all upload">Pause upload</button>
+                            <button class="play-all-button btn btn-outline-primary" title="Resume all upload">Resume upload</button>
                             <button class="btn btn-outline-primary cancel-all-button" title="Cancel all">
-                            Сancel all upload
+                                Сancel all uploads
                             </button>
                         </div>
                     </div>

Java/deltav/src/main/webapp/WEB-INF/MyCustomHandlerPage.html

@@ -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/deltav/src/main/webapp/WEB-INF/wwwroot/css/webdav-layout.css

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

Java/deltav/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);