Merge pull request #1006 from adshares/develop

Develop

CHANGELOG.md

@@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased
+## [Unreleased]
+
+## [2.4.3] - 2023-02-21
+### Fixed
+Display admin role on screen smaller than 1800px
 
 ## [2.4.2] - 2023-02-14
 ### Changed
@@ -553,7 +557,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Publisher features (Sites & AdUnits)
 
 
-[Unreleased]: https://github.com/adshares/adpanel/compare/v2.4.2...develop
+[Unreleased]: https://github.com/adshares/adpanel/compare/v2.4.3...develop
+[2.4.3]: https://github.com/adshares/adpanel/compare/v2.4.2...v2.4.3
 [2.4.2]: https://github.com/adshares/adpanel/compare/v2.4.1...v2.4.2
 [2.4.1]: https://github.com/adshares/adpanel/compare/v2.4.0...v2.4.1
 [2.4.0]: https://github.com/adshares/adpanel/compare/v2.3.0...v2.4.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adpanel",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "scripts": {
     "ng": "ng",
     "start": "ng serve adshares",

src/app/common/components/header/header.component.html

@@ -40,12 +40,12 @@
         [ngClass]="{ active: activeUserType === userType }"
         (click)="setActiveUserType(userType)">
         <fa-icon class="ap-icon ap-icon--prepend" [icon]="faUser"></fa-icon>
-        <span *ngIf="session.isModerator()">Moderator</span>
+        <span *ngIf="session.isModerator() && !session.isAdmin()">Moderator</span>
+        <span *ngIf="session.isAdmin()">Admin</span>
         <span *ngIf="session.isAgency()">Agency</span>
       </button>
     </div>
     <div
-      *ngIf="!session.isModerator() || session.isImpersonated()"
       class="ap-btn ap-btn--text ap-btn-light row align-center help-menu no-underline hidden-xl-up"
       (mouseover)="toggleRolesMenu(true)"
       (mouseleave)="toggleRolesMenu(false)">
@@ -88,7 +88,8 @@
             [ngClass]="{ active: activeUserType === userType }"
             (click)="setActiveUserType(userType)">
             <fa-icon class="ap-icon ap-icon--prepend" [icon]="faUser"></fa-icon>
-            <span *ngIf="session.isModerator()">Moderator</span>
+            <span *ngIf="session.isModerator() && !session.isAdmin()">Moderator</span>
+            <span *ngIf="session.isAdmin()">Admin</span>
             <span *ngIf="session.isAgency()">Agency</span>
           </button>
         </li>