[DSC-1956] fix lint, add isComColAdmin feature

FrancescoMolinaro · FrancescoMolinaro · commit 37a9b817b99e · 2026-06-24T15:25:04.000+02:00
diff --git a/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts b/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts
@@ -11,10 +11,10 @@ import { AuthService } from 'src/app/core/auth/auth.service';
 import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
 
 import { BitstreamDataService } from '../core/data/bitstream-data.service';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';
-import { FeatureID } from "../core/data/feature-authorization/feature-id";
 
 describe('bitstreamPageAuthorizationsGuard', () => {
   let authorizationService: AuthorizationDataService;
diff --git a/src/app/core/browse/search-manager.ts b/src/app/core/browse/search-manager.ts
@@ -1,4 +1,7 @@
-import { Inject, Injectable } from '@angular/core';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import isArray from 'lodash/isArray';
 import {
   forkJoin,
@@ -10,16 +13,24 @@ import {
   map,
   switchMap,
 } from 'rxjs/operators';
+import { SearchOptions } from 'src/app/shared/search/models/search-options.model';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import { FollowAuthorityMetadata } from '../../../config/search-follow-metadata.interface';
 import { environment } from '../../../environments/environment';
+import { AuthorizationService } from '../../shared/authorizations/authorization.service';
 import {
   hasValue,
   isNotEmpty,
 } from '../../shared/empty.util';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { getRequestIdFromParams } from '../data/feature-authorization/authorization-utils';
+import { FeatureID } from '../data/feature-authorization/feature-id';
 import { ItemDataService } from '../data/item-data.service';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
@@ -34,11 +45,6 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 import { SearchService } from '../shared/search/search.service';
 import { BrowseService } from './browse.service';
 import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
-import { AuthorizationService } from "../../shared/authorizations/authorization.service";
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
-import { FeatureID } from "../data/feature-authorization/feature-id";
-import { getRequestIdFromParams } from "../data/feature-authorization/authorization-utils";
-import { SearchOptions } from "src/app/shared/search/models/search-options.model";
 
 /**
  * The service aims to manage browse requests and subsequent extra fetch requests.
@@ -51,7 +57,7 @@ export class SearchManager {
     protected browseService: BrowseService,
     protected searchService: SearchService,
     protected authorizationService: AuthorizationService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
   }
 
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
@@ -59,7 +59,7 @@ describe('AuthorizationDataService', () => {
       getAuthorizationForObject: of(true),
       hasAuthorizationEntryForObject: of(true),
       isRequestLoading: of(false),
-      initStateForObjects: jasmine.createSpy('initStateForObjects')
+      initStateForObjects: jasmine.createSpy('initStateForObjects'),
     });
     objectCache = getMockObjectCacheService();
     service = new AuthorizationDataService(requestService, undefined, objectCache, undefined, siteService, authorizationService, undefined);
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
 import {
   Observable,
   of,
@@ -11,7 +12,10 @@ import {
   switchMap,
   take,
 } from 'rxjs/operators';
+import { AppState } from 'src/app/app.reducer';
 
+import { ObjectAuthorizationsState } from '../../../shared/authorizations/authorization.interfaces';
+import { AuthorizationService } from '../../../shared/authorizations/authorization.service';
 import {
   hasNoValue,
   hasValue,
@@ -25,6 +29,7 @@ import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.s
 import { RequestParam } from '../../cache/models/request-param.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { Authorization } from '../../shared/authorization.model';
+import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { BaseDataService } from '../base/base-data.service';
@@ -45,11 +50,6 @@ import {
   oneAuthorizationMatchesFeature,
 } from './authorization-utils';
 import { FeatureID } from './feature-id';
-import { AppState } from "src/app/app.reducer";
-import { Store } from "@ngrx/store";
-import { DSpaceObject } from "../../shared/dspace-object.model";
-import { AuthorizationService } from "../../../shared/authorizations/authorization.service";
-import { ObjectAuthorizationsState } from "../../../shared/authorizations/authorization.interfaces";
 
 /**
  * A service to retrieve {@link Authorization}s from the REST API
@@ -134,7 +134,7 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
               }
             }),
             catchError(() => of([])),
-            oneAuthorizationMatchesFeature(featureId)
+            oneAuthorizationMatchesFeature(featureId),
           );
         }
       }),
@@ -241,7 +241,7 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
           return [];
         }
       }),
-      catchError(() => of([]))
+      catchError(() => of([])),
     );
 
   }
diff --git a/src/app/core/data/feature-authorization/authorization-utils.ts b/src/app/core/data/feature-authorization/authorization-utils.ts
@@ -1,8 +1,8 @@
 import {
+  combineLatest,
   combineLatest as observableCombineLatest,
   Observable,
   of,
-  combineLatest,
 } from 'rxjs';
 import {
   distinctUntilChanged,
@@ -22,6 +22,7 @@ import {
 } from '../../../shared/empty.util';
 import { AuthService } from '../../auth/auth.service';
 import { Authorization } from '../../shared/authorization.model';
+import { DSpaceObject } from '../../shared/dspace-object.model';
 import { Feature } from '../../shared/feature.model';
 import {
   getFirstCompletedRemoteData,
@@ -30,7 +31,6 @@ import {
 import { SiteDataService } from '../site-data.service';
 import { AuthorizationSearchParams } from './authorization-search-params';
 import { FeatureID } from './feature-id';
-import { DSpaceObject } from "../../shared/dspace-object.model";
 
 /**
  * Operator accepting {@link AuthorizationSearchParams} and adding the current {@link Site}'s selflink to the parameter's
diff --git a/src/app/init.service.ts b/src/app/init.service.ts
@@ -44,12 +44,12 @@ import { LocaleService } from './core/locale/locale.service';
 import { HeadTagService } from './core/metadata/head-tag.service';
 import { CorrelationIdService } from './correlation-id/correlation-id.service';
 import { layoutBoxesMap } from './cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadata-box-rendering-map';
+import { AuthorizationService } from './shared/authorizations/authorization.service';
 import { dsDynamicFormControlMapFn } from './shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
 import { MenuService } from './shared/menu/menu.service';
 import { MenuProviderService } from './shared/menu/menu-provider.service';
 import { ThemeService } from './shared/theme-support/theme.service';
 import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
-import { AuthorizationService } from "./shared/authorizations/authorization.service";
 
 
 /**
@@ -81,7 +81,7 @@ export abstract class InitService {
     protected themeService: ThemeService,
     protected menuService: MenuService,
     protected menuProviderService: MenuProviderService,
-    protected authorizationService: AuthorizationService
+    protected authorizationService: AuthorizationService,
   ) {
   }
 
diff --git a/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts
@@ -13,13 +13,13 @@ import { AuthService } from 'src/app/core/auth/auth.service';
 import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
 
 import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
 import { Item } from '../../core/shared/item.model';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { itemPageDeleteGuard } from './item-page-delete.guard';
-import { FeatureID } from "../../core/data/feature-authorization/feature-id";
 
 describe('itemPageDeleteGuard', () => {
   let authorizationService: AuthorizationDataService;
diff --git a/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts
@@ -13,13 +13,13 @@ import { AuthService } from 'src/app/core/auth/auth.service';
 import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
 
 import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
 import { Item } from '../../core/shared/item.model';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { itemPageEditAuthorizationsGuard } from './item-page-edit-authorizations.guard';
-import { FeatureID } from "../../core/data/feature-authorization/feature-id";
 
 describe('itemPageEditAuthorizationsGuard', () => {
   let authorizationService: AuthorizationDataService;
diff --git a/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts
@@ -13,13 +13,13 @@ import { AuthService } from 'src/app/core/auth/auth.service';
 import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
 
 import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
 import { Item } from '../../core/shared/item.model';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { itemPageMoveGuard } from './item-page-move.guard';
-import { FeatureID } from "../../core/data/feature-authorization/feature-id";
 
 describe('itemPageMoveGuard', () => {
   let authorizationService: AuthorizationDataService;
diff --git a/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts
@@ -13,13 +13,13 @@ import { AuthService } from 'src/app/core/auth/auth.service';
 import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
 
 import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
 import { Item } from '../../core/shared/item.model';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { itemPagePrivateGuard } from './item-page-private.guard';
-import { FeatureID } from "../../core/data/feature-authorization/feature-id";
 
 describe('itemPagePrivateGuard', () => {
   let authorizationService: AuthorizationDataService;
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -26,6 +26,7 @@ import { REQUEST } from '../../../../../express.tokens';
 import { AuthRequestService } from '../../../../core/auth/auth-request.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
@@ -49,6 +50,7 @@ import { PaginationComponentOptions } from '../../../../shared/pagination/pagina
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub';
 import { AuthRequestServiceStub } from '../../../../shared/testing/auth-request-service.stub';
+import { AuthorizationDataServiceStub } from '../../../../shared/testing/authorization-service.stub';
 import { EditItemRelationshipsServiceStub } from '../../../../shared/testing/edit-item-relationships.service.stub';
 import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
@@ -275,6 +277,7 @@ describe('EditRelationshipListComponent', () => {
         { provide: XSRFService, useValue: {} },
         { provide: APP_CONFIG, useValue: environment },
         { provide: REQUEST, useValue: {} },
+        { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         CookieService,
       ], schemas: [
         NO_ERRORS_SCHEMA,
diff --git a/src/app/shared/authorizations/authorization.service.spec.ts b/src/app/shared/authorizations/authorization.service.spec.ts
@@ -99,7 +99,7 @@ describe('AuthorizationService', () => {
     tick(100);
 
     expect(siteService.find).toHaveBeenCalled();
-    expect(store.dispatch).toHaveBeenCalledWith(new GetAuthorizationsAction([mockAuthSiteObject.uuid], mockAuthSiteObject.uniqueType, environment.siteAuthorizationFeaturesConfig, [mockAuthSiteObject.self]));
+    expect(store.dispatch).toHaveBeenCalledWith(new GetAuthorizationsAction([mockAuthSiteObject.uuid], mockAuthSiteObject.uniqueType, environment.siteAuthorizationFeaturesConfig, [mockAuthSiteObject.self]) as any);
   }));
 
   it('should return a boolean for the authorization of a single object', (done) => {
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
@@ -97,9 +97,9 @@ mockObject = Object.assign(new WorkspaceItem(), {
   uuid: '1234',
   _links: {
     self: {
-      href: 'selfHref'
-    }
-  }
+      href: 'selfHref',
+    },
+  },
 });
 
 const ePersonMock: EPerson = Object.assign(new EPerson(), {
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
@@ -6,6 +6,7 @@ import {
 import { AccessibilitySettingsConfig } from '../app/accessibility/accessibility-settings.config';
 import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
 import { HALDataService } from '../app/core/data/base/hal-data-service.interface';
+import { FeatureID } from '../app/core/data/feature-authorization/feature-id';
 import { GenericConstructor } from '../app/core/shared/generic-constructor';
 import { FieldRenderingType } from '../app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/field-rendering-type';
 import { MetadataBoxFieldRenderOptions } from '../app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/rendering-type.model';
@@ -58,7 +59,6 @@ import { SubmissionConfig } from './submission-config.interface';
 import { SuggestionConfig } from './suggestion-config.interfaces';
 import { ThemeConfig } from './theme.config';
 import { UIServerConfig } from './ui-server-config.interface';
-import { FeatureID } from '../app/core/data/feature-authorization/feature-id';
 
 
 interface AppConfig extends Config {
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
@@ -1,6 +1,8 @@
 import { AccessibilitySettingsConfig } from '../app/accessibility/accessibility-settings.config';
 import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
+import { FeatureID } from '../app/core/data/feature-authorization/feature-id';
 import { RestRequestMethod } from '../app/core/data/rest-request-method';
+import { DiscoveryConfigurationFeaturesConfig } from '../app/shared/authorizations/authorization.interfaces';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
 import { ActuatorsConfig } from './actuators.config';
@@ -56,8 +58,6 @@ import { ServerConfig } from './server-config.interface';
 import { SubmissionConfig } from './submission-config.interface';
 import { ThemeConfig } from './theme.config';
 import { UIServerConfig } from './ui-server-config.interface';
-import { FeatureID } from "../app/core/data/feature-authorization/feature-id";
-import { DiscoveryConfigurationFeaturesConfig } from "../app/shared/authorizations/authorization.interfaces";
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -172,13 +172,14 @@ export class DefaultAppConfig implements AppConfig {
     FeatureID.CanSubmit,
     FeatureID.CoarNotifyEnabled,
     FeatureID.CanSeeQA,
+    FeatureID.IsComColAdmin,
   ];
 
   discoveryAuthorizationFeaturesConfig: DiscoveryConfigurationFeaturesConfig = {
     'workspace': {
       'submission.workspaceitem': [
-        FeatureID.CanEditItem
-      ]
+        FeatureID.CanEditItem,
+      ],
     },
   };
 
diff --git a/src/modules/app/browser-app.config.ts b/src/modules/app/browser-app.config.ts
@@ -61,6 +61,7 @@ import { ClientMathService } from '../../app/core/shared/client-math.service';
 import { MathService } from '../../app/core/shared/math.service';
 import { BrowserXSRFService } from '../../app/core/xsrf/browser-xsrf.service';
 import { XSRFService } from '../../app/core/xsrf/xsrf.service';
+import { AuthorizationService } from '../../app/shared/authorizations/authorization.service';
 import { BrowserOrejimeService } from '../../app/shared/cookies/browser-orejime.service';
 import { OrejimeService } from '../../app/shared/cookies/orejime.service';
 import { BrowserDatadogRumService } from '../../app/shared/datadog-rum/browser-datadog-rum.service';
@@ -71,7 +72,6 @@ import { SubmissionService } from '../../app/submission/submission.service';
 import { REQUEST } from '../../express.tokens';
 import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader';
 import { BrowserInitService } from './browser-init.service';
-import { AuthorizationService } from "../../app/shared/authorizations/authorization.service";
 
 export const REQ_KEY = makeStateKey<string>('req');
 
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
@@ -26,6 +26,7 @@ import {
   find,
   map,
 } from 'rxjs/operators';
+import { AuthorizationService } from 'src/app/shared/authorizations/authorization.service';
 
 import { logStartupMessage } from '../../../startup-message';
 import { AppState } from '../../app/app.reducer';
@@ -60,7 +61,6 @@ import { BuildConfig } from '../../config/build-config.interface';
 import { extendEnvironmentWithAppConfig } from '../../config/config.util';
 import { DefaultAppConfig } from '../../config/default-app-config';
 import { environment } from '../../environments/environment';
-import { AuthorizationService } from "src/app/shared/authorizations/authorization.service";
 
 /**
  * Performs client-side initialization.
@@ -91,7 +91,7 @@ export class BrowserInitService extends InitService {
     private halService: HALEndpointService,
     private matomoService: MatomoService,
     protected menuProviderService: MenuProviderService,
-    protected authorizationService: AuthorizationService
+    protected authorizationService: AuthorizationService,
   ) {
     super(
       store,
@@ -105,7 +105,7 @@ export class BrowserInitService extends InitService {
       themeService,
       menuService,
       menuProviderService,
-      authorizationService
+      authorizationService,
     );
   }
 
diff --git a/src/modules/app/server-app.config.ts b/src/modules/app/server-app.config.ts
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
