Fixed bugs from MERGE master

Author: TYueksel

src/app/app.component.html

@@ -16,22 +16,31 @@
 <ng-template #loadedConfig>
   <mat-toolbar color="primary">
     <mat-icon>library_books</mat-icon>
-    <span style="margin-left: 1rem">Pattern Atlas</span>
+    <span style="margin-left: 1rem">PatternAtlas</span>
+
     <span class="spacer"></span>
-    {{welcomeText}}
-    <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Button with a menu">
-      <mat-icon>more_vert</mat-icon>
-    </button>
-    <mat-menu #menu="matMenu">
-      <button mat-menu-item (click)="openFeatureToggleDialog()">
-        <span>Feature Toggles</span>
+    <div *patternAtlasUiShowOnFeature="!(UiFeatures.PATTERNCANDIDATE || UiFeatures.ISSUE)">
+      <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Button with a menu">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </mat-menu>
-    <div class="log-button">
-      <button mat-stroked-button
-              (click)="loginOAuth()"
-              *patternAtlasUiShowOnFeature="[UiFeatures.ISSUE,UiFeatures.PATTERNCANDIDATE]"> {{ loginButton }}</button>
-
+      <mat-menu #menu="matMenu">
+        <button mat-menu-item (click)="openFeatureToggleDialog()">
+          <span>Feature Toggles</span>
+        </button>
+      </mat-menu>
+    </div>
+    <div class="log-button" *patternAtlasUiShowOnFeature="UiFeatures.PATTERNCANDIDATE || UiFeatures.ISSUE">
+        <button *ngIf="!loggedIn" mat-button (click)="login()"> Login </button>
+        <button *ngIf="loggedIn" mat-button [matMenuTriggerFor]="menu">Hello {{userName}} <mat-icon>more_vert</mat-icon></button>
+        <mat-menu #menu="matMenu">
+            <button mat-menu-item routerLink="/user-info"> UserInfo </button>
+            <button *ngIf="p.hidden('USER_READ_ALL') | async" mat-menu-item routerLink="/admin"> Admin </button>
+            <!-- <button mat-menu-item routerLink="/developer"> Developer </button> -->
+            <button mat-menu-item (click)="openFeatureToggleDialog()">
+              <span>Feature Toggles</span>
+            </button>
+            <button mat-menu-item color="warn" (click)="logout()"> Logout </button>
+        </mat-menu>
     </div>
   </mat-toolbar>
   <nav mat-tab-nav-bar>
@@ -57,18 +66,6 @@
        routerLinkActive #rla5="routerLinkActive" [active]="rla5.isActive">
       Issue
     </a>
-    <a mat-tab-link [routerLink]="'/user'" *ngIf="(auth.hasRole('MEMBER') | async)"
-       routerLinkActive #rla6="routerLinkActive" [active]="rla6.isActive">
-      Personal
-    </a>
-    <a mat-tab-link [routerLink]="'/admin'" *ngIf="(auth.hasRole('ADMIN') | async)"
-       routerLinkActive #rla7="routerLinkActive" [active]="rla7.isActive">
-      Admin
-    </a>
-    <a mat-tab-link [routerLink]="'/developer'" *ngIf="(auth.hasRole('ADMIN') | async)"
-       routerLinkActive #rla8="routerLinkActive" [active]="rla8.isActive">
-      Developer
-    </a>
   </nav>
   <router-outlet></router-outlet>
 </ng-template>

src/app/authentication/_services/authentication.service.ts

@@ -179,7 +179,7 @@ export class AuthenticationService {
   }
 
   private getRoles() {
-    this.http.get<any>(`${environment.repositoryUrl}/users/roles`).subscribe(roles => {
+    this.http.get<any>(`${environment.API_URL}/users/roles`).subscribe(roles => {
       this.rolePASubject.next(roles._embedded.roleModels);
     }, error => {
       console.error('Error getToken via refreshToken: ', error)

src/app/core/candidate-management/_services/candidate-management.service.ts

@@ -40,7 +40,7 @@ export class CandidateManagementService {
    * CREATE
    */
   public createCandidate(candidate: Candidate): Observable<Candidate> {
-    candidate.uri = candidate.name;    
+    candidate.uri = candidate.name;
     return this.http.post<any>(this.repoEndpoint + this.serviceEndpoint, candidate).pipe(
       map(result => {
         this.toasterService.pop('success', 'Created new candidate');

src/app/core/directives/pattern-atlas-ui-repository-configuration.service.ts

@@ -41,9 +41,9 @@ interface EtcdNode {
 const initialValues: PatternAtlasUiConfiguration = {
   features: {
     designModel: false,
-    patternCandidate: false,
-    patternViews: false,
-    issue: false,
+    patternCandidate: true,
+    patternViews: true,
+    issue: true,
     showSettings: false,
     editing: true
   },

src/environments/environment.ts

@@ -27,7 +27,7 @@ export const environment = {
     window['env']['LATEX_RENDERER_PORT']
       ? `http://${window['env']['LATEX_RENDERER_HOST_NAME']}:${window['env']['LATEX_RENDERER_PORT']}`
       : 'http://localhost:5030',
-  repositoryUrl: 'http://localhost:1978/patternpedia',
+  repositoryUrl: 'http://localhost:1977/patternatlas',
   authorizeUrl: 'http://localhost:8081/oauth/authorize?',
   tokenUrl: 'http://localhost:8081/oauth/token',
   tokenRevokeUrl: 'http://localhost:8081/oauth/revoke_token',