POC: Reverse ThemedComponent selector convention

src/app/access-control/bulk-access/browse/bulk-access-browse.component.html

@@ -23,10 +23,10 @@
             <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
             <ng-template ngbNavContent>
               <div class="mx-n3">
-                <ds-themed-search [configuration]="'administrativeBulkAccess'"
+                <ds-search [configuration]="'administrativeBulkAccess'"
                                   [selectable]="true"
                                   [selectionConfig]="{ repeatable: true, listId: listId }"
-                                  [showThumbnails]="false"></ds-themed-search>
+                                  [showThumbnails]="false"></ds-search>
               </div>
             </ng-template>
           </li>

src/app/access-control/epeople-registry/epeople-registry.component.html

@@ -41,7 +41,7 @@ <h2 id="search" class="border-bottom pb-2">
         </div>
       </form>
 
-      <ds-themed-loading *ngIf="searching$ | async"></ds-themed-loading>
+      <ds-loading *ngIf="searching$ | async"></ds-loading>
       <ds-pagination
         *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(searching$ | async)"
         [paginationOptions]="config"

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html

@@ -42,12 +42,12 @@ <h1 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h1>
         </button>
       </ds-form>
 
-      <ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
+      <ds-loading [showMessage]="false" *ngIf="!formGroup"></ds-loading>
 
       <div *ngIf="epersonService.getActiveEPerson() | async">
         <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
 
-        <ds-themed-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-themed-loading>
+        <ds-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-loading>
 
         <ds-pagination
           *ngIf="(groups | async)?.payload?.totalElements > 0"

src/app/access-control/group-registry/groups-registry.component.html

@@ -33,7 +33,7 @@ <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
         </div>
       </form>
 
-      <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
+      <ds-loading *ngIf="loading$ | async"></ds-loading>
       <ds-pagination
         *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(loading$ | async)"
         [paginationOptions]="config"

src/app/admin/admin-sidebar/admin-sidebar.component.ts

