Merge branch 'main' of https://bitbucket.org/4Science/dspace-angular …

…into CST-12109-WITHDRAWN-REINSTATE-requests
DSpace · Feb 27, 2024 · e4b2814 · e4b2814
2 parents 447b275 + 91a419f
commit e4b2814
Show file tree

Hide file tree

Showing 80 changed files with 2,912 additions and 760 deletions.
diff --git a/config/config.example.yml b/config/config.example.yml
@@ -136,7 +136,7 @@ submission:
       # NOTE: example of configuration
       #   # NOTE: metadata name
       # - name: dc.author
-      #   # NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
+      #   # NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
       #   style: fas fa-user
       - name: dc.author
         style: fas fa-user
@@ -147,18 +147,40 @@ submission:
       confidence:
         # NOTE: example of configuration
         #   # NOTE: confidence value
-        # - name: dc.author
-        #   # NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
-        #   style: fa-user
+        # - value: 600
+        #   # NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
+        #   style: text-success
+        #   icon: fa-circle-check
+        #   # NOTE: the class configured in property style is used by default, the icon property could be used in component
+        #           configured to use a 'icon mode' display (mainly in edit-item page)
         - value: 600
           style: text-success
+          icon: fa-circle-check
         - value: 500
           style: text-info
+          icon: fa-gear
         - value: 400
           style: text-warning
+          icon: fa-circle-question
+        - value: 300
+          style: text-muted
+          icon: fa-thumbs-down
+        - value: 200
+          style: text-muted
+          icon: fa-circle-exclamation
+        - value: 100
+          style: text-muted
+          icon: fa-circle-stop
+        - value: 0
+          style: text-muted
+          icon: fa-ban
+        - value: -1
+          style: text-muted
+          icon: fa-circle-xmark
         # default configuration
         - value: default
           style: text-muted
+          icon: fa-circle-xmark
 
 #  Default Language in which the UI will be rendered if the user's browser language is not an active language
 defaultLanguage: en
@@ -272,6 +294,8 @@ homePage:
     # No. of communities to list per page on the home page
     # This will always round to the nearest number from the list of page sizes. e.g. if you set it to 7 it'll use 10
     pageSize: 5
+  # Enable or disable the Discover filters on the homepage
+  showDiscoverFilters: false
 
 # Item Config
 item:
@@ -400,3 +424,12 @@ comcolSelectionSort:
 # suggestion:
   # - collectionId: 8f7df5ca-f9c2-47a4-81ec-8a6393d6e5af
     # source: "openaire"
+
+
+# Search settings
+search: 
+  # Settings to enable/disable or configure advanced search filters.
+  advancedFilters:
+    enabled: false
+    # List of filters to enable in "Advanced Search" dropdown
+    filter: [ 'title', 'author', 'subject', 'entityType' ]
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
@@ -58,4 +58,4 @@
     <ds-themed-loading *ngIf="collectionRD?.isLoading"
                        message="{{'loading.collection' | translate}}"></ds-themed-loading>
   </div>
-</div>
+</div>
diff --git a/...collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/...collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -88,7 +88,7 @@ describe('CollectionSourceControlsComponent', () => {
       invoke: createSuccessfulRemoteDataObject$(process),
     });
     processDataService = jasmine.createSpyObj('processDataService', {
-      findById: createSuccessfulRemoteDataObject$(process),
+      autoRefreshUntilCompletion: createSuccessfulRemoteDataObject$(process),
     });
     bitstreamService = jasmine.createSpyObj('bitstreamService', {
       findByHref: createSuccessfulRemoteDataObject$(bitstream),
@@ -137,7 +137,7 @@ describe('CollectionSourceControlsComponent', () => {
         {name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId)},
       ], []);
 
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(bitstreamService.findByHref).toHaveBeenCalledWith(process._links.output.href);
       expect(notificationsService.info).toHaveBeenCalledWith(jasmine.anything() as any, 'Script text');
     });
