Skip to content

Commit c38329a

Browse files
andyjmacleanandyjmaclean
authored
Merge pull request #922 from europeana/develop
Merge develop into master
2 parents 9031d12 + bc5068f commit c38329a

File tree

513 files changed

+18596
-14549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

513 files changed

+18596
-14549
lines changed

‎.eslintrc.cjs‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎.github/workflows/_deploy-metis.js.yaml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Build Artifact
6565
uses: actions/setup-node@v4
6666
with:
67-
node-version: '18.18.0'
67+
node-version: '18.19.1'
6868
- run: npm install
6969
- run: npm run build-shared
7070
- run: npm run dist-metis
@@ -88,6 +88,9 @@ jobs:
8888
name: dist
8989
path: ./projects/metis/dist
9090

91+
- run: |
92+
ls -l ./projects/metis/dist/metis
93+
9194
- name: Login to Docker Hub
9295
uses: docker/login-action@v3
9396
with:
@@ -109,20 +112,9 @@ jobs:
109112
PROJECT_VERSION: ${{ secrets.PROJECT_VERSION }}
110113
with:
111114
images: europeana/metis-ui
112-
#tags: |
113-
# ${{ env.TAG_ESCAPED }}
114115
tags: |
115116
type=sha
116117
${{ env.TAG_ESCAPED }}
117-
# type=schedule
118-
# type=ref,event=branch
119-
# type=ref,event=pr
120-
# type=semver,pattern={{version}}
121-
# type=semver,pattern={{major}}.{{minor}}
122-
# type=semver,pattern={{major}}
123-
# ${{ env.PROJECT_VERSION }}
124-
# type=raw,value=latest,enable={{is_default_branch}}
125-
126118
- name: Build and push
127119
uses: docker/build-push-action@v5
128120
with:

‎.github/workflows/_deploy-sandbox.js.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Build Artifact
6565
uses: actions/setup-node@v4
6666
with:
67-
node-version: '18.18.0'
67+
node-version: '18.19.1'
6868
- run: npm install
6969
- run: npm run build-shared
7070
- run: npm run dist-sandbox

‎.github/workflows/env-file-generation-sandbox.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,32 @@ jobs:
1515
touch env_file
1616
case ${{ github.event.inputs.deploy_environment }} in
1717
'production')
18+
echo APP_KEYCLOAK_CLIENT_ID=${{ secrets.SANDBOX_PRODUCTION_KEYCLOAK_CLIENT_ID }} >> env_file
1819
echo APP_API_HOST=${{ secrets.SANDBOX_PRODUCTION_API_HOST }} >> env_file
20+
echo APP_API_DEREFERENCE=${{ secrets.SANDBOX_PRODUCTION_API_DEREFERENCE }} >> env_file
1921
echo APP_PREVIEW_URL_PREFIX=${{ secrets.SANDBOX_PRODUCTION_PREVIEW_URL_PREFIX }} >> env_file
2022
echo APP_MAINTENANCE_SCHEDULE_ENV_KEY=${{ secrets.SANDBOX_PRODUCTION_MAINTENANCE_SCHEDULE_ENV_KEY }} >> env_file
2123
echo APP_MATOMO_SITE_ID=${{ secrets.SANDBOX_PRODUCTION_MATOMO_SITE_ID }} >> env_file
2224
;;
2325
'acceptance')
26+
echo APP_KEYCLOAK_CLIENT_ID=${{ secrets.SANDBOX_ACCEPTANCE_KEYCLOAK_CLIENT_ID }} >> env_file
2427
echo APP_API_HOST=${{ secrets.SANDBOX_ACCEPTANCE_API_HOST }} >> env_file
28+
echo APP_API_DEREFERENCE=${{ secrets.SANDBOX_ACCEPTANCE_API_DEREFERENCE }} >> env_file
2529
echo APP_PREVIEW_URL_PREFIX=${{ secrets.SANDBOX_ACCEPTANCE_PREVIEW_URL_PREFIX }} >> env_file
2630
echo APP_MAINTENANCE_SCHEDULE_ENV_KEY=${{ secrets.SANDBOX_ACCEPTANCE_MAINTENANCE_SCHEDULE_ENV_KEY }} >> env_file
2731
echo APP_MATOMO_SITE_ID=${{ secrets.SANDBOX_ACCEPTANCE_MATOMO_SITE_ID }} >> env_file
2832
;;
2933
'test')
3034
echo APP_API_HOST=${{ secrets.SANDBOX_TEST_API_HOST }} >> env_file
35+
echo APP_API_DEREFERENCE=${{ secrets.SANDBOX_TEST_API_DEREFERENCE }} >> env_file
36+
echo APP_KEYCLOAK_CLIENT_ID=${{ secrets.SANDBOX_TEST_KEYCLOAK_CLIENT_ID }} >> env_file
3137
echo APP_PREVIEW_URL_PREFIX=${{ secrets.SANDBOX_TEST_PREVIEW_URL_PREFIX }} >> env_file
3238
echo APP_MAINTENANCE_SCHEDULE_ENV_KEY=${{ secrets.SANDBOX_TEST_MAINTENANCE_SCHEDULE_ENV_KEY }} >> env_file
3339
echo APP_MATOMO_SITE_ID=${{ secrets.SANDBOX_TEST_MATOMO_SITE_ID }} >> env_file
3440
;;
3541
esac
3642
43+
echo APP_API_HOST_AUTH=${{ secrets.SANDBOX_API_HOST_AUTH }} >> env_file
3744
echo APP_DOCUMENTATION_URL=${{ secrets.SANDBOX_DOCUMENTATION_URL }} >> env_file
3845
echo APP_FEEDBACK_URL=${{ secrets.SANDBOX_FEEDBACK_URL }} >> env_file
3946
echo APP_PRIVACY_POLICY_URL=${{ secrets.SANDBOX_PRIVACY_POLICY_URL }} >> env_file

