Merge branch 'dspace-cris-2024_02_x' into task/dspace-cris-2024_02_x/DSC-2193

# Conflicts:
#	bitbucket-pipelines.yml

Author: vins01-4science

src/app/app-routes.ts

@@ -187,15 +187,14 @@ export const APP_ROUTES: Route[] = [
         data: {
           isBackDoor: true,
         },
-        canMatch: [() => environment.auth.disableStandardLogin],
+        canMatch: [() => !environment.auth.disableStandardLogin],
       },
       {
         path: 'login',
         loadChildren: () => import('./login-page/login-page-routes').then((m) => m.ROUTES),
         data: {
           isBackDoor: false,
         },
-        canMatch: [() => !environment.auth.disableStandardLogin],
       },
       {
         path: 'logout',

src/app/app.component.spec.ts

@@ -71,6 +71,7 @@ const initialState = {
 };
 
 const itemPageUrl = '/entities/publication/3b6ef8e8-15a1-4607-abf8-2a6fbd572346';
+const itemPageCustomUrl = '/entities/publication/aCustomUrl';
 
 export function getMockLocaleService(): LocaleService {
   return jasmine.createSpyObj('LocaleService', {
@@ -206,6 +207,14 @@ describe('App component', () => {
       expect(comp.isRouteLoading$.value).toBeTrue();
     }));
 
+    it('should show loading for item page administrative edit if custom url is used', fakeAsync(() => {
+      routeServiceMock.getCurrentUrl.and.returnValue(of(itemPageCustomUrl));
+      routerEventsObs.next(new NavigationStart(2, itemPageCustomUrl + '/edit'));
+      fixture.detectChanges();
+      tick();
+      expect(comp.isRouteLoading$.value).toBeTrue();
+    }));
+
     it('should not show loading navigating between item pages in administrative edit', fakeAsync(() => {
       routeServiceMock.getCurrentUrl.and.returnValue(of(itemPageUrl + '/edit'));
       routerEventsObs.next(new NavigationStart(2, itemPageUrl + '/edit/status'));

src/app/app.component.ts

@@ -224,7 +224,7 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   private isAdministrativeEditItemPageRoute(nextUrl: string, currentUrl: string): boolean {
-    const editPageRegEx = /\/(entities\/[^\/]+|items)\/[0-9a-f-]{36}\/edit(?:\/.*)?$/;
+    const editPageRegEx = /\/(entities\/[^/]+|items)\/[^/]+\/edit(?:\/.*)?$/;
     return editPageRegEx.test(nextUrl) && !editPageRegEx.test(currentUrl);
   }
 

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component.html

@@ -8,7 +8,7 @@
       </tr>
       <tr *ngFor="let index of componentsToBeRenderedMap.keys();">
         <td *ngFor="let mdg of componentsToBeRenderedMap.get(index)">
-          <ds-metadata-render class="w-100"
+          <ds-metadata-render class="w-100 auto-phrase"
                               [item]="item"
                               [field]="mdg.field"
                               [metadataValue]="mdg.value"></ds-metadata-render>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component.scss

@@ -2,3 +2,7 @@
   margin-left: -0.75rem !important;
   margin-right: -0.75rem !important;
 }
+
+td {
+  word-break: auto-phrase;
+}

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-render/metadata-render.component.scss

@@ -1,3 +1,6 @@
 :host {
   word-break: break-word;
+  &.auto-phrase {
+    word-break: auto-phrase;
+  }
 }

src/app/item-page/item-page.resolver.ts

@@ -75,7 +75,8 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
     map((rd: RemoteData<Item>) => {
       store.dispatch(new ResolvedAction(state.url, rd.payload));
       if (rd.hasSucceeded && hasValue(rd.payload)) {
-        const itemRoute = router.parseUrl(getItemPageRoute(rd.payload)).toString();
+        const isItemEditPage = state.url.includes('/edit');
+        const itemRoute = isItemEditPage ? state.url : router.parseUrl(getItemPageRoute(rd.payload)).toString();
         // Check if custom url not empty and if the current id parameter is different from the custom url redirect to custom url
         if (hasValue(rd.payload.metadata) && isNotEmpty(rd.payload.metadata['cris.customurl'])) {
           if (route.params.id !== rd.payload.metadata['cris.customurl'][0].value) {

src/app/shared/log-in/log-in.component.spec.ts

@@ -138,7 +138,7 @@ describe('LogInComponent', () => {
 
     it('should render a log-in container component for each auth method available', () => {
       const loginContainers = fixture.debugElement.queryAll(By.css('ds-log-in-container'));
-      expect(loginContainers.length).toBe(2);
+      expect(loginContainers.length).toBe(1);
 
     });
 
@@ -154,14 +154,15 @@ describe('LogInComponent', () => {
       expect(result).toEqual([{ authMethodType: AuthMethodType.Password, position: 1 }]);
     });
 
-    it('excludes password method when standard login is disabled', () => {
+    it('does not exclude password method when standard login is disabled', () => {
       const authMethods = [
         { authMethodType: AuthMethodType.Password, position: 1 },
         { authMethodType: AuthMethodType.Shibboleth, position: 2 },
       ];
       component.excludedAuthMethod = undefined;
       const result = component.filterAndSortAuthMethods(authMethods, false, true);
       expect(result).toEqual([
+        { authMethodType: AuthMethodType.Password, position: 1 },
         { authMethodType: AuthMethodType.Shibboleth, position: 2 },
       ]);
     });
@@ -176,7 +177,6 @@ describe('LogInComponent', () => {
       component.excludedAuthMethod = AuthMethodType.Ip;
       const result = component.filterAndSortAuthMethods(authMethods, isBackdoor);
       expect(result).toEqual([
-        { authMethodType: AuthMethodType.Password, position: 1 },
         { authMethodType: AuthMethodType.Shibboleth, position: 3 },
       ]);
     });
@@ -191,7 +191,6 @@ describe('LogInComponent', () => {
       const result = component.filterAndSortAuthMethods(authMethods, isBackdoor);
       expect(result).toEqual([
         { authMethodType: AuthMethodType.Shibboleth, position: 1 },
-        { authMethodType: AuthMethodType.Password, position: 2 },
       ]);
     });
   });

src/app/shared/log-in/log-in.component.ts

@@ -167,7 +167,7 @@ export class LogInComponent implements OnInit, OnDestroy {
         if (isBackdoor) {
           return authM.authMethodType === AuthMethodType.Password;
         }
-        if (isStandardLoginDisabled) {
+        if (!isStandardLoginDisabled) {
           return authM.authMethodType !== AuthMethodType.Password;
         }
         return true;

src/assets/i18n/en.json5

@@ -1893,7 +1893,7 @@
 
   "context-menu.actions.audit-item.btn": "Audit",
 
-  "context-menu.actions.bulk-import.btn": "Import items into collection",
+  "context-menu.actions.bulk-import.btn": "Import into collection",
 
   "context-menu.actions.claim.btn": "Claim this profile",