Merged dspace-cris-2023_02_x into 2023_02_x_DSC-1437

Author: atarix83

src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts

@@ -126,6 +126,8 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
         return 'fa fa-wallet';
       case 'project':
         return 'fas fa-wallet';
+      case 'patent':
+        return 'fas fa-file';
       case 'education':
         return 'fas fa-school';
       case 'affiliation':

src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html

@@ -94,6 +94,28 @@ <h2>{{'person.orcid.sync.setting' | translate}}</h2>
           </div>
         </div>
       </div>
+      <div class="col-md mb-3">
+        <div class="card h-100" data-test="sync-mode-patent">
+          <div class="card-header">{{ 'person.page.orcid.patent-preferences'| translate }}</div>
+          <div class="card-body">
+            <div class="container">
+              <div class="row">
+                <ds-alert [type]="'alert-info'">
+                  {{ 'person.page.orcid.synchronization-mode-patent-message' | translate}}
+                </ds-alert>
+              </div>
+              <div class="form-group">
+                <div *ngFor="let option of syncPatentOptions" class="row form-check">
+                  <input type="radio" [(ngModel)]="currentSyncPatent"
+                         name="syncPatents" id="patentOption_{{option.value}}" [value]="option.value"
+                         required>
+                  <label for="patentOption_{{option.value}}" class="ml-2">{{option.label | translate}}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
       <div class="col-md mb-3">
         <div class="card h-100" data-test="profile-preferences">
           <div class="card-header">{{ 'person.page.orcid.profile-preferences'| translate }}</div>

src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts

@@ -117,6 +117,13 @@ describe('OrcidSyncSettingsComponent test suite', () => {
         'confidence': -1,
         'place': 0
       }],
