VCST-2698: variant 3 after review

Author: Ljutyj

src/VirtoCommerce.Platform.Web/wwwroot/js/app/navigation/blade/bladeContainer.tpl.html

@@ -42,13 +42,13 @@
             </div>
 
             <div class="blade-header">
-                <i ng-if="!blade.currentEntity.iconUrl" ng-class="blade.headIcon ? blade.headIcon : 'fa fa-folder'" class="blade-header__icon"></i>
+                <i ng-if="!blade.currentEntity.iconUrl && !blade.iconUrl" ng-class="blade.headIcon ? blade.headIcon : 'fa fa-folder'" class="blade-header__icon"></i>
 
-                <img ng-if="blade.currentEntity.iconUrl" ng-src="{{ blade.currentEntity.iconUrl }}" fallback-src="{{ blade.fallbackIconUrl }}" class="blade-header__img" />
+                <img ng-if="blade.currentEntity.iconUrl || blade.iconUrl" ng-src="{{ blade.iconUrl || blade.currentEntity.iconUrl }}" fallback-src="{{ blade.fallbackIconUrl }}" class="blade-header__img" />
 
                 <div class="blade-header__title">{{ blade.title | translate: blade.titleValues }}</div>
 
-                <span ng-if="pageSettings.totalItems" class="vc-badge">{{ pageSettings.totalItems | number: 0 }}</ span>
+                <span ng-if="pageSettings.totalItems" class="vc-badge">{{ pageSettings.totalItems | number: 0 }}</span>
             </div>
 
             <div class="blade-toolbar">

src/VirtoCommerce.Platform.Web/wwwroot/js/app/security/login/headerUserProfileWidget.js

@@ -1,6 +1,6 @@
 angular.module('platformWebApp')
