Merged main-cris into task/main-cris/DSC-2318

atarix83 · atarix83 · commit 0d181a9639d3 · 2025-04-24T13:07:20.000Z
diff --git a/src/app/collection-page/collection-page-routes.ts b/src/app/collection-page/collection-page-routes.ts
@@ -109,7 +109,8 @@ export const ROUTES: Route[] = [
         public: [{
           id: 'statistics_collection_:id',
           active: true,
-          visible: false,
+          visible: true,
+          parentID: 'statistics',
           index: 2,
           model: {
             type: MenuItemType.LINK,
diff --git a/src/app/community-page/community-page-routes.ts b/src/app/community-page/community-page-routes.ts
@@ -101,7 +101,8 @@ export const ROUTES: Route[] = [
         public: [{
           id: 'statistics_community_:id',
           active: true,
-          visible: false,
+          visible: true,
+          parentID: 'statistics',
           index: 2,
           model: {
             type: MenuItemType.LINK,
diff --git a/src/app/core/shared/listable.module.ts b/src/app/core/shared/listable.module.ts
@@ -111,6 +111,7 @@ import { ItemSearchResultListElementSubmissionComponent } from '../../shared/obj
 import { PoolSearchResultListElementComponent } from '../../shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component';
 import { WorkflowItemSearchResultListElementComponent } from '../../shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component';
 import { WorkspaceItemSearchResultListElementComponent } from '../../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component';
+import { RelationshipsListComponent } from '../../shared/object-list/relationships-list/relationships-list.component';
 import { CollectionSearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
 import { CommunitySearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
 import { ItemSearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
@@ -205,6 +206,7 @@ const ENTRY_COMPONENTS = [
   ClaimedTaskSearchResultDetailElementComponent,
   PoolSearchResultDetailElementComponent,
   ItemSearchResultListElementSubmissionComponent,
+  RelationshipsListComponent,
   PublicationComponent,
   UntypedItemComponent,
 ];
diff --git a/src/app/home-page/home-page-routes.ts b/src/app/home-page/home-page-routes.ts
@@ -1,7 +1,5 @@
 import { Route } from '@angular/router';
 
-import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
-import { MenuItemType } from '../shared/menu/menu-item-type.model';
 import { homePageResolver } from './home-page.resolver';
 import { ThemedHomePageComponent } from './themed-home-page.component';
 
@@ -13,19 +11,6 @@ export const ROUTES: Route[] = [
     data: {
       title: 'home.title',
       showSocialButtons: true,
-      menu: {
-        public: [{
-          id: 'statistics_site',
-          active: true,
-          visible: false,
-          index: 2,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.statistics',
-            link: 'statistics',
-          } as LinkMenuItemModel,
-        }],
-      },
     },
     resolve: {
       site: homePageResolver,
diff --git a/src/app/item-page/item-page-routes.ts b/src/app/item-page/item-page-routes.ts
@@ -24,6 +24,18 @@ import { versionResolver } from './version-page/version.resolver';
 import { VersionPageComponent } from './version-page/version-page/version-page.component';
 
 export const ROUTES: Route[] = [
+  {
+    path: 'version',
+    children: [
+      {
+        path: ':id',
+        component: VersionPageComponent,
+        resolve: {
+          dso: versionResolver,
+        },
+      },
+    ],
+  },
   {
     path: ':id',
     resolve: {
@@ -78,7 +90,8 @@ export const ROUTES: Route[] = [
         public: [{
           id: 'statistics_item_:id',
           active: true,
-          visible: false,
+          visible: true,
+          parentID: 'statistics',
           index: 2,
           model: {
             type: MenuItemType.LINK,
@@ -90,16 +103,5 @@ export const ROUTES: Route[] = [
       showSocialButtons: true,
     },
   },
-  {
-    path: 'version',
-    children: [
-      {
-        path: ':id',
-        component: VersionPageComponent,
-        resolve: {
-          dso: versionResolver,
-        },
-      },
-    ],
-  },
+
 ];
diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
@@ -14,7 +14,8 @@
            [selectionConfig]="{ repeatable: true, listId: listId }"
            (deselectObject)="onDeselectObject($event)"
            (selectObject)="onSelectObject($event)">
-  <ds-my-dspace-bulk-action *ngIf="(currentConfiguration$ | async) === workflowType"
+  <!-- Using *ngIf breaks the projection, so we are using hidden instead -->
+  <ds-my-dspace-bulk-action [hidden]="(currentConfiguration$ | async) !== workflowType"
                             bulkActions
                             [listId]="listId"></ds-my-dspace-bulk-action>
   <ds-my-dspace-new-bulk-import additionalSearchFormOptions></ds-my-dspace-new-bulk-import>
diff --git a/src/app/my-dspace-page/my-dspace-page.component.spec.ts b/src/app/my-dspace-page/my-dspace-page.component.spec.ts
@@ -33,6 +33,7 @@ import { RequestEntry } from '../core/data/request-entry.model';
 import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
 import { getMockRequestService } from '../shared/mocks/request.service.mock';
 import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
+import { MyDSpaceBulkActionComponent } from './my-dspace-new-submission/my-dspace-bulk-action/my-dspace-bulk-action.component';
 import { MyDSpaceNewBulkImportComponent } from './my-dspace-new-submission/my-dspace-new-bulk-import/my-dspace-new-bulk-import.component';
 import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component';
 
@@ -124,6 +125,7 @@ describe('MyDSpacePageComponent', () => {
             SuggestionsNotificationComponent,
             MyDspaceQaEventsNotificationsComponent,
             MyDSpaceNewBulkImportComponent,
+            MyDSpaceBulkActionComponent,
           ],
         },
       })
diff --git a/src/app/search-page/themed-configuration-search-page.component.ts b/src/app/search-page/themed-configuration-search-page.component.ts
@@ -228,6 +228,8 @@ export class ThemedConfigurationSearchPageComponent extends ThemedComponent<Conf
     'query',
     'scope',
     'hideScopeInUrl',
+    'customEvent',
+    'customData',
   ];
 
   protected getComponentName(): string {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -34,10 +34,12 @@ import {
   Subscription,
 } from 'rxjs';
 import {
+  distinctUntilChanged,
   filter,
   map,
   mergeMap,
   scan,
+  startWith,
   take,
 } from 'rxjs/operators';
 
@@ -118,8 +120,10 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
   }
 
   ngOnInit() {
-    this.initChipsFromModelValue();
-    this.valueChangeSubscription = this.model.valueChanges.subscribe(() => {
+    this.valueChangeSubscription = this.model.valueChanges.pipe(
+      startWith([]),
+      distinctUntilChanged((a,b) => JSON.stringify(a) === JSON.stringify(b)),
+    ).subscribe(() => {
       this.initChipsFromModelValue();
     });
   }
@@ -174,23 +178,28 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
     }
     modalRef.result.then(() => {
       // close
-      this.selectedChipItemIndex = null;
-      this.selectedChipItem = null;
-      this.valueChangeSubscription = this.model.valueChanges.subscribe(() => {
-        this.initChipsFromModelValue();
-      });
+      this.handleModalResult();
     }, () => {
       // dismiss
-      this.selectedChipItemIndex = null;
-      this.selectedChipItem = null;
-      this.valueChangeSubscription = this.model.valueChanges.subscribe(() => {
-        this.initChipsFromModelValue();
-      });
+      this.handleModalResult();
     });
 
     return modalRef;
   }
 
+  private handleModalResult(): void {
+    this.selectedChipItemIndex = null;
+    this.selectedChipItem = null;
+    if (this.valueChangeSubscription) {
+      this.valueChangeSubscription.unsubscribe();
+    }
+    this.valueChangeSubscription = this.model.valueChanges.pipe(
+      distinctUntilChanged((a,b) => JSON.stringify(a) === JSON.stringify(b)),
+    ).subscribe(() => {
+      this.initChipsFromModelValue();
+    });
+  }
+
   private initChipsFromModelValue() {
     let initChipsValue$: Observable<any[]>;
     if (this.model.isEmpty()) {
@@ -236,7 +245,7 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
           return acc;
         }, []),
         filter((modelValues: any[]) => this.model.getGroupValue().length === modelValues.length),
-      ).subscribe((modelValue) => {
+      ).pipe(distinctUntilChanged((a,b) => JSON.stringify(a) === JSON.stringify(b))).subscribe((modelValue) => {
         this.model.value = modelValue;
         this.initChips(modelValue);
         this.cdr.markForCheck();
diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts
@@ -66,6 +66,7 @@ const TOOLTIP_TEXT_LIMIT = 21;
     CdkDropList,
     CdkDropListGroup,
     NgTemplateOutlet,
+    CdkDropListGroup,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
@@ -43,7 +43,6 @@
                                                [showMetrics]="showMetrics"
                                                [showThumbnails]="showThumbnails"
                                                [showCorrection]="showCorrection"
-                                               (contentChange)="contentChange.emit()"
                                                (customEvent)="customEvent.emit($event)"
                                                (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
         </li>
diff --git a/src/app/shared/object-list/relationships-list/relationships-items-actions/relationships-items-actions.component.ts b/src/app/shared/object-list/relationships-list/relationships-items-actions/relationships-items-actions.component.ts
@@ -22,6 +22,7 @@ import {
   Subscription,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { BtnDisabledDirective } from 'src/app/shared/btn-disabled.directive';
 
 import { AppState } from '../../../../app.reducer';
 import { Item } from '../../../../core/shared/item.model';
@@ -44,6 +45,7 @@ import { hasValue } from '../../../empty.util';
     AsyncPipe,
     NgbTooltipModule,
     TranslateModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/search/search-charts/search-charts.component.ts b/src/app/shared/search/search-charts/search-charts.component.ts
@@ -227,7 +227,7 @@ export class SearchChartsComponent implements OnInit {
         getRemoteDataPayload(),
         map((configs: SearchFilterConfig[]) => {
           if (!hasValues && this.selectedFilter === filterConfig) {
-            const index = configs.findIndex(x => x.filterType === this.selectedFilter.filterType);
+            const index = configs.findIndex(x => x?.filterType === this.selectedFilter?.filterType);
             if (index > -1) {
               if (hasValue(configs[index - 1])) {
                 this.changeChartType(configs[index - 1]);
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,16 +1,18 @@
-<div [class.d-none]="!availableFilters">
+<div [class.d-none]="(availableFilters$ | async) === false">
   @if (inPlaceSearch) {
     <h3>{{filterLabel+'.filters.head' | translate}}</h3>
   } @else {
     <h2>{{filterLabel+'.filters.head' | translate}}</h2>
   }
 
   @if ((filters | async)?.hasSucceeded) {
-    <div [class.visually-hidden]="getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length">
+    <ng-container [class.visually-hidden]="getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length">
       @for (filter of (filters | async)?.payload; track filter.name) {
-        <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+        <div #searchFilter>
+          <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+        </div>
       }
-    </div>
+    </ng-container>
   }
 
   @if(getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length) {
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -90,13 +90,13 @@ describe('SearchFiltersComponent', () => {
   describe('when there are no filters', () => {
     beforeEach(() => {
       (comp as any).ngOnInit();
+      (comp as any).availableFilters$.next(false);
       fixture.detectChanges();
     });
 
     it('should not render component', () => {
       const menu = fixture.debugElement.query(By.css('div.d-none'));
       expect(menu).not.toBeNull();
-      expect(comp.availableFilters).toEqual(false);
     });
 
   });
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -2,12 +2,15 @@ import { AsyncPipe } from '@angular/common';
 import {
   AfterViewChecked,
   Component,
+  DestroyRef,
   Inject,
+  inject,
   Input,
   OnDestroy,
   OnInit,
   ViewChildren,
 } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import {
   Router,
   RouterLink,
@@ -19,6 +22,7 @@ import {
   Observable,
 } from 'rxjs';
 import {
+  distinctUntilChanged,
   filter,
   map,
   take,
@@ -90,7 +94,7 @@ export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestr
   /**
    * counts for the active filters
    */
-  availableFilters = false;
+  availableFilters$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
   appliedFilters: Map<string, AppliedFilter[]> = new Map();
 
@@ -111,6 +115,10 @@ export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestr
    */
   private finalFiltersComputed = [];
 
+  private allFiltersComputed = false;
+
+  private destroyRef = inject(DestroyRef);
+
   subs = [];
   filterLabel = 'search';
   defaultFilterCount: number;
@@ -220,7 +228,12 @@ export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestr
         }),
         // Automatically complete the observable after one emission
         take(1),
-      ).subscribe();
+      ).subscribe((results) => {
+        if (results.totalFilters === results.currentComputed) {
+          this.allFiltersComputed = true;
+          this.availableFilters$.next(this.searchFilter._results.some(element => element.nativeElement?.children[0]?.children.length > 0));
+        }
+      });
     }
   }
 
@@ -285,7 +298,14 @@ export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestr
   }
 
   ngAfterViewChecked() {
-    this.availableFilters = this.searchFilter._results.some(element => element.nativeElement?.children[0]?.children.length > 0);
+    this.searchFilter.changes.pipe(
+      filter(() => this.allFiltersComputed),
+      map((filters: any) => {
+        return filters._results.some(element => element.nativeElement?.children[0]?.children.length > 0);
+      }),
+      distinctUntilChanged(),
+      takeUntilDestroyed(this.destroyRef),
+    ).subscribe(this.availableFilters$);
   }
 
   ngOnDestroy() {
diff --git a/src/app/shared/theme-support/themed.component.spec.ts b/src/app/shared/theme-support/themed.component.spec.ts
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
