Merge branch 'release/3.804.0'

VirtoCommerce · Mar 1, 2024 · f547a35 · f547a35
2 parents 78cf5e3 + 00cc207
commit f547a35
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 19 deletions.
diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml
@@ -1,5 +1,5 @@
-# v3.800.2
-# https://virtocommerce.atlassian.net/browse/VCST-349
+# v3.800.3
+# https://virtocommerce.atlassian.net/browse/VCST-570
 name: Module CI
 
 on:
@@ -128,7 +128,7 @@ jobs:
         run: vc-build Compress -skip Clean+Restore+Compile+Test
 
       - name: Publish Nuget
-        if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'workflow_dispatch' }}
+        if: ${{ github.ref == 'refs/heads/master' }}
         uses: VirtoCommerce/vc-github-actions/publish-nuget@master
 
       - name: Publish to Blob
@@ -192,13 +192,13 @@ jobs:
           fi
 
       - name: Setup Git Credentials
-        if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }}
+        if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }}
         uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master
         with: 
           githubToken: ${{ secrets.REPO_TOKEN }}
 
       - name: Publish Manifest
-        if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }}
+        if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }}
         uses: VirtoCommerce/vc-github-actions/publish-manifest@master
         with:
           packageUrl: ${{ steps.artifactUrl.outputs.download_url }}

diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml
@@ -1,5 +1,5 @@
-# v3.800.2
-# https://virtocommerce.atlassian.net/browse/VCST-349
+# v3.800.3
+# https://virtocommerce.atlassian.net/browse/VCST-570
 name: Release hotfix
 
 on:

diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml
@@ -1,5 +1,5 @@
-# v3.800.2
-# https://virtocommerce.atlassian.net/browse/VCST-349
+# v3.800.3
+# https://virtocommerce.atlassian.net/browse/VCST-570
 name: Publish nuget
 
 on:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,5 +1,5 @@
-# v3.800.2
-# https://virtocommerce.atlassian.net/browse/VCST-349
+# v3.800.3
+# https://virtocommerce.atlassian.net/browse/VCST-570
 name: Release
 
 on:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.803.0</VersionPrefix>
+    <VersionPrefix>3.804.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.AssetsModule.Web/Controllers/AssetsController.cs b/src/VirtoCommerce.AssetsModule.Web/Controllers/AssetsController.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -131,10 +132,10 @@ public async Task<ActionResult<BlobInfo[]>> UploadAssetAsync([FromQuery] string
                 if (url != null)
                 {
                     var fileName = name ?? HttpUtility.UrlDecode(Path.GetFileName(url));
-                    var fileUrl = UrlHelpers.Combine(folderUrl ?? "", fileName);
+                    var fileUrl = UrlHelpers.Combine(folderUrl ?? "", Uri.EscapeDataString(fileName));
                     using (var client = _httpClientFactory.CreateClient())
-                    using (var blobStream = await _blobProvider.OpenWriteAsync(fileUrl))
                     using (var remoteStream = await client.GetStreamAsync(url))
+                    using (var blobStream = await _blobProvider.OpenWriteAsync(fileUrl))
                     {
                         await remoteStream.CopyToAsync(blobStream);
                         var blobInfo = AbstractTypeFactory<BlobInfo>.TryCreateInstance();
@@ -157,7 +158,7 @@ public async Task<ActionResult<BlobInfo[]>> UploadAssetAsync([FromQuery] string
                         if (hasContentDispositionHeader && MultipartRequestHelper.HasFileContentDisposition(contentDisposition))
                         {
                             var fileName = contentDisposition.FileName.Value;
-                            var targetFilePath = UrlHelpers.Combine(folderUrl ?? "", fileName);
+                            var targetFilePath = UrlHelpers.Combine(folderUrl ?? "", Uri.EscapeDataString(fileName));
 
                             using (var targetStream = await _blobProvider.OpenWriteAsync(targetFilePath))
                             {
@@ -174,6 +175,10 @@ public async Task<ActionResult<BlobInfo[]>> UploadAssetAsync([FromQuery] string
                     }
                 }
             }
+            catch (HttpRequestException ex)
+            {
+                return new ObjectResult(new { ex.Message }) { StatusCode = (int)ex.StatusCode };
+            }
             catch (PlatformException exc)
             {
                 return new ObjectResult(new { exc.Message }) { StatusCode = StatusCodes.Status405MethodNotAllowed };

diff --git a/src/VirtoCommerce.AssetsModule.Web/Scripts/blades/asset-list.js b/src/VirtoCommerce.AssetsModule.Web/Scripts/blades/asset-list.js
@@ -20,7 +20,8 @@ angular.module('virtoCommerce.assetsModule')
                         _.each(data.results, function (x) {
                             x.isImage = x.contentType && x.contentType.startsWith('image/');
                             if (x.isImage) {
-                                x.noCacheUrl = `${x.url}?t=${x.modifiedDate}`;
+                                const delimiter = x.url?.contains('?') ? '&' : '?';
+                                x.noCacheUrl = `${x.url}${delimiter}t=${x.modifiedDate}`;
                             }
                         });
                         $scope.listEntries = data.results;

diff --git a/src/VirtoCommerce.AssetsModule.Web/Scripts/blades/asset-upload.js b/src/VirtoCommerce.AssetsModule.Web/Scripts/blades/asset-upload.js
@@ -6,6 +6,10 @@ angular.module('virtoCommerce.assetsModule')
             blade.fileUploadOptions = {};
         }
         var folderUrl = blade.currentEntityId || "";
+        if (folderUrl.contains('?')) {
+            // Remove query string
+            folderUrl = folderUrl.substring(0, folderUrl.indexOf('?'));
+        }
 
         function initialize() {
             if (!$scope.uploader) {
@@ -50,7 +54,7 @@ angular.module('virtoCommerce.assetsModule')
                             }, function (error) {
                                 bladeNavigationService.setError('Error ' + error.status, blade);
                             });
-                        
+
                     } else {
                         dialogService.showNotificationDialog({
                             id: "error",
@@ -99,7 +103,7 @@ angular.module('virtoCommerce.assetsModule')
         $scope.addImageFromUrl = function () {
             if (blade.newExternalImageUrl) {
                 blade.uploadCompleted = false;
-                if (folderUrl) {                    
+                if (folderUrl) {
                     assets.uploadFromUrl({ folderUrl: folderUrl, url: blade.newExternalImageUrl }, function (data) {
                         refreshParentBlade();
                         if (blade.onUploadComplete) {

diff --git a/src/VirtoCommerce.AssetsModule.Web/module.manifest b/src/VirtoCommerce.AssetsModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Assets</id>
-  <version>3.803.0</version>
+  <version>3.804.0</version>
   <version-tag />
   <platformVersion>3.800.0</platformVersion>
   <dependencies />