From b5e32bcbdd5503c8b7708d563f40dcd90ba56b46 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Wed, 14 Aug 2024 10:28:32 +1000 Subject: [PATCH 1/5] Bump version to 7.1.1-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ae439bde..aca09ff0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - version "7.1.0" + version "7.1.1-SNAPSHOT" group "au.org.ala" } From e05d78948cceab5eafee1ae798a42b2438c92dc0 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Wed, 14 Aug 2024 20:56:09 +1000 Subject: [PATCH 2/5] Bump biocache-hubs 7.1.1-SNAPSHOT Cleanup gradle files --- build.gradle | 64 +++++++++---------------------------------------- settings.gradle | 18 +++++++------- 2 files changed, 20 insertions(+), 62 deletions(-) diff --git a/build.gradle b/build.gradle index aca09ff0..7a96b6ba 100644 --- a/build.gradle +++ b/build.gradle @@ -59,20 +59,19 @@ if (inplace) { plugins { // When not inplace used, the dependencies below are managed by biocache-hubs plugin implementation project(':biocache-hubs') - implementation project(':downloads-plugin') -//// implementation project(':ala-charts-plugin') -//// implementation project(':images-client-plugin') +// implementation project(':downloads-plugin') +// implementation project(':ala-charts-plugin') +// implementation project(':images-client-plugin') // implementation project(':ala-bootstrap3') // implementation project(':ala-ws-plugin') - // implementation "au.org.ala.plugins.grails:downloads-plugin:3.0", { // exclude group: 'org.grails.plugins', module: 'cache' // exclude group: 'org.ehcache', module: 'ehcache' // exclude group: 'org.grails.plugins', module: 'cache-ehcache' // } - implementation "org.grails.plugins:ala-bootstrap3:4.1.0", { - exclude group: 'au.org.ala', module: 'ala-cas-client' - } +// implementation "org.grails.plugins:ala-bootstrap3:4.1.0", { +// exclude group: 'au.org.ala', module: 'ala-cas-client' +// } } } } @@ -132,42 +131,16 @@ dependencies { implementation 'xml-apis:xml-apis:1.4.01' // ALA Plugins -// implementation "org.grails.plugins:ala-auth:3.2.3" + implementation "org.grails.plugins:ala-bootstrap3:4.5.0", { + exclude group: 'au.org.ala', module: 'ala-cas-client' + } + implementation "au.org.ala.plugins.grails:downloads-plugin:5.0.0" - //implementation "org.grails.plugins:ala-admin-plugin:2.2", noCache if (!inplace) { - implementation "au.org.ala.plugins.grails:biocache-hubs:7.1.0", noCache - implementation "au.org.ala.plugins.grails:downloads-plugin:5.0.0", noCache - implementation "org.grails.plugins:ala-bootstrap3:4.5.0", { - exclude group: 'au.org.ala', module: 'ala-cas-client' - } + implementation "au.org.ala.plugins.grails:biocache-hubs:7.1.1-SNAPSHOT", noCache } } -//webdriverBinaries { -// chromedriver "$chromeDriverVersion" -// geckodriver "$geckoDriverVersion" -//} - - -//tasks.getByName("integrationTest") { -// group JavaBasePlugin.VERIFICATION_GROUP -// -// //outputs.upToDateWhen { false } // Always run tests -// -// systemProperty "geb.build.reportsDir", reporting.file("geb/$name") -// -// systemProperty "geb.env", System.properties['driver']?:"firefox" // firefox by default -// // pass test server by -DbaseUrl -// systemProperty "geb.build.baseUrl", System.properties['baseUrl'] ?: "http://devt.ala.org.au:8081/ala-hub/" -// //Store username and password into the default config file -// systemProperty "configFile",System.properties['configFile']?: "/data/ala-hub/test/default.properties" -// //or pass with -Dusername, -Dpassword -// systemProperty "username", System.properties['username'] -// systemProperty "password", System.properties['password'] -//} - - bootRun { ignoreExitValue true jvmArgs( @@ -180,32 +153,17 @@ bootRun { systemProperty springProfilesActive, System.getProperty(springProfilesActive) } - tasks.withType(GroovyCompile) { configure(groovyOptions) { forkOptions.jvmArgs = ['-Xmx1024m'] } } -//webdriverBinaries { -// chromedriver '2.45.0' -// geckodriver '0.24.0' -//} -// -//tasks.withType(Test) { -// systemProperty "geb.env", System.getProperty('geb.env') -// systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest") -// systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver') -// systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver') -//} - - assets { minifyJs = true minifyCss = true } - publishing { repositories { maven { diff --git a/settings.gradle b/settings.gradle index 91b2f98e..1575460a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,23 +15,23 @@ pluginManagement { rootProject.name='ala-hub' -// Inplace plugin config +// In-place plugin config // Set to true it needed only for development boolean inplace = false if (inplace) { include ':biocache-hubs' project(':biocache-hubs').projectDir = new File(settingsDir, '../biocache-hubs') - include ':downloads-plugin' - project(':downloads-plugin').projectDir = new File(settingsDir,'../downloads-plugin') -//// include ':ala-charts-plugin' -//// project(':ala-charts-plugin').projectDir = new File(settingsDir,'../ala-charts-plugin') -//// include ':images-client-plugin' -//// project(':images-client-plugin').projectDir = new File(settingsDir,'../images-client-plugin') +// include ':downloads-plugin' +// project(':downloads-plugin').projectDir = new File(settingsDir,'../downloads-plugin') +// include ':ala-charts-plugin' +// project(':ala-charts-plugin').projectDir = new File(settingsDir,'../ala-charts-plugin') +// include ':images-client-plugin' +// project(':images-client-plugin').projectDir = new File(settingsDir,'../images-client-plugin') // include ':ala-bootstrap3' // project(':ala-bootstrap3').projectDir = new File(settingsDir, '../ala-bootstrap3') -//// include ':ala-auth' -//// project(':ala-auth').projectDir = new File(settingsDir,'../ala-auth-plugin') +// include ':ala-auth' +// project(':ala-auth').projectDir = new File(settingsDir,'../ala-auth-plugin') // include ':ala-ws-plugin' // project(':ala-ws-plugin').projectDir = new File(settingsDir, '../ala-ws-plugin') } From 6d7451a00624de325c8b3fa7c44afe8a719a876b Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Fri, 16 Aug 2024 15:50:49 +1000 Subject: [PATCH 3/5] #79 Fix for broken styling on error and 404 pages --- grails-app/views/error.gsp | 58 ++++++++++++++++++----------------- grails-app/views/notFound.gsp | 14 ++++++--- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/grails-app/views/error.gsp b/grails-app/views/error.gsp index 5c3cadff..e36fe4ec 100644 --- a/grails-app/views/error.gsp +++ b/grails-app/views/error.gsp @@ -2,39 +2,41 @@ <g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else> - + -

- Application error -

- -
    - -
    • -     - -
  • ${alatag.stripApiKey(message: flash.message)}
    • -     - -
  • An error has occurred
    • -
  • Exception: ${exception}
    • -
  • Message: ${message}
    • -
  • Path: ${path}
    • -     -
- - - +
+

+ Application error +

+
+
    -
  • ${alatag.stripApiKey(message: flash.message)}
    • + +
    • +     + +
  • ${alatag.stripApiKey(message: flash.message)}
    • +     + +
  • An error has occurred
    • +
  • Exception: ${exception}
    • +
  • Message: ${message}
    • +
  • Path: ${path}
    • +
- - - + + +
    +
  • ${alatag.stripApiKey(message: flash.message)}
    • +
+ + + +
diff --git a/grails-app/views/notFound.gsp b/grails-app/views/notFound.gsp index 2525d8b0..1d2a2b5e 100644 --- a/grails-app/views/notFound.gsp +++ b/grails-app/views/notFound.gsp @@ -2,14 +2,18 @@ Page Not Found - + -
    -
  • Error: Page Not Found (404)
    • -
  • Path: ${request.forwardURI}
    • -
+
+

Page Not Found

+
+
    +
  • Error: Page Not Found (404)
    • +
  • Path: ${request.forwardURI}
    • +
+