Merged dspace-cris-2025_02_x into task/dspace-cris-2025_02_x/DSC-2787

Author: Micheleboychuk

bitbucket-pipelines.yml

@@ -16,15 +16,15 @@ definitions:
           - echo "Using commit hash $HASH_COMMIT"
           - git config --global user.email "${BB_USER}"
           - git config --global user.name "${BB_EMAIL}"
-          - git clone https://x-token-auth:${E2ERUNNERS_ACCESS_TOKEN}@${E2E_VALUES_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${E2E_VALUES_REPO}
           - cd e2erunners-values
           - sed "s#HASH_COMMIT#${HASH_COMMIT}#g" TPL-cris-2025 > ${HASH_COMMIT}
           - sed -i "s#BRANCH_NAME#${BRANCH_NAME}#g" TPL-cris-2025 ${HASH_COMMIT}
           - git add ${HASH_COMMIT}
           - git commit -m "Add configuration for e2e-${HASH_COMMIT}" || echo "No changes to commit"
           - git push
           - cd ..
-          - git clone https://x-token-auth:${HELM_CHARTS_ACCESS_TOKEN}@${HELM_CHARTS_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${HELM_CHARTS_REPO}
           - cd helm-charts
           - PATH_VALUE=" e2e-$HASH_COMMIT"
           - printf "  - name:%s\n" "$PATH_VALUE" >> ${E2E_VALUES}
@@ -42,15 +42,15 @@ definitions:
           - echo "Using commit hash $HASH_COMMIT"
           - git config --global user.email "${BB_USER}"
           - git config --global user.name "${BB_EMAIL}"
-          - git clone https://x-token-auth:${E2ERUNNERS_ACCESS_TOKEN}@${E2E_VALUES_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${E2E_VALUES_REPO}
           - cd e2erunners-values
           - sed "s#HASH_COMMIT#${HASH_COMMIT}#g" TPL-cris-2025 > ${HASH_COMMIT}
           - sed -i "s#BRANCH_NAME#${BRANCH_NAME}#g" TPL-cris-2025 ${HASH_COMMIT}
           - git add ${HASH_COMMIT}
           - git commit -m "Add configuration for e2e-${HASH_COMMIT}" || echo "No changes to commit"
           - git push
           - cd ..
-          - git clone https://x-token-auth:${HELM_CHARTS_ACCESS_TOKEN}@${HELM_CHARTS_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${HELM_CHARTS_REPO}
           - cd helm-charts
           - PATH_VALUE=" e2e-$HASH_COMMIT"
           - printf "  - name:%s\n" "$PATH_VALUE" >> ${E2E_VALUES}
@@ -117,6 +117,7 @@ definitions:
           - export DSPACE_UI_PORT=4000
           - export DSPACE_CACHE_SERVERSIDE_BOTCACHE_MAX=0
           - export DSPACE_CACHE_SERVERSIDE_ANONYMOUSCACHE_MAX=0
+          - export DSPACE_INFO_ENABLECOOKIECONSENTPOPUP=false
           - export CYPRESS_BASE_URL=http://127.0.0.1:4000
           - export CYPRESS_CACHE_FOLDER=~/.cache/Cypress
           - export CHROME_FLAGS="--no-sandbox --disable-dev-shm-usage --disable-gpu"
@@ -149,6 +150,23 @@ definitions:
           - echo "Running Cypress tests..."
           - npm run cypress:run --env chromeFlags="$CHROME_FLAGS"
           - echo "Test execution completed"
