Merge branch 'release/3.802.0'

VirtoCommerce · Jun 20, 2024 · e520a5b · e520a5b
2 parents 9e71d11 + 07c6bc4
commit e520a5b
Show file tree

Hide file tree

Showing 28 changed files with 306 additions and 2,385 deletions.
diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml
@@ -1,4 +1,4 @@
-# v3.200.35
+# v3.800.6
 name: Module CI
 
 on:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.801.0</VersionPrefix>
+    <VersionPrefix>3.802.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/samples/VirtoCommerce.ImportSampleModule.Tests/VirtoCommerce.ImportSampleModule.Tests.csproj b/samples/VirtoCommerce.ImportSampleModule.Tests/VirtoCommerce.ImportSampleModule.Tests.csproj
@@ -18,7 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/VirtoCommerce.ImportModule.Core/Services/DefaultDataReporter.cs b/src/VirtoCommerce.ImportModule.Core/Services/DefaultDataReporter.cs
@@ -13,7 +13,7 @@ public void SetContext(ImportProfile importProfile)
 
         public Task<string> SaveErrorsAsync(List<ErrorInfo> errorsToSave)
         {
-            return Task.FromResult(nameof(DefaultDataReporter));
+            return Task.FromResult<string>(null);
         }
 
         public object Clone()

diff --git a/src/VirtoCommerce.ImportModule.Core/VirtoCommerce.ImportModule.Core.csproj b/src/VirtoCommerce.ImportModule.Core/VirtoCommerce.ImportModule.Core.csproj
@@ -17,8 +17,8 @@
   <ItemGroup>
     <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.801.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.801.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.825.0" />
   </ItemGroup>
 </Project>
 
