Merge remote-tracking branch 'origin/feat/ai-document-processing' int…

…o feat/ai-document-processing
VirtoCommerce · Oct 29, 2024 · 433664f · 433664f
2 parents 9c25ce4 + 6f90c52
commit 433664f
Show file tree

Hide file tree

Showing 19 changed files with 1,829 additions and 375 deletions.
diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml
@@ -1,5 +1,5 @@
-# v3.800.6
-# https://virtocommerce.atlassian.net/browse/VCST-915
+# v3.800.9
+# https://virtocommerce.atlassian.net/browse/VCST-1260
 name: Module CI
 
 on:
@@ -241,7 +241,7 @@ jobs:
     if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
         (github.event_name == 'workflow_dispatch')}}
     needs: 'ci'
-    uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.6
+    uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.9
 
     with:
       katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
@@ -260,7 +260,7 @@ jobs:
   deploy-cloud:
     if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
     needs: ci
-    uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.6
+    uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.9
     with:
       releaseSource: module
       moduleId: ${{ needs.ci.outputs.moduleId }}

diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml
@@ -1,5 +1,5 @@
-# v3.800.6
-# https://virtocommerce.atlassian.net/browse/VCST-915
+# v3.800.9
+# https://virtocommerce.atlassian.net/browse/VCST-1260
 name: Release hotfix
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.6
+    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.6    
+    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9    
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -46,7 +46,7 @@ jobs:
   publish-github-release:
     needs:
       [build, test, get-metadata]
-    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.6
+    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml
@@ -1,5 +1,5 @@
-# v3.800.6
-# https://virtocommerce.atlassian.net/browse/VCST-915
+# v3.800.9
+# https://virtocommerce.atlassian.net/browse/VCST-1260
 name: Publish nuget
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.6    
+    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9    
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.6    
+    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9    
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
   publish-nuget:
     needs:
       [build, test]
-    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.6    
+    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9    
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       forceGithub: false

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,12 +1,12 @@
-# v3.800.6
-# https://virtocommerce.atlassian.net/browse/VCST-915
+# v3.800.9
+# https://virtocommerce.atlassian.net/browse/VCST-1260
 name: Release
 
 on:
   workflow_dispatch:
 
 jobs:
   release:
-    uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.6    
+    uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.9    
     secrets:
       envPAT: ${{ secrets.REPO_TOKEN }}
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.817.0</VersionPrefix>
+    <VersionPrefix>3.818.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/samples/VirtoCommerce.QuoteExtensionsModule.Web/package-lock.json b/samples/VirtoCommerce.QuoteExtensionsModule.Web/package-lock.json
diff --git a/samples/VirtoCommerce.QuoteExtensionsModule.Web/package.json b/samples/VirtoCommerce.QuoteExtensionsModule.Web/package.json
@@ -11,7 +11,7 @@
         "clean-webpack-plugin": "^1.0.0",
         "css-loader": "^1.0.1",
         "mini-css-extract-plugin": "^0.4.5",
-        "webpack": "^5.58.1",
+        "webpack": "^5.94.0",
         "webpack-cli": "^4.9.0"
     },
     "dependencies": {}

diff --git a/src/VirtoCommerce.QuoteModule.Core/ModuleConstants.cs b/src/VirtoCommerce.QuoteModule.Core/ModuleConstants.cs
@@ -69,6 +69,16 @@ public static class General
                     DefaultValue = false,
                     IsPublic = true,
                 };
+
+                public static SettingDescriptor FileUploadScopeName { get; } = new SettingDescriptor
+                {
+                    Name = "Quotes.FileUploadScopeName",
+                    GroupName = "Quotes|General",
+                    ValueType = SettingValueType.ShortText,
+                    DefaultValue = "quote-attachments",
+                    IsPublic = true,
+                };
+
             }
 
             public static IEnumerable<SettingDescriptor> AllSettings
@@ -79,6 +89,7 @@ public static IEnumerable<SettingDescriptor> AllSettings
                     yield return General.Status;
                     yield return General.DefaultStatus;
                     yield return General.QuoteRequestNewNumberTemplate;
+                    yield return General.FileUploadScopeName;
                 }
             }
 
@@ -88,6 +99,7 @@ public static IEnumerable<SettingDescriptor> StoreLevelSettings
                 {
                     yield return General.QuoteRequestNewNumberTemplate;
                     yield return General.EnableQuotes;
+                    yield return General.FileUploadScopeName;
                 }
             }
         }