From ab78df2e6835a4720acf7d2b0f15045cd3c8d563 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 23 Feb 2023 11:08:23 +0100
Subject: [PATCH] Fixes after merge

---
 .../dso-edit-metadata-value.component.html                  | 2 +-
 ...-declined-task-search-result-list-element.component.html | 1 -
 ...ed-declined-task-search-result-list-element.component.ts | 6 ------
 .../claimed-search-result-list-element.component.html       | 3 +--
 .../pool-search-result-list-element.component.html          | 3 +--
 src/app/shared/shared.module.ts                             | 1 -
 .../subscription-modal/subscription-modal.component.html    | 2 +-
 .../subscription-view/subscription-view.component.html      | 2 +-
 8 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index f54dde4971..525b42610b 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -7,7 +7,7 @@
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
     <div class="d-flex" *ngIf="mdRepresentation">
       <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
-      <ds-type-badge [object]="mdRepresentation"></ds-type-badge>
+      <ds-themed-type-badge [object]="mdRepresentation"></ds-themed-type-badge>
     </div>
   </div>
   <div class="ds-flex-cell ds-lang-cell" role="cell">
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
index a8ec21fa6c..50e8870fd8 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
@@ -4,7 +4,6 @@
     <ds-themed-item-list-preview *ngIf="workflowitem"
                                  [item]="(workflowitem?.item | async)?.payload"
                                  [object]="object"
-                                 [status]="status"
                                  [showSubmitter]="showSubmitter">
     </ds-themed-item-list-preview>
   </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
index 131f4b6730..620513fe6a 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
@@ -4,7 +4,6 @@ import { ClaimedDeclinedTaskTaskSearchResult } from 'src/app/shared/object-colle
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
@@ -31,11 +30,6 @@ export class ClaimedDeclinedTaskSearchResultListElementComponent extends SearchR
    */
   public showSubmitter = true;
 
-  /**
-   * Represent item's status
-   */
-  public status = MyDspaceItemStatusType.DECLINED_TASk;
-
   /**
    * The workflowitem object that belonging to the result object
    */
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
index d3bcfc20dc..99d1bca135 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
@@ -3,8 +3,7 @@
                                [object]="object"
                                [showSubmitter]="showSubmitter"
                                [context]="childContext"
-                               [workflowItem]="workflowitem$.value"
-                               [status]="status"></ds-themed-item-list-preview>
+                               [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
 
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index 9ee1e022f3..d27c8a11c5 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -3,8 +3,7 @@
                                [object]="object"
                                [showSubmitter]="showSubmitter"
                                [context]="childContext"
-                               [workflowItem]="workflowitem$.value"
-                               [status]="status"></ds-themed-item-list-preview>
+                               [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
       <ds-pool-task-actions id="actions"
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 4454a48633..658b33f760 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -250,7 +250,6 @@ import {
 } from './object-list/listable-notification-object/listable-notification-object.component';
 import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
 import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
-import { LogInExternalProviderComponent } from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
 
 import { StatusBadgeComponent } from './object-collection/shared/badges/status-badge/status-badge.component';
 import { BadgesComponent } from './object-collection/shared/badges/badges.component';
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index a71498f002..ca5ec60406 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -7,7 +7,7 @@
   </div>
   <div class="modal-body">
     <p class="mb-3"><strong>{{dso.name}}</strong>
-      <span *ngIf="!!dso" class="float-right"><ds-type-badge *ngIf="!!dso" [object]="dso"></ds-type-badge></span>
+      <span *ngIf="!!dso" class="float-right"><ds-themed-type-badge *ngIf="!!dso" [object]="dso"></ds-themed-type-badge></span>
     </p>
     <div>
       <fieldset *ngFor="let subscriptionType of subscriptionForm?.controls | keyvalue" formGroupName="{{subscriptionType.key}}" class="form-group form-row">
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 1b3b0b54b7..8a533e0260 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -1,6 +1,6 @@
 <td class="dso-info">
   <ng-container *ngIf="!!dso">
-    <ds-type-badge [object]="dso"></ds-type-badge>
+    <ds-themed-type-badge [object]="dso"></ds-themed-type-badge>
     <p><a [routerLink]="[getPageRoutePrefix(), dso.id]">{{dso.name}}</a></p>
   </ng-container>
   <ng-container *ngIf="!dso">