diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml deleted file mode 100644 index e7e2a705..00000000 --- a/.github/workflows/build-test-release.yml +++ /dev/null @@ -1,54 +0,0 @@ -# Create builds for testing releases -name: Build a test release - -on: - push: - # Publish `RELEASE-*` as Docker `latest` test image. - branches: - - 'RELEASE-**' - tags: - - 'RC_**' - -env: - IMAGE_NAME: auscope-portal-ui-test-release - -jobs: - # Run tests. - # See also https://docs.docker.com/docker-hub/builds/automated-testing/ - test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Run tests - run: docker build . --file docker/Dockerfile --build-arg BUILDTYPE=build-test - - # Push image to GitHub Packages. - # See also https://docs.docker.com/docker-hub/builds/ - push: - # Ensure test job passes before pushing image. - needs: test - - runs-on: ubuntu-latest - if: github.event_name == 'push' - - steps: - - uses: actions/checkout@v2 - - - name: Build image - run: docker build . --file docker/Dockerfile --tag $IMAGE_NAME --build-arg BUILDTYPE=build-test - - - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=ghcr.io/${{ github.repository }}/$IMAGE_NAME - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - VERSION=latest - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $IMAGE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION diff --git a/angular.json b/angular.json index 4d30e421..bd25e83a 100644 --- a/angular.json +++ b/angular.json @@ -103,20 +103,6 @@ } ] }, - "au2": { - "budgets": [ - { - "type": "anyComponentStyle", - "maximumWarning": "50kb" - } - ], - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.au2.ts" - } - ] - }, "development": { "buildOptimizer": false, "optimization": false, @@ -141,9 +127,6 @@ "production": { "browserTarget": "project:build:production" }, - "au2": { - "browserTarget": "project:build:au2" - }, "development": { "browserTarget": "project:build:development" } diff --git a/package.json b/package.json index 83c909c7..4727952f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "start": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng serve", "build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build", "build-prod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration=production", - "build-test": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration=au2", "build-dev": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration=audev", "test": "ng test", "lint": "ng lint", diff --git a/src/environments/environment.au2.ts b/src/environments/environment.au2.ts deleted file mode 100644 index 527f1ca5..00000000 --- a/src/environments/environment.au2.ts +++ /dev/null @@ -1,43 +0,0 @@ -// This file contains runtime environment settings for the au2 (http://au-portal-2.it.csiro.au) profile. -// The build system defaults to the local profile which uses `environment.ts`, but you can switch between -// profiles using the --configuration argument. - -// To us this au2 profile run `ng build --configuration=au2`. - -// Available build profiles and their environment files can be found in the angular configuration (angular.json). -// Note: environment files replace the default, they don't override. So, any change in this file -// will almost always need an equivalent change in all the other environment files. - - -export const environment = { - production: true, - getCSWRecordEndP: 'getKnownLayers.do', - portalBaseUrl: 'https://au-portal-2.it.csiro.au/api/', - portalProxyUrl: '/api/', - authBaseUrl: 'https://au-portal-2.it.csiro.au/api/', - hostUrl: 'https://au-portal-2.it.csiro.au/portal', - nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/', - googleAnalyticsKey: null, - bingMapsKey: '', - baseMapLayers: [ - { value: 'World_Imagery', viewValue: 'ESRI World Imagery', tooltip: 'ESRI World Imagery', layerType: 'ESRI' }, - { value: 'NatGeo_World_Map', viewValue: 'ESRI National Geographic Map', tooltip: 'ESRI National Geographic Map', layerType: 'ESRI' }, - { value: 'World_Street_Map', viewValue: 'ESRI Street Map', tooltip: 'ESRI Street Map', layerType: 'ESRI' }, - { value: 'OSM', viewValue: 'OpenStreetMap', - tooltip: 'OpenStreetMap (OSM) is a collaborative project to create a free editable\n' + - 'map of the world.\nhttp://www.openstreetmap.org', layerType: 'OSM' }, - { value: 'Road', viewValue: 'Bing Roads', tooltip: 'Bing Maps Road', layerType: 'Bing' }, - { value: 'Aerial', viewValue: 'Bing Aerial', tooltip: 'Bing Maps Aerial', layerType: 'Bing' }, - { value: 'AerialWithLabels', viewValue: 'Bing Aerial With Labels', tooltip: 'Bing Maps Aerial with Labels', layerType: 'Bing' }, - { value: 'Natural_Earth_II', viewValue: 'Natural Earth II', - tooltip: 'Natural Earth II, darkened for contrast.\nhttp://www.naturalearthdata.com/', layerType: 'NEII' }, - ], - grace: { - hostUrl: 'https://insargrace.geoanalytics.csiro.au:/grace/grace' - }, - urlNeedProxy: ['http://ogc-jdlc.curtin.edu.au:80', - 'https://geossdi.dmp.wa.gov.au', - 'https://geology.data.vic.gov.au', - 'http://geology.data.vic.gov.au', - 'http://geoserver.octopusdata.org'] -}; diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 2c253c91..d34443c2 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -12,13 +12,13 @@ export const environment = { production: false, getCSWRecordEndP: 'getKnownLayers.do', - portalBaseUrl: 'https://au-portal-dev.it.csiro.au/api/', + portalBaseUrl: 'https://auportal-dev.geoanalytics.group/api/', portalProxyUrl: '/api/', - authBaseUrl: 'https://au-portal-dev.it.csiro.au/api/', - hostUrl: 'https://au-portal-dev.it.csiro.au', + authBaseUrl: 'https://auportal-dev.geoanalytics.group/api/', + hostUrl: 'https://auportal-dev.geoanalytics.group', nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/', googleAnalyticsKey: null, - bingMapsKey: '', + bingMapsKey: 'Bing_Maps_Key', baseMapLayers: [ { value: 'World_Imagery', viewValue: 'ESRI World Imagery', tooltip: 'ESRI World Imagery', layerType: 'ESRI' }, { value: 'NatGeo_World_Map', viewValue: 'ESRI National Geographic Map', tooltip: 'ESRI National Geographic Map', layerType: 'ESRI' }, diff --git a/src/environments/environment.prod-https.ts b/src/environments/environment.prod-https.ts deleted file mode 100644 index a0dc1ac2..00000000 --- a/src/environments/environment.prod-https.ts +++ /dev/null @@ -1,43 +0,0 @@ -// This file contains runtime environment settings for the prod (http://portal.it.csiro.au) profile. -// The build system defaults to the local profile which uses `environment.ts`, but you can switch between -// profiles using the --configuration argument. - -// To us this prod profile run `ng build --configuration=prod`. - -// Available build profiles and their environment files can be found in the angular configuration (angular.json). -// Note: environment files replace the default, they don't override. So, any change in this file -// will almost always need an equivalent change in all the other environment files. - - -export const environment = { - production: true, - getCSWRecordEndP: 'getKnownLayers.do', - portalBaseUrl: 'https://auscope-portal.geoanalytics.csiro.au/api/', - portalProxyUrl: '/api/', - authBaseUrl: 'https://portal.auscope.org.au/api/', - hostUrl: 'https://auscope-portal.geoanalytics.csiro.au', - nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/', - googleAnalyticsKey: null, - bingMapsKey: 'Bing_Maps_Key', - baseMapLayers: [ - { value: 'World_Imagery', viewValue: 'ESRI World Imagery', tooltip: 'ESRI World Imagery', layerType: 'ESRI' }, - { value: 'NatGeo_World_Map', viewValue: 'ESRI National Geographic Map', tooltip: 'ESRI National Geographic Map', layerType: 'ESRI' }, - { value: 'World_Street_Map', viewValue: 'ESRI Street Map', tooltip: 'ESRI Street Map', layerType: 'ESRI' }, - { value: 'OSM', viewValue: 'OpenStreetMap', - tooltip: 'OpenStreetMap (OSM) is a collaborative project to create a free editable\n' + - 'map of the world.\nhttp://www.openstreetmap.org', layerType: 'OSM' }, - { value: 'Road', viewValue: 'Bing Roads', tooltip: 'Bing Maps Road', layerType: 'Bing' }, - { value: 'Aerial', viewValue: 'Bing Aerial', tooltip: 'Bing Maps Aerial', layerType: 'Bing' }, - { value: 'AerialWithLabels', viewValue: 'Bing Aerial With Labels', tooltip: 'Bing Maps Aerial with Labels', layerType: 'Bing' }, - { value: 'Natural_Earth_II', viewValue: 'Natural Earth II', - tooltip: 'Natural Earth II, darkened for contrast.\nhttp://www.naturalearthdata.com/', layerType: 'NEII' }, - ], - grace: { - hostUrl: 'https://insargrace.geoanalytics.csiro.au:/grace/grace' - }, - urlNeedProxy: ['http://ogc-jdlc.curtin.edu.au:80', - 'https://geossdi.dmp.wa.gov.au', - 'https://geology.data.vic.gov.au', - 'http://geology.data.vic.gov.au', - 'http://geoserver.octopusdata.org'] - } diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 9f25e082..98bd1771 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,7 +4,7 @@ // To us this prod profile run `ng build --configuration=prod`. -// Available build profiles and their environment files can be found in the angular configuration (angular.json). +// Available build profiles and their environment files can be found in the angular configuration in `angular.json`. // Note: environment files replace the default, they don't override. So, any change in this file // will almost always need an equivalent change in all the other environment files. @@ -12,10 +12,10 @@ export const environment = { production: true, getCSWRecordEndP: 'getKnownLayers.do', - portalBaseUrl: 'http://portal.auscope.org.au/api/', + portalBaseUrl: 'https://portal.auscope.org.au/api/', portalProxyUrl: '/api/', - authBaseUrl: 'http://portal.auscope.org.au/api/', - hostUrl: 'http://portal.auscope.org.au', + authBaseUrl: 'https://portal.auscope.org.au/api/', + hostUrl: 'https://portal.auscope.org.au', nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/', googleAnalyticsKey: null, bingMapsKey: 'Bing_Maps_Key',