Add magda-backed build

.gitignore

@@ -21,3 +21,4 @@ wwwroot/privateconfig.json
 deploy/packages/
 deploy/work/
 packages/
+.env

.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "node",
+ "request": "launch",
+ "name": "Launch Server",
+ "args": [
+ "${workspaceFolder}/node_modules/terriajs-server/lib/app.js",
+ "--config-file", "devserverconfig.json",
+ "--public", "false"
+ ]
+ },
+ {
+ "type": "chrome",
+ "request": "launch",
+ "name": "Launch Chrome against localhost",
+ "url": "http://localhost:3001",
+ "webRoot": "${workspaceFolder}"
+ }
+ ]
+}

buildprocess/webpack.config.js

@@ -1,6 +1,9 @@
 'use strict';
 
 /*global require*/
+var webpack = require('webpack');
+const Dotenv = require('dotenv-webpack');
+
 var configureWebpackForTerriaJS = require('terriajs/buildprocess/configureWebpack');
 var MiniCssExtractPlugin = require('mini-css-extract-plugin');
 var path = require('path');
@@ -100,7 +103,15 @@ module.exports = function(devMode, hot) {
  ]
  },
  plugins: [
+ new webpack.DefinePlugin({
+ 'process.env': {
+ 'NODE_ENV': devMode ? '"development"' : '"production"'
+ }
+ }),
+
+ new Dotenv(),
  new MiniCssExtractPlugin({filename: "TerriaMap.css", disable: hot, ignoreOrder: true, allChunks: true})
+
  ],
  resolve: {
  alias: {},

index.js

@@ -53,11 +53,25 @@ if (process.env.NODE_ENV !== "production" && module.hot) {
  document.styleSheets[0].disabled = true;
 }
 
+
+var theConfig = 'config.json';
+if (process.env.MAGDA_GATEWAY) {
+ var webDomainName = window.location.hostname;
+ console.debug(`webDomainName = ${webDomainName}`);
+ theConfig = `api/v0/registry/records/terria_map/aspects/terria-config`;
+}
+
+console.debug(`theConfig = ${theConfig}`);
+
 module.exports = terria.start({
+
  // If you don't want the user to be able to control catalog loading via the URL, remove the applicationUrl property below
  // as well as the call to "updateApplicationOnHashChange" further down.
  applicationUrl: window.location,
- configUrl: 'config.json',
+
+ // If it is a pure file name, e.g. 'config.json', it is assumed to be located at TerriaMap under the
+ // directory of wwwwroot, e.g. wwwroot/config.json
+ configUrl: theConfig,
  shareDataService: new ShareDataService({
  terria: terria
  })

lib/Views/AboutButton.jsx

@@ -1,5 +1,13 @@
 import React from 'react';
-
 import MenuButton from 'terriajs/lib/ReactViews/Map/MenuButton';
 
-export default function AboutButton() { return (<MenuButton caption="About" href="about.html"/>)};
+export default function AboutButton() {
+ let theLink = "about.html";
+ if (process.env.MAGDA_GATEWAY) {
+ const webDomainName = window.location.hostname;
+ theLink = "api/v0/content/" + webDomainName + "/about.html";
+ console.debug("about ref = " + theLink);
+ }
+
+ return (<MenuButton caption="About" href={theLink} />)
+};

lib/Views/UserInterface.jsx

@@ -4,6 +4,7 @@ import MenuItem from 'terriajs/lib/ReactViews/StandardUserInterface/customizable
 import PropTypes from 'prop-types';
 import React from 'react';
 import RelatedMaps from './RelatedMaps';
+import AboutButton from './AboutButton';
 import SplitPoint from 'terriajs/lib/ReactViews/SplitPoint';
 import StandardUserInterface from 'terriajs/lib/ReactViews/StandardUserInterface/StandardUserInterface.jsx';
 import version from '../../version';
@@ -26,7 +27,7 @@ export default function UserInterface(props) {
  <StandardUserInterface {... props} version={version}>
  <Menu>
  <RelatedMaps viewState={props.viewState} />
- <MenuItem caption="About" href="about.html" key="about-link"/>
+ <AboutButton viewState={props.viewState} />
  </Menu>
  <Nav>
  <MeasureTool terria={props.viewState.terria} key="measure-tool"/>

magda/deploy/magda-terria-minikube.yml

@@ -0,0 +1,53 @@
+global:
+ externalUrl: http://admin-withterria.dev.magda.io.local:30100
+ rollingUpdate:
+ maxUnavailable: 1
+ exposeNodePorts: true
+ image:
+ repository: "localhost:5000/data61"
+ tag: "latest"
+ pullPolicy: Always
+ noDbAuth: true
+ useCloudSql: false
+ useCombinedDb: true
+ enablePriorityClass: false
+
+tags:
+ all: false
+ gateway: true
+ registry-api: true
+ combined-db: true
+ authorization-api: true
+ registry-db: true
+ authorization-db: true
+ session-db: true
+
+registry-api:
+ skipAuthorization: true
+
+gateway:
+ ckanRedirectionDomain: "ckan.data.gov.au"
+ ckanRedirectionPath: ""
+ enableCkanRedirection: true
+ enableAuthEndpoint: true
+ cors:
+ credentials: true
+ origin: true
+ auth:
+ facebookClientId: "173073926555600"
+ googleClientId: "275237095477-f7ej2gsvbl2alb8bcqcn7r5jk0ur719p.apps.googleusercontent.com"
+ ckanAuthenticationUrl: https://data.gov.au/data
+ enableMultiTenants: true 
+ magdaAdminPortalName: admin-withterria.dev.magda.io.local
+ web: http://terria-map:3001
+ csp:
+ directives:
+ scriptSrc:
+ - "''self''"
+ - "''unsafe-inline''"
+ - "*.dev.magda.io.local"
+ - "https://cdn.polyfill.io"
+ - "https://dev.virtualearth.net"
+ - browser-update.org
+ objectSrc:
+ - "''none''"

magda/deploy/preview-terria-map.yml

@@ -0,0 +1,100 @@
+global:
+ rollingUpdate:
+ maxUnavailable: 1000
+ image:
+ imagePullSecret: "regcred"
+ pullPolicy: Always
+ exposeNodePorts: false
+ enablePriorityClass: false
+
+tags:
+ all: true
+ ingress: true
+ priorities: false
+
+ingress:
+ ingressClass: nginx
+ enableTls: true
+ useDefaultCertificate: true
+
+registry-api:
+ skipAuthorization: false
+
+gateway:
+ ckanRedirectionDomain: "ckan.data.gov.au"
+ ckanRedirectionPath: ""
+ enableCkanRedirection: true
+ enableAuthEndpoint: true
+ enableHttpsRedirection: true
+ auth:
+ facebookClientId: "173073926555600"
+ googleClientId: "275237095477-f7ej2gsvbl2alb8bcqcn7r5jk0ur719p.apps.googleusercontent.com"
+ ckanAuthenticationUrl: https://data.gov.au/data
+ autoscaler:
+ enabled: false
+ enableMultiTenants: true 
+ magdaAdminPortalName: admin-withterria.dev.magda.io
+ web: http://terria-map:3001
+ helmet:
+ frameguard: false
+ cors:
+ credentials: true
+ origin: true
+ csp:
+ directives:
+ scriptSrc:
+ - "''self''"
+ - "''unsafe-inline''"
+ - "*.dev.magda.io"
+ - "https://cdn.polyfill.io"
+ - "https://dev.virtualearth.net"
+ - browser-update.org
+ objectSrc:
+ - "''none''"
+ reportUri: https://sdga.report-uri.com/r/d/csp/enforce
+
+combined-db:
+ waleBackup:
+ method: WAL
+ readOnly: "TRUE"
+ recoveryMode: "immediate"
+ gsPrefix: "gs://magda-postgres-backups-asia/dev"
+ googleApplicationCreds:
+ secretName: storage-account-credentials
+ fileName: db-service-account-private-key.json
+ data:
+ storage: 250Gi
+ resources:
+ limits:
+ cpu: 2000m
+
+elasticsearch:
+ data:
+ heapSize: 500m
+ pluginsInstall: "repository-gcs"
+ backup:
+ googleApplicationCreds:
+ secretName: storage-account-credentials
+ fileName: db-service-account-private-key.json
+indexer:
+ resources:
+ requests:
+ cpu: 100m
+ memory: 0
+ readSnapshots: false
+ makeSnapshots: false
+ elasticsearch:
+ useGcsSnapshots: true
+ gcsSnapshotBucket: "magda-es-snapshots-dev"
+ gcsSnapshotClient: "default"
+
+web-server:
+ fallbackUrl: "https://data.gov.au"
+ featureFlags:
+ cataloguing: true
+
+correspondence-api:
+ defaultRecipient: "[email protected]"
+ alwaysSendToDefaultRecipient: true
+ smtpHostname: "smtp.mailgun.org"
+ smtpPort: 2525

magda/registry/aspects/terria-catalog.schema.json

@@ -0,0 +1,31 @@
+{
+ "id": "terria-catalog.json",
+ "tenantId": "1",
+ "name": "schema for terria catalog",
+ "jsonSchema": {
+ "type": "object",
+ "title": "Aspect for a terria caltalog record",
+ "$schema": "http://json-schema.org/schema#",
+ "homeCamera": {
+ "type": "object",
+ "north": {
+ "type": "double"
+ },
+ "east": {
+ "type": "double"
+ },
+ "south": {
+ "type": "double"
+ },
+ "west": {
+ "type": "double"
+ }
+ },
+ "catalog": {
+ "type": "array",
+ "items": {
+ "type": "object"
+ }
+ }
+ }
+}

magda/registry/aspects/terria-config.schema.json

@@ -0,0 +1,54 @@
+{
+ "id": "terria-config",
+ "tenantId": "1",
+ "name": "config for terria",
+ "jsonSchema": {
+ "type": "object",
+ "title": "Aspect for a config record for terria map",
+ "$schema": "http://json-schema.org/schema#",
+ "parameters": {
+ "type": "object",
+ "title": "parameters for a config",
+ "disclaimer": {
+ "type": "object",
+ "text": {
+ "type": "string"
+ },
+ "url": {
+ "type": "string"
+ }
+ },
+ "appName": {
+ "type": "string"
+ },
+ "brandBarElements": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "supportEmail": {
+ "type": "string"
+ },
+ "proj4ServiceBaseUrl": {
+ "type": "string"
+ },
+ "feedbackUrl": {
+ "type": "string"
+ },
+ "mobileDefaultViewerMode": {
+ "type": "string"
+ },
+ "experimentalFeatures": {
+ "type": "boolean"
+ }
+ },
+ "initializationUrls": {
+ "type": "array",
+ "title": "Intial catalog files to be loaded by default.",
+ "items": {
+ "type": "string"
+ }
+ }
+ }
+}