diff --git a/src/VirtoCommerce.ImportModule.CsvHelper/CsvSettings.cs b/src/VirtoCommerce.ImportModule.CsvHelper/CsvSettings.cs
@@ -5,23 +5,23 @@ namespace VirtoCommerce.ImportModule.CsvHelper
 {
     public static class CsvSettings
     {
-        public static SettingDescriptor Delimiter { get; } = new SettingDescriptor
+        public static SettingDescriptor Delimiter { get; } = new()
         {
             Name = "Import.Csv.Delimiter",
             ValueType = SettingValueType.ShortText,
             GroupName = "Import",
             IsDictionary = false,
             DefaultValue = ";",
-            IsRequired = true
+            IsRequired = true,
         };
 
-        public static SettingDescriptor PageSize { get; } = new SettingDescriptor
+        public static SettingDescriptor PageSize { get; } = new()
         {
             Name = "Import.Csv.PageSize",
             ValueType = SettingValueType.PositiveInteger,
             GroupName = "Import",
             IsDictionary = false,
-            DefaultValue = "50"
+            DefaultValue = 50,
         };
 
         public static IEnumerable<SettingDescriptor> AllSettings

diff --git a/src/VirtoCommerce.ImportModule.Data.MySql/VirtoCommerce.ImportModule.Data.MySql.csproj b/src/VirtoCommerce.ImportModule.Data.MySql/VirtoCommerce.ImportModule.Data.MySql.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -16,6 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.825.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...toCommerce.ImportModule.Data.PostgreSql/VirtoCommerce.ImportModule.Data.PostgreSql.csproj b/...toCommerce.ImportModule.Data.PostgreSql/VirtoCommerce.ImportModule.Data.PostgreSql.csproj
@@ -7,8 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql" Version="8.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -17,6 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.825.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...irtoCommerce.ImportModule.Data.SqlServer/VirtoCommerce.ImportModule.Data.SqlServer.csproj b/...irtoCommerce.ImportModule.Data.SqlServer/VirtoCommerce.ImportModule.Data.SqlServer.csproj
@@ -11,11 +11,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.825.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/VirtoCommerce.ImportModule.Data/Services/DataImportProcessManager.cs b/src/VirtoCommerce.ImportModule.Data/Services/DataImportProcessManager.cs
@@ -144,7 +144,7 @@ void ErrorCallback(ErrorInfo info)
                 // Import finished
                 importProgress.Description = "Import has been finished";
                 importProgress.Finished = DateTime.UtcNow;
-                importProgress.ReportUrl = errorReportResult;
+                importProgress.ReportUrl = errorReportResult ?? importProgress.ReportUrl;
 
                 await dataImporter.OnImportCompletedAsync(context);
 

diff --git a/src/VirtoCommerce.ImportModule.Data/VirtoCommerce.ImportModule.Data.csproj b/src/VirtoCommerce.ImportModule.Data/VirtoCommerce.ImportModule.Data.csproj
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.801.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.801.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.825.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...le.Web/Localizations/en.ImportModule.json → ...rtModule.Web/Localizations/en.Import.json b/...le.Web/Localizations/en.ImportModule.json → ...rtModule.Web/Localizations/en.Import.json
diff --git a/src/VirtoCommerce.ImportModule.Web/import-app/package.json b/src/VirtoCommerce.ImportModule.Web/import-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "import-app",
-  "version": "1.0.152",
+  "version": "1.0.160",
   "private": true,
   "scripts": {
     "bootstrap": "yarn build:modules-library",
@@ -32,9 +32,9 @@
     "@types/node": "^20.10.5",
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
-    "@vc-shell/api-client-generator": "^1.0.178",
-    "@vc-shell/release-config": "^1.0.178",
-    "@vc-shell/ts-config": "^1.0.178",
+    "@vc-shell/api-client-generator": "^1.0.240",
+    "@vc-shell/release-config": "^1.0.240",
+    "@vc-shell/ts-config": "^1.0.240",
     "@vitejs/plugin-vue": "^5.0.3",
     "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
@@ -59,14 +59,13 @@
     "vite": "^5.0.11",
     "vite-plugin-checker": "^0.6.2",
     "vite-plugin-mkcert": "^1.17.1",
-    "vite-plugin-pwa": "^0.17.4",
     "vue-eslint-parser": "^9.3.2",
     "vue-tsc": "^1.8.27"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.3",
-    "@vc-shell/config-generator": "^1.0.178",
-    "@vc-shell/framework": "^1.0.178",
+    "@vc-shell/config-generator": "^1.0.240",
+    "@vc-shell/framework": "^1.0.240",
     "@vueuse/core": "^10.7.1",
     "@vueuse/integrations": "^10.7.1",
     "moment": "^2.30.1",

diff --git a/src/VirtoCommerce.ImportModule.Web/import-app/settings.json b/src/VirtoCommerce.ImportModule.Web/import-app/settings.json
@@ -0,0 +1,6 @@
+{
+  "i18n-ally.localesPaths": [
+    "src/locales",
+    "src/modules/import/locales"
+  ]
+}
diff --git a/src/VirtoCommerce.ImportModule.Web/import-app/src/api_client/package.json b/src/VirtoCommerce.ImportModule.Web/import-app/src/api_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@virtocommerce/import-app-api",
-  "version": "1.0.152",
+  "version": "1.0.160",
   "type": "module",
   "types": "./virtocommerce.import.d.ts",
   "exports": {

diff --git a/...ule.Web/import-app/src/modules/import/components/notifications/ImportPushNotification.vue b/...ule.Web/import-app/src/modules/import/components/notifications/ImportPushNotification.vue
@@ -66,6 +66,13 @@ async function onClick() {
       },
       true,
     );
+    await openBlade({
+      blade: resolveBladeByName("ImportNew"),
+      param: props.notification.profileId,
+      options: {
+        importJobId: props.notification.jobId,
+      },
+    });
   }
 }
 </script>
diff --git a/...rtoCommerce.ImportModule.Web/import-app/src/modules/import/composables/useImport/index.ts b/...rtoCommerce.ImportModule.Web/import-app/src/modules/import/composables/useImport/index.ts
@@ -403,7 +403,7 @@ export default (): IUseImport => {
   }
 
   async function GetSellerId(): Promise<string> {
-    let result = route?.params?.userId as string;
+    let result = route?.params?.sellerId as string;
     if (!result || result === "") {
       result = (await getCurrentOrganization())?.organizationId as string;
     }

diff --git a/src/VirtoCommerce.ImportModule.Web/import-app/src/modules/import/locales/en.json b/src/VirtoCommerce.ImportModule.Web/import-app/src/modules/import/locales/en.json
@@ -24,6 +24,9 @@
         "TOOLBAR": {
           "ADD_PROFILE": "Add profile",
           "REFRESH": "Refresh"
+        },
+        "EMPTY": {
+          "NO_ITEMS": "List is empty"
         }
       },
       "PROFILE_DETAILS": {

diff --git a/src/VirtoCommerce.ImportModule.Web/import-app/src/modules/import/pages/import-new.vue b/src/VirtoCommerce.ImportModule.Web/import-app/src/modules/import/pages/import-new.vue
@@ -1,6 +1,6 @@
 <template>
   <VcBlade
-    v-loading="bladeLoading"
+    v-loading:1000="bladeLoading"
     :title="param && profileDetails?.name ? profileDetails.name : options?.title"
     width="70%"
     :toolbar-items="bladeToolbar"
@@ -600,7 +600,7 @@ const uploadActions = ref<INotificationActions[]>([
     name: computed(() => t("IMPORT.PAGES.ACTIONS.UPLOADER.ACTIONS.PREVIEW")),
     async clickHandler() {
       try {
-        previewLoading.value = true
+        previewLoading.value = true;
         preview.value = await previewData();
         popupItems.value = [];
         popupColumns.value = [];
@@ -621,7 +621,7 @@ const uploadActions = ref<INotificationActions[]>([
         errorMessage.value = (e as Error).message;
         throw e;
       } finally {
-        previewLoading.value = false
+        previewLoading.value = false;
       }
     },
     outline: true,
@@ -782,6 +782,7 @@ async function onPaginationClick(page: number) {
 
 defineExpose({
   reloadParent,
+  title: props.param && profileDetails.value.name ? profileDetails.value.name : props.options?.title,
 });
 </script>
 

diff --git a/...oCommerce.ImportModule.Web/import-app/src/modules/import/pages/import-profile-details.vue b/...oCommerce.ImportModule.Web/import-app/src/modules/import/pages/import-profile-details.vue
@@ -1,11 +1,12 @@
 <template>
   <VcBlade
-    v-loading="loading"
+    v-loading:1000="loading"
     :title="param && profileDetails ? profileDetails.name : $t('IMPORT.PAGES.PROFILE_DETAILS.TITLE')"
     width="50%"
     :toolbar-items="bladeToolbar"
     :closable="closable"
     :expanded="expanded"
+    :modified="modified"
     @close="$emit('close:blade')"
     @expand="$emit('expand:blade')"
     @collapse="$emit('collapse:blade')"
@@ -81,7 +82,7 @@
 
               <VcDynamicProperty
                 v-for="(setting, i) in profileDetails.settings"
-                :key="`${profileDetails.id}_${i}`"
+                :key="`${setting.name}_${i}`"
                 class="tw-px-4 tw-pb-4"
                 :property="setting"
                 :dictionary="setting.isDictionary"
@@ -92,7 +93,7 @@
                 :required="setting.isRequired ?? false"
                 :value-type="setting.valueType ?? ''"
                 :placeholder="setting.defaultValue"
-                @update:model-value="setSettingsValue"
+                @update:model-value="(args) => setSettingsValue({ property: setting, ...args })"
               >
               </VcDynamicProperty>
             </VcCol>
@@ -258,14 +259,15 @@ function setSettingsValue(data: { property: ObjectSettingEntry; value: string |
   const mutatedSetting = new ObjectSettingEntry({ ...property, value });
 
   profileDetails.value.settings?.forEach((x) => {
-    if (x.id === property.id) {
+    if ((x.id && property.id && x.id === property.id) || x.name === property.name) {
       Object.assign(x, mutatedSetting);
     }
   });
 }
 
-function loadDictionaries(setting: ObjectSettingEntry) {
-  if (setting.allowedValues && setting.allowedValues.length) {
+function loadDictionaries(settingId: string) {
+  const setting = profileDetails.value.settings?.find((x) => x.id === settingId);
+  if (setting?.allowedValues && setting?.allowedValues.length) {
     return setting.allowedValues.map((val) => ({
       id: val,
       alias: val,