@@ -151,7 +151,7 @@ describe('CollectionSourceControlsComponent', () => {
         {name: '-r', value: null},
         {name: '-c', value: collection.uuid},
       ], []);
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(notificationsService.success).toHaveBeenCalled();
     });
   });
@@ -164,7 +164,7 @@ describe('CollectionSourceControlsComponent', () => {
         {name: '-o', value: null},
         {name: '-c', value: collection.uuid},
       ], []);
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(notificationsService.success).toHaveBeenCalled();
     });
   });

diff --git a/...page/collection-source/collection-source-controls/collection-source-controls.component.ts b/...page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -1,15 +1,14 @@
-import { Component, Input, OnDestroy } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
 import { ContentSource } from '../../../../core/shared/content-source.model';
 import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
 import {
-  getAllCompletedRemoteData,
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload
 } from '../../../../core/shared/operators';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
-import { hasValue, hasValueOperator } from '../../../../shared/empty.util';
+import { hasValue } from '../../../../shared/empty.util';
 import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { RequestService } from '../../../../core/data/request.service';
@@ -30,7 +29,7 @@ import { ContentSourceSetSerializer } from '../../../../core/shared/content-sour
   styleUrls: ['./collection-source-controls.component.scss'],
   templateUrl: './collection-source-controls.component.html',
 })