@@ -15,7 +15,7 @@ import { ThemeService } from '../../shared/theme-support/theme.service';
  * Component representing the admin sidebar
  */
 @Component({
-  selector: 'ds-admin-sidebar',
+  selector: 'ds-unthemed-admin-sidebar',
   templateUrl: './admin-sidebar.component.html',
   styleUrls: ['./admin-sidebar.component.scss'],
   animations: [slideSidebar]

src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts

@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
  * Themed wrapper for AdminSidebarComponent
  */
 @Component({
-  selector: 'ds-themed-admin-sidebar',
+  selector: 'ds-admin-sidebar',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })

src/app/app.component.html

@@ -1,3 +1,3 @@
-<ds-themed-root
+<ds-root
   [shouldShowFullscreenLoader]="(isAuthBlocking$ | async) || (isThemeLoading$ | async)"
-  [shouldShowRouteLoader]="isRouteLoading$ | async"></ds-themed-root>
+  [shouldShowRouteLoader]="isRouteLoading$ | async"></ds-root>

src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html

@@ -2,7 +2,7 @@
   <div class="container" *ngVar="(bitstreamFormatsRD$ | async) as formatsRD">
     <div class="row" *ngIf="bitstreamRD?.hasSucceeded && formatsRD?.hasSucceeded">
       <div class="col-md-2">
-        <ds-themed-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-themed-thumbnail>
+        <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
       </div>
       <div class="col-md-10">
         <div class="container">
@@ -27,7 +27,7 @@ <h1 class="h2">{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="tex
       </div>
     </div>
     <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
-    <ds-themed-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
-                message="{{'loading.bitstream' | translate}}"></ds-themed-loading>
+    <ds-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
+                message="{{'loading.bitstream' | translate}}"></ds-loading>
   </div>
 </ng-container>

src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts

@@ -49,7 +49,7 @@ import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-for
 import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
 
 @Component({
-  selector: 'ds-edit-bitstream-page',
+  selector: 'ds-unthemed-edit-bitstream-page',
   styleUrls: ['./edit-bitstream-page.component.scss'],
   templateUrl: './edit-bitstream-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush

src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts

@@ -3,7 +3,7 @@ import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 
 @Component({
-  selector: 'ds-themed-edit-bitstream-page',
+  selector: 'ds-edit-bitstream-page',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })

src/app/breadcrumbs/breadcrumbs.component.ts

@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
  * Component representing the breadcrumbs of a page
  */
 @Component({
-  selector: 'ds-breadcrumbs',
+  selector: 'ds-unthemed-breadcrumbs',
   templateUrl: './breadcrumbs.component.html',
   styleUrls: ['./breadcrumbs.component.scss']
 })

src/app/breadcrumbs/themed-breadcrumbs.component.ts

@@ -6,7 +6,7 @@ import { BreadcrumbsComponent } from './breadcrumbs.component';
  * Themed wrapper for BreadcrumbsComponent
  */
 @Component({
-  selector: 'ds-themed-breadcrumbs',
+  selector: 'ds-breadcrumbs',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })

src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html

@@ -1,6 +1,6 @@
 <section class="comcol-page-browse-section">
   <div class="browse-by-metadata w-100">
-    <ds-themed-browse-by *ngIf="!(loading$ | async)" class="col-xs-12 w-100"
+    <ds-browse-by *ngIf="!(loading$ | async)" class="col-xs-12 w-100"
                          title="{{'browse.title' | translate:{
                            field: 'browse.metadata.' + browseId | translate,
                            startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
@@ -14,8 +14,8 @@
                          [startsWithOptions]="startsWithOptions"
                          (prev)="goPrev()"
                          (next)="goNext()">
-    </ds-themed-browse-by>
-    <ds-themed-loading *ngIf="loading$ | async"
-                       message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
+    </ds-browse-by>
+    <ds-loading *ngIf="loading$ | async"
+                       message="{{'loading.browse-by-page' | translate}}"></ds-loading>
   </div>
 </section>

src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html

@@ -28,14 +28,14 @@ <h2>{{'collection.edit.item-mapper.head' | translate}}</h2>
           <ng-template ngbNavContent>
             <div class="row mt-2">
               <div class="col-12 col-lg-6">
-                <ds-themed-search-form id="search-form"
+                <ds-search-form id="search-form"
                                 [query]="(searchOptions$ | async)?.query"
                                 [scope]="(searchOptions$ | async)?.scope"
                                 [currentUrl]="'./'"
                                 [inPlaceSearch]="true"
                                 [searchPlaceholder]="'collection.edit.item-mapper.search-form.placeholder' | translate"
                                 (submitSearch)="performedSearch = true">
-                </ds-themed-search-form>
+                </ds-search-form>
               </div>
             </div>
 

src/app/collection-page/collection-page.component.html

@@ -17,10 +17,10 @@
             </ds-comcol-page-logo>
 
             <!-- Handle -->
-            <ds-themed-comcol-page-handle
+            <ds-comcol-page-handle
                 [content]="collection.handle"
                 [title]="'collection.page.handle'">
-            </ds-themed-comcol-page-handle>
+            </ds-comcol-page-handle>
             <!-- Introductory text -->
             <ds-comcol-page-content
                 [content]="collection.introductoryText"
@@ -37,10 +37,10 @@
         </div>
         <section class="comcol-page-browse-section">
           <!-- Browse-By Links -->
-          <ds-themed-comcol-page-browse-by
+          <ds-comcol-page-browse-by
               [id]="collection.id"
               [contentType]="collection.type">
-          </ds-themed-comcol-page-browse-by>
+          </ds-comcol-page-browse-by>
 
           <router-outlet></router-outlet>
         </section>
@@ -55,7 +55,7 @@
     </div>
     <ds-error *ngIf="collectionRD?.hasFailed"
               message="{{'error.collection' | translate}}"></ds-error>
-    <ds-themed-loading *ngIf="collectionRD?.isLoading"
-                       message="{{'loading.collection' | translate}}"></ds-themed-loading>
+    <ds-loading *ngIf="collectionRD?.isLoading"
+                       message="{{'loading.collection' | translate}}"></ds-loading>
   </div>
-</div>
+</div>

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

@@ -18,7 +18,7 @@ import { redirectOn4xx } from '../core/shared/authorized.operators';
 import { DSONameService } from '../core/breadcrumbs/dso-name.service';
 
 @Component({
-  selector: 'ds-collection-page',
+  selector: 'ds-unthemed-collection-page',
   styleUrls: ['./collection-page.component.scss'],
   templateUrl: './collection-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,

src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html

@@ -25,7 +25,7 @@ <h2>{{ 'collection.edit.tabs.source.head' | translate }}</h2>
         <label class="form-check-label"
                for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
     </div>
-    <ds-themed-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-themed-loading>
+    <ds-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-loading>
     <h3 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
 </div>
 <div class="row">

src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html

@@ -3,10 +3,10 @@
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
       <ng-container *ngIf="itemRD?.hasSucceeded">
         <h1 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h1>
-        <ds-themed-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-themed-dso-edit-metadata>
+        <ds-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-dso-edit-metadata>
         <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
       </ng-container>
-      <ds-themed-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-themed-loading>
+      <ds-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-loading>
       <ds-alert *ngIf="itemRD?.hasFailed" [type]="AlertTypeEnum.Error" [content]="'collection.edit.template.error' | translate"></ds-alert>
     </div>
   </div>

src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts

@@ -12,7 +12,7 @@ import { AlertType } from '../../shared/alert/alert-type';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 
 @Component({
-  selector: 'ds-edit-item-template-page',
+  selector: 'ds-unthemed-edit-item-template-page',
   templateUrl: './edit-item-template-page.component.html',
 })
 /**

src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts

@@ -3,7 +3,7 @@ import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
 
 @Component({
-  selector: 'ds-themed-edit-item-template-page',
+  selector: 'ds-edit-item-template-page',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })

src/app/collection-page/themed-collection-page.component.ts

@@ -6,7 +6,7 @@ import { CollectionPageComponent } from './collection-page.component';
  * Themed wrapper for CollectionPageComponent
  */
 @Component({
-  selector: 'ds-themed-collection-page',
+  selector: 'ds-collection-page',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })

src/app/community-list-page/community-list-page.component.html

@@ -1,4 +1,4 @@
 <div class="container">
   <h1>{{ 'communityList.title' | translate }}</h1>
-  <ds-themed-community-list></ds-themed-community-list>
+  <ds-community-list></ds-community-list>
 </div>

src/app/community-list-page/community-list-page.component.ts

@@ -5,7 +5,7 @@ import { Component } from '@angular/core';
  * navigated to with community-list.page.routing.module
  */
 @Component({
-  selector: 'ds-community-list-page',
+  selector: 'ds-unthemed-community-list-page',
   templateUrl: './community-list-page.component.html',
 })
 export class CommunityListPageComponent {

src/app/community-list-page/community-list/community-list.component.html

@@ -1,4 +1,4 @@
-<ds-themed-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-themed-loading"></ds-themed-loading>
+<ds-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-themed-loading"></ds-loading>
 <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl" [trackBy]="trackBy">
   <!-- This is the tree node template for show more node -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: isShowMore" cdkTreeNodePadding
@@ -12,7 +12,7 @@
            class="btn btn-outline-primary btn-sm" role="button">
            <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
         </button>
-        <ds-themed-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-themed-loading"></ds-themed-loading>
+        <ds-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-themed-loading"></ds-loading>
       </div>
     </div>
     <div class="text-muted" cdkTreeNodePadding>
@@ -61,7 +61,7 @@
       <span aria-hidden="true" class="btn btn-default invisible">
         <span class="fa fa-chevron-right"></span>
       </span>
-      <ds-themed-loading class="ds-themed-loading"></ds-themed-loading>
+      <ds-loading class="ds-themed-loading"></ds-loading>
     </div>
   </cdk-tree-node>
   <!-- This is the tree node template for leaf nodes (collections and (sub)coms without children) -->

src/app/community-list-page/community-list/community-list.component.ts

@@ -17,7 +17,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
  * Which nodes were expanded is kept in the store, so this persists across pages.
  */
 @Component({
-  selector: 'ds-community-list',
+  selector: 'ds-unthemed-community-list',
   templateUrl: './community-list.component.html',
   styleUrls: ['./community-list.component.scss'],
 })

src/app/community-list-page/community-list/themed-community-list.component.ts

@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
 
 
 @Component({
-  selector: 'ds-themed-community-list',
+  selector: 'ds-community-list',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })

src/app/community-list-page/themed-community-list-page.component.ts

@@ -6,7 +6,7 @@ import { CommunityListPageComponent } from './community-list-page.component';
  * Themed wrapper for CommunityListPageComponent
  */
 @Component({
-  selector: 'ds-themed-community-list-page',
+  selector: 'ds-community-list-page',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })

src/app/community-page/community-page.component.html

@@ -10,8 +10,8 @@
           <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'community.logo' | translate">
           </ds-comcol-page-logo>
           <!-- Handle -->
-          <ds-themed-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
-          </ds-themed-comcol-page-handle>
+          <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
+          </ds-comcol-page-handle>
           <!-- Introductory text -->
           <ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
           </ds-comcol-page-content>
@@ -25,8 +25,8 @@
       <section class="comcol-page-browse-section">
 
         <!-- Browse-By Links -->
-        <ds-themed-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
-        </ds-themed-comcol-page-browse-by>
+        <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
+        </ds-comcol-page-browse-by>
 
         <router-outlet></router-outlet>
       </section>
@@ -39,5 +39,5 @@
   </div>
 
   <ds-error *ngIf="communityRD?.hasFailed" message="{{'error.community' | translate}}"></ds-error>
-  <ds-themed-loading *ngIf="communityRD?.isLoading" message="{{'loading.community' | translate}}"></ds-themed-loading>
+  <ds-loading *ngIf="communityRD?.isLoading" message="{{'loading.community' | translate}}"></ds-loading>
 </div>

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

@@ -16,7 +16,7 @@ import { redirectOn4xx } from '../core/shared/authorized.operators';
 import { DSONameService } from '../core/breadcrumbs/dso-name.service';
 
 @Component({
-  selector: 'ds-community-page',
+  selector: 'ds-unthemed-community-page',
   styleUrls: ['./community-page.component.scss'],
   templateUrl: './community-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,

src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html

@@ -9,5 +9,5 @@ <h3>{{'community.sub-collection-list.head' | translate}}</h3>
     </ds-viewable-collection>
   </div>
   <ds-error *ngIf="subCollectionsRD?.hasFailed" message="{{'error.sub-collections' | translate}}"></ds-error>
-  <ds-themed-loading *ngIf="subCollectionsRD?.isLoading" message="{{'loading.sub-collections' | translate}}"></ds-themed-loading>
+  <ds-loading *ngIf="subCollectionsRD?.isLoading" message="{{'loading.sub-collections' | translate}}"></ds-loading>
 </ng-container>

src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts

@@ -14,7 +14,7 @@ import { switchMap } from 'rxjs/operators';
 import { hasValue } from '../../../../shared/empty.util';
 
 @Component({
-  selector: 'ds-community-page-sub-collection-list',
+  selector: 'ds-unthemed-community-page-sub-collection-list',
   styleUrls: ['./community-page-sub-collection-list.component.scss'],
   templateUrl: './community-page-sub-collection-list.component.html',
   animations:[fadeIn]

src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts

@@ -4,7 +4,7 @@ import { Component, Input } from '@angular/core';
 import { Community } from '../../../../core/shared/community.model';
 
 @Component({
-  selector: 'ds-themed-community-page-sub-collection-list',
+  selector: 'ds-community-page-sub-collection-list',
   styleUrls: [],
   templateUrl: '../../../../shared/theme-support/themed.component.html',
 })

src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html

@@ -1,8 +1,8 @@
 <ng-container *ngIf="(community$ | async) as community">
-  <ds-themed-community-page-sub-community-list
+  <ds-community-page-sub-community-list
       [community]="community">
-  </ds-themed-community-page-sub-community-list>
-  <ds-themed-community-page-sub-collection-list
+  </ds-community-page-sub-community-list>
+  <ds-community-page-sub-collection-list
       [community]="community">
-  </ds-themed-community-page-sub-collection-list>
+  </ds-community-page-sub-collection-list>
 </ng-container>