‎.github/workflows/env-file-generation.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ jobs:
1515
touch env_file
1616
case ${{ github.event.inputs.deploy_environment }} in
1717
'production')
18-
1918
echo APP_API_HOST_CORE=${{ secrets.METIS_PRODUCTION_API_HOST_CORE }} >> env_file
20-
echo APP_API_HOST_AUTH=${{ secrets.METIS_PRODUCTION_API_HOST_AUTH }} >> env_file
19+
echo APP_KEYCLOAK_CLIENT_ID=${{ secrets.METIS_PRODUCTION_KEYCLOAK_CLIENT_ID }} >> env_file
2120
2221
echo APP_VIEW_COLLECTIONS=${{ secrets.METIS_PRODUCTION_VIEW_COLLECTIONS }} >> env_file
2322
echo APP_VIEW_PREVIEW=${{ secrets.METIS_PRODUCTION_VIEW_PREVIEW }} >> env_file
@@ -26,7 +25,7 @@ jobs:
2625
;;
2726
'acceptance')
2827
echo APP_API_HOST_CORE=${{ secrets.METIS_ACCEPTANCE_API_HOST_CORE }} >> env_file
29-
echo APP_API_HOST_AUTH=${{ secrets.METIS_ACCEPTANCE_API_HOST_AUTH }} >> env_file
28+
echo APP_KEYCLOAK_CLIENT_ID=${{ secrets.METIS_ACCEPTANCE_KEYCLOAK_CLIENT_ID }} >> env_file
3029
3130
echo APP_VIEW_COLLECTIONS=${{ secrets.METIS_ACCEPTANCE_VIEW_COLLECTIONS }} >> env_file
3231
echo APP_VIEW_PREVIEW=${{ secrets.METIS_ACCEPTANCE_VIEW_PREVIEW }} >> env_file
@@ -35,14 +34,15 @@ jobs:
3534
;;
3635
'test')
3736
echo APP_API_HOST_CORE=${{ secrets.METIS_TEST_API_HOST_CORE }} >> env_file
38-
echo APP_API_HOST_AUTH=${{ secrets.METIS_TEST_API_HOST_AUTH }} >> env_file
37+
echo APP_KEYCLOAK_CLIENT_ID=${{ secrets.METIS_TEST_KEYCLOAK_CLIENT_ID }} >> env_file
3938
4039
echo APP_VIEW_COLLECTIONS=${{ secrets.METIS_TEST_VIEW_COLLECTIONS }} >> env_file
4140
echo APP_VIEW_PREVIEW=${{ secrets.METIS_TEST_VIEW_PREVIEW }} >> env_file
4241
4342
echo APP_MAINTENANCE_SCHEDULE_ENV_KEY=${{ secrets.METIS_TEST_MAINTENANCE_SCHEDULE_ENV_KEY }} >> env_file
4443
;;
4544
esac
45+
echo APP_API_HOST_AUTH=${{ secrets.METIS_API_HOST_AUTH }} >> env_file
4646
echo APP_MAINTENANCE_SCHEDULE_ENV_URL=${{ secrets.MAINTENANCE_SCHEDULE_URL }} >> env_file
4747
cat env_file
4848
- uses: actions/upload-artifact@master

‎.github/workflows/run-tests-e2e-sandbox.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
ref: ${{ github.event.inputs.tag_name }}
1212
- uses: actions/setup-node@v4
1313
with:
14-
node-version: '18.18.0'
14+
node-version: '18.19.1'
1515
- run: npm install
1616
- run: npm run build-shared
1717
- name: Run Cypress Tests
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: actions/setup-node@v4
3636
with:
37-
node-version: '18.18.0'
37+
node-version: '18.19.1'
3838

