140019: Remove entity type prefix, fix issue with opensearch service link having search before service

Author: ConfusionOrb221

src/app/shared/rss-feed/rss.component.spec.ts

@@ -264,15 +264,6 @@ describe('RssComponent', () => {
       setupComponent(['html', 'atom', 'rss'], mockCollection);
     });
 
-    it('should include "Collection" in the rel="alternate" link titles', () => {
-      const alternateTags = (linkHeadService.addTag as jasmine.Spy).calls.all()
-        .map(c => c.args[0])
-        .filter(tag => tag.rel === 'alternate');
-      for (const tag of alternateTags) {
-        expect(tag.title).toContain('Collection');
-      }
-    });
-
     it('should include the collection name in the rel="alternate" link titles', () => {
       const alternateTags = (linkHeadService.addTag as jasmine.Spy).calls.all()
         .map(c => c.args[0])
@@ -282,29 +273,11 @@ describe('RssComponent', () => {
       }
     });
 
-    it('should not include "Community" in the rel="alternate" link titles', () => {
-      const alternateTags = (linkHeadService.addTag as jasmine.Spy).calls.all()
-        .map(c => c.args[0])
-        .filter(tag => tag.rel === 'alternate');
-      for (const tag of alternateTags) {
-        expect(tag.title).not.toContain('Community');
-      }
-    });
-
     describe('when scoped to a community', () => {
       beforeEach(() => {
         setupComponent(['html', 'atom', 'rss'], mockCommunity);
       });
 
-      it('should include "Community" in the rel="alternate" link titles', () => {
-        const alternateTags = (linkHeadService.addTag as jasmine.Spy).calls.all()
-          .map(c => c.args[0])
-          .filter(tag => tag.rel === 'alternate');
-        for (const tag of alternateTags) {
-          expect(tag.title).toContain('Community');
-        }
-      });
-
       it('should include the community name in the rel="alternate" link titles', () => {
         const alternateTags = (linkHeadService.addTag as jasmine.Spy).calls.all()
           .map(c => c.args[0])
@@ -313,15 +286,6 @@ describe('RssComponent', () => {
           expect(tag.title).toContain(mockCommunity.name);
         }
       });
-
-      it('should not include "Collection" in the rel="alternate" link titles', () => {
-        const alternateTags = (linkHeadService.addTag as jasmine.Spy).calls.all()
-          .map(c => c.args[0])
-          .filter(tag => tag.rel === 'alternate');
-        for (const tag of alternateTags) {
-          expect(tag.title).not.toContain('Collection');
-        }
-      });
     });
   });
 });

src/app/shared/rss-feed/rss.component.ts

@@ -267,17 +267,8 @@ export class RSSComponent implements OnInit, OnDestroy, OnChanges {
         getFirstCompletedRemoteData(),
       ).subscribe((result) => {
         let scopeLabel: string;
-        let objectType = '';
         if (result.hasSucceeded) {
           scopeLabel = this.dsoNameService.getName(result.payload);
-          if (result.payload instanceof Collection) {
-            objectType = 'Collection';
-          } else if (result.payload instanceof Community) {
-            objectType = 'Community';
-            // If its not a collection or community idk how we got here skip this.
-          } else {
-            return;
-          }
         } else {
           scopeLabel = 'Sitewide';
         }
@@ -288,7 +279,7 @@ export class RSSComponent implements OnInit, OnDestroy, OnChanges {
             href,
             type: OPENSEARCH_FORMAT_MIME_TYPES[format],
             rel: 'alternate',
-            title: `${objectType} ${scopeLabel} ${format.charAt(0).toUpperCase() + format.slice(1)} Feed`.trim(),
+            title: `${scopeLabel} ${format.charAt(0).toUpperCase() + format.slice(1)} Feed`.trim(),
           });
         }
       });
@@ -307,7 +298,7 @@ export class RSSComponent implements OnInit, OnDestroy, OnChanges {
 
     // Service discovery link uses the primary (first) format
     this.linkHeadService.addTag({
-      href: environment.rest.baseUrl + '/' + opensearch + '/service',
+      href: environment.rest.baseUrl + '/' + opensearch.split('/search')[0] || '' + '/service',
       type: OPENSEARCH_FORMAT_MIME_TYPES[formats[0]],
       rel: 'search',
       title: 'DSpace OpenSearch',