-    .directive('vaHeaderUserProfileWidget', ['$document', '$state', 'platformWebApp.authService', 'platformWebApp.dialogService', 'platformWebApp.login',
-        function ($document, $state, authService, dialogService, loginResources) {
+    .directive('vaHeaderUserProfileWidget', ['$document', '$state', 'platformWebApp.authService', 'platformWebApp.dialogService', 'platformWebApp.login', 'platformWebApp.userProfileIconService',
+        function ($document, $state, authService, dialogService, loginResources, userProfileIconService) {
 
             return {
                 restrict: 'E',
@@ -28,7 +28,7 @@ angular.module('platformWebApp')
                     scope.userType = '';
                     scope.isAdministrator = false;
                     scope.isSsoAuthenticationMethod = false;
-                    scope.iconUrl = null;
+                    scope.userIconUrl = userProfileIconService.userIconUrl;
 
                     function handleClickEvent(event) {
                         var dropdownElement = $document.find('[userProfileWidget]');
@@ -71,9 +71,9 @@ angular.module('platformWebApp')
                     });
 
                     scope.$watch(function () {
-                        return authService.member;
+                        return userProfileIconService.userIconUrl;
                     }, function () {
-                        scope.iconUrl = authService.member ? authService.member.iconUrl : null;
+                        scope.userIconUrl = userProfileIconService.userIconUrl;
                     });
 
                     $document.bind('click', handleClickEvent);

src/VirtoCommerce.Platform.Web/wwwroot/js/app/security/login/headerUserProfileWidget.tpl.html

@@ -3,7 +3,7 @@
     <span class="account-user" va-tooltip tooltip="{{'platform.menu.user-profile' | translate}}"
         tooltip-placement="bottom" tooltip-animation="false" tooltip-popup-delay="{{$parent.tooltipPopupDelay}}">
         <span class="account-user__img">
-            <img src="{{iconUrl ? iconUrl : '/images/userpic.svg'}}" alt="" class="account-user__pic" style="border-radius: 9999px">
+            <img src="{{userIconUrl ? userIconUrl : '/images/userpic.svg'}}" alt="" class="account-user__pic">
         </span>
         <span class="account-user__info">
             <span class="account-user__name">{{fullName || userLogin}}</span>

src/VirtoCommerce.Platform.Web/wwwroot/js/app/security/services/auth.js

@@ -7,8 +7,7 @@ angular.module('platformWebApp')
         fullName: null,
         permissions: null,
         isAuthenticated: false,
-        memberId: null,
-        member: null
+        memberId: null
     };
 
     authContext.fillAuthData = function () {
@@ -147,7 +146,6 @@ angular.module('platformWebApp')
         authContext.fullName = user.userLogin;
         authContext.isAuthenticated = user.userName != null;
         authContext.memberId = user.memberId;
-        authContext.member = null;
 
         // Interpolate permissions to replace some template to real value
         if (authContext.permissions) {
@@ -159,9 +157,5 @@ angular.module('platformWebApp')
         $rootScope.$broadcast('loginStatusChanged', authContext);
     }
 
-    $rootScope.$on("memberIconChanged", function (event, member) {
-        authContext.member = member;
-    });
-
     return authContext;
 }]);

src/VirtoCommerce.Platform.Web/wwwroot/js/app/userProfile/blades/userProfile.js

@@ -1,19 +1,17 @@
 angular.module('platformWebApp')
-    .controller('platformWebApp.userProfile.userProfileController', ['$rootScope', '$scope', 'platformWebApp.i18n', 'platformWebApp.userProfile', 'platformWebApp.common.languages', 'platformWebApp.common.locales', 'platformWebApp.common.timeZones', 'platformWebApp.userProfileApi', 'platformWebApp.authService',
-        function ($rootScope, $scope, i18n, userProfile, languages, locales, timeZones, userProfileApi, authService) {
+    .controller('platformWebApp.userProfile.userProfileController', ['$rootScope', '$scope', 'platformWebApp.i18n', 'platformWebApp.userProfile', 'platformWebApp.common.languages', 'platformWebApp.common.locales', 'platformWebApp.common.timeZones', 'platformWebApp.userProfileApi', 'platformWebApp.userProfileIconService',
+        function ($rootScope, $scope, i18n, userProfile, languages, locales, timeZones, userProfileApi, userProfileIconService) {
             var blade = $scope.blade;
             blade.headIcon = 'fa fa-user';
             blade.title = 'platform.blades.user-profile.title';
+            blade.iconUrl = userProfileIconService.userIconUrl;
 
             blade.currentLanguage = i18n.getLanguage();
             blade.currentRegionalFormat = i18n.getRegionalFormat();
             blade.currentTimeZone = i18n.getTimeZone();
             blade.currentTimeAgoSettings = i18n.getTimeAgoSettings();
             blade.currentTimeSettings = i18n.getTimeSettings();
-            blade.currentEntity = authService.member;
-            // This flag is used to save icon immediately in the MemberIcon blade of the Customer model
-            blade.saveIconImmediately = true;
-
+            
             userProfile.load().then(function () {
                 initializeBlade();
             });
@@ -55,6 +53,7 @@ angular.module('platformWebApp')
                 blade.currentTimeZone = getNameByCode($scope.timeZones, blade.currentTimeZone);
                 blade.currentTimeAgoSettings = userProfile.timeAgoSettings;
                 blade.currentTimeSettings = userProfile.timeSettings;
+                blade.currentMemberId = userProfile.memberId;
             }
 
             function isLoading() {
@@ -115,4 +114,10 @@ angular.module('platformWebApp')
                     userProfile.save();
                 }
             }
+
+            $scope.$watch(function () {
+                return userProfileIconService.userIconUrl;
+            }, function () {
+                blade.iconUrl = userProfileIconService.userIconUrl;
+            });
         }]);

src/VirtoCommerce.Platform.Web/wwwroot/js/app/userProfile/services/userProfileIconService.js

@@ -0,0 +1,10 @@
+angular.module('platformWebApp')
+    .factory('platformWebApp.userProfileIconService', ['$http', '$rootScope', '$interpolate', '$q', '$window', 'platformWebApp.authDataStorage', 'platformWebApp.externalSignInStorage', function ($http, $rootScope, $interpolate, $q, $window, authDataStorage, externalSignInStorage) {
+
+    var service = {
+        userIconUrl: null,
+        userId: null
+    };
+
+    return service;
+}]);