From 72c382d5c3ac29a70770c83dd2033522e56980d3 Mon Sep 17 00:00:00 2001
From: lhenze <lh435@nyu.edu>
Date: Fri, 23 Aug 2019 17:59:08 -0400
Subject: [PATCH] Using "type" value to determine path & innerHTML of first
 button

---
 .../browse-by-metadata-page.component.html         |  8 ++++++--
 .../collection-page.component.html                 |  4 ++--
 .../+community-page/community-page.component.html  |  2 +-
 .../comcol-page-browse-by.component.html           |  5 ++++-
 .../comcol-page-browse-by.component.ts             | 14 --------------
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
index 27bf8502c1..3251550d84 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -13,9 +13,13 @@
                  [content]="parentContext.introductoryText"
                  [hasInnerHtml]="true">
          </ds-comcol-page-content>
-                
+         
+         <!-- News -->
+         <ds-comcol-page-content [content]="parentContext.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
+         </ds-comcol-page-content>
+         
          <!-- Browse-By Links -->
-         <ds-comcol-page-browse-by [id]="parentContext.id"></ds-comcol-page-browse-by>
+         <ds-comcol-page-browse-by [id]="parentContext.id"  [contentType]="parentContext.type"></ds-comcol-page-browse-by>
       </header>
     </div>
   </div>
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 895c030b48..c8bb75ceed 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -16,8 +16,8 @@
           <ds-comcol-page-content [content]="collection.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
           </ds-comcol-page-content>
           <!-- Browse-By Links -->
-  
-          <ds-comcol-page-browse-by [id]="collection.id" [thisurl]="thisurl"></ds-comcol-page-browse-by>
+
+          <ds-comcol-page-browse-by [id]="collection.id" [contentType]="collection.type"></ds-comcol-page-browse-by>
         </header>
         <ng-container *ngVar="(itemRD$ | async) as itemRD">
           <div *ngIf="itemRD?.hasSucceeded" @fadeIn>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index e429d224f2..05912f676d 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -4,7 +4,7 @@
       <!-- Community name -->
       <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
       <!-- Browse-By Links -->
-      <ds-comcol-page-browse-by [id]="communityPayload.id"></ds-comcol-page-browse-by>
+      <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type"></ds-comcol-page-browse-by>
       <!-- Community logo -->
       <ds-comcol-page-logo *ngIf="logoRD$"
                            [logo]="(logoRD$ | async)?.payload"
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
index 38bbb2e2c1..f6734a1ee3 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -1,7 +1,10 @@
 <div role="navigation" class="comcol-browse">
   <div class="comcol-browse-label">{{'browse.comcol.head' | translate}}</div>
   <div class="list-group list-group-horizontal">
-    <a [href]="thisurl | dsSafeUrl" class="list-group-item" routerLinkActive="active" >Submission date</a>
+    <a *ngIf="contentType=='collection'" [routerLink]="['/collections/' + id ]" class="list-group-item" routerLinkActive="active">
+Submission date</a>
+    <a *ngIf="contentType=='community'" [routerLink]="['/communities/' + id ]" class="list-group-item" routerLinkActive="active">
+Subcommunties and collections</a>
     <a *ngFor="let config of types" class="list-group-item" [routerLink]="['/browse/' + config.id]" [queryParams]="{scope: id}" routerLinkActive="active">{{'browse.comcol.by.' + config.id | translate}}</a>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
index 7f49b767db..9190bbc687 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -18,19 +18,6 @@ export class ComcolPageBrowseByComponent implements OnInit {
   @Input() id: string;
   @Input() contentType: string;
   
-  /**
-   * getPathfromType
-   */
-  getPathfromType(t) {
-    if (t === "collection") {
-      t = "/collections/";
-    } else if (t === "community") {
-      t = "/communities/";
-    } else {
-      t = "/";
-    }
-    return t;
-  }
   
   /**
    * List of currently active browse configurations
@@ -42,7 +29,6 @@ export class ComcolPageBrowseByComponent implements OnInit {
 
   ngOnInit(): void {
     this.types = this.config.browseBy.types;
-    this.contentTypePath = this.getPathfromType(this.contentType) ;
   }
 
 }