Merge branch 'release/3.807.0'

VirtoCommerce · Jun 4, 2024 · 9eaa384 · 9eaa384
2 parents ad0fd4e + 7d0a503
commit 9eaa384
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 14 deletions.
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.806.0</VersionPrefix>
+    <VersionPrefix>3.807.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.NotificationsModule.Core/Model/UnregisteredNotification.cs b/src/VirtoCommerce.NotificationsModule.Core/Model/UnregisteredNotification.cs
@@ -6,12 +6,17 @@ namespace VirtoCommerce.NotificationsModule.Core.Model
     //The special type for handle cases when  the system have stored the notification objects with unregistered types. 
     public class UnregisteredNotification : Notification
     {
+        public UnregisteredNotification(string type) : base(type)
+        {
+
+        }
+
         public UnregisteredNotification() : base(nameof(UnregisteredNotification))
         {
             Templates = new List<NotificationTemplate>();
         }
         public override string Kind => "undef";
-        
+
 
         public override void SetFromToMembers(string from, string to)
         {

diff --git a/src/VirtoCommerce.NotificationsModule.Data/Services/NotificationRegistrar.cs b/src/VirtoCommerce.NotificationsModule.Data/Services/NotificationRegistrar.cs
@@ -47,6 +47,5 @@ public NotificationBuilder OverrideNotificationType<TOldNotificationType, TNewNo
 
             return builder;
         }
-
     }
 }
diff --git a/src/VirtoCommerce.NotificationsModule.Data/Services/NotificationService.cs b/src/VirtoCommerce.NotificationsModule.Data/Services/NotificationService.cs
@@ -174,7 +174,7 @@ private static Notification ToModel(NotificationEntity entity)
                 entity.ToModel(result);
             }
 
-            return result ?? new UnregisteredNotification();
+            return result ?? new UnregisteredNotification(typeName);
         }
     }
 }
diff --git a/src/VirtoCommerce.NotificationsModule.Web/Localizations/en.VirtoCommerce.Notifications.json b/src/VirtoCommerce.NotificationsModule.Web/Localizations/en.VirtoCommerce.Notifications.json
@@ -210,7 +210,7 @@
     "dialogs": {
       "unknown-kind": {
         "title": "Error",
-        "message": "Unable to edit template of an unknown type: '{{kind}}'."
+        "message": "Unable to open '{{type}}' notification. Please contact your Site Administrator(s) for information."
       },
       "notification-details-save": {
         "title": "Save changes",

diff --git a/src/VirtoCommerce.NotificationsModule.Web/Localizations/ru.VirtoCommerce.Notifications.json b/src/VirtoCommerce.NotificationsModule.Web/Localizations/ru.VirtoCommerce.Notifications.json
@@ -207,7 +207,7 @@
     "dialogs": {
       "unknown-kind": {
         "title": "Ошибка",
-        "message": "Невозможно изменить шаблон неопределенного типа:: '{{kind}}'."
+        "message": "Невозможно открыть уведомление '{{type}}'. Обратитесь к администратору(ам) вашего сайта за информацией."
       },
       "notification-details-save": {
         "title": "Сохранить изменения",

diff --git a/src/VirtoCommerce.NotificationsModule.Web/Scripts/blades/notification-templates-list.js b/src/VirtoCommerce.NotificationsModule.Web/Scripts/blades/notification-templates-list.js
@@ -40,7 +40,7 @@ angular.module('virtoCommerce.notificationsModule')
                 return _.toArray(templatesToDisplay);
             }
 
-            function resolveType(kind) {
+            function resolveType(kind, type) {
                 var foundTemplate = notificationTemplatesResolverService.resolve(kind);
                 if (foundTemplate && foundTemplate.knownChildrenTypes && foundTemplate.knownChildrenTypes.length) {
                     return foundTemplate;
@@ -49,13 +49,14 @@ angular.module('virtoCommerce.notificationsModule')
                         id: "error",
                         title: "notifications.dialogs.unknown-kind.title",
                         message: "notifications.dialogs.unknown-kind.message",
-                        messageValues: { kind: kind },
+                        messageValues: { kind: kind, type: type },
                     });
+                    return null;
                 }
             }
 
             blade.openTemplate = function (template) {
-                var foundTemplate = resolveType(blade.currentEntity.kind);
+                var foundTemplate = resolveType(blade.currentEntity.kind, blade.currentEntity.type);
                 if (foundTemplate) {
                     var newBlade = {
                         id: foundTemplate.detailBlade.id,

diff --git a/src/VirtoCommerce.NotificationsModule.Web/Scripts/blades/notifications-list.js b/src/VirtoCommerce.NotificationsModule.Web/Scripts/blades/notifications-list.js
@@ -49,7 +49,7 @@ angular.module('virtoCommerce.notificationsModule')
             });
         }
 
-        function resolveType(kind) {
+        function resolveType(kind, type) {
             var foundNotification = notificationTypesResolverService.resolve(kind);
             if (foundNotification && foundNotification.knownChildrenTypes && foundNotification.knownChildrenTypes.length) {
                     return foundNotification;
@@ -58,14 +58,15 @@ angular.module('virtoCommerce.notificationsModule')
                         id: "error",
                         title: "notifications.dialogs.unknown-kind.title",
                         message: "notifications.dialogs.unknown-kind.message",
-                        messageValues: { kind: kind },
-                });
+                        messageValues: { kind: kind, type: type },
+                    });
+                return null;
             }
         }
 
         if (authService.checkPermission('notifications:access')) {
             blade.editNotification = function (item) {
-                var foundNotification = resolveType(item.kind);
+                var foundNotification = resolveType(item.kind, item.type);
                 var newBlade = {
                     id: 'editNotification',
                     title: 'notifications.blades.notification-details.title',

diff --git a/src/VirtoCommerce.NotificationsModule.Web/module.manifest b/src/VirtoCommerce.NotificationsModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Notifications</id>
-  <version>3.806.0</version>
+  <version>3.807.0</version>
   <version-tag />
   <platformVersion>3.825.0</platformVersion>
   <dependencies>
-Original file line number
+Diff line change
@@ Expand Up @@
                 return builder;
             }
         }
     }