Skip to content

Commit 9e23917

Browse files
committed
Merge branch 'refs/heads/main' into DURACOM-248-ANGULAR-17
# Conflicts: # server.ts # src/config/universal-config.interface.ts # src/environments/environment.production.ts # src/environments/environment.ts
2 parents 2bbf584 + 39d2a75 commit 9e23917

9 files changed

Lines changed: 29 additions & 19 deletions

File tree

.github/workflows/build.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
id: yarn-cache-dir-path
7575
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
7676
- name: Cache Yarn dependencies
77-
uses: actions/cache@v3
77+
uses: actions/cache@v4
7878
with:
7979
# Cache entire Yarn cache directory (see previous step)
8080
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -101,10 +101,10 @@ jobs:
101101
# so that it can be shared with the 'codecov' job (see below)
102102
# NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
103103
- name: Upload code coverage report to Artifact
104-
uses: actions/upload-artifact@v3
104+
uses: actions/upload-artifact@v4
105105
if: matrix.node-version == '18.x'
106106
with:
107-
name: dspace-angular coverage report
107+
name: coverage-report-${{ matrix.node-version }}
108108
path: 'coverage/dspace-angular/lcov.info'
109109
retention-days: 14
110110

@@ -135,19 +135,19 @@ jobs:
135135
# Cypress always creates a video of all e2e tests (whether they succeeded or failed)
136136
# Save those in an Artifact
137137
- name: Upload e2e test videos to Artifacts
138-
uses: actions/upload-artifact@v3
138+
uses: actions/upload-artifact@v4
139139
if: always()
140140
with:
141-
name: e2e-test-videos
141+
name: e2e-test-videos-${{ matrix.node-version }}
142142
path: cypress/videos
143143

144144
# If e2e tests fail, Cypress creates a screenshot of what happened
145145
# Save those in an Artifact
146146
- name: Upload e2e test failure screenshots to Artifacts
147-
uses: actions/upload-artifact@v3
147+
uses: actions/upload-artifact@v4
148148
if: failure()
149149
with:
150-
name: e2e-test-screenshots
150+
name: e2e-test-screenshots-${{ matrix.node-version }}
151151
path: cypress/screenshots
152152

153153
- name: Stop app (in case it stays up after e2e tests)
@@ -197,7 +197,7 @@ jobs:
197197

198198
# Download artifacts from previous 'tests' job
199199
- name: Download coverage artifacts
200-
uses: actions/download-artifact@v3
200+
uses: actions/download-artifact@v4
201201

202202
# Now attempt upload to Codecov using its action.
203203
# NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
@@ -207,11 +207,12 @@ jobs:
207207
- name: Upload coverage to Codecov.io
208208
uses: Wandalen/wretry.action@v1.3.0
209209
with:
210-
action: codecov/codecov-action@v3
210+
action: codecov/codecov-action@v4
211211
# Ensure codecov-action throws an error when it fails to upload
212212
# This allows us to auto-restart the action if an error is thrown
213213
with: |
214214
fail_ci_if_error: true
215+
token: ${{ secrets.CODECOV_TOKEN }}
215216
# Try re-running action 5 times max
216217
attempt_limit: 5
217218
# Run again in 30 seconds

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
2929
uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
3030
with:
31-
build_id: dspace-angular
31+
build_id: dspace-angular-dev
3232
image_name: dspace/dspace-angular
3333
dockerfile_path: ./Dockerfile
3434
secrets:

.github/workflows/issue_opened.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Only add to project board if issue is flagged as "needs triage" or has no labels
1717
# NOTE: By default we flag new issues as "needs triage" in our issue template
1818
if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
19-
uses: actions/add-to-project@v0.5.0
19+
uses: actions/add-to-project@v1.0.0
2020
# Note, the authentication token below is an ORG level Secret.
2121
# It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
2222
# See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token

.github/workflows/pull_request_opened.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
# Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
2222
# See https://github.com/toshimaru/auto-author-assign
2323
- name: Assign PR to creator
24-
uses: toshimaru/auto-author-assign@v2.0.1
24+
uses: toshimaru/auto-author-assign@v2.1.0

config/config.example.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ ui:
1717
# Trust X-FORWARDED-* headers from proxies (default = true)
1818
useProxies: true
1919

20+
universal:
21+
# Whether to inline "critical" styles into the server-side rendered HTML.
22+
# Determining which styles are critical is a relatively expensive operation;
23+
# this option can be disabled to boost server performance at the expense of
24+
# loading smoothness.
25+
inlineCriticalCss: true
26+
2027
# The REST API server settings
2128
# NOTE: these settings define which (publicly available) REST API to use. They are usually
2229
# 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.

src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ form {
33
&:before {
44
pointer-events: none; // prevent the icon from ‘catching‘ the click
55
position: absolute;
6-
font-weight: 900;
7-
font-family: "Font Awesome 5 Free";
6+
font: var(--fa-font-solid);
87
content: "\f0d7";
9-
top: 7px;
8+
top: 10px;
109
right: 0;
1110
height: 20px;
1211
width: 20px;

src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ form {
22
&:before {
33
pointer-events: none; // prevent the icon from ‘catching‘ the click
44
position: absolute;
5-
font-weight: 900;
6-
font-family: "Font Awesome 5 Free";
5+
font: var(--fa-font-solid);
76
content: "\f0d7";
8-
top: 7px;
7+
top: 10px;
98
right: 0;
109
height: 20px;
1110
width: 20px;

src/styles/_bootstrap_variables.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ $navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox
6262

6363
$ds-home-news-link-color: $link-color !default;
6464
$ds-home-news-link-hover-color: darken($ds-home-news-link-color, 15%) !default;
65-
$ds-breadcrumb-link-color: $link-color !default;
65+
$ds-breadcrumb-link-color: #003333 !default;
66+
$ds-breadcrumb-link-active-color: #040D11 !default;
6667

6768
$ds-header-navbar-border-top-color: #fff !default;
6869
$ds-header-navbar-border-bottom-color: #ced4da !default;

src/themes/dspace/styles/_theme_sass_variable_overrides.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,6 @@ $navbar-dark-color: #fff;
8585

8686
$ds-home-news-link-color: #92c642;
8787
$ds-header-navbar-border-bottom-color: #92c642;
88+
89+
$ds-breadcrumb-link-color: #154E66 !default;
90+
$ds-breadcrumb-link-active-color: #040D11 !default;

0 commit comments

Comments
 (0)