Merge branch 'ufal/cherrypick-updating-config-files' of github.com:dataquest-dev/dspace-angular into ufal/cherrypick-updating-config-files

Author: jr-rk

.github/pull_request_template.md

@@ -1,15 +1,16 @@
-| Phases            | MP | MM  |  MB  | MR |   JM | Total  |
-|-----------------|----:|----:|----:|-----:|-----:|-------:|
-| ETA                  |  0  |  0  |    0 |     0 |      0 |        0 |
-| Developing      |  0  |  0  |    0 |    0 |      0 |         0 |
-| Review             |  0  |  0  |    0 |    0 |      0 |         0 |
-| Total                |   -  |   -  |   -   |  -    |   -    |         0 |
-| ETA est.             |      |      |       |       |         |         0 |
-| ETA cust.           |   -  |   -  |   -  |   -   |   -     |        0 |
 ## Problem description
-### Reported issues
-### Not-reported issues
+
 ## Analysis
 (Write here, if there is needed describe some specific problem. Erase it, when it is not needed.)
 ## Problems
 (Write here, if some unexpected problems occur during solving issues. Erase it, when it is not needed.) 
+
+### Sync verification
+If en.json5 or cs.json5 translation files were updated:
+- [ ] Run `yarn run sync-i18n -t src/assets/i18n/cs.json5 -i` to synchronize messages, and changes are included in this PR.
+
+### Manual Testing (if applicable)
+- [ ] Added to [testing scenarios](https://github.com/dataquest-dev/dspace-customers/issues/55)
+
+### Copilot review
+- [ ] Requested review from Copilot

.github/workflows/docker.yml

@@ -28,9 +28,12 @@ jobs:
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
     uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev
     with:
-      build_id: dspace-angular
+      build_id: dspace-angular-dev
       image_name: dataquest/dspace-angular
       dockerfile_path: ./Dockerfile
+      tags_flavor: suffix=-dev
+      # As this is a "dev" image, its tags are all suffixed with "-dev". Otherwise, it uses the same
+      # tagging logic as the primary 'dspace/dspace-angular' image above.
       run_python_version_script: true
       python_version_script_dest: src/static-files/VERSION_D.html
     secrets:
@@ -42,16 +45,13 @@ jobs:
   #############################################################
   dspace-angular-dist:
     # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace-angular'
-    if: github.repository == 'dataquest-dev/dspace-angular' && false # not used for now
+    if: github.repository == 'dataquest-dev/dspace-angular'
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
     uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev
     with:
-      build_id: dspace-angular-dist
-      image_name: dspace/dspace-angular
+      build_id: dspace-angular
+      image_name: dataquest/dspace-angular
       dockerfile_path: ./Dockerfile.dist
-      # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
-      # tagging logic as the primary 'dspace/dspace-angular' image above.
-      tags_flavor: suffix=-dist
       run_python_version_script: true
       python_version_script_dest: src/static-files/VERSION_D.html
     secrets:

.github/workflows/trigger-ui-tests.yml

@@ -24,7 +24,7 @@ jobs:
 
           git fetch --prune origin
           BRANCHES=$(git ls-remote --heads origin | awk -F'/' '{print $3"/"$4}' | grep '^customer/')
-          SKIP_BRANCHES=("customer/sav")
+          SKIP_BRANCHES=("customer/sav" "customer/uk")
           
           for branch in $(echo "$BRANCHES" | sed -e 's/[\[\]"]//g' -e 's/,/\n/g'); do
             if [[ " ${SKIP_BRANCHES[@]} " =~ " ${branch} " ]]; then

Dockerfile.dist

@@ -15,6 +15,9 @@ COPY package.json yarn.lock ./
 RUN yarn install --network-timeout 300000
 
 ADD . /app/
+
+# Set memory limit for build process - Angular builds require more memory
+ENV NODE_OPTIONS="--max_old_space_size=4096"
 RUN yarn build:prod
 
 FROM node:18-alpine

cypress/e2e/homepage-statistics.cy.ts

@@ -1,36 +1,34 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
-import { testA11y } from 'cypress/support/utils';
-import '../support/commands';
+// Commented out because exposing of the config.json was changed and the `generateViewEvent` cannot be used.
 
-describe('Site Statistics Page', () => {
-    // CLARIN
-    // NOTE: statistics were removed from the navbar
-    // it('should load if you click on "Statistics" from homepage', () => {
-    //     cy.visit('/');
-    //     cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
-    //     cy.location('pathname').should('eq', '/statistics');
-    // });
-
-    it('should pass accessibility tests', () => {
-        // generate 2 view events on an Item's page
-        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
-        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
-
-        cy.visit('/statistics');
-
-        // <ds-site-statistics-page> tag must be visable
-        cy.get('ds-site-statistics-page').should('be.visible');
-
-        // Verify / wait until "Total Visits" table's *last* label is non-empty
-        // (This table loads these labels asynchronously, so we want to wait for them before analyzing page)
-        cy.get('table[data-test="TotalVisits"] th[data-test="statistics-label"]').last().contains(REGEX_MATCH_NON_EMPTY_TEXT);
-        // Wait an extra 500ms, just so all entries in Total Visits have loaded.
-        cy.wait(500);
-
-        // Analyze <ds-site-statistics-page> for accessibility issues
-        // CLARIN
-        // NOTE: accessibility tests are failing because the UI has been changed
-        // testA11y('ds-site-statistics-page');
-        // CLARIN
-    });
-});
+// describe('Site Statistics Page', () => {
+//   // CLARIN
+//   // NOTE: statistics were removed from the navbar
+//   // it('should load if you click on "Statistics" from homepage', () => {
+//   //     cy.visit('/');
+//   //     cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
+//   //     cy.location('pathname').should('eq', '/statistics');
+//   // });
+//
+//   it('should pass accessibility tests', () => {
+//     // generate 2 view events on an Item's page
+//     cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
+//     cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
+//
+//     cy.visit('/statistics');
+//
+//     // <ds-site-statistics-page> tag must be visable
+//     cy.get('ds-site-statistics-page').should('be.visible');
+//
+//     // Verify / wait until "Total Visits" table's *last* label is non-empty
+//     // (This table loads these labels asynchronously, so we want to wait for them before analyzing page)
+//     cy.get('table[data-test="TotalVisits"] th[data-test="statistics-label"]').last().contains(REGEX_MATCH_NON_EMPTY_TEXT);
+//     // Wait an extra 500ms, just so all entries in Total Visits have loaded.
+//     cy.wait(500);
+//
+//     // Analyze <ds-site-statistics-page> for accessibility issues
+//     // CLARIN
+//     // NOTE: accessibility tests are failing because the UI has been changed
+//     // testA11y('ds-site-statistics-page');
+//     // CLARIN
+//   });
+// });

docker/docker-compose-rest.yml

@@ -87,12 +87,12 @@ services:
     - assetstore:/dspace/assetstore
     - handle_server:/dspace/handle-server
     - ./local.cfg:/dspace/config/local.cfg
-    # Mount a tmpfs over the requests folder to protect it
-    - type: tmpfs
-      target: /dspace/var/oai/requests
-      tmpfs:
-        size: 67108864   # 64 MB, adjust as needed
-        mode: 1777       # writable, sticky bit
+    # Mount a tmpfs over the requests folder to protect it - associated with https://github.com/dataquest-dev/DSpace/pull/1095
+#    - type: tmpfs
+#      target: /dspace/var/oai/requests
+#      tmpfs:
+#        size: 67108864   # 64 MB, adjust as needed
+#        mode: 1777       # writable, sticky bit
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables

docker/docker-compose.yml

@@ -36,7 +36,7 @@ services:
       dockerfile: Dockerfile
     networks:
       dspacenet:
-    entrypoint: ${FE_CMD:-/bin/sh -c "pm2-runtime start docker/dspace-ui.json > /dev/null 2> /dev/null"}
+    entrypoint: ${FE_CMD:-/bin/sh -c "pm2-runtime start dspace-ui.json > /dev/null 2> /dev/null"}
     ports:
     - published: 400${INSTANCE}
       target: 4000

src/app/core/metadata/metadata.service.ts

@@ -128,8 +128,8 @@ export class MetadataService {
       const titlePrefix = this.translate.get('repository.title.prefix');
       const title = this.translate.get(routeInfo.data.value.title, routeInfo.data.value);
       combineLatest([titlePrefix, title]).pipe(take(1)).subscribe(([translatedTitlePrefix, translatedTitle]: [string, string]) => {
-        this.addMetaTag('title', translatedTitlePrefix + translatedTitle);
-        this.title.setTitle(translatedTitlePrefix + translatedTitle);
+        this.addMetaTag('title', translatedTitlePrefix + ' ' + translatedTitle);
+        this.title.setTitle(translatedTitlePrefix + ' ' + translatedTitle);
       });
     }
     if (routeInfo.data.value.description) {