+      'dspace.orcid.sync-patents': [{
+        'value': 'DISABLED',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0
+      }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
@@ -167,13 +174,15 @@ describe('OrcidSyncSettingsComponent test suite', () => {
 
   it('should create cards properly', () => {
     const modes = fixture.debugElement.query(By.css('[data-test="sync-mode"]'));
+    const patent = fixture.debugElement.query(By.css('[data-test="sync-mode-patent"]'));
     const publication = fixture.debugElement.query(By.css('[data-test="sync-mode-publication"]'));
     const product = fixture.debugElement.query(By.css('[data-test="sync-mode-product"]'));
     const funding = fixture.debugElement.query(By.css('[data-test="sync-mode-funding"]'));
     const preferences = fixture.debugElement.query(By.css('[data-test="profile-preferences"]'));
     expect(modes).toBeTruthy();
     expect(publication).toBeTruthy();
     expect(product).toBeTruthy();
+    expect(patent).toBeTruthy();
     expect(funding).toBeTruthy();
     expect(preferences).toBeTruthy();
   });
@@ -183,6 +192,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     expect(comp.currentSyncPublications).toBe('ALL');
     expect(comp.currentSyncProduct).toBe('DISABLED');
     expect(comp.currentSyncFunding).toBe('DISABLED');
+    expect(comp.currentSyncPatent).toBe('DISABLED');
   });
 
   describe('form submit', () => {
@@ -193,6 +203,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
         syncMode: new UntypedFormControl('MANUAL'),
         syncFundings: new UntypedFormControl('ALL'),
         syncProducts: new UntypedFormControl('ALL'),
+        syncPatents: new UntypedFormControl('ALL'),
         syncPublications: new UntypedFormControl('ALL'),
         syncProfile_BIOGRAPHICAL: new UntypedFormControl(true),
         syncProfile_IDENTIFIERS: new UntypedFormControl(true),
@@ -208,6 +219,10 @@ describe('OrcidSyncSettingsComponent test suite', () => {
           path: '/orcid/mode',
           op: 'replace',
           value: 'MANUAL'
+        }, {
+          path: '/orcid/patents',
+          op: 'replace',
+          value: 'ALL'
         }, {
           path: '/orcid/publications',
           op: 'replace',

src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts

@@ -35,6 +35,11 @@ export class OrcidSyncSettingsComponent implements OnInit {
    */
   currentSyncMode: string;
 
+  /**
+   * The current synchronization mode for patents
+   */
+  currentSyncPatent: string;
+
   /**
    * The current synchronization mode for publications
    */
@@ -55,6 +60,11 @@ export class OrcidSyncSettingsComponent implements OnInit {
    */
   syncModes: { value: string, label: string }[];
 
+  /**
+   * The synchronization options for patents
+   */
+  syncPatentOptions: { value: string, label: string }[];
+
   /**
    * The synchronization options for publications
    */
@@ -116,6 +126,14 @@ export class OrcidSyncSettingsComponent implements OnInit {
         };
       });
 
+    this.syncPatentOptions = ['DISABLED', 'ALL']
+      .map((value) => {
+        return {
+          label: this.messagePrefix + '.sync-patents.' + value.toLowerCase(),
+          value: value,
+        };
+      });
+
     this.syncFundingOptions = ['DISABLED', 'ALL']
       .map((value) => {
         return {
@@ -136,6 +154,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
       });
 
     this.currentSyncMode = this.getCurrentPreference('dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL');
+    this.currentSyncPatent = this.getCurrentPreference('dspace.orcid.sync-patents', ['DISABLED', 'ALL'], 'DISABLED');
     this.currentSyncPublications = this.getCurrentPreference('dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED');
     this.currentSyncProduct = this.getCurrentPreference('dspace.orcid.sync-products', ['DISABLED', 'ALL'], 'DISABLED');
     this.currentSyncFunding = this.getCurrentPreference('dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED');
@@ -149,6 +168,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
   onSubmit(form: UntypedFormGroup): void {
     const operations: Operation[] = [];
     this.fillOperationsFor(operations, '/orcid/mode', form.value.syncMode);
+    this.fillOperationsFor(operations, '/orcid/patents', form.value.syncPatents);
     this.fillOperationsFor(operations, '/orcid/publications', form.value.syncPublications);
     this.fillOperationsFor(operations, '/orcid/products', form.value.syncProducts);
     this.fillOperationsFor(operations, '/orcid/fundings', form.value.syncFundings);

src/app/menu.resolver.ts

@@ -271,6 +271,19 @@ export class MenuResolver implements Resolve<boolean> {
       this.authorizationService.isAuthorized(FeatureID.CanEditItem),
     ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, canEditItem]) => {
       const newSubMenuList = [
+        /* Communities and Collections */
+        {
+          id: `browse_global_communities_and_collections`,
+          active: false,
+          visible: !environment.layout.navbar.showCommunityCollection && isCollectionAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: `menu.section.communities_and_collections`,
+            link: `/community-list`
+          } as LinkMenuItemModel,
+          icon: 'users',
+          index: 0
+        },
         {
           id: 'new_community',
           parentID: 'new',

src/assets/i18n/en.json5

@@ -6902,6 +6902,8 @@
 
   "person.page.orcid.products-preferences": "Product preferences",
 
+  "person.page.orcid.patent-preferences": "Patent preferences",
+
   "person.page.orcid.publications-preferences": "Publication preferences",
 
   "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
@@ -6924,6 +6926,14 @@
 
   "person.page.orcid.sync-fundings.disabled": "Disabled",
 
+  "person.page.orcid.sync-patents.all": "All patents",
+
+  "person.page.orcid.sync-patents.mine": "My patents",
+
+  "person.page.orcid.sync-patents.my_selected": "Selected patents",
+
+  "person.page.orcid.sync-patents.disabled": "Disabled",
+
   "person.page.orcid.sync-publications.all": "All publications",
 
   "person.page.orcid.sync-publications.mine": "My publications",
@@ -6976,6 +6986,8 @@
 
   "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
 
+  "person.page.orcid.sync-queue.tooltip.patent": "Patent",
+
   "person.page.orcid.sync-queue.tooltip.publication": "Publication",
 
   "person.page.orcid.sync-queue.tooltip.product": "Product",
@@ -7060,6 +7072,8 @@
 
   "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
 
+  "person.page.orcid.synchronization-mode-patent-message": "Select whether to send your linked Patent entities to your ORCID record's list of works.",
+
   "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
 
   "person.page.orcid.synchronization-mode-product-message": "Select whether to send your linked Product entities to your ORCID record's list of works.",