Merged dspace-cris-2023_02_x into dspace-cris-2023_02_x-DSC-1454

Author: atarix83

bitbucket-pipelines.yml

@@ -1,5 +1,5 @@
 options:
-  runs-on: ubuntu-latest
+  runs-on: self.hosted
 
 definitions:
   steps:
@@ -15,7 +15,7 @@ definitions:
           - yarn install --frozen-lockfile
           - yarn run lint --quiet
           - yarn run check-circ-deps
-          - yarn run build:prod
+          - yarn run build:prod:ci
           - yarn run test:headless
 
 pipelines:

package.json

@@ -17,8 +17,11 @@
     "build:stats": "ng build --stats-json",
     "build:ci": "ng config cli.cache.environment ci && yarn run build:ssr",
     "build:prod": "cross-env NODE_ENV=production yarn run build:ssr",
+    "build:prod:ci": "cross-env NODE_ENV=production yarn run build:ssr:ci",
     "build:ssr": "npm run ng-high-memory -- build --configuration production && npm run ng-high-memory -- run dspace-angular:server:production",
+    "build:ssr:ci": "npm run ng-mid-memory -- build --configuration production && npm run ng-mid-memory -- run dspace-angular:server:production",
     "ng-high-memory": "node --max-old-space-size=8192 node_modules/@angular/cli/bin/ng",
+    "ng-mid-memory": "node --max-old-space-size=4096 node_modules/@angular/cli/bin/ng",
     "test": "npm run ng-high-memory -- test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"npm run ng-high-memory -- test --source-map=true --watch=true --configuration test\"",
     "test:headless": "npm run ng-high-memory -- test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",

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

@@ -120,6 +120,8 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     switch (orcidQueue.recordType.toLowerCase()) {
       case 'publication':
         return 'fas fa-book';
+      case 'product':
+        return 'fas fa-database';
       case 'funding':
         return 'fa fa-wallet';
       case 'project':

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

@@ -49,6 +49,29 @@ <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-product">
+          <div class="card-header">{{ 'person.page.orcid.products-preferences'| translate }}</div>
+          <div class="card-body">
+            <div class="container">
+              <div class="row">
+                <ds-alert [type]="'alert-info'">
+                  {{ 'person.page.orcid.synchronization-mode-product-message' | translate}}
+                </ds-alert>
+              </div>
+              <div class="form-group">
+                <div *ngFor="let option of syncProductOptions" class="row form-check">
+                  <input type="radio" [(ngModel)]="currentSyncProduct"
+                         name="syncProducts" id="productOption_{{option.value}}" [value]="option.value"
+                         required>
+                  <label for="productOption_{{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="sync-mode-funding">
           <div class="card-header">{{ 'person.page.orcid.funding-preferences'| translate }}</div>

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

@@ -168,17 +168,20 @@ describe('OrcidSyncSettingsComponent test suite', () => {
   it('should create cards properly', () => {
     const modes = fixture.debugElement.query(By.css('[data-test="sync-mode"]'));
     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(funding).toBeTruthy();
     expect(preferences).toBeTruthy();
   });
 
   it('should init sync modes properly', () => {
     expect(comp.currentSyncMode).toBe('MANUAL');
     expect(comp.currentSyncPublications).toBe('ALL');
+    expect(comp.currentSyncProduct).toBe('DISABLED');
     expect(comp.currentSyncFunding).toBe('DISABLED');
   });
 
@@ -189,6 +192,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
       formGroup = new UntypedFormGroup({
         syncMode: new UntypedFormControl('MANUAL'),
         syncFundings: new UntypedFormControl('ALL'),
+        syncProducts: new UntypedFormControl('ALL'),
         syncPublications: new UntypedFormControl('ALL'),
         syncProfile_BIOGRAPHICAL: new UntypedFormControl(true),
         syncProfile_IDENTIFIERS: new UntypedFormControl(true),
@@ -208,6 +212,10 @@ describe('OrcidSyncSettingsComponent test suite', () => {
           path: '/orcid/publications',
           op: 'replace',
           value: 'ALL'
+        }, {
+          path: '/orcid/products',
+          op: 'replace',
+          value: 'ALL'
         }, {
           path: '/orcid/fundings',
           op: 'replace',

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

@@ -40,6 +40,11 @@ export class OrcidSyncSettingsComponent implements OnInit {
    */
   currentSyncPublications: string;
 
+  /**
+   * The current synchronization mode for product
+   */
+  currentSyncProduct: string;
+
   /**
    * The current synchronization mode for funding
    */
@@ -55,6 +60,11 @@ export class OrcidSyncSettingsComponent implements OnInit {
    */
   syncPublicationOptions: { value: string, label: string }[];
 
+  /**
+   * The synchronization options for products
+   */
+  syncProductOptions: { value: string, label: string }[];
+
   /**
    * The synchronization options for funding
    */
@@ -98,6 +108,14 @@ export class OrcidSyncSettingsComponent implements OnInit {
         };
       });
 
+    this.syncProductOptions = ['DISABLED', 'ALL']
+      .map((value) => {
+        return {
+          label: this.messagePrefix + '.sync-products.' + value.toLowerCase(),
+          value: value,
+        };
+      });
+
     this.syncFundingOptions = ['DISABLED', 'ALL']
       .map((value) => {
         return {
@@ -119,6 +137,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
 
     this.currentSyncMode = this.getCurrentPreference('dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL');
     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');
   }
 
@@ -131,6 +150,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
     const operations: Operation[] = [];
     this.fillOperationsFor(operations, '/orcid/mode', form.value.syncMode);
     this.fillOperationsFor(operations, '/orcid/publications', form.value.syncPublications);
+    this.fillOperationsFor(operations, '/orcid/products', form.value.syncProducts);
     this.fillOperationsFor(operations, '/orcid/fundings', form.value.syncFundings);
 
     const syncProfileValue = this.syncProfileOptions

src/assets/i18n/en.json5

@@ -6900,6 +6900,8 @@
 
   "person.page.orcid.funding-preferences": "Funding preferences",
 
+  "person.page.orcid.products-preferences": "Product 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",
@@ -6930,6 +6932,14 @@
 
   "person.page.orcid.sync-publications.disabled": "Disabled",
 
+  "person.page.orcid.sync-products.all": "All products",
+
+  "person.page.orcid.sync-products.mine": "My products",
+
+  "person.page.orcid.sync-products.my_selected": "Selected products",
+
+  "person.page.orcid.sync-products.disabled": "Disabled",
+
   "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
 
   "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
@@ -6968,6 +6978,8 @@
 
   "person.page.orcid.sync-queue.tooltip.publication": "Publication",
 
+  "person.page.orcid.sync-queue.tooltip.product": "Product",
+
   "person.page.orcid.sync-queue.tooltip.project": "Project",
 
   "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
@@ -7050,6 +7062,8 @@
 
   "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.",
+
   "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
 
   "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",