+          - echo "Cleaning up e2e runner configuration for commit $HASH_COMMIT"
+          - git config --global user.email "${BB_USER}"
+          - git config --global user.name "${BB_EMAIL}"
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${E2E_VALUES_REPO}
+          - cd e2erunners-values
+          - rm -f ${HASH_COMMIT}
+          - git add -A
+          - git commit -m "Remove configuration for e2e-${HASH_COMMIT}" || echo "No changes to commit"
+          - git push
+          - cd ..
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${HELM_CHARTS_REPO}
+          - cd helm-charts
+          - 'sed -i "/^  - name: e2e-${HASH_COMMIT}$/d" ${E2E_VALUES}'
+          - git add e2e-ingress/values.yaml
+          - git commit -m "Remove ${HASH_COMMIT} from e2e-ingress values" || echo "No changes to commit"
+          - git push
+          - cd ..
         artifacts:
           - cypress/screenshots/**
           - cypress/videos/**
@@ -183,7 +201,7 @@ definitions:
           - export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
           - export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
           - export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
-          - git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
           - cd dspace-values
           - '[ -f "dev/${BRANCH_FILE}" ] && sed -i "/^angular:/,/^[^ ]/s/\(tag: \).*/\1${BRANCH_NAME}-${HASH_COMMIT}/" "dev/${BRANCH_FILE}" && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "dev/${BRANCH_FILE}"'
           - git config --global user.email "${BB_EMAIL}"
@@ -198,7 +216,7 @@ definitions:
           - export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
           - export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
           - export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
-          - git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
           - cd dspace-values
           - '[ -f "staging/${BRANCH_FILE}" ] && sed -i "/^angular:/,/^[^ ]/s/\(tag: \).*/\1${BRANCH_NAME}-${HASH_COMMIT}/" "staging/${BRANCH_FILE}" && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "staging/${BRANCH_FILE}"'
           - git config --global user.email "${BB_EMAIL}"
@@ -213,7 +231,7 @@ definitions:
           - export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
           - export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
           - export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
-          - git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
           - cd dspace-values
           - '[ -f */test/"${BRANCH_FILE}" ] && sed -i "/^angular:/,/^[^ ]/s/\(tag: \).*/\1${BRANCH_NAME}-${HASH_COMMIT}/" */test/"${BRANCH_FILE}" && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" */test/"${BRANCH_FILE}"'
           - git config --global user.email "${BB_EMAIL}"
@@ -228,7 +246,7 @@ definitions:
           - export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
           - export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
           - export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
-          - git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
           - cd dspace-values
           - '[ -f "dev/${BRANCH_FILE}" ] && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "dev/${BRANCH_FILE}"'
           - git config --global user.email "${BB_USER}"
@@ -243,7 +261,7 @@ definitions:
           - export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
           - export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
           - export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
-          - git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
           - cd dspace-values
           - '[ -f "staging/${BRANCH_FILE}" ] && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "staging/${BRANCH_FILE}"'
           - git config --global user.email "${BB_USER}"
@@ -258,7 +276,7 @@ definitions:
           - export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
           - export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
           - export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
-          - git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
+          - git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
           - cd dspace-values
           - '[ -f */test/"${BRANCH_FILE}" ] && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "staging/${BRANCH_FILE}"'
           - git config --global user.email "${BB_USER}"

config/config.example.yml

@@ -410,6 +410,8 @@ item:
     pageSize: 5
     # Show the bitstream access status label on the item page
     showAccessStatuses: false
+    # Open bitstream download links in a new browser tab by default
+    openDownloadLinksInNewTab: true
   # The maximum number of metadata values to add to the metatag list of the item page
   metatagLimit: 20
   # The maximum number of values for repeatable metadata to show in the full item

server.ts

