Skip to content

Commit 82d0bc8

Browse files
vc-civc-ci
committed
Merge branch 'release/3.807.0'
2 parents 914e116 + aec1e2c commit 82d0bc8

File tree

10 files changed

+394
-45
lines changed

10 files changed

+394
-45
lines changed

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

Lines changed: 63 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.12
2-
# https://virtocommerce.atlassian.net/browse/VCST-2469
1+
# v3.800.17
2+
# https://virtocommerce.atlassian.net/browse/VCST-2789
33
name: Module CI
44

55
on:
@@ -54,6 +54,8 @@ jobs:
5454
moduleId: ${{ steps.artifact_ver.outputs.moduleId }}
5555
matrix: ${{ steps.deployment-matrix.outputs.matrix }}
5656
run-e2e: ${{ steps.run-e2e.outputs.result }}
57+
run-ui-tests: ${{ steps.run-ui-tests.outputs.result }}
58+
deployment-folder-exists: ${{ steps.check_deployment_folder.outputs.exists }}
5759

5860
steps:
5961

@@ -91,13 +93,25 @@ jobs:
9193
uses: VirtoCommerce/vc-github-actions/get-image-version@master
9294
id: artifact_ver
9395

96+
- name: Check if .deployment folder exists
97+
id: check_deployment_folder
98+
run: |
99+
if [ -d ".deployment" ]; then
100+
echo "exists=true" >> $GITHUB_OUTPUT
101+
echo "Diagnostic: .deployment folder exists."
102+
else
103+
echo "exists=false" >> $GITHUB_OUTPUT
104+
echo "Diagnostic: .deployment folder does NOT exist."
105+
fi
106+
94107
- name: Set VERSION_SUFFIX variable
95108
run: |
96109
if [ '${{ github.event_name }}' = 'workflow_dispatch' ]; then
97110
echo "VERSION_SUFFIX=${{ steps.artifact_ver.outputs.fullSuffix }}" >> $GITHUB_ENV
98111
else
99112
echo "VERSION_SUFFIX=${{ steps.artifact_ver.outputs.suffix }}" >> $GITHUB_ENV
100113
fi;
114+
101115
- name: Add version suffix
102116
if: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' }}
103117
uses: VirtoCommerce/vc-github-actions/add-version-suffix@master
@@ -183,14 +197,37 @@ jobs:
183197

184198
- name: Check commit message for version number
185199
id: run-e2e
200+
env:
201+
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
186202
run: |
187-
if [[ "${{ github.event.head_commit.message }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]];
203+
if [[ "$COMMIT_MESSAGE" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]];
188204
then
189205
echo "result=false" >> $GITHUB_OUTPUT
190206
else
191207
echo "result=true" >> $GITHUB_OUTPUT
192208
fi
193209
210+
- name: Look for xapi module in dependencies
211+
id: run-ui-tests
212+
shell: pwsh
213+
run: |
214+
$manifestFile = Get-ChildItem -Path ${{ github.workspace }} -Recurse -Filter "module.manifest" | Where-Object { $_.FullName -like "*/src/*/module.manifest" } | Select-Object -First 1
215+
if (-not $manifestFile) {
216+
Write-Error "No module.manifest file found in src subdirectories"
217+
exit 1
218+
}
219+
Write-Host "Found module.manifest at: $($manifestFile.FullName)"
220+
$manifestContent = Get-Content $manifestFile.FullName -Raw
221+
$containsXapi = 'false'
222+
$dependecies = $(Select-Xml -Content $manifestContent -XPath "//dependencies").Node.dependency
223+
foreach ($dependency in $dependecies) {
224+
if ($dependency.id -eq 'VirtoCommerce.Xapi') {
225+
Write-Host "Found VirtoCommerce.Xapi in dependencies"
226+
$containsXapi = 'true'
227+
}
228+
}
229+
echo "result=$containsXapi" >> $env:GITHUB_OUTPUT
230+
194231
- name: Setup Git Credentials
195232
if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }}
196233
uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master
@@ -237,11 +274,28 @@ jobs:
237274
run: |
238275
echo "Jira Upload Build Info response: ${{ steps.push_build_info_to_jira.outputs.response }}"
239276
277+
ui-auto-tests:
278+
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push')) ||
279+
(github.event_name == 'workflow_dispatch') || ((github.base_ref == 'dev') && (github.event_name == 'pull_request')) }}
280+
needs: 'ci'
281+
uses: VirtoCommerce/.github/.github/workflows/ui-autotests.yml@v3.800.17
282+
with:
283+
installModules: 'false'
284+
installCustomModule: 'true'
285+
customModuleId: ${{ needs.ci.outputs.moduleId }}
286+
customModuleUrl: ${{ needs.ci.outputs.artifactUrl }}
287+
runTests: ${{ needs.ci.outputs.run-ui-tests }}
288+
vctestingRepoBranch: 'dev'
289+
frontendZipUrl: 'latest'
290+
secrets:
291+
envPAT: ${{ secrets.REPO_TOKEN }}
292+
testSecretEnvFile: ${{ secrets.VC_TESTING_MODULE_ENV_FILE }}
293+
240294
module-katalon-tests:
241295
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
242296
(github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
243297
needs: 'ci'
244-
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.12
298+
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.17
245299
with:
246300
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
247301
katalonRepoBranch: 'dev'
@@ -257,9 +311,11 @@ jobs:
257311
katalonApiKey: ${{ secrets.KATALON_API_KEY }}
258312

259313
deploy-cloud:
260-
if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
314+
if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev')
315+
&& github.event_name == 'push'
316+
&& needs.ci.outputs.deployment-folder-exists == 'true'}}
261317
needs: ci
262-
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.12
318+
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.17
263319
with:
264320
releaseSource: module
265321
moduleId: ${{ needs.ci.outputs.moduleId }}
@@ -268,4 +324,4 @@ jobs:
268324
jiraKeys: ${{ needs.ci.outputs.jira-keys }}
269325
argoServer: 'argo.virtocommerce.cloud'
270326
matrix: '{"include":${{ needs.ci.outputs.matrix }}}'
271-
secrets: inherit
327+
secrets: inherit

