Skip to content

Commit 815fc52

Browse files
committed
Merge branch 'develop' into release/6.77.0
2 parents 8854654 + 5460b89 commit 815fc52

Some content is hidden

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

47 files changed

+1014
-823
lines changed

.env

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ ISSUE_TRACKING_BASE_URL='https://griidc.atlassian.net/browse'
5151
DATABASE_NAME=pelagos
5252
DATA_STORE_DIRECTORY=/path/to/store/directory
5353
DOWNLOAD_PATH="path/to/zip"
54-
INGEST_API_URL="https://ingest-server:port/api-name"
5554
GCMD_VERSION="16.9"
5655
GCMD_VERSION_YEAR="2023"
5756
ANZSRC_VERSION="2020"
@@ -117,3 +116,6 @@ WKHTMLTOIMAGE_PATH=/usr/local/bin/wkhtmltoimage
117116
ESRI_API_KEY='yourkeyhere'
118117
#WORLD_VIEW_CODE='unitedStatesOfAmerica'
119118
###< ESRI Leaflet ###
119+
120+
### Minimum reasonable number of datasets ###
121+
EXPECTED_DATASET_COUNT_MIN=0

.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@v4
15+
- uses: actions/checkout@v5
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@v4
15+
- uses: actions/checkout@v5
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@v4
15+
- uses: actions/checkout@v5
1616

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

assets/js/entry/person-profile.js

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

assets/js/vue/components/person-profile/AvatarCard.vue

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

assets/js/vue/components/person-profile/UserDetailsCard.vue

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

assets/js/vue/components/search/SearchForm.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<button type="reset" id="search-clear" class="btn btn-primary clear-button">Clear</button>
7979
<div class="mt-3 pt-3 empty-button-div"></div>
8080
<button type="button" id="map-search" class="btn btn-primary map-search-button"
81-
@click="dataDiscovery()">Map Search
81+
@click="mapSearch()">Map Search
8282
</button>
8383
</div>
8484
</div>
@@ -230,9 +230,9 @@ export default {
230230
this.route = window.location.hash;
231231
this.submitted = false;
232232
},
233-
dataDiscovery() {
233+
mapSearch() {
234234
// eslint-disable-next-line no-undef
235-
window.location.href = Routing.generate('pelagos_app_ui_datadiscovery_default');
235+
window.location.href = Routing.generate('app_map_search');
236236
},
237237
},
238238
mounted() {

assets/js/vue/components/stats/RepositorySummary.vue

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
<div id="program-resources" class="text-center">
33
<div class="summaryLabel text-center">Repository Summary</div>
44
<div class="row">
5-
<div class="col-sm">
5+
<div class="col-sm stats-icons">
66
<img src="~images/icon-datasets.png" class="inline-block">
77
<div class="count">{{ (datasets == 0) ? '-' : datasets }}</div>
88
<div class="label">Datasets</div>
99
</div>
10-
<div class="col-sm">
10+
<div class="col-sm stats-icons">
1111
<img src="~images/icon-filesize.png" class="inline-block">
1212
<div class="count">{{ (totalsize == 0) ? '-' : totalsize }}</div>
1313
<div class="label"> {{sizeUnit}} Of Data</div>
1414
</div>
15-
<div class="col-sm">
15+
<div class="col-sm stats-icons">
1616
<img src="~images/icon-downloads.png" class="inline-block">
1717
<div class="count">{{ (totalDownloads == 0) ? '-' : totalDownloads }}</div>
1818
<div class="label">Total Downloads</div>
1919
</div>
20-
<div class="col-sm">
20+
<div class="col-sm stats-icons">
2121
<img src="~images/icon-projects.png" class="inline-block">
2222
<div class="count">{{ (researchGroups == 0) ? '-' : researchGroups }}</div>
2323
<div class="label">{{ getRGLabel() }}</div>
2424
</div>
25-
<div class="col-sm">
25+
<div class="col-sm stats-icons">
2626
<img src="~images/icon-researchers.png" class="inline-block">
2727
<div class="count">{{ (people == 0) ? '-' : people }}</div>
2828
<div class="label">People</div>
@@ -93,4 +93,11 @@ export default {
9393
font-size: 18px;
9494
text-transform: uppercase;
9595
}
96+
97+
/* Center icons above counts/labels */
98+
.stats-icons {
99+
display: flex;
100+
flex-direction: column;
101+
align-items: center;
102+
}
96103
</style>

assets/js/vue/pages/PersonProfile.vue

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

0 commit comments

Comments
 (0)