Merge branch 'main' into task/main/CST-16756_squashed

# Conflicts:
#	src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
#	src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
#	src/app/shared/upload/uploader/uploader.component.spec.ts
#	src/app/shared/upload/uploader/uploader.component.ts
#	src/app/submission/sections/license/section-license.component.spec.ts

Author: Andrea Barbasso

cypress/support/commands.ts

@@ -6,11 +6,11 @@
 import {
   AuthTokenInfo,
   TOKENITEM,
-} from 'src/app/core/auth/models/auth-token-info.model';
+} from '@dspace/core/auth/models/auth-token-info.model';
 import {
   DSPACE_XSRF_COOKIE,
   XSRF_REQUEST_HEADER,
-} from 'src/app/core/xsrf/xsrf.constants';
+} from '@dspace/core/xsrf/xsrf.constants';
 import { v4 as uuidv4 } from 'uuid';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs

cypress/support/e2e.ts

@@ -19,7 +19,7 @@ import './commands';
 // https://github.com/component-driven/cypress-axe
 import 'cypress-axe';
 
-import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
+import { DSPACE_XSRF_COOKIE } from '@dspace/core/xsrf/xsrf.constants';
 
 // Runs once before all tests
 before(() => {

package-lock.json

@@ -3,13 +3,13 @@
   "version": "10.0.0-next",
   "scripts": {
     "ng": "ng",
-    "test:rest": "ts-node --project ./tsconfig.ts-node.json scripts/test-rest.ts",
+    "test:rest": "ts-node -r tsconfig-paths/register --project ./tsconfig.ts-node.json scripts/test-rest.ts",
     "start": "npm run start:prod",
     "start:dev": "cross-env NODE_ENV=development npm run serve --watch",
     "start:prod": "npm run build:prod && cross-env NODE_ENV=production npm run serve:ssr",
     "start:mirador:prod": "npm run build:mirador && npm run start:prod",
     "preserve": "npm run base-href",
-    "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
+    "serve": "ts-node -r tsconfig-paths/register --project ./tsconfig.ts-node.json scripts/serve.ts",
     "serve:ssr": "node dist/server/main",
     "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
@@ -25,7 +25,7 @@
     "lint": "npm run build:lint && npm run lint:nobuild",
     "lint:nobuild": "ng lint",
     "lint-fix": "npm run build:lint && ng lint --fix=true",
-    "docs:lint": "ts-node --project ./lint/tsconfig.json ./lint/generate-docs.ts",
+    "docs:lint": "ts-node -r tsconfig-paths/register --project ./lint/tsconfig.json ./lint/generate-docs.ts",
     "e2e": "cross-env NODE_ENV=production ng e2e",
     "clean:dev:config": "rimraf src/assets/config.json",
     "clean:coverage": "rimraf coverage",
@@ -37,14 +37,14 @@
     "clean:cli": "rimraf .angular/cache",
     "clean:prod": "npm run clean:dist && npm run clean:log && npm run clean:doc && npm run clean:coverage && npm run clean:json",
     "clean": "npm run clean:prod && npm run clean:dev:config && npm run clean:cli && npm run clean:node",
-    "sync-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
+    "sync-i18n": "ts-node -r tsconfig-paths/register --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
     "build:mirador": "webpack --config webpack/webpack.mirador.config.ts",
-    "merge-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts",
+    "merge-i18n": "ts-node -r tsconfig-paths/register --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts",
     "cypress:open": "cypress open",
     "cypress:run": "cypress run",
-    "env:yaml": "ts-node --project ./tsconfig.ts-node.json scripts/env-to-yaml.ts",
-    "base-href": "ts-node --project ./tsconfig.ts-node.json scripts/base-href.ts",
-    "check-circ-deps": "npx madge --exclude '(bitstream|bundle|collection|config-submission-form|eperson|item|version)\\.model\\.ts$' --circular --extensions ts ./",
+    "env:yaml": "ts-node -r tsconfig-paths/register --project ./tsconfig.ts-node.json scripts/env-to-yaml.ts",
+    "base-href": "ts-node -r tsconfig-paths/register --project ./tsconfig.ts-node.json scripts/base-href.ts",
+    "check-circ-deps": "npx madge --exclude '.nx|(bitstream|bundle|collection|config-submission-form|eperson|item|version)\\.model\\.ts|index.ts$' --circular --extensions ts ./",
     "postinstall": "npm run build:lint || echo 'Skipped DSpace ESLint plugins.'"
   },
   "browser": {
@@ -132,7 +132,7 @@
     "filesize": "^10.1.6",
     "http-proxy-middleware": "^2.0.9",
     "http-terminator": "^3.2.0",
-    "isbot": "^5.1.30",
+    "isbot": "^5.1.31",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
@@ -193,7 +193,7 @@
     "@typescript-eslint/rule-tester": "^7.18.0",
     "@typescript-eslint/utils": "^7.18.0",
     "axe-core": "^4.10.2",
-    "commander": "^14.0.1",
+    "commander": "^14.0.2",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
@@ -231,10 +231,11 @@
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "sass": "~1.92.1",
+    "sass": "~1.93.3",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
+    "tsconfig-paths": "^4.2.0",
     "typescript": "~5.4.5",
     "webpack": "^5.54.0",
     "webpack-cli": "^6.0.1"

package.json

@@ -1,8 +1,8 @@
 import { request } from 'http';
 import { request as https_request } from 'https';
 
-import { AppConfig } from '../src/config/app-config.interface';
-import { buildAppConfig } from '../src/config/config.server';
+import { AppConfig } from '@dspace/config/app-config.interface';
+import { buildAppConfig } from '@dspace/config/config.server';
 
 const appConfig: AppConfig = buildAppConfig();
 

scripts/test-rest.ts

@@ -14,9 +14,8 @@
  * from your application's main.server.ts file, as seen below with the
  * import for `ngExpressEngine`.
  */
-
-import 'zone.js/node';
 import 'reflect-metadata';
+import 'zone.js/node';
 
 /* eslint-disable import/no-namespace */
 import * as morgan from 'morgan';
@@ -40,7 +39,7 @@ import { enableProdMode } from '@angular/core';
 
 import { environment } from './src/environments/environment';
 import { createProxyMiddleware } from 'http-proxy-middleware';
-import { hasValue } from './src/app/shared/empty.util';
+import { hasValue } from '@dspace/shared/utils/empty.util';
 import { UIServerConfig } from './src/config/ui-server-config.interface';
 import bootstrap from './src/main.server';
 import { buildAppConfig } from './src/config/config.server';
@@ -50,14 +49,14 @@ import {
 } from './src/config/app-config.interface';
 import { extendEnvironmentWithAppConfig } from './src/config/config.util';
 import { logStartupMessage } from './startup-message';
-import { TOKENITEM } from './src/app/core/auth/models/auth-token-info.model';
+import { TOKENITEM } from '@dspace/core/auth/models/auth-token-info.model';
 import { CommonEngine } from '@angular/ssr';
 import { APP_BASE_HREF } from '@angular/common';
 import {
   REQUEST,
   RESPONSE,
 } from './src/express.tokens';
-import { SsrExcludePatterns } from "./src/config/ssr-config.interface";
+import { SsrExcludePatterns } from './src/config/ssr-config.interface';
 
 /*
  * Set path for the browser application's dist folder

server.ts

@@ -1,13 +1,13 @@
 import { AbstractControl } from '@angular/forms';
 import { Route } from '@angular/router';
+import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
+import { groupAdministratorGuard } from '@dspace/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { siteAdministratorGuard } from '@dspace/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import {
   DYNAMIC_ERROR_MESSAGES_MATCHER,
   DynamicErrorMessagesMatcher,
 } from '@ng-dynamic-forms/core';
 
-import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { groupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
-import { siteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import {
   EPERSON_PATH,
   GROUP_PATH,

src/app/access-control/access-control-routes.ts

@@ -1,8 +1,14 @@
-import { getAccessControlModuleRoute } from '../app-routing-paths';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { Group } from '@dspace/core/eperson/models/group.model';
+import { URLCombiner } from '@dspace/core/url-combiner/url-combiner';
 
 export const EPERSON_PATH = 'epeople';
 
+export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
+
+export function getAccessControlModuleRoute() {
+  return `/${ACCESS_CONTROL_MODULE_PATH}`;
+}
+
 export function getEPersonsRoute(): string {
   return new URLCombiner(getAccessControlModuleRoute(), EPERSON_PATH).toString();
 }
@@ -20,3 +26,11 @@ export function getGroupsRoute() {
 export function getGroupEditRoute(id: string) {
   return new URLCombiner(getGroupsRoute(), id, 'edit').toString();
 }
+
+/**
+ * Get Edit page of group
+ * @param group Group we want edit page for
+ */
+export function getGroupEditPageRouterLink(group: Group): string {
+  return getGroupEditRoute(group.id);
+}

src/app/access-control/access-control-routing-paths.ts

@@ -4,23 +4,23 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
+import { buildPaginatedList } from '@dspace/core/data/paginated-list.model';
+import { PageInfo } from '@dspace/core/shared/page-info.model';
+import { createSuccessfulRemoteDataObject } from '@dspace/core/utilities/remote-data.utils';
 import {
   NgbAccordionModule,
   NgbNavModule,
 } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
 import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
 import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
 import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
 import { SelectableObject } from '../../../shared/object-list/selectable-list/selectable-list.service.spec';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { ThemedSearchComponent } from '../../../shared/search/themed-search.component';
+import { getMockThemeService } from '../../../shared/theme-support/test/theme-service.mock';
 import { ThemeService } from '../../../shared/theme-support/theme.service';
 import { BulkAccessBrowseComponent } from './bulk-access-browse.component';
 

src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts

@@ -5,6 +5,16 @@ import {
   OnDestroy,
   OnInit,
 } from '@angular/core';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '@dspace/core/data/paginated-list.model';
+import { RemoteData } from '@dspace/core/data/remote-data';
+import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
+import { ListableObject } from '@dspace/core/shared/object-collection/listable-object.model';
+import { PageInfo } from '@dspace/core/shared/page-info.model';
+import { createSuccessfulRemoteDataObject } from '@dspace/core/utilities/remote-data.utils';
+import { hasValue } from '@dspace/shared/utils/empty.util';
 import {
   NgbAccordionModule,
   NgbNavModule,
@@ -20,23 +30,13 @@ import {
   map,
 } from 'rxjs/operators';
 
-import {
-  buildPaginatedList,
-  PaginatedList,
-} from '../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
-import { hasValue } from '../../../shared/empty.util';
-import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
 import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
 import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
 import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { SearchConfigurationService } from '../../../shared/search/search-configuration.service';
 import { ThemedSearchComponent } from '../../../shared/search/themed-search.component';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';