Skip to content

Commit 5be5b9c

Browse files
vc-civc-ci
committed
Merge branch 'release/3.836.0'
2 parents f4af9aa + 00ee67f commit 5be5b9c

File tree

13 files changed

+368
-259
lines changed

13 files changed

+368
-259
lines changed

‎.github/workflows/module-ci.yml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.23
2-
# https://virtocommerce.atlassian.net/browse/VCST-3056
1+
# v3.800.24
2+
# https://virtocommerce.atlassian.net/browse/VCST-4487
33
name: Module CI
44

55
on:
@@ -154,11 +154,26 @@ jobs:
154154
blobSAS: ${{ secrets.BLOB_TOKEN }}
155155
blobUrl: ${{ vars.BLOB_URL }}
156156

157+
- name: Sanitize branch name
158+
if: ${{ github.event_name == 'pull_request' }}
159+
id: sanitize_branch
160+
env:
161+
BRANCH_NAME: ${{ github.head_ref }}
162+
run: |
163+
# Keep only alphanumeric, hyphens, underscores, and forward slashes and limit length to 255 characters.
164+
SANITIZED_BRANCH=$(printf '%s\n' "$BRANCH_NAME" | sed 's/[^-a-zA-Z0-9_/]//g' | cut -c1-255)
165+
if [ -z "$SANITIZED_BRANCH" ]; then
166+
echo "branch name is empty"
167+
exit 1
168+
else
169+
echo "branchName=$SANITIZED_BRANCH" >> $GITHUB_OUTPUT
170+
fi
171+
157172
- name: Add Jira link
158173
if: ${{ github.event_name == 'pull_request' }}
159174
uses: VirtoCommerce/vc-github-actions/publish-jira-link@master
160175
with:
161-
branchName: ${{ github.head_ref }}
176+
branchName: ${{ steps.sanitize_branch.outputs.branchName }}
162177
repoOrg: ${{ github.repository_owner }}
163178
env:
164179
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -309,7 +324,7 @@ jobs:
309324
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push')) ||
310325
(github.event_name == 'workflow_dispatch') || ((github.base_ref == 'dev') && (github.event_name == 'pull_request')) }}
311326
needs: 'ci'
312-
uses: VirtoCommerce/.github/.github/workflows/ui-autotests.yml@v3.800.23
327+
uses: VirtoCommerce/.github/.github/workflows/ui-autotests.yml@v3.800.24
313328
with:
314329
installModules: 'false'
315330
installCustomModule: 'true'
@@ -327,7 +342,7 @@ jobs:
327342
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
328343
(github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
329344
needs: 'ci'
330-
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.23
345+
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.24
331346
with:
332347
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
333348
katalonRepoBranch: 'dev'
@@ -348,7 +363,7 @@ jobs:
348363
&& github.event_name == 'push'
349364
&& needs.ci.outputs.deployment-folder-exists == 'true'}}
350365
needs: ci
351-
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.23
366+
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.24
352367
with:
353368
releaseSource: module
354369
moduleId: ${{ needs.ci.outputs.moduleId }}

‎.github/workflows/module-release-hotfix.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.23
2-
# https://virtocommerce.atlassian.net/browse/VCST-3056
1+
# v3.800.24
2+
# https://virtocommerce.atlassian.net/browse/VCST-4487
33
name: Release hotfix
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.23
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.24
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.23
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.24
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -46,7 +46,7 @@ jobs:
4646
publish-github-release:
4747
needs:
4848
[build, test, get-metadata]
49-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.23
49+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.24
5050
with:
5151
fullKey: ${{ needs.build.outputs.packageFullKey }}
5252
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

‎.github/workflows/publish-nugets.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.23
2-
# https://virtocommerce.atlassian.net/browse/VCST-3056
1+
# v3.800.24
2+
# https://virtocommerce.atlassian.net/browse/VCST-4487
33
name: Publish nuget
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.23
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.24
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.23
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.24
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
2929
publish-nuget:
3030
needs:
3131
[build, test]
32-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.23
32+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.24
3333
with:
3434
fullKey: ${{ needs.build.outputs.packageFullKey }}
3535
forceGithub: false

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# v3.800.23
2-
# https://virtocommerce.atlassian.net/browse/VCST-3056
1+
# v3.800.24
2+
# https://virtocommerce.atlassian.net/browse/VCST-4487
33
name: Release
44

