From cddcd834ca1d6449d5e942693b82d1d1c4b95089 Mon Sep 17 00:00:00 2001
From: Jose Blanco <blancoj@umich.edu>
Date: Fri, 1 Nov 2024 20:31:09 -0400
Subject: [PATCH] improved file listing in search and other changes

---
 .../admin-sidebar/admin-sidebar.component.ts  |  8 ++-
 .../shared/listfiles/listfiles.component.html | 70 ++++++++-----------
 .../shared/listfiles/listfiles.component.ts   |  7 +-
 ...-search-result-list-element.component.html | 60 +++++++++-------
 .../search-sidebar.component.html             |  5 +-
 5 files changed, 81 insertions(+), 69 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 26ded965d4d..916a14e5247 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -49,7 +49,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   sidebarExpanded: Observable<boolean>;
 
-  inFocus$: BehaviorSubject<boolean>;
+  inFocus$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   constructor(
     protected menuService: MenuService,
@@ -70,10 +70,16 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
   ngOnInit(): void {
     super.ngOnInit();
     this.sidebarWidth = this.variableService.getVariable('--ds-sidebar-items-width');
+
+    // Ensure the menu is shown and expanded initially
+    this.menuService.showMenu(this.menuID);  // Assuming 'showMenu' makes the menu visible but does not expand it
+    this.menuService.expandMenu(this.menuID);  // Expanding the menu initially
+
     this.authService.isAuthenticated()
       .subscribe((loggedIn: boolean) => {
         if (loggedIn) {
           this.menuService.showMenu(this.menuID);
+          this.menuService.expandMenu(this.menuID);  // Ensuring it's expanded when authenticated          
         }
       });
     this.menuCollapsed.pipe(first())
diff --git a/src/app/shared/listfiles/listfiles.component.html b/src/app/shared/listfiles/listfiles.component.html
index 0894fa6e9a6..dbf1c4159f8 100644
--- a/src/app/shared/listfiles/listfiles.component.html
+++ b/src/app/shared/listfiles/listfiles.component.html
@@ -2,59 +2,49 @@
 <div *ngIf="!item.isWithdrawn">
 
 
-<ng-container *ngVar="(bitstreams$ | async) as bitstreams">
+  <ng-container *ngVar="(bitstreams$ | async) as bitstreams">
+    <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="">
 
+      <div class="row">
+        <div class="col-md-12 ml-4">
 
-  <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="">
-<!-- To remove Files from display on the 
-  <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
--->
-    <div class="file-section" *ngFor="let file of bitstreams; let last=last;">
+          <span style="white-space: nowrap;" class="file-section pr-3" *ngFor="let file of bitstreams; let last=last;">
 
+            <ds-themed-file-download-link   [bitstream]="file" [item]="item">        
+              <span style="text-decoration:none;width:20px; display: inline-block; margin-right: 3px;"  [innerHtml]="dsoNameService.getIconForFile(file)"></span>
 
-<div class="row">
-<div class="col-md-6">
-        <span style="text-decoration:none;width:20px; display: inline-block; margin-right: 10px;"  [innerHtml]="dsoNameService.getIconForFile(file)"></span>
 
+              <ng-container *ngIf="getIconForRequestCopy(item.firstMetadataValue('dc.requestcopy.email')) != ''">
+                <span style="text-decoration:none;width:20px; display: inline-block; margin-right: 3px;"  [innerHtml]="getIconForRequestCopy(item.firstMetadataValue('dc.requestcopy.email'))"></span>
+              </ng-container>
 
-        <ds-themed-file-download-link   [bitstream]="file" [item]="item">
-          <span>{{ dsoNameService.getName(file) }}</span>
-        </ds-themed-file-download-link>
+              <ng-container *ngIf="getIconForFileRestriction(file.firstMetadataValue('dc.description')) != ''">
+                <span style="text-decoration:none;width:20px; display: inline-block; margin-right: 3px;"  [innerHtml]="getIconForFileRestriction(file.firstMetadataValue('dc.description'))"></span>
+              </ng-container>
 
-        <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
+            </ds-themed-file-download-link>
 
-          <!-- <span *ngIf="!last" innerHTML="{{separator}}"></span> -->
+            <!-- For a hidden file -->
+            <div *ngIf="file?.formatId == this.formatId"> 
+             THIS IS A HIDDEN FILE
+           </div>
 
+           <span style="font-size:12px; vertical-align:sub"> ({{(file?.sizeBytes) | dsFileSize }})</span>
 
-</div>
-<div class="col-md-6">
-
-        <ng-container *ngIf="getIconForRequestCopy(item.firstMetadataValue('dc.requestcopy.email')) != ''">
-            <span style="text-decoration:none;width:20px; display: inline-block; margin-right: 10px;"  [innerHtml]="getIconForRequestCopy(item.firstMetadataValue('dc.requestcopy.email'))"></span>Click file name to request access from the owner
-        </ng-container>
+         </span>
 
-        <ng-container *ngIf="getIconForFileRestriction(file.firstMetadataValue('dc.description')) != ''">
-          <span style="text-decoration:none;width:20px; display: inline-block; margin-right: 10px;"  [innerHtml]="getIconForFileRestriction(file.firstMetadataValue('dc.description'))"></span>
-        </ng-container>
+       </div>
 
-<!-- For a hidden file -->
-<div *ngIf="file?.formatId == this.formatId"> 
-THIS IS A HIDDEN FILE
-</div>
-        {{file.firstMetadataValue('dc.description')}}
-</div>
-</div>
+     </div>
+     <!-- </div> -->
 
-</div>
-<!-- </div> -->
-
-      <ds-themed-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-themed-loading>
-      <div *ngIf="!isLastPage" class="mt-1" id="view-more">
-        <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPageDisplay()">{{'item.page.bitstreams.view-more' | translate}}</button>
-      </div>
-      <div *ngIf="isLastPage && currentPage != 1" class="mt-1" id="collapse">
-        <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPageDisplay();">{{'item.page.bitstreams.collapse' | translate}}</button>
-      </div>
+     <ds-themed-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-themed-loading>
+     <div *ngIf="!isLastPage" class="mt-1" id="view-more">
+      <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPageDisplay()">{{'item.page.bitstreams.view-more' | translate}}</button>
+    </div>
+    <div *ngIf="isLastPage && currentPage != 1" class="mt-1" id="collapse">
+      <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPageDisplay();">{{'item.page.bitstreams.collapse' | translate}}</button>
+    </div>
 
 
   </ds-metadata-field-wrapper>
diff --git a/src/app/shared/listfiles/listfiles.component.ts b/src/app/shared/listfiles/listfiles.component.ts
index a4a663da315..aef9102612d 100644
--- a/src/app/shared/listfiles/listfiles.component.ts
+++ b/src/app/shared/listfiles/listfiles.component.ts
@@ -58,7 +58,10 @@ export class ListfilesComponent implements OnInit {
     public dsoNameService: DSONameService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
-    this.pageSize = this.appConfig.item.bitstream.pageSize;
+    //this.pageSize = this.appConfig.item.bitstream.pageSize;
+    // Just going to hardcode it to 1000
+    this.pageSize = 1000;
+
   }
 
   ngOnInit(): void {
@@ -143,4 +146,4 @@ export class ListfilesComponent implements OnInit {
     });
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index 68537a94445..32ad4de9a36 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -14,35 +14,47 @@
   </div>
 -->
 
-  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <div class="d-flex">
-      <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context" [showAccessStatus]="true"></ds-themed-badges>
+<div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
+  <div class="d-flex">
+    <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context" [showAccessStatus]="true"></ds-themed-badges>
+  </div>
+
+  <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+    [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+    [innerHTML]="dsoTitle"></a>
+    <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
+    [innerHTML]="dsoTitle"></span>
+
+    <div>
+      <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
+        (<span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
+      </ng-container>
     </div>
 
-    <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
-      <span class="text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+    <span class="text-muted">
+      <ds-truncatable-part [id]="dso.id" [minLines]="1">
 
-          <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
+        <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
+          <span *ngIf="allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length <= 3">
             <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
-                <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
-                <span *ngIf="!last">; </span>
+              <span [innerHTML]="author"></span>
+              <span *ngIf="!last">; </span>
             </span>
           </span>
+          <span *ngIf="allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 3">
+            <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).slice(0,3); let last=last;">
+              <span [innerHTML]="author"></span>
+              <span *ngIf="!last">; </span>
+            </span>
+            <span>; et. al.</span>
+          </span>
+        </span>
 
-          <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
-            (<span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
-          </ng-container>
-
-        </ds-truncatable-part>
-      </span>
+      </ds-truncatable-part>
+    </span>
 
-      <ds-listfiles [item]="dso"></ds-listfiles>
+    <ds-listfiles [item]="dso"></ds-listfiles>
 
 <!-- No need for abstract in search result page
       <div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
@@ -50,7 +62,7 @@
           [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
         </ds-truncatable-part>
       </div>
--->
-    </ds-truncatable>
-  </div>
+    -->
+  </ds-truncatable>
+</div>
 </div>
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index 8bf42792fa8..0fe2672c920 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -14,6 +14,9 @@
                              (changeViewMode)="changeViewMode.emit($event)"></ds-view-mode-switch>
 -->
         <div class="sidebar-content">
+	    <!-- Move setting search box to the top -->
+            <ds-themed-search-settings [currentSortOption]="currentSortOption"
+                                       [sortOptionsList]="sortOptionsList"></ds-themed-search-settings>
             <ds-search-switch-configuration *ngIf="configurationList"
                                             [configurationList]="configurationList"
                                             [defaultConfiguration]="configuration"
@@ -24,8 +27,6 @@
                                [filters]="filters"
                                [refreshFilters]="refreshFilters"
                                [inPlaceSearch]="inPlaceSearch"></ds-themed-search-filters>
-            <ds-themed-search-settings [currentSortOption]="currentSortOption"
-                                       [sortOptionsList]="sortOptionsList"></ds-themed-search-settings>
         </div>
     </div>
 </div>