Feature/pwa

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install nodejs
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - run: npm install
 

build.gradle

@@ -18,6 +18,10 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.gorylenko.gradle-git-properties" version "2.4.1"
+}
+
 
 version "$biocollectVersion"
 group "au.org.ala"
@@ -111,6 +115,8 @@ dependencies {
     implementation('org.grails.plugins:http-builder-helper:1.1.0') {
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
+
+    implementation 'com.opencsv:opencsv:5.7.0'
     implementation "org.apache.httpcomponents:httpclient:4.5.7"
     runtimeOnly 'org.webjars:jquery:1.12.4'
     implementation 'dk.glasius:external-config:3.0.0'
@@ -151,10 +157,13 @@ dependencies {
     runtimeOnly 'com.bertramlabs.plugins:less-asset-pipeline:3.3.1'
     implementation 'com.bertramlabs.plugins:sass-asset-pipeline:3.2.5'
     implementation 'org.codehaus.groovy:groovy-dateutil:2.5.0'
-
+    implementation "com.nimbusds:nimbus-jose-jwt:9.25.6"
+    implementation "io.jsonwebtoken:jjwt-impl:0.11.5"
+    implementation "io.jsonwebtoken:jjwt-jackson:0.11.5"
+    implementation "io.jsonwebtoken:jjwt-api:0.11.5"
     if (!Boolean.valueOf(inplace)) {
         implementation "org.grails.plugins:ala-map-plugin:3.0.1"
-        implementation "org.grails.plugins:ecodata-client-plugin:7.0-SNAPSHOT"
+        implementation "org.grails.plugins:ecodata-client-plugin:7.0-PWA-SNAPSHOT"
     }
 
     testCompileOnly "org.grails:grails-test-mixins:3.3.0"
@@ -200,7 +209,8 @@ assets {
     maxThreads = 6
     minifyOptions = [
             languageMode  : 'ES6', //languageIn
-            targetLanguage: 'ES5', // languageOut
+//            targetLanguage: 'ES5', // languageOut
+            excludes: ['sw.js', '**/*.min.js']
     ]
 
     includes = []

gradle.properties

@@ -1,4 +1,4 @@
-biocollectVersion=7.0-SNAPSHOT
+biocollectVersion=7.0-PWA-SNAPSHOT
 grailsVersion=6.2.0
 grailsGradlePluginVersion=6.1.2
 assetPipelineVersion=4.3.0

grails-app/assets/javascripts/MapUtilities.js

@@ -133,7 +133,7 @@ Biocollect.MapUtilities = {
         var options = {baseLayer: undefined, otherLayers: {}};
         baseLayers = baseLayers || [];
         baseLayers.forEach(function (baseLayer) {
-            var baseConfig = Biocollect.MapUtilities.getBaseLayer(baseLayer.code);
+            var baseConfig = Biocollect.MapUtilities.getBaseLayer(baseLayer.code, baseLayer);
             var title = baseConfig.title || baseLayer.displayText;
             if (baseLayer.isSelected) {
                 options.baseLayer = baseConfig;
@@ -156,15 +156,18 @@ Biocollect.MapUtilities = {
     /**
      * Get {L.tileLayer | L.Google} base map for a given code.
      * @param code
+     * @param config - used to get basemap url
      * @returns {L.tileLayer | L.Google}
      */
-    getBaseLayer: function (code) {
-        var option, layer;
+    getBaseLayer: function (code, config) {
+        config = config || {};
+        var option, layer,
+            url = config.url;
         switch (code) {
             case 'minimal':
                 option = {
                     // See https://cartodb.com/location-data-services/basemaps/
-                    url: 'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png',
+                    url: url || 'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png',
                     options: {
                         subdomains: "abcd",
                         attribution: 'Map data &copy; <a target="_blank" rel="noopener noreferrer" href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, imagery &copy; <a target="_blank" rel="noopener noreferrer" href="http://cartodb.com/attributions">CartoDB</a>',
@@ -177,7 +180,7 @@ Biocollect.MapUtilities = {
             case 'worldimagery':
                 option = {
                     // see https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9
-                    url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
+                    url: url || 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
                     options: {
                         attribution: '<a target="_blank" rel="noopener noreferrer" href="https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9">Tiles from Esri</a> &mdash; Sources: Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Aerogrid, IGN, IGP, and the GIS User Community',
                         maxZoom: 21,
@@ -186,10 +189,22 @@ Biocollect.MapUtilities = {
                 };
                 layer = L.tileLayer(option.url, option.options);
                 break;
+            case 'maptilersatellite':
+                option = {
+                    url:  url || 'https://api.maptiler.com/maps/hybrid/256/{z}/{x}/{y}.jpg?key=O11Deo7fBLatChkUYGIH',
+                    options: {
+                        attribution: '<a href="https://www.maptiler.com/copyright/" target="_blank">© MapTiler</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap contributors</a>',
+                        maxZoom: 21,
+                        maxNativeZoom: 21
+                    }
+                };
+                layer = L.tileLayer(option.url, option.options);
+                break;
+
             case 'detailed':
                 option = {
                     // see https://wiki.openstreetmap.org/wiki/Standard_tile_layer
-                    url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                    url: url || 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
                     options: {
                         subdomains: "abc",
                         attribution: '&copy; <a target="_blank" rel="noopener noreferrer" href="https://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>',
@@ -202,7 +217,7 @@ Biocollect.MapUtilities = {
             case 'topographic':
                 option = {
                     // see https://www.arcgis.com/home/item.html?id=30e5fe3149c34df1ba922e6f5bbf808f
-                    url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}',
+                    url: url || 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}',
                     options: {
                         attribution: '<a target="_blank" rel="noopener noreferrer" href="https://www.arcgis.com/home/item.html?id=30e5fe3149c34df1ba922e6f5bbf808f">Tiles from Esri</a> &mdash; Sources: Esri, HERE, Garmin, Intermap, INCREMENT P, GEBCO, USGS, FAO, NPS, NRCAN, GeoBase, IGN, Kadaster NL, Ordnance Survey, Esri Japan, METI, Esri China (Hong Kong), &copy; OpenStreetMap contributors, GIS User Community',
                         maxZoom: 21,

grails-app/assets/javascripts/biocollect-utils.js

@@ -0,0 +1,115 @@
+var biocollect = {
+    utils: {
+        /**
+         * https://stackoverflow.com/a/20584396
+         * @param node
+         * @returns {*}
+         */
+        nodeScriptReplace: function nodeScriptReplace(node) {
+            if (biocollect.utils.nodeScriptIs(node) === true) {
+                node.parentNode.replaceChild(biocollect.utils.nodeScriptClone(node), node);
+            } else {
+                var i = -1, children = node.childNodes;
+                while (++i < children.length) {
+                    biocollect.utils.nodeScriptReplace(children[i]);
+                }
+            }
+
+            return node;
+        },
+
+        /**
+         * https://stackoverflow.com/a/20584396
+         * @param node
+         * @returns {HTMLScriptElement}
+         */
+        nodeScriptClone: function nodeScriptClone(node) {
+            var script = document.createElement("script");
+            script.text = node.innerHTML;
+
+            var i = -1, attrs = node.attributes, attr;
+            while (++i < attrs.length) {
+                script.setAttribute((attr = attrs[i]).name, attr.value);
+            }
+            return script;
+        },
+
+        /**
+         * https://stackoverflow.com/a/20584396
+         * @param node
+         * @returns {boolean}
+         */
+        nodeScriptIs: function nodeScriptIs(node) {
+            return node.tagName === 'SCRIPT';
+        },
+        readDocument: function readDocument(file) {
+            var deferred = $.Deferred();
+            if (file) {
+                var reader = new FileReader();
+                reader.onload = function (e) {
+                    var contents = e.target.result;
+                    deferred.resolve({data: {blob: contents, file: file}});
+                };
+
+                reader.onerror = function (e) {
+                    deferred.reject({message: "Failed to read file" + file.name});
+                };
+
+                reader.readAsArrayBuffer(file);
+            } else {
+                deferred.reject();
+            }
+
+            return deferred.promise();
+        },
+        saveDocument: function saveDocument(result) {
+            var deferred = $.Deferred(),
+                file = result.data.file,
+                blob = result.data.blob,
+                document = biocollect.utils.createDocument(file, blob);
+
+            if (window.entities)
+                window.entities.saveDocument(document).then(deferred.resolve, function (error) {
+                    deferred.reject({data: document, error: error});
+                });
+            else
+                deferred.reject();
+
+            return deferred.promise();
+        },
+        fetchDocument: function fetchDocument(result) {
+            var documentId = result.data;
+            return window.entities.offlineGetDocument(documentId);
+        },
+        addObjectURL: function addObjectURL(document) {
+            var url = ImageViewModel.createObjectURL(document);
+            if (url) {
+                document.thumbnailUrl = document.url = url;
+            }
+        },
+        createDocument: function createDocument(file, blob) {
+            return {
+                blob: blob,
+                contentType: file.type,
+                filename: file.name,
+                name: file.name,
+                filesize: file.size,
+                dateTaken: new Date(file.lastModified).toISOStringNoMillis(),
+                staged: false,
+                attribution: "",
+                licence: "",
+                entityUpdated: true
+            };
+        },
+        getReturnToAddressForPWA: function getReturnToAddressForPWA() {
+            const context = new URL(window.location.href).searchParams.get('context');
+            switch (context) {
+                case 'global':
+                    return fcConfig.globalReturnToAddress;
+                case 'survey':
+                default:
+                    return fcConfig.surveyReturnToAddress;
+            }
+        }
+    }
+}