-export class CollectionSourceControlsComponent implements OnDestroy {
+export class CollectionSourceControlsComponent implements OnInit, OnDestroy {
 
   /**
    * Should the controls be enabled.
@@ -49,6 +48,7 @@ export class CollectionSourceControlsComponent implements OnDestroy {
 
   contentSource$: Observable<ContentSource>;
   private subs: Subscription[] = [];
+  private autoRefreshIDs: string[] = [];
 
   testConfigRunning$ = new BehaviorSubject(false);
   importRunning$ = new BehaviorSubject(false);
@@ -95,36 +95,28 @@ export class CollectionSourceControlsComponent implements OnDestroy {
       }),
       // filter out responses that aren't successful since the pinging of the process only needs to happen when the invocation was successful.
       filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-      switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-      getAllCompletedRemoteData(),
-      filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
-      map((rd) => rd.payload),
-      hasValueOperator(),
+      switchMap((rd) => {
+        this.autoRefreshIDs.push(rd.payload.processId);
+        return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+      }),
+      map((rd) => rd.payload)
     ).subscribe((process: Process) => {
-        if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-          process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-          // Ping the current process state every 5s
-          setTimeout(() => {
-            this.requestService.setStaleByHrefSubstring(process._links.self.href);
-          }, 5000);
-        }
-        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-          this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed'));
-          this.testConfigRunning$.next(false);
-        }
-        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-          this.bitstreamService.findByHref(process._links.output.href).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => {
-            this.httpClient.get(bitstream._links.content.href, {responseType: 'text'}).subscribe((data: any) => {
-              const output = data.replaceAll(new RegExp('.*\\@(.*)', 'g'), '$1')
-                .replaceAll('The script has started', '')
-                .replaceAll('The script has completed', '');
-              this.notificationsService.info(this.translateService.get('collection.source.controls.test.completed'), output);
-            });
+      if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+        this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed'));
+        this.testConfigRunning$.next(false);
+      }
+      if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+        this.bitstreamService.findByHref(process._links.output.href).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => {
+          this.httpClient.get(bitstream._links.content.href, {responseType: 'text'}).subscribe((data: any) => {
+            const output = data.replaceAll(new RegExp('.*\\@(.*)', 'g'), '$1')
+              .replaceAll('The script has started', '')
+              .replaceAll('The script has completed', '');
+            this.notificationsService.info(this.translateService.get('collection.source.controls.test.completed'), output);
           });
-          this.testConfigRunning$.next(false);
-        }
+        });
+        this.testConfigRunning$.next(false);
       }
-    ));
+    }));
   }
 
   /**
@@ -147,31 +139,22 @@ export class CollectionSourceControlsComponent implements OnDestroy {
           }
         }),
         filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-        switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-        getAllCompletedRemoteData(),
-        filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
-        map((rd) => rd.payload),
-        hasValueOperator(),
+        switchMap((rd) => {
+          this.autoRefreshIDs.push(rd.payload.processId);
+          return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+        }),
+        map((rd) => rd.payload)
       ).subscribe((process) => {
-          if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-            process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-            // Ping the current process state every 5s
-            setTimeout(() => {
-              this.requestService.setStaleByHrefSubstring(process._links.self.href);
-              this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            }, 5000);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-            this.notificationsService.error(this.translateService.get('collection.source.controls.import.failed'));
-            this.importRunning$.next(false);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-            this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed'));
-            this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            this.importRunning$.next(false);
-          }
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+          this.notificationsService.error(this.translateService.get('collection.source.controls.import.failed'));
+          this.importRunning$.next(false);
+        }
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+          this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed'));
+          this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
+          this.importRunning$.next(false);
         }
-      ));
+      }));
   }
 
   /**
@@ -194,31 +177,22 @@ export class CollectionSourceControlsComponent implements OnDestroy {
           }
         }),
         filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-        switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-        getAllCompletedRemoteData(),
-        filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
-        map((rd) => rd.payload),
-        hasValueOperator(),
+        switchMap((rd) => {
+          this.autoRefreshIDs.push(rd.payload.processId);
+          return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+        }),
+        map((rd) => rd.payload)
       ).subscribe((process) => {
-          if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-            process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-            // Ping the current process state every 5s
-            setTimeout(() => {
-              this.requestService.setStaleByHrefSubstring(process._links.self.href);
-              this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            }, 5000);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-            this.notificationsService.error(this.translateService.get('collection.source.controls.reset.failed'));
-            this.reImportRunning$.next(false);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-            this.notificationsService.success(this.translateService.get('collection.source.controls.reset.completed'));
-            this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            this.reImportRunning$.next(false);
-          }
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+          this.notificationsService.error(this.translateService.get('collection.source.controls.reset.failed'));
+          this.reImportRunning$.next(false);
         }
-      ));
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+          this.notificationsService.success(this.translateService.get('collection.source.controls.reset.completed'));
+          this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
+          this.reImportRunning$.next(false);
+        }
+      }));
   }
 
   ngOnDestroy(): void {
@@ -227,5 +201,9 @@ export class CollectionSourceControlsComponent implements OnDestroy {
         sub.unsubscribe();
       }
     });
+
+    this.autoRefreshIDs.forEach((id) => {
+      this.processDataService.stopAutoRefreshing(id);
+    });
   }
 }
diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts
@@ -7,7 +7,7 @@ import { Bitstream } from '../core/shared/bitstream.model';
 import { Community } from '../core/shared/community.model';
 import { fadeInOut } from '../shared/animations/fade';
 import { hasValue } from '../shared/empty.util';
-import { getAllSucceededRemoteDataPayload} from '../core/shared/operators';
+import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
 import { AuthService } from '../core/auth/auth.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';

diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -273,12 +273,13 @@ export class RemoteDataBuildService {
           return isStale(r2.state) ? r1 : r2;
         }
       }),
-      distinctUntilKeyChanged('lastUpdated')
     );
 
     const payload$ = this.buildPayload<T>(requestEntry$, href$, ...linksToFollow);
 
-    return this.toRemoteDataObservable<T>(requestEntry$, payload$);
+    return this.toRemoteDataObservable<T>(requestEntry$, payload$).pipe(
+      distinctUntilKeyChanged('lastUpdated'),
+    );
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,4 +58,4 @@ @@
         <ds-themed-loading *ngIf="collectionRD?.isLoading"
                            message="{{'loading.collection' | translate}}"></ds-themed-loading>
       </div>
-    </div>
+    </div>