Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit fec2378
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Mon Apr 8 07:58:47 2024 +1000

    chore: Consolidate Gradle 'start' tasks

commit 86d7043
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Mon Apr 8 07:14:31 2024 +1000

    Add Gradle task to launch pre-compiled build

commit 29ae098
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Sun Apr 7 21:24:21 2024 +1000

    Remove bad test

    - This requires multiple nodes are present

commit ba41ae2
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Sun Apr 7 21:24:04 2024 +1000

    Allow building with test fails

commit 783926b
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Sun Apr 7 21:23:49 2024 +1000

    Revert back to use of twbs

commit 063bbae
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Sun Apr 7 21:23:29 2024 +1000

    Revert back to safe/known dependencies

commit 326fc65
Author: scroix <[email protected]>
Date:   Sun Apr 7 16:30:51 2024 +1000

    Add more tests

    - Check for source files
    - Check for Google font, which gets packaged indepdently
    - Check for results of custom.css getting correctly compiled
    - Check for bootstrap layout

commit 7315692
Author: scroix <[email protected]>
Date:   Sun Apr 7 13:08:03 2024 +1000

    Switch Gradle tasks to utilise Playwright

commit c8cb6e9
Author: scroix <[email protected]>
Date:   Sun Apr 7 12:58:40 2024 +1000

    Convert Selenium tests to Playwright

    - It's a much nicer style of testing which even comes with bundled browsers

commit 4a022b9
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Sun Apr 7 12:01:39 2024 +1000

    Add shutdown hook to Launch class

commit e7099e7
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Sun Apr 7 11:55:28 2024 +1000

    Add example Selenium test classes

commit dcd3acb
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Sun Apr 7 11:54:07 2024 +1000

    Add Selenium test runners to jyhost build

commit 4173ead
Merge: 5d6d89d 0cdb687
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Sat Apr 6 17:00:44 2024 +1100

    Merge branch 'upgrade/node-20lts' into feature/introduce-frontend-testing

    # Conflicts:
    #	.gitignore
    #	build.gradle
    #	nodel-webui-js/Gruntfile.js
    #	nodel-webui-js/build.gradle
    #	nodel-webui-js/package-lock.json
    #	nodel-webui-js/package.json

commit 5d6d89d
Merge: ff08b94 de67ed4
Author: scroix <[email protected]>
Date:   Sat Apr 6 16:51:43 2024 +1100

    Merge branch 'upgrade/gradle-7.6' into feature/introduce-frontend-testing

commit de67ed4
Author: scroix <[email protected]>
Date:   Thu Apr 4 14:51:47 2024 +1100

    Rename branch in support of .jar generation

    - This tackles a tiny regression which saw us lose -dev- handled in the generated .jar filename
    - We also handle the odd case of building in a git branch which includes a forward slash

commit 138c477
Author: scroix <[email protected]>
Date:   Thu Apr 4 07:29:27 2024 +1100

    Stop targetting specific Gruntfile command

    - 'default' includes googlefonts build, but the 'build' command does not

commit 0cdb687
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Tue Apr 2 08:25:04 2024 +1100

    Build new lock file

commit 60657c9
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Tue Apr 2 08:24:35 2024 +1100

    Replace twbs with grunt-contrib-less

commit 58e4fe3
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Tue Apr 2 08:23:54 2024 +1100

    Remove twbs from package.json

commit f9ad07d
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Tue Apr 2 08:23:34 2024 +1100

    Bump node version from 12.19 to 20.12

commit a34a662
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:46:36 2024 +1100

    Revert "Update gradle-wrapper.jar"

    This reverts commit 058a407.

commit 3b4bbb0
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:46:17 2024 +1100

    Update gradle-wrapper.jar

commit 34351c4
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:41:50 2024 +1100

    Switch to Gradle bin

commit 92de5d1
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:36:28 2024 +1100

    Update gradlew files

    - Using `gradle wrapper` command

commit 1acab40
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:24:58 2024 +1100

    Move project info variables to top-level build file

commit 233355a
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:24:33 2024 +1100

    Revert to original devDependencies

commit 529ceb7
Author: scroix <[email protected]>
Date:   Sat Mar 30 12:03:12 2024 +1100

    Revert node version to simplify grunt issue

commit c491c79
Author: scroix <[email protected]>
Date:   Sat Mar 30 08:13:58 2024 +1100

    Add a couple more optimisations

commit 572f1f2
Author: scroix <[email protected]>
Date:   Sat Mar 30 07:42:54 2024 +1100

    Move the feature to check for file changes into a class

