Merge pull request #4217 from kshepherd/rss-sort-link-fix

Several fixes to RSS component and object lists

Author: tdonohue

src/app/app-routes.ts

@@ -109,14 +109,12 @@ export const APP_ROUTES: Route[] = [
         path: COMMUNITY_MODULE_PATH,
         loadChildren: () => import('./community-page/community-page-routes')
           .then((m) => m.ROUTES),
-        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
         path: COLLECTION_MODULE_PATH,
         loadChildren: () => import('./collection-page/collection-page-routes')
           .then((m) => m.ROUTES),
-        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {

src/app/collection-page/collection-page-routes.ts

@@ -100,6 +100,7 @@ export const ROUTES: Route[] = [
             data: {
               breadcrumbKey: 'collection.search',
               menuRoute: MenuRoute.COLLECTION_PAGE,
+              enableRSS: true,
             },
           },
           {

src/app/community-page/community-page-routes.ts

@@ -90,6 +90,7 @@ export const ROUTES: Route[] = [
             data: {
               breadcrumbKey: 'community.search',
               menuRoute: MenuRoute.COMMUNITY_PAGE,
+              enableRSS: true,
             },
           },
           {

src/app/home-page/top-level-community-list/top-level-community-list.component.html

@@ -8,6 +8,7 @@ <h2>
       <ds-viewable-collection
         [config]="config"
         [sortConfig]="sortConfig"
+        [showRSS]="rssSortConfig"
         [objects]="communitiesRD$ | async"
         [hideGear]="true">
       </ds-viewable-collection>

src/app/home-page/top-level-community-list/top-level-community-list.component.ts

@@ -65,9 +65,10 @@ export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
   pageId = 'tl';
 
   /**
-   * The sorting configuration
+   * The sorting configuration for the community list itself, and the optional RSS feed button
    */
   sortConfig: SortOptions;
+  rssSortConfig: SortOptions;
 
   /**
    * The subscription to the observable for the current page.
@@ -84,6 +85,7 @@ export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
     this.config.pageSize = appConfig.homePage.topLevelCommunityList.pageSize;
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
+    this.rssSortConfig = new SortOptions('dc.date.accessioned', SortDirection.DESC);
   }
 
   ngOnInit() {

src/app/shared/object-collection/object-collection.component.html

@@ -13,6 +13,7 @@
     [linkType]="linkType"
     [context]="context"
     [hidePaginationDetail]="hidePaginationDetail"
+    [showRSS]="showRSS"
     [showPaginator]="showPaginator"
     [showThumbnails]="showThumbnails"
     (paginationChange)="onPaginationChange($event)"
@@ -58,6 +59,7 @@
     [sortConfig]="sortConfig"
     [objects]="objects"
     [hideGear]="hideGear"
+    [showRSS]="showRSS"
     [linkType]="linkType"
     [context]="context"
     [hidePaginationDetail]="hidePaginationDetail"

src/app/shared/object-collection/object-collection.component.ts

@@ -71,17 +71,22 @@ export class ObjectCollectionComponent implements OnInit {
   @Input() sortConfig: SortOptions;
 
   /**
-   * Whether or not the list elements have a border or not
+   * Whether the list elements have a border or not
    */
   @Input() hasBorder = false;
 
   /**
-   * Whether or not to hide the gear to change the sort and pagination configuration
+   * Whether to hide the gear to change the sort and pagination configuration
    */
   @Input() hideGear = false;
   @Input() selectable = false;
   @Input() selectionConfig: {repeatable: boolean, listId: string};
 
+  /**
+   * Whether to show an RSS syndication button for the current search options
+   */
+  @Input() showRSS: SortOptions | boolean = false;
+
   /**
    * Emit custom event for listable object custom actions.
    */

src/app/shared/object-detail/object-detail.component.html

@@ -4,6 +4,7 @@
   [sortOptions]="sortConfig"
   [objects]="objects"
   [hideGear]="hideGear"
+  [showRSS]="showRSS"
   [hidePaginationDetail]="hidePaginationDetail"
   [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
   [showPaginator]="showPaginator"

src/app/shared/object-detail/object-detail.component.ts

@@ -85,6 +85,11 @@ export class ObjectDetailComponent {
    */
   @Input() showThumbnails;
 
+  /**
+   * Whether to show the RSS syndication link. Either false, or valid SortOptions object
+   */
+  @Input() showRSS: SortOptions | boolean = false;
+
   /**
    * Emit when one of the listed object has changed.
    */

src/app/shared/object-list/object-list.component.html

@@ -4,6 +4,7 @@
   [objects]="objects"
   [sortOptions]="sortConfig"
   [hideGear]="hideGear"
+  [showRSS]="showRSS"
   [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
   [hidePaginationDetail]="hidePaginationDetail"
   [showPaginator]="showPaginator"