cleanup code, back buttons for about and profile

projects/aca-about/src/lib/about.component.html

@@ -1,5 +1,8 @@
 <aca-page-layout>
   <aca-page-layout-header>
+    <button mat-icon-button [routerLink]="landingPage">
+      <mat-icon class="app-profile-icon">arrow_back</mat-icon>
+    </button>
     <h1>{{ 'APP.BROWSE.ABOUT.TITLE' | translate }}</h1>
   </aca-page-layout-header>
 

projects/aca-about/src/lib/about.component.ts

@@ -27,7 +27,7 @@ import { Component, Inject, OnInit, Optional } from '@angular/core';
 import { DEV_MODE_TOKEN } from './dev-mode.tokens';
 import { Observable } from 'rxjs';
 import { AppExtensionService, ExtensionRef } from '@alfresco/adf-extensions';
-import { AuthenticationService, RepositoryInfo } from '@alfresco/adf-core';
+import { AppConfigService, AuthenticationService, RepositoryInfo } from '@alfresco/adf-core';
 import { DiscoveryApiService } from '@alfresco/adf-content-services';
 import { PACKAGE_JSON } from './package-json.token';
 
@@ -47,6 +47,7 @@ export class AboutComponent implements OnInit {
   dev = false;
   extensions$: Observable<ExtensionRef[]>;
   repository: RepositoryInfo = null;
+  landingPage: string;
 
   constructor(
     @Inject(DEV_MODE_TOKEN) devMode,
@@ -55,10 +56,12 @@ export class AboutComponent implements OnInit {
     public packageJson,
     private authService: AuthenticationService,
     private appExtensions: AppExtensionService,
-    private discovery: DiscoveryApiService
+    private discovery: DiscoveryApiService,
+    appConfigService: AppConfigService
   ) {
     this.dev = !devMode;
     this.extensions$ = this.appExtensions.references$;
+    this.landingPage = appConfigService.get('landingPage', '/personal-files');
   }
 
   ngOnInit(): void {

projects/aca-about/src/lib/aca-about.module.ts

@@ -32,9 +32,10 @@ import { SharedModule, PageLayoutModule } from '@alfresco/aca-shared';
 import { ExtensionService, provideExtensionConfig } from '@alfresco/adf-extensions';
 import { DEV_MODE_TOKEN } from './dev-mode.tokens';
 import { PACKAGE_JSON } from './package-json.token';
+import { RouterModule } from '@angular/router';
 
 @NgModule({
-  imports: [CommonModule, CoreModule.forChild(), SharedModule, PageLayoutModule],
+  imports: [CommonModule, RouterModule, CoreModule.forChild(), SharedModule, PageLayoutModule],
   declarations: [AboutComponent],
   providers: [provideExtensionConfig(['about.plugin.json'])]
 })

projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html

@@ -18,7 +18,7 @@
 
 <ng-container *ngIf="item.children && item.children.length">
   <mat-expansion-panel
-    [expanded]="acaExpansionPanel.isItemExpanded()"
+    [expanded]="acaExpansionPanel.hasActiveLinks()"
     [acaExpansionPanel]="item"
     #acaExpansionPanel="acaExpansionPanel"
     [@.disabled]="true"

projects/aca-content/src/lib/components/sidenav/directives/expansion-panel.directive.ts

@@ -64,26 +64,6 @@ export class ExpansionPanelDirective implements OnInit, OnDestroy {
     return false;
   }
 
-  isRouteAbout(): boolean {
-    return this.router.url.includes('/about');
-  }
-
-  isRouteProfile(): boolean {
-    return this.router.url.includes('/profile');
-  }
-
-  isRouteSearch(): boolean {
-    return this.router.url.includes('/search');
-  }
-
-  isItemExpanded() {
-    if (this.isRouteAbout() || this.isRouteProfile() || this.isRouteSearch()) {
-      return !this.hasActiveLinks();
-    } else {
-      return this.hasActiveLinks();
-    }
-  }
-
   ngOnInit() {
     this.hasActiveChildren = this.hasActiveLinks();
 

projects/aca-content/src/lib/components/view-profile/view-profile.component.html

@@ -1,8 +1,10 @@
 <div class="app-profile-container">
   <div class="app-profile-row">
     <div class="app-profile-title">
-      <mat-icon class="app-profile-icon" [routerLink]="landingPage">arrow_back</mat-icon>
+      <button mat-icon-button [routerLink]="landingPage">
-      <h3 class="app-profile">{{'APP.EDIT_PROFILE.MY_PROFILE' | translate}}</h3>
+        <mat-icon class="app-profile-icon">arrow_back</mat-icon>
+      </button>
+      <h1 class="app-profile">{{'APP.EDIT_PROFILE.MY_PROFILE' | translate}}</h1>
     </div>
   </div>
   <div class="app-profile-general-row" [formGroup]="profileForm">

projects/aca-shared/src/lib/services/app.service.ts

@@ -64,7 +64,8 @@ export class AppService {
   toggleAppNavBar$ = new Subject();
 
   hideSidenavConditions = ['/preview/'];
-  minimizeSidenavConditions = ['search'];
+  minimizeSidenavConditions = ['search', 'about', 'profile'];
+
   onDestroy$ = new Subject<boolean>();
 
   /**