‎.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.12
2-
# https://virtocommerce.atlassian.net/browse/VCST-2469
1+
# v3.800.17
2+
# https://virtocommerce.atlassian.net/browse/VCST-2789
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.12
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.17
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.12
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.17
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.12
49+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.17
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.12
2-
# https://virtocommerce.atlassian.net/browse/VCST-2469
1+
# v3.800.17
2+
# https://virtocommerce.atlassian.net/browse/VCST-2789
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.12
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.17
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.12
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.17
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.12
32+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.17
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.12
2-
# https://virtocommerce.atlassian.net/browse/VCST-2469
1+
# v3.800.17
2+
# https://virtocommerce.atlassian.net/browse/VCST-2789
33
name: Release
44

55
on:
66
workflow_dispatch:
77

88
jobs:
99
release:
10-
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.12
10+
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.17
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.806.0</VersionPrefix>
5+
<VersionPrefix>3.807.0</VersionPrefix>
66
<VersionSuffix>
77
</VersionSuffix>
88
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

‎src/VirtoCommerce.ExportModule.Web/Localizations/fi.VirtoCommerce.Export.json‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"export": {
3+
"main-menu-title": "Yleinen vienti",
4+
"commands": {
5+
"pick-all": "Valitse kaikki"
6+
},
7+
"provider-names": {
8+
"JsonExportProvider": "JSON-vientipalveluntarjoaja",
9+
"CsvExportProvider": "CSV-vientipalveluntarjoaja"
10+
},
11+
"blades": {
12+
"export-settings": {
13+
"title": "Vientiasetukset",
14+
"subtitle": "Määritä vientiasetukset",
15+
"labels": {
16+
"provider": "Valitse palveluntarjoaja",
17+
"template": "Valitse vientimalli",
18+
"property-selected": "Valitse ominaisuus",
19+
"row-selected": "Valitse tietueet",
20+
"total": "Kokonaismäärä",
21+
"processed": "Käsitelty määrä",
22+
"errors-count": "Virheiden määrä",
23+
"edit": "Muokkaa",
24+
"delete": "Poista",
25+
"save": "Tallenna",
26+
"exported-type": "Valitse objektityyppi",
27+
"select": "Valitse",
28+
"none": "Ei mitään",
29+
"exported-data": "Valitse vietävät tiedot",
30+
"exported-properties": "Valitse ominaisuudet",
31+
"exported-properties-group": "Valitse tämän ryhmän ominaisuudet",
32+
"all": "Kaikki",
33+
"provider-description": "Taulukkomuotoiset palveluntarjoajat (esim. CSV-palveluntarjoaja) eivät ole käytettävissä vientityypeille, jotka eivät tue taulukkovientiä",
34+
"exported-properties-description": "Valitse ominaisuudet",
35+
"exported-data-description": "Valitse tietoväli",
36+
"exported-type-description": "Valitse tietotyyppi",
37+
"selected": "{{ count }} / {{total}} valittu",
38+
"allFiltered": "Kaikki (suodatin määritetty)"
39+
},
40+
"placeholders": {
41+
"provider": "Valitse vientipalveluntarjoaja",
42+
"template": "Valitse vientimalli"
43+
}
44+
},
45+
"export-progress": {
46+
"title": "Vientiedistyminen"
47+
},
48+
"export-type-selector": {
49+
"title": "Valitse vietävä tyyppi",
50+
"subtitle": "Valitse tietotyyppi, jonka haluat viedä",
51+
"bread-crumb-top": "Kaikki tyypit"
52+
},
53+
"export-generic-viewer": {
54+
"title": "Valitse vietävät tiedot",
55+
"subtitle": "Valitse tiedot, jotka haluat viedä",
56+
"labels": {
57+
"picture": "Kuva",
58+
"type": "Objektityyppi",
59+
"name": "Nimi",
60+
"code": "Koodi",
61+
"new-filter": "Lisää uusi suodatin",
62+
"important": "Tärkeää!",
63+
"important-description": "Tämä tietolähde ei tue yksittäisten valittujen kohteiden vientiä. Käytä suodatinta rajoittaaksesi vietyä tietojoukkoa"
64+
},
65+
"placeholders": {
66+
"select-filter": "Valitse suodatin..."
67+
},
68+
"commands": {
69+
"select": "Valitse"
70+
}
71+
},
72+
"generic-filter": {
73+
"new-title": "Nimetön suodatin",
74+
"new-subtitle": "Muokkaa suodatinta",
75+
"subtitle": "Muokkaa suodatinta",
76+
"labels": {
77+
"criteria": "Suodatuskriteerit",
78+
"filter-name": "Suodattimen nimi",
79+
"unnamed-filter": "Nimetön suodatin"
80+
},
81+
"placeholders": {
82+
"filter-name": "Nimeä tämä suodatin"
83+
},
84+
"commands": {
85+
"apply": "Käytä"
86+
}
87+
}
88+
}
89+
},
90+
"settings": {
91+
"Export": {
92+
"FileNameTemplate": {
93+
"description": "Malli (kaava), jota käytetään viedyn tiedoston nimen luomiseen. Parametrit: 0 - päivämäärä (tiedoston luonnin UTC-aika)",
94+
"title": "Vientitiedoston nimen malli"
95+
}
96+
}
97+
}
98+
}

0 commit comments

Comments
 (0)