Skip to content

Commit d48b07b

Browse files
authored
Merge pull request #1720 from griidc/release/6.67.0
Release/6.67.0
2 parents fd6ba50 + 287f874 commit d48b07b

File tree

18 files changed

+2369
-1424
lines changed

18 files changed

+2369
-1424
lines changed

.github/dependabot.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
version: 2
2+
updates:
3+
4+
# Maintain dependencies for GitHub Actions
5+
- package-ecosystem: "github-actions"
6+
# Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
7+
directory: "/"
8+
schedule:
9+
interval: "weekly"
10+
day: "sunday"
11+
time: "16:00"
12+
timezone: "America/Chicago"
13+
reviewers:
14+
- "griidc/devs"
15+
16+
# Maintain dependencies for npm
17+
- package-ecosystem: "npm"
18+
directory: "/"
19+
schedule:
20+
interval: "weekly"
21+
day: "sunday"
22+
time: "16:00"
23+
timezone: "America/Chicago"
24+
reviewers:
25+
- "griidc/devs"
26+
27+
# Maintain dependencies for Composer
28+
- package-ecosystem: "composer"
29+
directory: "/"
30+
schedule:
31+
interval: "weekly"
32+
day: "sunday"
33+
time: "16:00"
34+
timezone: "America/Chicago"
35+
reviewers:
36+
- "griidc/devs"

.github/workflows/eslint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616

1717
- name: Setup PHP with PECL extension
1818
uses: shivammathur/setup-php@v2

.github/workflows/phpcs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616

1717
- name: Setup PHP with PECL extension
1818
uses: shivammathur/setup-php@v2

.github/workflows/phpunit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616

1717
- name: Setup PHP with PECL extension
1818
uses: shivammathur/setup-php@v2

assets/js/entry/data-land.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,10 @@ if (metadataDownloadLink) {
123123
event.preventDefault();
124124
window.open(
125125
// eslint-disable-next-line no-undef
126-
Routing.generate('pelagos_app_ui_dataland_formatted_metadata',
127-
{ udi: metadataDownloadLink.dataset.udi }),
126+
Routing.generate(
127+
'pelagos_app_ui_dataland_formatted_metadata',
128+
{ udi: metadataDownloadLink.dataset.udi },
129+
),
128130
'_blank',
129131
);
130132
});

assets/js/vue/FileManager.vue

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,14 @@ const downloadItems = (items) => new Promise((resolve, reject) => {
311311
cancel = c;
312312
}),
313313
};
314-
downloadApi(
315-
// eslint-disable-next-line no-undef
316-
`${Routing.generate('pelagos_api_file_download')}/${response.data.id}`, config,
317-
// eslint-disable-next-line no-shadow
318-
).then((response) => {
314+
// eslint-disable-next-line no-undef
315+
const url = `${Routing.generate('pelagos_api_file_download')}/${response.data.id}`;
316+
// eslint-disable-next-line no-shadow
317+
downloadApi(url, config).then((response) => {
319318
if (myFileManager.$parent.downloadPopup) {
320-
const url = window.URL.createObjectURL(new Blob([response.data]));
319+
const href = window.URL.createObjectURL(new Blob([response.data]));
321320
const link = document.createElement('a');
322-
link.href = url;
321+
link.href = href;
323322
// eslint-disable-next-line no-use-before-define
324323
link.setAttribute('download', getFileNameFromHeader(response.headers));
325324
document.body.appendChild(link);

assets/js/vue/components/information-product/InformationProductCard.vue

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,14 @@ export default {
5353
},
5454
infoProdUrl() {
5555
if (window.getSelection().toString() === '') {
56-
window.open(
57-
// eslint-disable-next-line no-undef
58-
`${Routing.generate('pelagos_app_ui_info_product_landing',
59-
{ id: this.informationProduct.id })}`, '_blank',
60-
);
56+
// eslint-disable-next-line no-undef
57+
const url = Routing.generate('pelagos_app_ui_info_product_landing', { id: this.informationProduct.id });
58+
window.open(url, '_blank');
6159
}
6260
},
6361
openRemoteUrl() {
6462
if (window.getSelection().toString() === '') {
65-
window.open(
66-
// eslint-disable-next-line no-undef
67-
`${this.informationProduct.remoteUri}`, '_blank',
68-
);
63+
window.open(`${this.informationProduct.remoteUri}`, '_blank');
6964
}
7065
},
7166
},

assets/js/vue/components/research-group/PeopleTab.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ export default {
3232
},
3333
methods: {
3434
openUrl(person) {
35-
window.open(
36-
// eslint-disable-next-line no-undef
37-
`${Routing.generate('app_person_land', { person: person.person.id })}`, '_blank',
38-
);
35+
// eslint-disable-next-line no-undef
36+
const url = `${Routing.generate('app_person_land', { person: person.person.id })}`;
37+
window.open(url, '_blank');
3938
},
4039
},
4140
};
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
@tailwind base;
22
@tailwind components;
33
@tailwind utilities;
4+
5+
@import 'components/links.scss';

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"symfony/browser-kit": "6.4.*",
7878
"symfony/css-selector": "6.4.*",
7979
"symfony/debug-bundle": "6.4.*",
80-
"symfony/phpunit-bridge": "6.4.*",
80+
"symfony/phpunit-bridge": "7.2.*",
8181
"symfony/stopwatch": "6.4.*",
8282
"symfony/web-profiler-bundle": "6.4.*",
8383
"vimeo/psalm": "^5.0"

0 commit comments

Comments
 (0)