From 75a781c2abe705dae8780dbfd6737b081baee508 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Thu, 24 Oct 2024 17:03:35 +0000 Subject: [PATCH 1/3] 3.811.0 --- Directory.Build.props | 2 +- src/VirtoCommerce.StoreModule.Web/module.manifest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8480544..1036069 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.810.0 + 3.811.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.StoreModule.Web/module.manifest b/src/VirtoCommerce.StoreModule.Web/module.manifest index 97baa74..0b58809 100644 --- a/src/VirtoCommerce.StoreModule.Web/module.manifest +++ b/src/VirtoCommerce.StoreModule.Web/module.manifest @@ -1,7 +1,7 @@ VirtoCommerce.Store - 3.810.0 + 3.811.0 3.853.0 From e0049be678286c8c6f89126e375c8764f048780d Mon Sep 17 00:00:00 2001 From: vc-ci Date: Wed, 6 Nov 2024 04:33:04 +0000 Subject: [PATCH 2/3] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 10 +++++----- .github/workflows/module-release-hotfix.yml | 10 +++++----- .github/workflows/publish-nugets.yml | 10 +++++----- .github/workflows/release.yml | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index d52007c..d7b89cd 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,5 +1,5 @@ -# v3.800.9 -# https://virtocommerce.atlassian.net/browse/VCST-1260 +# v3.800.10 +# https://virtocommerce.atlassian.net/browse/VCST-1738 name: Module CI on: @@ -239,9 +239,9 @@ jobs: module-katalon-tests: if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) || - (github.event_name == 'workflow_dispatch')}} + (github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }} needs: 'ci' - uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.10 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.9 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.10 with: releaseSource: module moduleId: ${{ needs.ci.outputs.moduleId }} diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml index 967db97..aaa4675 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,5 +1,5 @@ -# v3.800.9 -# https://virtocommerce.atlassian.net/browse/VCST-1260 +# v3.800.10 +# https://virtocommerce.atlassian.net/browse/VCST-1738 name: Release hotfix on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10 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.9 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10 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 index 655f9ba..bee4b38 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,5 +1,5 @@ -# v3.800.9 -# https://virtocommerce.atlassian.net/browse/VCST-1260 +# v3.800.10 +# https://virtocommerce.atlassian.net/browse/VCST-1738 name: Publish nuget on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.10 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.10 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.9 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.10 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb4030e..f7a9ab0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ -# v3.800.9 -# https://virtocommerce.atlassian.net/browse/VCST-1260 +# v3.800.10 +# https://virtocommerce.atlassian.net/browse/VCST-1738 name: Release on: @@ -7,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.9 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.10 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From 64b3853d5f107f6d010d41cc852f895e56b1ef88 Mon Sep 17 00:00:00 2001 From: Oleg Zhuk Date: Mon, 25 Nov 2024 18:05:45 +0200 Subject: [PATCH 3/3] VCST-2113: Add max length client-side validation for email input fields. (#143) --- .../Scripts/blades/store-advanced.tpl.html | 150 +++++++++--------- .../package-lock.json | 7 +- 2 files changed, 79 insertions(+), 78 deletions(-) diff --git a/src/VirtoCommerce.StoreModule.Web/Scripts/blades/store-advanced.tpl.html b/src/VirtoCommerce.StoreModule.Web/Scripts/blades/store-advanced.tpl.html index 18f3d49..f466be4 100644 --- a/src/VirtoCommerce.StoreModule.Web/Scripts/blades/store-advanced.tpl.html +++ b/src/VirtoCommerce.StoreModule.Web/Scripts/blades/store-advanced.tpl.html @@ -1,83 +1,83 @@
-
-
-
-
-
- -
- -
+
+
+ +
+
+ +
+ +
+
+
+ {{ 'stores.blades.store-advanced.labels.store-regional-settings' | translate }} +
+
+ +
+ + {{$select.selected.displayName}} + + + +
-
- {{ 'stores.blades.store-advanced.labels.store-regional-settings' | translate }} -
-
- -
- - {{$select.selected.displayName}} - - - - -
-
-
-
-
- -
- -
-
-
+
+
+
+
+ +
+
-
- -
- - {{$select.selected.name}} - - - - -
+
+
+
+
+ +
+ + {{$select.selected.name}} + + + + +
+
+
+ {{ 'stores.blades.store-advanced.labels.store-email-settings' | translate }} +
+
+ +
+
-
- {{ 'stores.blades.store-advanced.labels.store-email-settings' | translate }} -
-
- -
- -
-
-
- -
- -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
+
+
+ +
+
-
- -
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
diff --git a/src/VirtoCommerce.StoreModule.Web/package-lock.json b/src/VirtoCommerce.StoreModule.Web/package-lock.json index 0cde824..79b4398 100644 --- a/src/VirtoCommerce.StoreModule.Web/package-lock.json +++ b/src/VirtoCommerce.StoreModule.Web/package-lock.json @@ -531,10 +531,11 @@ "dev": true }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0",