Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 7.1 #1652

Merged
merged 121 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
b4b0e8a
AtlasOfLivingAustralia/biocollect#1532
temi May 31, 2023
5d1780c
AtlasOfLivingAustralia/biocollect#1532
temi Aug 1, 2023
dfaaca7
AtlasOfLivingAustralia/biocollect#1532
temi Aug 3, 2023
994ee3a
AtlasOfLivingAustralia/biocollect#1532
temi Aug 9, 2023
ee4a271
Implements additional project fields for biocollect initiator (#1541)…
jack-brinkman Aug 17, 2023
4b55142
AtlasOfLivingAustralia/biocollect#1532
temi Aug 28, 2023
6896004
AtlasOfLivingAustralia/biocollect#1532
temi Aug 28, 2023
03b000d
AtlasOfLivingAustralia/biocollect#1532
temi Aug 28, 2023
60e8de0
AtlasOfLivingAustralia/biocollect#1532
temi Aug 29, 2023
f470772
AtlasOfLivingAustralia/biocollect#1532
temi Sep 17, 2023
a1e3e03
Merge branch 'feature/cognito' into feature/pwa
temi Oct 6, 2023
eb90541
- updated chrome version
temi Oct 10, 2023
98ae5b9
- added storage management
temi Oct 12, 2023
091242e
- removed functional test
temi Oct 16, 2023
d29cdc9
- parameterised batch size
temi Oct 16, 2023
aa5c39a
- added prompt to reload when indexeddb connection fails
temi Oct 17, 2023
7650762
- notify parent when deletion is complete
temi Oct 19, 2023
e758106
- added a list of caches that should not be deleted
temi Dec 8, 2023
2e3273d
- added cache to delete as a separate config
temi Dec 12, 2023
0387aba
- checking in for testing
temi Feb 1, 2024
4f2cb56
- modified the page navigated to by back, cancel or save buttons
temi Feb 7, 2024
2f0eaf4
- added missing images.js
temi Feb 7, 2024
a7bea58
- added new navigation logic
temi Feb 8, 2024
6a1008a
- fixed a bug with map zoom in during caching
temi Feb 8, 2024
e5fc7eb
- added feature to select sites to download if survey sites larger th…
temi Feb 9, 2024
4df0c7e
- stacked table for pwa
temi May 6, 2024
8ae0db6
Merge branch 'master' into feature/pwa
temi May 10, 2024
a1066f5
- fixed incorrectly checked file
temi May 10, 2024
ddcafaf
- added missing libraries
temi May 12, 2024
deee49a
- added sw.js to asset exclusion list
temi May 12, 2024
b19903a
- added sw.js to minify exclusion list
temi May 12, 2024
c2641de
added default codec none on pwa config file
temi May 13, 2024
2186740
- resolve site regardless site update fails
temi May 14, 2024
1a26d41
- reordered components in survey offline page
temi May 31, 2024
3abaeec
- updated chrome version
temi May 31, 2024
aae9df0
- added site search feature
temi Jun 3, 2024
ba60f5c
- silently fail site download
temi Jun 4, 2024
da137e2
Bump ws and socket.io
dependabot[bot] Jul 31, 2024
02ee620
commit Friends Grass Tree Health Survey #1626
salomon-j Aug 19, 2024
18d1a70
commit updates #1626
salomon-j Aug 20, 2024
c955dd5
Merge branch 'develop' into feature/pwa
temi Aug 29, 2024
5e2d4e5
migrated functional test to webdriverio
temi Sep 4, 2024
57af071
upgraded node version
temi Sep 13, 2024
570b7ce
Bump body-parser from 1.20.2 to 1.20.3
dependabot[bot] Sep 21, 2024
c757ab3
- added pwa test cases
temi Sep 24, 2024
308c548
- WIP
temi Oct 1, 2024
721230d
- WIP
temi Oct 2, 2024
5663d5e
- WIP
temi Oct 3, 2024
6f54abc
7.1-SNAPSHOT
temi Oct 4, 2024
23475e5
Bump cookie and socket.io
dependabot[bot] Oct 10, 2024
38f2062
ecodata-client-plugin:7.1-SNAPSHOT
salomon-j Oct 15, 2024
b39a881
commit baseline version
salomon-j Nov 11, 2024
27daaa6
commit baseline version
salomon-j Nov 11, 2024
85e0867
commit change requests for Rocky Shore Transect Survey #1643
salomon-j Nov 12, 2024
7424e25
commit change requests for Sandy and Muddy Shore Transect Survey #1643
salomon-j Nov 12, 2024
0322c26
bumped chromedriver
salomon-j Nov 12, 2024
880d720
commit baseline version
salomon-j Nov 13, 2024
c074c0e
commit update to add indexes #1643
salomon-j Nov 13, 2024
cfda857
updated functional test code
temi Nov 15, 2024
5c2fa8e
updated packages
temi Nov 15, 2024
a28462b
updated script command
temi Nov 15, 2024
f89f138
headless mode
temi Nov 15, 2024
d9b128b
start ecodata first
temi Nov 17, 2024
f791efa
do not generate style sheet for test environment
temi Nov 18, 2024
ed116c9
commit more updates #1643
salomon-j Nov 18, 2024
72cfb6b
commit progress #1644
salomon-j Nov 18, 2024
bdb0998
commit code review changes #1644
salomon-j Nov 18, 2024
64619b6
Merge pull request #1647 from AtlasOfLivingAustralia/feature/issue1644
temi Nov 18, 2024
42389cf
create new survey #1646
salomon-j Nov 20, 2024
221f47e
request to add Fences beach #1646
salomon-j Nov 22, 2024
dd12057
changed ecodata branch
temi Nov 23, 2024
aa65833
github action publish artifacts
temi Nov 24, 2024
a737774
upload on failure
temi Nov 24, 2024
e207bfc
upload artifacts
temi Nov 24, 2024
0b4bb8c
reloadable page
temi Nov 24, 2024
ce907ce
added jobs
temi Nov 24, 2024
54bd3c7
start wire mock in foreground
temi Nov 24, 2024
dd75763
test again
temi Nov 24, 2024
c9d4111
increase timeout
temi Nov 25, 2024
e37f6bc
greater timeout
temi Nov 25, 2024
3f738d1
another try
temi Nov 25, 2024
efdb46b
added video
temi Nov 25, 2024
36bde70
moved start button
temi Nov 25, 2024
aed67a5
increased window size
temi Nov 25, 2024
5932ea2
wait for clickable dismiss dialog
temi Nov 25, 2024
920ecfa
pointing to new ecodata branch
temi Nov 27, 2024
2868ee2
upgraded ecodata-client-plugin
temi Nov 27, 2024
70e0cd7
Merge pull request #1640 from AtlasOfLivingAustralia/dependabot/npm_a…
temi Nov 27, 2024
24b5131
Merge pull request #1637 from AtlasOfLivingAustralia/dependabot/npm_a…
temi Nov 27, 2024
0c6d2e4
Merge branch 'develop' into dependabot/npm_and_yarn/multi-2d3aef8690
temi Nov 27, 2024
fff6611
Merge pull request #1618 from AtlasOfLivingAustralia/dependabot/npm_a…
temi Nov 27, 2024
f7ce95a
Merge branch 'develop' into feature/pwa
temi Nov 27, 2024
8fc13dc
updated package-log.json
temi Nov 27, 2024
8c7296b
deleted project-activity-index.js
temi Nov 27, 2024
dda70af
added minified dexie library
temi Nov 27, 2024
ba11538
Merge pull request #1558 from AtlasOfLivingAustralia/feature/pwa
jack-brinkman Nov 28, 2024
4d9da91
biocollect version 7.1-SNAPSHOT
temi Dec 1, 2024
81d2a9f
updated ecodata branch for functional test
temi Dec 2, 2024
72bfb63
ecodata-client-plugin:7.1-SNAPSHOT
temi Dec 3, 2024
a42a896
added new test to drop a pin on map
temi Dec 4, 2024
d109473
start second test from first page
temi Dec 4, 2024
8b2c8be
fix for getting second record
temi Dec 4, 2024
2976bc6
fix for getting second record
temi Dec 4, 2024
fbe97a5
added a new functional test
temi Dec 5, 2024
5bda228
adding original and resolved files for caching
temi Dec 5, 2024
749c81d
keeping original file name and processed file name
temi Dec 5, 2024
9e38b00
commit baseline version
salomon-j Dec 2, 2024
818f516
commit fix update
salomon-j Dec 6, 2024
c220359
commit update #1648
salomon-j Dec 6, 2024
3f57e7f
Merge pull request #1649 from AtlasOfLivingAustralia/feature/1648
temi Dec 6, 2024
9121b82
fixed issue with activity upload when site upload fails
temi Dec 7, 2024
84e792e
Editor should have access to view an activity.
temi Dec 10, 2024
1ad0a1c
Merge pull request #1650 from AtlasOfLivingAustralia/feature/pwa
jack-brinkman Dec 10, 2024
799ed24
better feedback when uploading activity
temi Dec 11, 2024
ba1d72b
Merge pull request #1651 from AtlasOfLivingAustralia/feature/pwa
jack-brinkman Dec 11, 2024
2ddefdc
Merge pull request #1628 from AtlasOfLivingAustralia/feature/issue1626
temi Dec 12, 2024
0b77051
ala security lib 6.3.0
temi Dec 12, 2024
0013c90
fixes a bug with document list page
temi Dec 12, 2024
9809dd7
added url mapping for document search
temi Dec 13, 2024
3fe2c1e
fixes an issue with getting document
temi Dec 13, 2024
6b1959d
ecodata-client-plugin:7.1
temi Dec 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install nodejs
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- run: npm install

Expand Down Expand Up @@ -88,17 +88,26 @@ jobs:

- name: Run BioCollect functional tests
run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata dev
continue-on-error: true
env:
GITHUB_ACTOR: ${{env.GITHUB_ACTOR}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

- name: Archive log directory
uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
path: ./logs

- name: Clean to remove clover instrumentation
uses: gradle/[email protected]
if: ${{ success() }}
with:
arguments: clean

- name: Publish the JAR to the repository
uses: gradle/[email protected]
if: ${{ success() }}
with:
arguments: publish
env:
Expand Down
17 changes: 14 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ buildscript {
}
}

plugins {
id "com.gorylenko.gradle-git-properties" version "2.4.1"
}


version "$biocollectVersion"
group "au.org.ala"
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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"
implementation "org.grails.plugins:ecodata-client-plugin:7.1"
}

testCompileOnly "org.grails:grails-test-mixins:3.3.0"
Expand Down Expand Up @@ -200,7 +209,8 @@ assets {
maxThreads = 6
minifyOptions = [
languageMode : 'ES6', //languageIn
targetLanguage: 'ES5', // languageOut
// targetLanguage: 'ES5', // languageOut
excludes: ['sw.js', '**/*.min.js']
]

includes = []
Expand Down Expand Up @@ -261,6 +271,7 @@ tasks.withType(Test) {
wiremock {
dir "${project.projectDir}/src/integration-test/resources/wiremock/"
params "--port=8018 --global-response-templating --local-response-templating"
// params "--port=8018 --global-response-templating --local-response-templating --verbose --print-all-network-traffic --record-mappings"
}

assets {
Expand Down
Loading
Loading