commit 8d14466
Author: scroix <[email protected]>
Date:   Sat Mar 30 07:18:03 2024 +1100

    Remove unneccesary dir check during Gradle webui tasks

commit bd4f0d2
Author: scroix <[email protected]>
Date:   Sat Mar 30 07:17:27 2024 +1100

    Remove Gradle optimisation flags

commit b93a3f0
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 22:26:53 2024 +1100

    Maybe this is working now

commit b7764b2
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 21:57:48 2024 +1100

    Remove the grunt script from the package.json

commit 8a97243
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 21:57:37 2024 +1100

    Further attempt to cache the grunt task

commit 2fcc696
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 20:51:49 2024 +1100

    Add hack for "cache" of grunt tasks

commit 9fb4439
Author: scroix <[email protected]>
Date:   Fri Mar 29 19:43:22 2024 +1100

    Attempt to cache grunt

commit 61f075b
Author: scroix <[email protected]>
Date:   Fri Mar 29 19:42:47 2024 +1100

    Enable some speed-ups

commit 1e5f84f
Author: scroix <[email protected]>
Date:   Fri Mar 29 16:29:48 2024 +1100

    Bump node-gradle plugin version to 7.0.2

commit 5269ab2
Author: scroix <[email protected]>
Date:   Fri Mar 29 16:29:22 2024 +1100

    Resolve minor warnings

commit 31757e3
Author: scroix <[email protected]>
Date:   Fri Mar 29 16:28:48 2024 +1100

    Replace deprecated jcenter

commit c51ce33
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 15:10:53 2024 +1100

    Bump Gradle version to 7.6.4

commit 1b75ec9
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Mon Mar 18 21:13:46 2024 +1100

    Upgrade Gradle to 7.4 and Node.js to 16.x

    - Migrate build scripts to be compatible
    - Bump Node.js version to one which supports ARM/Silicon builds
    - Configure the node-gradle-plugin

