Merge branch 'dspace-cris-2023_02_x' into task/ux-plus-2023_02_x/UXP-184_fixes

Author: atarix83

src/app/shared/context-menu/context-menu.component.html

@@ -1,6 +1,6 @@
 <div *ngIf="contextMenuObject">
   <div class="d-flex space-children-mr justify-content-end" *dsRenderOnlyForBrowser="true">
-    <ng-container *ngFor="let entry of (getStandAloneMenuEntries() | async)">
+    <ng-container *ngFor="let entry of (standAloneEntries$ | async)">
       <ng-container *ngComponentOutlet="entry; injector: objectInjector;"></ng-container>
     </ng-container>
     <div ngbDropdown #itemOptions="ngbDropdown" placement="bottom-right"
@@ -10,7 +10,7 @@
       </button>
       <div id="itemOptionsDropdownMenu" aria-labelledby="context-menu" ngbDropdownMenu>
         <h6 class="dropdown-header">{{ 'context-menu.actions.label' | translate }}</h6>
-        <ng-container *ngFor="let entry of (getContextMenuEntries() | async)">
+        <ng-container *ngFor="let entry of (contextEntries$ | async)">
           <ng-container *ngComponentOutlet="entry; injector: objectInjector;"></ng-container>
         </ng-container>
       </div>

src/app/shared/context-menu/context-menu.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, Inject, Injector, Input, OnInit } from '@angular/core';
+import { AfterViewChecked, ChangeDetectorRef, Component, Inject, Injector, Input, OnInit } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 
 import { from, Observable } from 'rxjs';
@@ -24,7 +24,7 @@ import { GenericConstructor } from '../../core/shared/generic-constructor';
   styleUrls: ['./context-menu.component.scss'],
   templateUrl: './context-menu.component.html'
 })
-export class ContextMenuComponent implements OnInit {
+export class ContextMenuComponent implements OnInit, AfterViewChecked {
 
   /**
    * The related item
@@ -48,6 +48,9 @@ export class ContextMenuComponent implements OnInit {
    */
   public optionCount = 0;
 
+  public standAloneEntries$: Observable<any>;
+  public contextEntries$: Observable<any>;
+
   /**
    * Initialize instance variables
    *
@@ -71,6 +74,9 @@ export class ContextMenuComponent implements OnInit {
       ],
       parent: this.injector
     });
+
+    this.standAloneEntries$ = this.getStandAloneMenuEntries();
+    this.contextEntries$ = this.getContextMenuEntries();
   }
 
   /**
@@ -118,10 +124,6 @@ export class ContextMenuComponent implements OnInit {
     );
   }
 
-  isItem(): boolean {
-    return this.contextMenuObjectType === DSpaceObjectType.ITEM;
-  }
-
   ngAfterViewChecked() {
     // To check that Context-menu contains options or not
     if (this._document.getElementById('itemOptionsDropdownMenu')) {

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts

@@ -588,8 +588,9 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
 
   isNotRequiredGroupAndEmpty(): boolean {
     const parent = this.model.parent;
-
-    if (hasValue(parent) && parent.type === 'GROUP') {
+    // Check if the model is part of a group, the group needs to be an inner form and be in the submission form not in a nested form.
+    // The check hasValue(parent.parent) tells if the parent is in the submission or in a modal (nested cases)
+    if (hasValue(parent) && parent.type === 'GROUP' && this.model.isModelOfInnerForm && hasValue(parent.parent)) {
 
      const groupHasSomeValue = parent.group.some(elem => !!elem.value);
 

src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html

@@ -14,6 +14,7 @@
                  [attr.aria-labelledby]="'label_' + model.id"
                  [attr.tabindex]="item.index"
                  [checked]="item.value"
+                 [class.is-invalid]="showErrorMessages"
                  [id]="model.id + item.id"
                  [formControlName]="item.id"
                  [name]="model.name"
@@ -58,6 +59,7 @@
 
         <input type="radio" class="custom-control-input"
                [checked]="item.value"
+               [class.is-invalid]="showErrorMessages"
                [id]="model.id + item.id"
                [name]="model.id"
                [required]="model.required"

src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts

@@ -15,7 +15,8 @@ import { TruncatableService } from '../../../../../truncatable/truncatable.servi
 import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
 import { APP_CONFIG, AppConfig } from '../../../../../../../config/app-config.interface';
 import { getFirstSucceededRemoteListPayload } from '../../../../../../core/shared/operators';
-import { map } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
+import { isNotEmpty } from '../../../../../empty.util';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
@@ -80,7 +81,9 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
       this.klaroService.watchConsentUpdates();
 
       this.hasLoadedThirdPartyMetrics$ = combineLatest([
-        this.klaroService.consentsUpdates$,
+        this.klaroService.consentsUpdates$.pipe(
+          filter(consents => isNotEmpty(consents))
+        ),
         this.dso.metrics?.pipe(
           getFirstSucceededRemoteListPayload(),
           map(metrics => {