Merge remote-tracking branch 'uxplus-angular/ux-plus-cris-2024_02_x' into task/ux-plus-cris-2024_02_x/UXP-295

# Conflicts:
#	bitbucket-pipelines.yml

Author: vins01-4science

src/app/app-routes.ts

@@ -188,15 +188,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

@@ -226,7 +226,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

@@ -27,7 +27,7 @@
       </tr>
       <tr *ngFor="let index of lastLimitedDataToBeRenderedMap?.keys();">
         <td *ngFor="let mdg of lastLimitedDataToBeRenderedMap.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,6 +2,11 @@
   margin-left: -0.75rem !important;
   margin-right: -0.75rem !important;
 }
+
+td {
+  word-break: auto-phrase;
+}
+
 .more-collapse {
   background-color: #f9f9f9;
-}
+}

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/process-page/form/process-form.component.ts

@@ -136,7 +136,7 @@ export class ProcessFormComponent implements OnInit {
    * @param processParameter The parameter value to check
    */
   private checkValue(processParameter: ProcessParameter): string {
-    if (typeof processParameter.value === 'object') {
+    if (processParameter?.value != null && typeof processParameter.value === 'object') {
       this.files = [...this.files, processParameter.value];
       return processParameter.value.name;
     }

src/app/process-page/form/process-parameters/process-parameters.component.ts

@@ -7,7 +7,6 @@ import {
   EventEmitter,
   Input,
   OnChanges,
-  OnInit,
   Optional,
   Output,
   SimpleChanges,
@@ -40,7 +39,7 @@ import { ParameterSelectComponent } from './parameter-select/parameter-select.co
   standalone: true,
   imports: [NgIf, NgFor, ParameterSelectComponent, TranslateModule],
 })
-export class ProcessParametersComponent implements OnChanges, OnInit {
+export class ProcessParametersComponent implements OnChanges {
   /**
    * The currently selected script
    */
@@ -60,12 +59,6 @@ export class ProcessParametersComponent implements OnChanges, OnInit {
    */
   parameterValues: ProcessParameter[];
 
-  ngOnInit(): void {
-    if (hasValue(this.initialParams)) {
-      this.parameterValues = this.initialParams;
-    }
-  }
-
   /**
    * Makes sure the parameters are reset when the script changes
    * @param changes
@@ -82,7 +75,8 @@ export class ProcessParametersComponent implements OnChanges, OnInit {
    */
   initParameters() {
     if (hasValue(this.initialParams)) {
-      this.parameterValues = this.initialParams;
+      this.parameterValues = [...this.initialParams];
+      this.addParameter();
     } else {
       this.parameterValues = [];
       this.initializeParameter();

src/app/shared/form/builder/parsers/field-parser.ts

@@ -11,14 +11,11 @@ import {
 import { TranslateService } from '@ngx-translate/core';
 import uniqueId from 'lodash/uniqueId';
 
-import {
-  SubmissionVisibilityType,
-  SubmissionVisibilityValue,
-} from '../../../../core/config/models/config-submission-section.model';
+import { SubmissionVisibilityType } from '../../../../core/config/models/config-submission-section.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { Metadata } from '../../../../core/shared/metadata.utils';
-import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
 import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { SubmissionVisibility } from '../../../../submission/utils/visibility.util';
 import { isNgbDateStruct } from '../../../date.util';
 import {
   hasValue,
@@ -336,7 +333,7 @@ export abstract class FieldParser {
 
     // Set read only option
     controlModel.readOnly = this.parserOptions.readOnly
-      || this.isFieldReadOnly(this.configData.visibility, 'test', this.parserOptions.submissionScope);
+      || this.isFieldReadOnly(this.configData.visibility, this.parserOptions.submissionScope);
     controlModel.disabled = controlModel.readOnly;
     controlModel.isModelOfInnerForm = this.parserOptions.isInnerForm;
     if (hasValue(this.configData.selectableRelationship)) {
@@ -378,23 +375,12 @@ export abstract class FieldParser {
   }
 
   /**
-   * Check if a field is read-only with the given scope
+   * Check if a field is read-only within the given scope
    * @param visibility
    * @param submissionScope
    */
-  private isFieldReadOnly(visibility: SubmissionVisibilityType, fieldScope: string, submissionScope: string) {
-    return isNotEmpty(submissionScope)
-      && isNotEmpty(fieldScope)
-      && isNotEmpty(visibility)
-      && ((
-        submissionScope === SubmissionScopeType.WorkspaceItem.valueOf()
-          && visibility.main === SubmissionVisibilityValue.ReadOnly
-      )
-        ||
-          (visibility.other === SubmissionVisibilityValue.ReadOnly
-          && submissionScope === SubmissionScopeType.WorkflowItem.valueOf()
-          )
-      );
+  private isFieldReadOnly(visibility: SubmissionVisibilityType, submissionScope) {
+    return isNotEmpty(submissionScope) && SubmissionVisibility.isReadOnly(visibility, submissionScope);
   }
 
   /**