commit ad02c68
Author: Mic <[email protected]>
Date:   Fri Oct 13 15:49:04 2023 +1100

    bugfix: <switch> not possible in <status> (museumsvictoria#307)

commit c031182
Author: Mic <[email protected]>
Date:   Fri Oct 13 15:47:49 2023 +1100

    Fix for museumsvictoria#192: UI may fail to render and generate error if not all node data is ready

commit e3506f0
Author: Mic <[email protected]>
Date:   Fri Oct 13 15:46:34 2023 +1100

    Fix for museumsvictoria#303 special characters break log (museumsvictoria#309)

commit b0c1169
Author: Justin Parker <[email protected]>
Date:   Fri Aug 25 12:57:16 2023 +1000

    museumsvictoria#297: JWT convenience dependencies (is discussion museumsvictoria#297)

commit b737f0f
Author: Justin Parker <[email protected]>
Date:   Mon May 15 16:38:53 2023 +1000

    museumsvictoria#282 update: 'showevent' attribute support for <row> within <grid>

commit 9ac2865
Author: Peter (Yongsik) Moon <[email protected]>
Date:   Wed Apr 5 16:29:03 2023 +1000

    check if timer already existing

commit 8ec0987
Author: Justin Parker <[email protected]>
Date:   Thu Mar 9 13:40:55 2023 +1100

    frontend updates museumsvictoria#285 and museumsvictoria#285: <range> improvements

    * Prevents extreme jumps and nudge controls

commit 6294672
Author: Justin Parker <[email protected]>
Date:   Thu Mar 9 13:15:34 2023 +1100

    museumsvictoria#282: <row> does not respect "showevent" attribute

commit e18e4bd
Author: Justin Parker <[email protected]>
Date:   Tue Mar 7 16:41:02 2023 +1100

    bugfix museumsvictoria#289: Managed Process "stopped" callback can be skipped in certain environment and conditions

commit 5b23d6f
Author: Justin Parker <[email protected]>
Date:   Mon Jan 16 16:32:16 2023 +1100

    minor bugfix museumsvictoria#276: Dynamically created remote signals result in wrong name in activity log (museumsvictoria#277)

commit 500b0d3
Author: Justin Parker <[email protected]>
Date:   Tue Nov 29 17:05:53 2022 +1100

    minor bugfix museumsvictoria#267: duplicate network topology change messages

    update museumsvictoria#268: user-friendly messaging on port binding failure

commit 214e341
Author: Justin Parker <[email protected]>
Date:   Thu Nov 24 20:41:30 2022 +1100

    update museumsvictoria#240: more context in /diagnostics logging

    Update thanks automatic.com.au

commit ea291af
Author: Justin Parker <[email protected]>
Date:   Thu Nov 24 19:59:05 2022 +1100

    update museumsvictoria#258: Uptime can be misleading if start timestamp is inaccurate

    Update thanks to automatic.com.au

commit 17606a5
Author: Justin Parker <[email protected]>
Date:   Tue Nov 22 20:00:12 2022 +1100

    update: Allow use of relative URIs museumsvictoria#266

commit 8688424
Author: Justin Parker <[email protected]>
Date:   Tue Nov 22 18:34:13 2022 +1100

    Major update museumsvictoria#81: HTTP and WebSocket ports unified

    Feature thanks to automatic.com.au; co-authored-by: @morimoriysmoon and @justparking

    Normally an additional arbitrary TCP socket was used as a WebSocket endpoint. This update avoids the additional port by adding WebSocket funcionality onto the main HTTP port.

commit 9f0cea3
Author: Justin Parker <[email protected]>
Date:   Tue Nov 22 10:23:57 2022 +1100

    Feature museumsvictoria#252: Added <dynamicbuttongroup> front end element

commit f869021
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Nov 3 22:17:27 2022 +1100

    Bump moment from 2.29.2 to 2.29.4 in /nodel-webui-js (museumsvictoria#257)

    Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4.
    - [Release notes](https://github.com/moment/moment/releases)
    - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
    - [Commits](moment/moment@2.29.2...2.29.4)

    ---
    updated-dependencies:
    - dependency-name: moment
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit f45fae7
Author: Michael Cartmel <[email protected]>
Date:   Fri Jul 22 14:49:22 2022 +1000

    Fix for museumsvictoria#256

    GSAP package, which provides the color animation function, has no jQuery plugin for v3. Rolling back to v2.

commit 2640d2b
Author: Justin Parker <[email protected]>
Date:   Mon Jul 4 16:22:54 2022 +1000

    museumsvictoria#219 bugfix: meter should not initialise at 100%

commit 73119d7
Author: Justin Parker <[email protected]>
Date:   Mon May 30 18:26:47 2022 +1000

    bugfix: preset colours should not update when feedback "wired" (museumsvictoria#248)

commit 7d271c2
Author: Justin Parker <[email protected]>
Date:   Fri May 27 15:59:47 2022 +1000

    #13: <lighting> can cause virtual keyboard pop-up

commit c9b8847
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Apr 11 10:47:36 2022 +1000

    Bump moment from 2.29.1 to 2.29.2 in /nodel-webui-js (museumsvictoria#241)

    Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.2.
    - [Release notes](https://github.com/moment/moment/releases)
    - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
    - [Commits](moment/moment@2.29.1...2.29.2)

    ---
    updated-dependencies:
    - dependency-name: moment
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 9db27c6
Author: Justin Parker <[email protected]>
Date:   Wed Mar 16 23:56:36 2022 +1100

    update museumsvictoria#234: <panel> supports "showevent" attribute

    Thanks to automatic.com.au

commit bb99817
Author: Justin Parker <[email protected]>
Date:   Tue Mar 15 15:36:30 2022 +1100

    bugfix: museumsvictoria#237 timers could become orphaned (museumsvictoria#238)

    Bugfix thanks to automatic.com.au

commit 4c6ede4
Author: Justin Parker <[email protected]>
Date:   Fri May 27 13:45:32 2022 +1000

    museumsvictoria#225 update: <lighting> can be coerced using multiple formats

commit fd7e218
Author: Justin Parker <[email protected]>
Date:   Mon Jan 17 23:41:39 2022 +1100

    bugfix museumsvictoria#230: <dynamicselect> affected by recent updates

    co-authored-by: @morimoriysmoon

commit b151ab5
Author: Justin Parker <[email protected]>
Date:   Thu Jan 6 15:59:41 2022 +1100

    feature museumsvictoria#213: QR code support, static and dynamic

    Feature thanks to automatic.com.au; co-authored-by: @morimoriysmoon

commit 760e459
Author: Justin Parker <[email protected]>
Date:   Thu Jan 6 14:12:03 2022 +1100

    Feature museumsvictoria#227: Filtering of active diagnostic charts

    Feature thanks to automatic.com.au; co-authored-by: @morimoriysmoon

commit ab3e625
Author: Justin Parker <[email protected]>
Date:   Thu Jan 6 13:49:09 2022 +1100

    <div> element is not closed properly

    Co-authored-by: @morimoriysmoon

commit a4d0ca6
Author: Justin Parker <[email protected]>
Date:   Wed Nov 17 21:05:27 2021 +1100

    feature: <lighting> frontend control supporting multi-channel lighting/colour devices (museumsvictoria#222)

    Implemented by automatic.com.au thanks to Museums Victoria

commit 32c2469
Author: Justin Parker <[email protected]>
Date:   Wed Nov 17 20:16:36 2021 +1100

    (minor rollback)

commit 4d0b95e
Author: Justin Parker <[email protected]>
Date:   Mon Nov 8 23:26:53 2021 +1100

    Reduced dependabot alerts by updating javascript libraries

    Co-authored-by: automatic.com.au

commit e2fca9f
Author: Justin Parker <[email protected]>
Date:   Tue Oct 12 13:54:53 2021 +1100

    prevent hoisting (unlisted issue)

    authored-by: automatic.com.au

commit 6ffa4b7
Author: Justin Parker <[email protected]>
Date:   Wed Oct 6 01:11:29 2021 +1100

    (cont)

commit 8394d75
Author: Justin Parker <[email protected]>
Date:   Wed Oct 6 00:50:14 2021 +1100

    (cont.)

commit 4a1f1cc
Author: Justin Parker <[email protected]>
Date:   Tue Oct 5 23:26:46 2021 +1100

    only poll locals or network when required

commit 74d2ae1
Author: Justin Parker <[email protected]>
Date:   Tue Oct 5 01:31:27 2021 +1100

    bugfix: search fails when space or punctuation used

commit 51c3156
Author: Justin Parker <[email protected]>
Date:   Tue Oct 5 00:50:47 2021 +1100

    REVERT nav

commit 6fbd56e
Author: Justin Parker <[email protected]>
Date:   Tue Oct 5 00:39:24 2021 +1100

    revert PAGE constants, revert generateHostIcon cache

commit 506dc77
Author: Justin Parker <[email protected]>
Date:   Mon Oct 4 23:50:20 2021 +1100

    revert whitespace change

commit 8859e10
Author: Justin Parker <[email protected]>
Date:   Mon Oct 4 23:18:13 2021 +1100

    only apply filter on filter change (background poll continues), nav: host icon always shows locals, nodel icon always shows all nodes

commit 21a3cac
Author: Yongsik Moon <[email protected]>
Date:   Sun Oct 3 23:17:23 2021 +1100

    use cache

commit b5c89ae
Author: Yongsik Moon <[email protected]>
Date:   Sun Oct 3 23:08:21 2021 +1100

    check page type

commit de237e7
Author: Yongsik Moon <[email protected]>
Date:   Sun Oct 3 16:35:24 2021 +1100

    Revert "cache host icons"

    This reverts commit a0c4ec2.

commit dffb3c0
Author: Yongsik Moon <[email protected]>
Date:   Sun Oct 3 15:44:50 2021 +1100

    cache host icons

    and check if related elements exist before querying.

commit 06eeabb
Author: Justin Parker <[email protected]>
Date:   Fri Oct 1 20:36:49 2021 +1000

    museumsvictoria#205: /diagnostics: more build info and links, overloaded 'nicetime' to allow for year

commit d4f22c8
Author: Yongsik Moon <[email protected]>
Date:   Thu Sep 23 14:10:53 2021 +1000

    apply navigation rule

commit dae1832
Author: Yongsik Moon <[email protected]>
Date:   Thu Sep 23 12:43:56 2021 +1000

    Use /REST

    and add a new page for Locals

commit f6a70fb
Author: Yongsik Moon <[email protected]>
Date:   Sat Sep 4 15:05:20 2021 +1000

    bugfix : make avatar as same as current host's one

commit 3c901a9
Author: Michael Cartmel <[email protected]>
Date:   Fri May 21 14:40:22 2021 +1000

    Properly sanitise log values

commit c3e2335
Author: Peter(Yongsik) Moon <[email protected]>
Date:   Thu May 27 15:56:46 2021 +1000

    refresh

commit 9889dcb
Author: Peter(Yongsik) Moon <[email protected]>
Date:   Wed May 26 20:56:54 2021 +1000

    init commit

commit 5de7268
Author: Justin Parker <[email protected]>
Date:   Wed Apr 7 15:06:55 2021 +1000

    build: tidyup: sourceset duplication warning (relates to museumsvictoria#204)

commit b16c5ee
Author: Michael Cartmel <[email protected]>
Date:   Wed Apr 7 14:45:41 2021 +1000

    Fix for older browsers

commit f214b10
Author: Julien de Sainte-Croix <[email protected]>
Date:   Mon Feb 22 12:01:03 2021 +1100

    Add support for @lg >1200px column layouts

commit 046abe4
Author: Justin Parker <[email protected]>
Date:   Tue Apr 6 14:46:53 2021 +1000

    Feat nodejsgradle (museumsvictoria#209)

    * Use nodejs plugin for Gradle so no need to manually install grunt/loadash cli
    * updated BUILDING instructions

commit 57a7746
Author: Justin Parker <[email protected]>
Date:   Thu Apr 1 17:50:42 2021 +1100

    Managed SSH support (museumsvictoria#206)

    This Nodel feature contribution is thanks to [ACMI](https://acmi.net.au), implemented by [Automatic](https://automatic.com.au)

commit 5c95e5c
Author: Michael Cartmel <[email protected]>
Date:   Wed Mar 17 11:24:00 2021 +1100

    Change REST endpoints to use node path as root

commit b53ed50
Author: Michael Cartmel <[email protected]>
Date:   Mon Mar 15 16:45:38 2021 +1100

    Fix for missing function, link to node via node name

commit 8e17763
Author: Michael Cartmel <[email protected]>
Date:   Wed Feb 17 16:27:04 2021 +1100

    Load frontend UI by default on frontend nodes

commit 37d98d0
Author: Michael Cartmel <[email protected]>
Date:   Wed Feb 17 16:25:51 2021 +1100

    Fix button text overflow in main interface

commit 3c7bdf4
Author: Justin Parker <[email protected]>
Date:   Wed Jan 27 15:50:57 2021 +1100

    bugfix: museumsvictoria#152 - bindings left un-'registered' can cause a cleanup failure

commit dc14166
Author: Michael Cartmel <[email protected]>
Date:   Mon Feb 8 11:31:43 2021 +1100

    Fix for museumsvictoria#200

commit fa7b473
Author: Michael Cartmel <[email protected]>
Date:   Tue Nov 17 14:05:00 2020 +1100

    Add support for subtitle

commit b6e5821
Author: Michael Cartmel <[email protected]>
Date:   Tue Nov 17 13:49:22 2020 +1100

    Allow setting specific size for titles

commit 492dca1
Author: Michael Cartmel <[email protected]>
Date:   Tue Nov 17 13:46:39 2020 +1100

    Use status blocks with no status arg

commit 18402cd
Author: Michael Cartmel <[email protected]>
Date:   Mon Nov 16 23:41:50 2020 +1100

    Fix for museumsvictoria#193

commit cdd6df0
Author: Michael Cartmel <[email protected]>
Date:   Mon Nov 16 19:20:19 2020 +1100

    Fix for museumsvictoria#185

commit 1933a3c
Author: Michael Cartmel <[email protected]>
Date:   Mon Nov 16 18:56:44 2020 +1100

    Fix for museumsvictoria#195

commit 783a972
Author: Michael Cartmel <[email protected]>
Date:   Wed Aug 19 12:29:23 2020 +1000

    Fix for museumsvictoria#191

commit 1f8aa45
Author: Michael Cartmel <[email protected]>
Date:   Fri Jul 10 08:58:58 2020 +1000

    Fix for museumsvictoria#168 layout issue

commit d21788e
Author: Michael Cartmel <[email protected]>
Date:   Fri Jul 3 14:14:07 2020 +1000

    Initialise log with most recent first

commit f3c7747
Author: Michael Cartmel <[email protected]>
Date:   Fri Jul 3 14:13:25 2020 +1000

    Fix for museumsvictoria#187

commit 5902d60
Author: Mic <[email protected]>
Date:   Thu Jul 2 16:58:25 2020 +1000

    UI performance overhaul (museumsvictoria#188)

    Better handing of very large nodes
    * UI performance overhaul
    * Console space fix
    * build(deps): bump websocket-extensions in /nodel-webui-js
    Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
    * Use HTTP or HTTPS depending on what client uses
    * Use hosticon as favicon
    * Throttle log further optimisation
    * Remove redundant debug block
    * Update to log throttling mechanism
    * Add bindings filter
    * Further fixes for log buffer and display
    * Fix for initialising the log if there is no prior activity
    * Fix polling mode not updating
    * Clean up gruntfile

commit 802fec5
Author: Justin Parker <[email protected]>
Date:   Tue Jun 30 13:06:16 2020 +1000

    minor update: handles deeply nested comments (extraneous info) in simple names, e.g. "...(...(...))..."

commit ea2c575
Author: Justin Parker <[email protected]>
Date:   Thu Jun 25 21:01:24 2020 +1000

    (cont.)

commit b531ace
Author: Justin Parker <[email protected]>
Date:   Thu Jun 25 20:49:57 2020 +1000

    obscure bug: remote event arg wrong un/persisting behaviour

commit e0feea9
Author: Justin Parker <[email protected]>
Date:   Thu Jun 18 02:14:45 2020 +1000

    feature museumsvictoria#183: .addEmitFilter and .addCallFilter

commit 34ef00a
Author: Justin Parker <[email protected]>
Date:   Fri Jun 5 01:03:15 2020 +1000

    museumsvictoria#150: _lastError.txt cleanup

commit 62a3413
Author: Justin Parker <[email protected]>
Date:   Sat May 23 18:43:14 2020 +1000

    build: update to Gradle 5.6.4 (prev. 3.5)

commit b8916be
Author: Justin Parker <[email protected]>
Date:   Fri May 15 11:43:33 2020 +1000

    museumsvictoria#157: treat 0xa0 NO-BREAK-SPACE; and tidy-up

commit 85723e1
Author: Justin Parker <[email protected]>
Date:   Wed May 13 15:42:32 2020 +1000

    museumsvictoria#170 exclude '.nodel' directory in listing

commit 7e8af16
Author: Michael Cartmel <[email protected]>
Date:   Wed Jun 17 15:02:13 2020 +1000

    Use HTTP or HTTPS depending on client connection

commit f996063
Author: Michael Cartmel <[email protected]>
Date:   Mon May 11 14:24:52 2020 +1000

    Fix for museumsvictoria#178

commit 997b677
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:46:36 2024 +1100

    Revert "Update gradle-wrapper.jar"

    This reverts commit 058a407.

commit 058a407
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:46:17 2024 +1100

    Update gradle-wrapper.jar

commit d23abeb
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:41:50 2024 +1100

    Switch to Gradle bin

commit 90c5066
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:36:28 2024 +1100

    Update gradlew files

    - Using `gradle wrapper` command

commit 9018716
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:24:58 2024 +1100

    Move project info variables to top-level build file

commit 0cfb6fd
Author: scroix <[email protected]>
Date:   Sat Mar 30 13:24:33 2024 +1100

    Revert to original devDependencies

commit 162d58d
Author: scroix <[email protected]>
Date:   Sat Mar 30 12:03:12 2024 +1100

    Revert node version to simplify grunt issue

commit 1b0b706
Author: scroix <[email protected]>
Date:   Sat Mar 30 08:13:58 2024 +1100

    Add a couple more optimisations

commit d65be71
Author: scroix <[email protected]>
Date:   Sat Mar 30 07:42:54 2024 +1100

    Move the feature to check for file changes into a class

commit 027a129
Author: scroix <[email protected]>
Date:   Sat Mar 30 07:18:03 2024 +1100

    Remove unneccesary dir check during Gradle webui tasks

commit 1a766c2
Author: scroix <[email protected]>
Date:   Sat Mar 30 07:17:27 2024 +1100

    Remove Gradle optimisation flags

commit 2fd735b
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 22:26:53 2024 +1100

    Maybe this is working now

commit 820dba9
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 21:57:48 2024 +1100

    Remove the grunt script from the package.json

commit 3e66086
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 21:57:37 2024 +1100

    Further attempt to cache the grunt task

commit 3121adf
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 20:51:49 2024 +1100

    Add hack for "cache" of grunt tasks

commit 48c0b59
Author: scroix <[email protected]>
Date:   Fri Mar 29 19:43:22 2024 +1100

    Attempt to cache grunt

commit 8a93e80
Author: scroix <[email protected]>
Date:   Fri Mar 29 19:42:47 2024 +1100

    Enable some speed-ups

commit d151cda
Author: scroix <[email protected]>
Date:   Fri Mar 29 16:29:48 2024 +1100

    Bump node-gradle plugin version to 7.0.2

commit 2c8f6f5
Author: scroix <[email protected]>
Date:   Fri Mar 29 16:29:22 2024 +1100

    Resolve minor warnings

commit 0fcc59e
Author: scroix <[email protected]>
Date:   Fri Mar 29 16:28:48 2024 +1100

    Replace deprecated jcenter

commit c10d6ef
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Fri Mar 29 15:10:53 2024 +1100

    Bump Gradle version to 7.6.4

commit 9e05637
Author: Julien de-Sainte-Croix <[email protected]>
Date:   Mon Mar 18 21:13:46 2024 +1100

    Upgrade Gradle to 7.4 and Node.js to 16.x

    - Migrate build scripts to be compatible
    - Bump Node.js version to one which supports ARM/Silicon builds
    - Configure the node-gradle-plugin

commit b4eea85
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Apr 30 13:25:45 2020 +0000

    build(deps): bump jquery from 3.4.1 to 3.5.0 in /nodel-webui-js

    Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0.
    - [Release notes](https://github.com/jquery/jquery/releases)
    - [Commits](jquery/jquery@3.4.1...3.5.0)

    Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
@scroix
scroix committed Apr 20, 2024
1 parent a9dddcb commit 8fe2db4
Show file tree
Hide file tree
Showing 8 changed files with 1,618 additions and 965 deletions.
1 change: 1 addition & 0 deletions nodel-jyhost/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodelhost-temp
117 changes: 117 additions & 0 deletions nodel-jyhost/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,117 @@ tasks.named('distZip') {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}

tasks.register('cleanNodelhostTemp') {
doLast {
def nodelhostTempDir = new File("$projectDir/nodelhost-temp")
if (nodelhostTempDir.exists()) {
nodelhostTempDir.deleteDir()
println "Cleaned nodelhost-temp directory"
}
}
}

clean {
dependsOn 'cleanNodelhostTemp'
}

def process

tasks.register('startNodelhost') {
dependsOn 'cleanNodelhostTemp'
doLast {
def nodelhostTempDir = new File("$projectDir/nodelhost-temp")
if (!nodelhostTempDir.exists()) {
nodelhostTempDir.mkdirs()
}

def processBuilder = new ProcessBuilder(
'java',
'-cp', sourceSets.main.runtimeClasspath.asPath,
'-ea',
'org.nodel.jyhost.Launch'
)
processBuilder.directory(nodelhostTempDir)
processBuilder.redirectOutput(new File("$nodelhostTempDir/output.log"))
processBuilder.redirectError(new File("$nodelhostTempDir/error.log"))
process = processBuilder.start()
}
}

tasks.register('startNodelhostInteractive') {
dependsOn 'cleanNodelhostTemp'

// Declare a variable to store the spawned process
process = null

doLast {
def nodelhostTempDir = new File("$projectDir/nodelhost-temp")
if (!nodelhostTempDir.exists()) {
nodelhostTempDir.mkdirs()
}

def processBuilder = new ProcessBuilder(
'java',
'-cp', sourceSets.main.runtimeClasspath.asPath,
'-ea',
'org.nodel.jyhost.Launch'
)
processBuilder.directory(nodelhostTempDir)

// Redirect the process output to the Gradle logger
processBuilder.redirectErrorStream(true)
process = processBuilder.start()

// Create a separate thread to consume the process output
Thread outputThread = new Thread({
process.inputStream.eachLine { line ->
logger.lifecycle(line)
}
})
outputThread.start()

// Wait for the process to terminate
process.waitFor()

// Wait for the output thread to finish
outputThread.join()
}

// Configure the task to run only if the process is not already running
onlyIf {
process == null || !process.isAlive()
}

// Specify the cleanup task to run after this task, even if it fails or is stopped
finalizedBy stopNodelhost
}

tasks.register('stopNodelhost') {
doLast {
if (process != null && process.isAlive()) {
logger.lifecycle("Terminating the spawned process...")
process.destroy()
logger.lifecycle("Spawned process terminated.")
}
}
}

// ./gradlew playwright --args="help"
task playwright(type: JavaExec) {
classpath sourceSets.test.runtimeClasspath
mainClass = 'com.microsoft.playwright.CLI'
}

test {
dependsOn startNodelhost
useJUnitPlatform()
testLogging {
events "passed", "skipped", "failed"
}
finalizedBy stopNodelhost
ignoreFailures = true
}

dependencies {
implementation project(':nodel-webui-js')
implementation project(':nodel-framework')
Expand All @@ -84,4 +195,10 @@ dependencies {

// Add joda-time dependency
implementation 'joda-time:joda-time:2.10.14'

// add Playwright and test dependencies
testImplementation 'com.microsoft.playwright:playwright:1.42.0'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
}
7 changes: 7 additions & 0 deletions nodel-jyhost/src/main/java/org/nodel/jyhost/Launch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ public static void main(String[] args) throws IOException, JSONException, Startu
System.out.println("Press Enter to initiate a shutdown.");
System.out.println();

// Add shutdown hook
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
System.out.println("Received termination signal. Shutting down...");
launch.shutdown();
System.out.println("Finished.");
}));

tryReadFromConsole();

System.out.println("Shutdown initiated...");
Expand Down
89 changes: 89 additions & 0 deletions nodel-jyhost/src/test/java/org/nodel/PlaywrightTests.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package org.nodel;

import com.microsoft.playwright.*;
import org.junit.jupiter.api.*;

import static org.junit.jupiter.api.Assertions.*;

public class PlaywrightTests {

private static Playwright playwright;
private static Browser browser;
private static Page page;

@BeforeAll
public static void setup() {
playwright = Playwright.create();
BrowserType.LaunchOptions options = new BrowserType.LaunchOptions();
// Add any browser options here if necessary
browser = playwright.chromium().launch(options);
BrowserContext context = browser.newContext();
// Customize the context if needed (viewport size, user agent, etc.)
page = context.newPage();

// Wait for the application to start up
page.navigate("http://127.0.0.1:8085");
page.waitForSelector(".navbar");
}

@Test
public void testNavigationBarPresence() {
assertNotNull(page.querySelector(".navbar"), "Navigation bar should be present");
}

@Test
public void testActiveNavigationItem() {
String activeNavItemText = page.textContent(".nav.navbar-nav .active");
assertEquals("Locals", activeNavItemText, "Active navigation item should be 'Locals'");
}

@Test
public void testSourceFileAvailability() {
APIResponse response = page.request().get("http://127.0.0.1:8085/v1/css/components.default.css");
assertEquals(200, response.status(), "components.default.css should be available");

response = page.request().get("http://127.0.0.1:8085/v1/img/logo.png");
assertEquals(200, response.status(), "logo.png should be available");

response = page.request().get("http://127.0.0.1:8085/v1/js/components.min.js");
assertEquals(200, response.status(), "components.min.js should be available");

response = page.request().get("http://127.0.0.1:8085/v1/js/nodel.js");
assertEquals(200, response.status(), "nodel.js should be available");
}

@Test
public void testFontFamily() {
String fontFamily = page.evaluate("() => window.getComputedStyle(document.body).getPropertyValue('font-family')").toString();
assertTrue(fontFamily.contains("Roboto"), "Font family should include Roboto");
}

@Test
public void testBootstrapLayout() {
assertNotNull(page.querySelector("div.row > div.col-sm-12"), "Bootstrap row and column should be present");
}

@Test
public void testNodelAddElement() {
assertNotNull(page.querySelector(".nodel-add"), ".nodel-add should be present");
}

@Test
public void testListGroupItems() {
assertNotNull(page.querySelector(".list-group-item"), "list-group-item elements should be present");
}

@Test
public void testNodelAddButtonMargin() {
String marginBottom = page.evaluate("() => window.getComputedStyle(document.querySelector('.nodel-add .btn')).getPropertyValue('margin-bottom')").toString();
assertEquals("5px", marginBottom, ".nodel-add .btn should have margin-bottom: 5px");
}

@AfterAll
public static void tearDown() {
if (browser != null) {
browser.close();
}
playwright.close();
}
}
18 changes: 9 additions & 9 deletions nodel-webui-js/Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ module.exports = function(grunt) {
cwd: './node_modules/@fortawesome/fontawesome-free/webfonts/',
src: '**',
dest: 'build/grunt/v1/fonts/',
flatten: true,
flatten: true,
filter: 'isFile'
},
{
expand: true,
cwd: './node_modules/bootstrap/dist/fonts/',
src: '**',
dest: 'build/grunt/v1/fonts/',
flatten: true,
flatten: true,
filter: 'isFile'
},
{
Expand Down Expand Up @@ -252,13 +252,13 @@ module.exports = function(grunt) {
dest: './build/grunt/v1/js/components.js'
}
},
uglify: {
options: {
compress: true
},
applib: {
uglify: {
options: {
compress: true
},
applib: {
src: './build/grunt/v1/js/components.js',
dest: './build/grunt/v1/js/components.min.js'
dest: './build/grunt/v1/js/components.min.js'
}
}
});
Expand All @@ -275,4 +275,4 @@ module.exports = function(grunt) {
grunt.registerTask('build', ['copy:updatetheme','replace','twbs:dark','concat_css:dark','twbs:light','concat_css:light','copy:main','concat','uglify']);
grunt.registerTask('gfonts', ['googlefonts']);
grunt.registerTask('deploy', ['copy:main','copy:deploy']);
};
};
4 changes: 3 additions & 1 deletion nodel-webui-js/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ dependencies {
}

node {
version = '12.19.0'
version = '20.12.0'
download = true

workDir = file("${project.buildDir}/nodejs")
nodeProjectDir = file("${project.projectDir}")
}

npmInstall.args = ['--legacy-peer-deps']

class FileChecker {
def nodeModulesDir
def srcDir
Expand Down
Loading

0 comments on commit 8fe2db4

Please sign in to comment.