@@ -719,10 +719,12 @@ function healthCheck(req, res) {
   const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
   fetch(baseUrl)
     .then((response) => {
-      res.status(response.status).send(response);
+      return response.json().then((data) => {
+        res.status(response.status).send(data);
+      });
     })
     .catch((error) => {
-      res.status(error.response.status).send({
+      res.status(error?.response?.status || 503).send({
         error: error.message,
       });
     });

src/app/app.menus.ts

@@ -25,6 +25,7 @@ import { HealthMenuProvider } from './shared/menu/providers/health.menu';
 import { ImportMenuProvider } from './shared/menu/providers/import.menu';
 import { ClaimMenuProvider } from './shared/menu/providers/item-claim.menu';
 import { OrcidMenuProvider } from './shared/menu/providers/item-orcid.menu';
+import { ItemStatisticsMenuProvider } from './shared/menu/providers/item-statistics.menu';
 import { VersioningMenuProvider } from './shared/menu/providers/item-versioning.menu';
 import { MetadataCmsMenuProvider } from './shared/menu/providers/metadata-cms.menu';
 import { NewMenuProvider } from './shared/menu/providers/new.menu';
@@ -58,6 +59,7 @@ export const MENUS = buildMenuStructure({
     CommunityListMenuProvider,
     ExploreMenuProvider,
     StatisticsMenuProvider,
+    ItemStatisticsMenuProvider,
   ],
   [MenuID.ADMIN]: [
     AdminCommunityListMenuProvider,

src/app/core/export-service/browser-export.service.spec.ts

@@ -0,0 +1,175 @@
+/* eslint-disable import/no-namespace */
+import * as fileSaver from 'file-saver';
+import { ExportAsService } from 'ngx-export-as';
+import {
+  BehaviorSubject,
+  of,
+} from 'rxjs';
+
+import { BrowserExportService } from './browser-export.service';
+import { ExportImageType } from './export.service';
+
+describe('BrowserExportService', () => {
+  let service: BrowserExportService;
+  let mockDocument: any;
+  let mockWindow: any;
+
+  beforeEach(() => {
+    mockWindow = {
+      nativeWindow: {
+        location: {
+          origin: 'http://localhost:9876',
+        },
+      },
+    };
+
+    mockDocument = {
+      styleSheets: [],
+    };
+
+    service = new BrowserExportService('browser', mockWindow, mockDocument);
+  });
+
+  describe('exportAsFile', () => {
+    it('should create ExportAsService and call save', () => {
+      const mockResult = of(null);
+      spyOn(ExportAsService.prototype, 'save').and.returnValue(mockResult as any);
+
+      const result = service.exportAsFile('csv', 'element-id', 'test-file');
+
+      expect(ExportAsService.prototype.save).toHaveBeenCalled();
+      expect(service.exportAsConfig).toEqual(jasmine.objectContaining({
+        type: 'csv',
+        elementIdOrContent: 'element-id',
+        fileName: 'test-file',
+        download: true,
+      }));
+      expect(result).toBe(mockResult);
+    });
+
+    it('should pass download=false when specified', () => {
+      spyOn(ExportAsService.prototype, 'save').and.returnValue(of(null) as any);
+
+      service.exportAsFile('xlsx', 'element-id', 'test-file', false);
+
+      expect(service.exportAsConfig.download).toBe(false);
+    });
+  });
+
+  describe('exportAsImage', () => {
+    let domNode: HTMLElement;
+    let isLoading: BehaviorSubject<boolean>;
+
+    beforeEach(() => {
+      domNode = document.createElement('div');
+      isLoading = new BehaviorSubject<boolean>(true);
+    });
+
+    it('should call collectSameOriginFontCSS and set isLoading to false after export for png', async () => {
+      spyOn(service, 'collectSameOriginFontCSS').and.returnValue('');
+
+      service.exportAsImage(domNode, ExportImageType.png, 'test-image', isLoading);
+      await new Promise(resolve => setTimeout(resolve, 100));
+
+      expect(service.collectSameOriginFontCSS).toHaveBeenCalled();
+      expect(isLoading.getValue()).toBe(false);
+    });
+
+    it('should call collectSameOriginFontCSS and set isLoading to false after export for jpeg', async () => {
+      spyOn(service, 'collectSameOriginFontCSS').and.returnValue('');
+
+      service.exportAsImage(domNode, ExportImageType.jpeg, 'test-image', isLoading);
+      await new Promise(resolve => setTimeout(resolve, 100));
+
+      expect(service.collectSameOriginFontCSS).toHaveBeenCalled();
+      expect(isLoading.getValue()).toBe(false);
+    });
+
+    it('should pass fontEmbedCSS from collectSameOriginFontCSS to the export', async () => {
+      const fakeFontCSS = '@font-face { font-family: Test; }';
+      spyOn(service, 'collectSameOriginFontCSS').and.returnValue(fakeFontCSS);
+
+      service.exportAsImage(domNode, ExportImageType.png, 'test', isLoading);
+      await new Promise(resolve => setTimeout(resolve, 100));
+
+      expect(service.collectSameOriginFontCSS).toHaveBeenCalled();
+    });
+  });
+
+  describe('exportImageWithBase64', () => {
+    let isLoading: BehaviorSubject<boolean>;
+
+    beforeEach(() => {
+      isLoading = new BehaviorSubject<boolean>(true);
+    });
+
+    it('should call saveAs with the base64 string when it has a value', () => {
+      spyOn(fileSaver, 'saveAs');
+      const base64 = 'data:image/png;base64,abc123';
+
+      service.exportImageWithBase64(base64, ExportImageType.png, 'my-file', isLoading);
+
+      expect(fileSaver.saveAs).toHaveBeenCalledWith(base64, 'my-file.png');
+      expect(isLoading.getValue()).toBe(false);
+    });
+
+    it('should not call saveAs and should log error when base64 is null', () => {
+      spyOn(fileSaver, 'saveAs');
+      spyOn(console, 'error');
+
+      service.exportImageWithBase64(null, ExportImageType.jpeg, 'my-file', isLoading);
+
+      expect(fileSaver.saveAs).not.toHaveBeenCalled();
+      expect(console.error).toHaveBeenCalledWith('Base64 string is empty');
+      expect(isLoading.getValue()).toBe(false);
+    });
+
+    it('should set isLoading to false regardless', () => {
+      spyOn(fileSaver, 'saveAs');
+
+      service.exportImageWithBase64('data:image/jpeg;base64,xyz', ExportImageType.jpeg, 'file', isLoading);
+
+      expect(isLoading.getValue()).toBe(false);
+    });
+  });
+
+  describe('collectSameOriginFontCSS', () => {
+    it('should skip cross-origin stylesheets', () => {
+      const crossOriginSheet = { href: 'https://www.gstatic.com/charts/50/css/core/tooltip.css', cssRules: [] };
+      mockDocument.styleSheets = [crossOriginSheet];
+
+      const fontCSS = service.collectSameOriginFontCSS();
+
+      expect(fontCSS).toBe('');
+    });
+
+    it('should silently skip stylesheets that throw on cssRules access', () => {
+      spyOn(console, 'error');
+
+      const badSheet = {
+        href: null,
+        get cssRules(): CSSRuleList {
+          throw new DOMException('Not allowed');
+        },
+      };
+      mockDocument.styleSheets = [badSheet];
+
+      const fontCSS = service.collectSameOriginFontCSS();
+
+      expect(console.error).toHaveBeenCalledWith('Error appending sheet to export: ', null);
+      expect(fontCSS).toBe('');
+    });
+
+    it('should collect @font-face rules from null-href (inline) stylesheets', () => {
+      const fontRule1 = { constructor: { name: 'CSSFontFaceRule' }, cssText: '@font-face { font-family: A; }' };
+      const fontRule2 = { constructor: { name: 'CSSFontFaceRule' }, cssText: '@font-face { font-family: B; }' };
+      const nonFontRule = { constructor: { name: 'CSSStyleRule' }, cssText: 'body { margin: 0; }' };
+      mockDocument.styleSheets = [{ href: null, cssRules: [fontRule1, nonFontRule, fontRule2] }];
+
+      const fontCSS = service.collectSameOriginFontCSS();
+
+      expect(fontCSS).toBe('@font-face { font-family: A; }\n@font-face { font-family: B; }');
+    });
+  });
+});
+