55
on:
66
workflow_dispatch:
77

88
jobs:
99
release:
10-
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.23
10+
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.24
1111
secrets:
1212
envPAT: ${{ secrets.REPO_TOKEN }}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<!-- These properties will be shared for all projects -->
44
<PropertyGroup>
5-
<VersionPrefix>3.835.0</VersionPrefix>
5+
<VersionPrefix>3.836.0</VersionPrefix>
66
<VersionSuffix>
77
</VersionSuffix>
88
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

‎src/VirtoCommerce.ContentModule.Core/ContentConstants.cs‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,54 @@
33
using VirtoCommerce.ContentModule.Core.Model;
44
using VirtoCommerce.Platform.Core.Settings;
55

6-
namespace VirtoCommerce.ContentModule.Core
6+
namespace VirtoCommerce.ContentModule.Core;
7+
8+
public static class ContentConstants
79
{
8-
public static class ContentConstants
10+
public const string AnyIndexValue = "any";
11+
12+
public static class Security
913
{
10-
public static class Security
14+
public static class Permissions
1115
{
12-
public static class Permissions
13-
{
14-
public const string Read = "content:read",
15-
Access = "content:access",
16-
Create = "content:create",
17-
Delete = "content:delete",
18-
Update = "content:update";
16+
public const string Read = "content:read",
17+
Access = "content:access",
18+
Create = "content:create",
19+
Delete = "content:delete",
20+
Update = "content:update";
1921

20-
public static string[] AllPermissions = { Read, Access, Create, Delete, Update };
21-
}
22+
public static string[] AllPermissions = { Read, Access, Create, Delete, Update };
2223
}
24+
}
2325

24-
public static class Settings
26+
public static class Settings
27+
{
28+
public static class Search
2529
{
26-
public static class Search
30+
public static SettingDescriptor IndexationDateContent { get; } = new()
2731
{
28-
public static SettingDescriptor IndexationDateContent { get; } = new()
29-
{
30-
Name = $"VirtoCommerce.Search.IndexingJobs.IndexationDate.{nameof(ContentFile)}",
31-
GroupName = "Content|Search",
32-
ValueType = SettingValueType.DateTime,
33-
DefaultValue = default(DateTime),
34-
};
35-
}
36-
37-
public static IEnumerable<SettingDescriptor> AllSettings
38-
{
39-
get
40-
{
41-
yield return Search.IndexationDateContent;
42-
}
43-
}
32+
Name = $"VirtoCommerce.Search.IndexingJobs.IndexationDate.{nameof(ContentFile)}",
33+
GroupName = "Content|Search",
34+
ValueType = SettingValueType.DateTime,
35+
DefaultValue = default(DateTime),
36+
};
4437
}
4538

46-
public static class ContentTypes
39+
public static IEnumerable<SettingDescriptor> AllSettings
4740
{
48-
public const string Blogs = "blogs";
49-
public const string Pages = "pages";
50-
public const string Themes = "themes";
41+
get
42+
{
43+
yield return Search.IndexationDateContent;
44+
}
5145
}
46+
}
5247

53-
public const string DefaultTheme = "default";
48+
public static class ContentTypes
49+
{
50+
public const string Blogs = "blogs";
51+
public const string Pages = "pages";
52+
public const string Themes = "themes";
5453
}
54+
55+
public const string DefaultTheme = "default";
5556
}

‎src/VirtoCommerce.ContentModule.Core/Model/ContentSearchCriteria.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
using System.Collections.Generic;
13
using VirtoCommerce.Platform.Core.Common;
24

35
namespace VirtoCommerce.ContentModule.Core.Model
@@ -9,5 +11,7 @@ public class ContentSearchCriteria : SearchCriteriaBase
911
public string FolderUrl { get; set; }
1012
public string ContentType { get; set; }
1113
public string OrganizationId { get; set; }
14+
public IList<string> UserGroups { get; set; }
15+
public DateTime? ActiveOn { get; set; }
1216
}
1317
}

0 commit comments

Comments
 (0)