Skip to content

Commit 6993433

Browse files
author
Jon
committed
Fix bug with public data not being included from request link, and with loading text not disappearing after load. Also fixed some docker-compose launch env variables
1 parent b7ac17b commit 6993433

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

docker-compose.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ web:
33
ports:
44
- "8080:8080"
55
environment:
6-
- VUE_APP_OBSERVATION_PORTAL_API_URL=http://observation-portal-dev.lco.gtn
7-
- VUE_APP_ARCHIVE_API_URL=http://archive-api-dev.lco.gtn
6+
- VUE_APP_OBSERVATION_PORTAL_API_URL=https://observe.lco.global
7+
- VUE_APP_ARCHIVE_API_URL=https://archive-api.lco.global
8+
- VUE_APP_ARCHIVE_CLIENT_URL=https://archive.lco.global
89
- VUE_APP_SIMBAD_SERVICE_URL=https://simbad2k.lco.global
9-
- INTERNAL_OBSERVATION_PORTAL_API_URL=http://observation-portal-dev.lco.gtn
10+
- VUE_APP_THUMBNAILS_SERVICE_URL=https://thumbnails.lco.global
11+
- INTERNAL_OBSERVATION_PORTAL_API_URL=https://observe.lco.global

docker/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ if [ ! "$DISABLE_OVERWRITE_APP_CONFIG_IN_ENTRYPOINT" = "true" ]
1717
then
1818
check_and_set_config "${VUE_APP_OBSERVATION_PORTAL_API_URL}" "observationPortalApiUrl" "${CONFIG_FILE_PATH}"
1919
check_and_set_config "${VUE_APP_ARCHIVE_API_URL}" "archiveApiUrl" "${CONFIG_FILE_PATH}"
20+
check_and_set_config "${VUE_APP_ARCHIVE_CLIENT_URL}" "archiveClientUrl" "${CONFIG_FILE_PATH}"
2021
check_and_set_config "${VUE_APP_SIMBAD_SERVICE_URL}" "simbadServiceUrl" "${CONFIG_FILE_PATH}"
22+
check_and_set_config "${VUE_APP_THUMBNAILS_SERVICE_URL}" "thumbnailServiceUrl" "${CONFIG_FILE_PATH}"
2123
fi
2224

2325
# Copy the internal observation portal url into the nginx configuration file and run the nginx entrypoint.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "observation-portal-frontend",
3-
"version": "1.6.8",
3+
"version": "1.6.10",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",

src/components/ArchiveTable.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default {
3030
return this.$store.state.urls.archiveClient;
3131
},
3232
archiveLink: function() {
33-
return this.archiveClientUrl + '/?request_id=' + this.requestid + '&start=2014-01-01';
33+
return this.archiveClientUrl + '/?request_id=' + this.requestid + '&start=2014-01-01&public=true';
3434
}
3535
},
3636
watch: {
@@ -47,6 +47,7 @@ export default {
4747
alert('More than 1000 results found, please view on archive to view all data');
4848
}
4949
that.$emit('dataLoaded', res.results);
50+
$('.fixed-table-loading').hide();
5051
return res.results;
5152
},
5253
onClickRow: function(row) {

0 commit comments

Comments
 (0)