3939
- run: npm install
4040
- run: npm run build-shared

‎.github/workflows/run-tests-e2e.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
ref: ${{ github.event.inputs.tag_name }}
1313
- uses: actions/setup-node@v4
1414
with:
15-
node-version: '18.18.0'
15+
node-version: '18.19.1'
1616
- run: npm install
1717
- run: npm run build-shared
1818
- name: Run Cypress Tests
@@ -36,7 +36,7 @@ jobs:
3636

3737
- uses: actions/setup-node@v4
3838
with:
39-
node-version: '18.18.0'
39+
node-version: '18.19.1'
4040

4141
- run: npm install
4242
- run: npm run build-shared

‎.github/workflows/run-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
ref: ${{ github.event.inputs.tag_name || github.event.pull_request.head.ref }}
1111
- uses: actions/setup-node@v4
1212
with:
13-
node-version: '18.18.0'
13+
node-version: '18.19.1'
1414
- run: npm install
1515
- run: npm run build-shared
1616
- run: npm run test:dev

‎angular.json‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@
1515
"sourceRoot": "projects/metis/src",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular-devkit/build-angular:application",
1919
"options": {
20-
"outputPath": "projects/metis/dist/metis",
20+
"outputPath": {
21+
"base": "projects/metis/dist/metis"
22+
},
2123
"index": "projects/metis/src/index.html",
22-
"main": "projects/metis/src/main.ts",
2324
"tsConfig": "projects/metis/src/tsconfig.app.json",
24-
"polyfills": "projects/metis/src/polyfills.ts",
25+
"polyfills": ["projects/metis/src/polyfills.ts"],
2526
"progress": false,
26-
"allowedCommonJsDependencies": ["@ctrl/ngx-codemirror", "codemirror", "vkbeautify"],
27+
"allowedCommonJsDependencies": ["@ctrl/ngx-codemirror", "codemirror", "xml-formatter"],
2728
"stylePreprocessorOptions": {
2829
"includePaths": ["./"]
2930
},
3031
"assets": ["projects/metis/src/assets", "projects/metis/src/favicon.ico"],
3132
"styles": ["projects/metis/src/styles.scss"],
3233
"scripts": [],
33-
"vendorChunk": true,
3434
"extractLicenses": false,
35-
"buildOptimizer": false,
3635
"sourceMap": true,
3736
"optimization": false,
38-
"namedChunks": true
37+
"namedChunks": true,
38+
"browser": "projects/metis/src/main.ts"
3939
},
4040
"configurations": {
4141
"production": {
@@ -45,7 +45,6 @@
4545
"maximumWarning": "100kb"
4646
}
4747
],
48-
"buildOptimizer": true,
4948
"extractLicenses": true,
5049
"namedChunks": false,
5150
"optimization": {
@@ -122,13 +121,14 @@
122121
},
123122
"architect": {
124123
"build": {
125-
"builder": "@angular-devkit/build-angular:browser",
124+
"builder": "@angular-devkit/build-angular:application",
126125
"options": {
127-
"outputPath": "projects/sandbox/dist/sandbox",
126+
"outputPath": {
127+
"base": "projects/sandbox/dist/sandbox"
128+
},
128129
"index": "projects/sandbox/src/index.html",
129-
"main": "projects/sandbox/src/main.ts",
130130
"tsConfig": "projects/sandbox/src/tsconfig.app.json",
131-
"polyfills": "projects/sandbox/src/polyfills.ts",
131+
"polyfills": ["projects/sandbox/src/polyfills.ts"],
132132
"progress": false,
133133
"assets": ["projects/sandbox/src/favicon.ico", "projects/sandbox/src/assets"],
134134
"styles": ["projects/sandbox/src/styles.scss"],
@@ -157,12 +157,11 @@
157157
"includePaths": ["./"]
158158
},
159159
"scripts": [],
160-
"vendorChunk": true,
161160
"extractLicenses": false,
162-
"buildOptimizer": false,
163161
"sourceMap": true,
164162
"optimization": false,
165-
"namedChunks": true
163+
"namedChunks": true,
164+
"browser": "projects/sandbox/src/main.ts"
166165
},
167166
"configurations": {
168167
"production": {
@@ -177,7 +176,6 @@
177176
"sourceMap": false,
178177
"namedChunks": false,
179178
"extractLicenses": true,
180-
"buildOptimizer": true,
181179
"budgets": [
182180
{
183181
"type": "initial",

0 commit comments

Comments
 (0)