Merge pull request #5719 from GauravD2t/backport-4484-to-dspace-7_x

[Port dspace-7_x] :Backport change DELETE to OBSOLETE (DELETE) and update view table (#4484)

Author: tdonohue

src/app/core/resource-policy/models/action-type.model.ts

@@ -15,7 +15,7 @@ export enum ActionType {
   /**
    * Action of deleting something
    */
-  DELETE = 'DELETE',
+  DELETE = 'OBSOLETE (DELETE)',
 
   /**
    * Action of adding something to a container

src/app/shared/resource-policies/entry/resource-policy-entry.component.html

@@ -15,7 +15,7 @@
 </th>
 <td>{{entry.policy.name}}</td>
 <td>{{entry.policy.policyType}}</td>
-<td>{{entry.policy.action}}</td>
+<td>{{getActionDisplayLabel(entry.policy.action)}}</td>
 <td>
   {{ epersonName$ | async }}
 </td>

src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts

@@ -218,5 +218,16 @@ describe('ResourcePolicyEntryComponent', () => {
       checkbox.triggerEventHandler('ngModelChange', false);
       expect(comp.toggleCheckbox.emit).toHaveBeenCalledWith(false);
     });
+     it('should return "DELETE" for ActionType.DELETE', () => {
+      expect(comp.getActionDisplayLabel(ActionType.DELETE)).toBe('DELETE');
+    });
+
+    it('should return string value for other action types', () => {
+      expect(comp.getActionDisplayLabel(ActionType.READ)).toBe('READ');
+      expect(comp.getActionDisplayLabel(ActionType.WRITE)).toBe('WRITE');
+      expect(comp.getActionDisplayLabel(ActionType.ADD)).toBe('ADD');
+      expect(comp.getActionDisplayLabel(ActionType.REMOVE)).toBe('REMOVE');
+      expect(comp.getActionDisplayLabel(ActionType.ADMIN)).toBe('ADMIN');
+    });
   });
 });

src/app/shared/resource-policies/entry/resource-policy-entry.component.ts

@@ -17,6 +17,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Group } from '../../../core/eperson/models/group.model';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
 import { getGroupEditRoute } from '../../../access-control/access-control-routing-paths';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 
@@ -76,6 +77,20 @@ export class ResourcePolicyEntryComponent implements OnInit {
     return isNotEmpty(date) ? dateToString(stringToNgbDateStruct(date)) : '';
   }
 
+  /**
+   * Returns the display label for the action type.
+   * Shows 'DELETE' instead of 'OBSOLETE (DELETE)' for better UX.
+   *
+   * @param action the ActionType value
+   * @return a string with the display label
+   */
+  getActionDisplayLabel(action: ActionType): string {
+    if (action === ActionType.DELETE) {
+      return 'DELETE';
+    }
+    return String(action);
+  }
+
   /**
    * Redirect to resource policy editing page
    */

src/app/shared/resource-policies/form/resource-policy-form.model.ts

@@ -52,7 +52,7 @@ const policyActionList: DynamicFormOptionConfig<any>[] = [
     value: ActionType.ADMIN
   },
   {
-    label: ActionType.DELETE.toString(),
+    label: 'DELETE',
     value: ActionType.DELETE
   },
   {