Skip to content
Snippets Groups Projects
Commit ac7a8e39 authored by Viktor Vorobev's avatar Viktor Vorobev
Browse files

[NRRPLT-8168] NRP 4.0 Integration 

Squashed commit of the following:

commit 6a168bbc27d387d55555bb22e0fd05953ee63e1a
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Feb 28 19:28:24 2023 +0100

    [NRRPLT-8803] Acknowledgments in README.md

commit 81ae00dfc7e9b412992cd19b1dd4acc69583a2e1
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Feb 23 12:47:47 2023 +0100

    [NRRPLT-8793] Prevent initializing without MQTT

commit 9482de4410a4afbd09332c8fe0f2f4368514d9f6
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Wed Feb 22 10:54:56 2023 +0100

    [NRRPLT-8775] hide binaries in TF

commit 59977bc3ea2a147846e7bee2d29e8c1a22958add
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Feb 21 17:09:59 2023 +0100

    [NRRPLT-8168] Hide mqtt behind proxy in Docker installation

commit 02672f6ff0cfdbc5ad312309574469b4d377a0cc
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Mon Feb 20 18:25:21 2023 +0100

    [NRRPLT-8168] update .dockerfile

commit dbf3bef1cd132e44f96f42637ff59c03a9e6f7f7
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Mon Feb 20 14:24:02 2023 +0100

    [NRRPLT-8168] Remove unused components

commit 30fe64a2d7b207f5236bc2cb44cee7200a6c8a48
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Mon Feb 20 14:22:34 2023 +0100

    [NRRPLT-8791] The buttons Launch and Stop are renamed to Initialize and Shutdown

commit 5bf8efa162c27bbfec1f50d4ee180fb09764f6d5
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Wed Feb 15 11:10:59 2023 +0100

    [NRRPLT-8787] Add code highlighting in the TFEditor

commit d787db6f78dd47afe5856628f7f7ae49968199c4
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Feb 9 14:54:23 2023 +0100

    [NRRPLT-8168] comment non-working stop all button

commit cd5c7b377a267317a626c9205999980101161b6b
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Feb 9 11:03:39 2023 +0100

    [NRRPLT-8168] clean Jenkinsfile

commit 87858681887d19543140acc6c8bd359f0f98febf
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Feb 9 10:14:28 2023 +0100

    [NRRPLT-8168] add babel configuration .babelrc

commit 4cead32a0cddc6ac75edc7923a8e6bf8d4689197
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Feb 7 22:29:14 2023 +0100

    [NRRPLT-8168] add state for non-created experiment

commit 07cff00088d1ad70728cf358dcbf616cde25b6de
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Feb 7 19:51:31 2023 +0100

    [NRRPLT-8168] fix the stop button in the experiment leave dialog

commit 156baaea10896e4d037f19d91657efa9600cb98a
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Feb 2 18:59:06 2023 +0100

    [NRRPLT-8168] add Dockerfile to build an image

commit 8c6cb64c314ba29c26459b97f2f4c141c17f2b75
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Jan 31 17:28:36 2023 +0100

    [NRRPLT-8168] Fix Stop button in experiments view

commit 36a643a455da01996bd4e34cab0fed3a5c0cca41
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Jan 31 11:39:21 2023 +0100

    [NRRPLT-8168] Cosmetic fixes

commit 511f4da43523498211d657c27832555482380d73
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Mon Jan 30 22:30:48 2023 +0100

    [NRRPLT-8168] Workflow fixes

commit ef8e5917c2612a46910dfab43fe3a5e53ffb05c3
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Fri Jan 27 17:27:47 2023 +0100

    [NRRPLT-8168] Small fix

commit 4e1d18d04f7df84b9c09536936766edb0097debb
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Fri Jan 27 14:05:39 2023 +0100

    [NRRPLT-8168] change SimDescription to SimulationDescription

commit 6fe1c365f8578afcc7832344bae9e0aa315ab083
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Wed Jan 25 12:36:49 2023 +0100

    [NRRPLT-8716] Fix POST /simulation request and tests

commit 71c58b1f1a8250a37f9eeef97c1ca01c90dd084a
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Mon Jan 23 11:38:44 2023 +0100

    [NRRPLT-8716] Add Launch button and error message parsing

commit 4ca4998a9045d52d0e3b2ac4afa30b603aa31e53
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Jan 10 11:52:01 2023 +0100

    [NRRPLT-8716] Remove experiment-configuration.js

commit 9a2a44542731e5a86dabd1b8b625959afbfe7a08
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Jan 10 11:39:12 2023 +0100

    [NRRPLT-8716] Remove initConfigFiles from Simulation Service

commit 5c0ffcd013cf887d559c94f6fab91a20cf53ccb9
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Jan 10 11:08:52 2023 +0100

    [NRRPLT-8716] Fix tests

commit aab4e8f0ec361e10d9d93c87c7caeb57990a25da
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Jan 10 10:56:32 2023 +0100

    [NRRPLT-8716] Fix Jenkinsfile

commit f6154394f43908ed00af883d62db311405c2bc4e
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Jan 10 10:55:34 2023 +0100

    [NRRPLT-8716] Fix tests

commit f9b32773b5d79bc0089af3a013b20c1a2363e9e2
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Jan 10 10:52:43 2023 +0100

    [NRRPLT-8716] Remove mocks

commit f10b881d818e628ff858cb877da47c199c511f68
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Mon Jan 9 15:06:11 2023 +0100

    [NRRPLT-8716] Receive and handle simulation status mqtt messages

commit 07bc3cab6c9dd61d0c6bc1bdf58152a1dff7d6da
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Dec 27 10:59:44 2022 +0100

    [NRRPLT-8716] ProxyEventService in user-menu

commit b0062e6b948c702ac629442dda3b6c4f82638f29
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Dec 27 10:54:53 2022 +0100

    [NRRPLT-8716] ProxyEventService added

    Squashed commit of the following:

    commit 1825d2f5dec06cd1b06d7519993efe747fc731d0
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Fri Dec 23 19:06:32 2022 +0100

        [NRRPLT-8716] NrpCoreDashboard uses EventProxyService

    commit 6c1cc84a6a2d5472ee7e1b6335e93fee2864a761
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Fri Dec 23 18:45:22 2022 +0100

        [NRRPLT-8716] NrpHeader uses EventProxyService

    commit 49f84f060c6c2d1b5d8447ea745dafed2285f090
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Fri Dec 23 14:26:41 2022 +0100

        [NRRPLT-8716] added proxy events service

    commit 01f75d541eaaa19d61d82d11ef2fa4cf24bfb898
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Fri Dec 23 12:02:39 2022 +0100

        [NRRPLT-8716] modify performRequest for proxy

    commit e6bc64f1841d8de2d6705def7da29424baab27c6
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Thu Dec 22 14:23:06 2022 +0100

        [NRRPLT-8716] add HttpProxyService and tests

commit 2d283c3bd7b82508182a50669294285cd27de3dd
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Dec 20 12:12:45 2022 +0100

    [NRRPLT-8717] update test coverage

    Squashed commit of the following:

    commit 4eb64eb4724ef87c3b7b5728979089d165395822
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 20 12:10:47 2022 +0100

        [NRRPLT-8717] add DialogService description

    commit 429c20f947c135d2328696d03c3531ad451a563b
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 20 12:09:16 2022 +0100

        [NRRPLT-8717] update RemoteExperimentFilesService tests

    commit 6bd1c29fdf4a3a2d0e64802098d6150ccb7aee12
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 20 10:59:05 2022 +0100

        [NRRPLT-8717] update ModelsStorageService tests

    commit 1ad321585a5e12e3e3e717b1ac46f5e9dbd9f98a
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Fri Dec 16 20:59:36 2022 +0100

        [NRRPLT-8717] update PublicExperimentsService tests

    commit 8e2c3d9fb81a2f171cab8b58f2b0f9e75215b8e6
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Thu Dec 15 22:22:40 2022 +0100

        [NRRPLT-8717] add PublicExperimentsService tests

    commit 5f062676a6403859934ba6a8d07fc3e0cee6ef6f
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Thu Dec 15 18:16:36 2022 +0100

        [NRRPLT-8717] improve ExperimentStorageService coverage

    commit 984db68b9b184661d3a397621cc16104fa8e5564
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Thu Dec 15 14:52:36 2022 +0100

        [NRRPLT-8717] improve ExperimentStorageService coverage

    commit faf9648be8bac0efacc833b65c0d6ca91cbfb490
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Thu Dec 15 13:22:39 2022 +0100

        [NRRPLT-8717] improve NrpUserService coverage

commit d74c054795e23a45b9c26b7b89738bffa213f233
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Dec 13 19:14:30 2022 +0100

    [NRRPLT-8715] Unit tests restored & added CI pipeline

    Squashed commit of the following:

    commit 5ea426bf46ed438352290d90a34c3bd6ebc26bf6
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 13 19:02:06 2022 +0100

        [NRRPLT-8715] fix src/services/__tests__/mqtt-client-service.test.js

    commit 5929c5df0aa88656065778ec06f0c06370f4e215
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 13 17:42:46 2022 +0100

        [NRRPLT-8715] fix src/services/__tests__/http-service.test.js

    commit 4e689ef72b860c5953a61db32ac777bec608fd4e
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 13 14:48:15 2022 +0100

        [NRRPLT-8715] add jumit report

    commit 9738e1871da08eee8033f3f2e2dc16c2c40508ba
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 13 14:35:07 2022 +0100

        [NRRPLT-8715] fix Jenkinsfile

    commit dd9ded22b2d601a0201d6b31a229118b80303ec7
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 13 14:25:35 2022 +0100

        [NRRPLT-8715] add Jenkinsfile and disable failing tests

    commit 08eefd4ac55228f782825c625cb22d582210c677
    Author: Viktor Vorobev <vorobev@in.tum.de>
    Date:   Tue Dec 13 13:33:15 2022 +0100

        [NRRPLT-8715] fix src/services/__tests__/authentication-service.test.js

commit 3e51a4b67174c9197c19cc92a2a2de0fb37fbad7
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Mon Dec 12 16:25:43 2022 +0100

    [NRRPLT-8713] Cloning date added

commit 521406ac355788cb2a88bd6f3a592d210491cbcf
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Fri Dec 9 18:35:26 2022 +0100

    [NRRPLT-8168] fix quotes

commit 032a2d6f4bd88a0903970bb9e908b73f14eba32e
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Fri Dec 9 14:10:55 2022 +0100

    [NRRPLT-8168] add error catching

commit b1cdbd7af055b157ec64deeaf95be9156154a0ec
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Fri Dec 9 00:14:52 2022 +0100

    [NRRPLT-8168] add clonning of the storage experiments

commit bd234e675a0c7f663ae443d690f00808b11d1cb4
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Dec 8 17:33:33 2022 +0100

    [NRRPLT-8168] add comments and cleanup

commit 95a0cac925d8dd55a3b28dda6b3ced888cc71293
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Dec 8 12:26:22 2022 +0100

    [NRRPLT-8168] handle disconnected proxy

commit 0aab507b810bc6cbe7ec7a31e97305889870c25a
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Dec 1 22:10:48 2022 +0100

    [NRRPLT-8168] handle disconnected proxy

commit 7e398250650246b845e4d79cbc15f268ee09ce42
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Wed Nov 9 15:46:25 2022 +0100

    [NRRPLT-8168] added error topic subscription

commit f787759d7fd2c33b9c1ef75cf01093bd57e625e6
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Nov 3 17:03:22 2022 +0100

    [NRRPLT-8168] add removal of the experiments dialog and tooltip for the import

commit a929ebbea5d064c164300d03db7502d42db17a1f
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Nov 3 16:14:24 2022 +0100

    [NRRPLT-8168] navigate to workbench on joining the simulation

commit 0483e4a65895ddfe50c79fbdf3e8690c83b9543f
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Nov 3 14:46:58 2022 +0100

    [NRRPLT-8168] fix logout

commit f2ad994447ec2001ecf4a66421075db8431ad006
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Thu Nov 3 09:44:00 2022 +0100

    [NRRPLT-8168] revert name editing button

commit d321c40ab66508f8016f7b4d4eb19e20c3917df8
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Wed Nov 2 21:47:20 2022 +0100

    Merge branch 'feature/NRRPLT-8683-refactor-experiment-workbench'

commit 4d7f7bb8f0dbbdedd734333742973cc537f67920
Merge: 8df4a77 f7a9e33
Author: Evan Eames <eames@fortiss.org>
Date:   Wed Oct 26 15:22:28 2022 +0000

    Merged in feature/NRRPLT-8677 (pull request #42)

    Feature/NRRPLT-8677 - Edit Experiment Name

    Approved-by: Viktor Vorobev

commit f7a9e3370f6aa4a249954ad8aa224b1aa80995b3
Merge: 4c472bf 8df4a77
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Wed Oct 26 15:17:19 2022 +0000

    Merged dev4.0 into feature/NRRPLT-8677

commit 8df4a771ce7300c132230ab017c6f86ffd2afe66
Merge: 0402f7a 9dffba0
Author: jules.lecomte <lecomte@fortiss.org>
Date:   Wed Oct 26 13:20:20 2022 +0000

    Merged in release/NRRPLT-8657 (pull request #41)

    Release/NRRPLT-8657

    Approved-by: Viktor Vorobev

commit 4c472bfca6f98f1e1c75aa8e7df311f7c89438d0
Author: ManosAngelidis <angelidis@fortiss.org>
Date:   Wed Oct 26 15:12:09 2022 +0200

    [feature/NRRPLT-8677] Editing experiment name no longer possible in the Templates tab

commit 0402f7ad9597cd633cb04ac9424d03d999cc1cf8
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Oct 25 22:16:22 2022 +0200

    [NRRPLT-8681] Mock thumbnails usage

commit 68762f44a3812562a142a04491e67c607f0c2ff4
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Oct 25 16:46:05 2022 +0200

    [NRRPLT-8677] Fix renameExperiment

commit 9dffba00ac56b3465721d0cef67101b0a64b94f2
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Tue Oct 25 16:10:26 2022 +0200

    removing 3.2 mock experiment file

commit 9141559db6f980ee073a158748c1e6cc3c5a7a90
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Tue Oct 25 15:45:00 2022 +0200

    tests working with 4.0 experiments

commit a85688b25cbcd6ec25f312a9877f8f50fe4cfd00
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Tue Oct 25 09:36:19 2022 +0200

    cleaning code

commit acdd4ac46c670811527b0f2dbecc1fd74851d03b
Author: Viktor Vorobev <vorobev@in.tum.de>
Date:   Tue Oct 25 00:15:47 2022 +0200

    [NRRPLT-8677] Add renaming request and modify buttons behavior

commit 5edb1686248b515cbbe7a986fc7d6037484d6856
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Mon Oct 24 16:00:05 2022 +0200

    tab file editor inside experiment

commit 1c0d89dba8127c793a14cc43ded90df3e739ff83
Author: ManosAngelidis <angelidis@fortiss.org>
Date:   Mon Oct 24 15:27:17 2022 +0200

    [NRRPLT-8677] Name of simulation on workbench and toggleable edit button next to sim name

commit a4ff81f378edfcbbdf67e4c9d343ad5528f4dcb9
Merge: 40065b4 035d7d7
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Thu Oct 20 15:40:02 2022 +0200

    Merge branch 'NRRPLT-8620' into NRRPLT-8657

commit 035d7d72e3a0beb645d0aba01b041097cb78a196
Merge: d72e722 c01d3e4b
Author: Sandro Weber <webers@in.tum.de>
Date:   Thu Oct 13 13:29:33 2022 +0000

    Merged development into NRRPLT-8620

commit 40065b4fe7ea21fe5d781f19863e5d420d334f6b
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Thu Oct 13 14:39:21 2022 +0200

    [NRRPLT-8657] Adding TF features

commit d72e72284a3b5bc3b104051a31b7b170b83599b9
Merge: 2aa060e 6e8f4df
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Tue Oct 11 10:23:47 2022 +0200

    Merge branch 'NRRPLT-8620' of bitbucket.org:hbpneurorobotics/nrp-frontend into NRRPLT-8620

commit 2aa060eac733490b22493ad08a804cea46e0a7d7
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Tue Oct 11 09:55:25 2022 +0200

    [NRRPLT-8620]renaming attribute config to id

commit 6e8f4df38706a61e9f0cf35442ff5fad9831bd86
Merge: 39d1b19 db84008a
Author: Sandro Weber <webers@in.tum.de>
Date:   Mon Oct 10 15:56:19 2022 +0000

    Merged development into NRRPLT-8620

commit 39d1b19b5f0cff2feed86739c265d039ed8885d5
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Tue Sep 13 17:33:46 2022 +0200

    [NRRPLT-8608]Fixing config name convention

commit 64a1e4a8527730a9cbaa76d384db6258034b6baf
Merge: 0666e1b 6fc1087a
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Mon Sep 12 17:31:31 2022 +0200

    Merge branch 'development' into NRRPLT-8608

commit 0666e1b524e879a66589bf091b2b943b4fc64536
Merge: ad3e380 e2963a50
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Mon Sep 12 17:28:11 2022 +0200

    Merge branch 'NRRPLT-8608' of bitbucket.org:hbpneurorobotics/nrp-frontend into NRRPLT-8608

commit ad3e380a398f9234e918eb278b9080608bccf12f
Author: Juleslcmt <jules.lecomte@telecom-paris.fr>
Date:   Mon Sep 12 17:27:34 2022 +0200

    [NRRPLT-8608]
parent c01d3e4b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4453 additions and 3788 deletions
.babelrc 0 → 100644
+ 6
− 0
View file @ ac7a8e39
{
"presets": [
"@babel/preset-env",
["@babel/preset-react", {"runtime": "automatic"}]
]
}
\ No newline at end of file
.dockerignore 0 → 100644
+ 10
− 0
View file @ ac7a8e39
node_modules
build
.vscode
Jenkinsfile
.git
src/config.json*
!src/config.json.sample.docker
.gitignore
+ 3
− 0
View file @ ac7a8e39
......@@ -53,3 +53,6 @@ Thumbs.db
src/config.json
coverage
junit.xml
src/config.json.local
src/config.json.*
Dockerfile 0 → 100644
+ 21
− 0
View file @ ac7a8e39
FROM node:14
WORKDIR /nrp-frontend-app
COPY public/ ./public/
COPY src/ ./src/
COPY package*.json ./
COPY README.md ./
RUN cp src/config.json.sample.docker src/config.json
RUN npm ci
# Build the app
RUN npm run build
ENV NODE_ENV production
# EXPOSE 9000
CMD [ "npx", "serve", "-s", "build", "-l", "3000" ]
Jenkinsfile 0 → 100644
+ 103
− 0
View file @ ac7a8e39
// Load shared library at master branch
// the path to the repo with this library should be specified in Jenkins
// https://tomd.xyz/jenkins-shared-library/
// https://www.jenkins.io/doc/book/pipeline/shared-libraries/
@Library('nrp-shared-libs@master') _
pipeline {
environment {
NRP_FRONTED_DIR = "nrp-frontend"
// GIT_CHECKOUT_DIR is a dir of the main project (that was pushed)
GIT_CHECKOUT_DIR = "${env.NRP_FRONTED_DIR}"
}
agent {
docker {
label 'ci_label'
alwaysPull true
image "node:14"
}
}
options {
// Skip code checkout prior running pipeline (only Jenkinsfile is checked out)
skipDefaultCheckout true
}
stages {
stage('Code checkout') {
steps {
// Notify BitBucket on the start of the job
// The Bitbucket Build Status Notifier is used
// REF: https://plugins.jenkins.io/bitbucket-build-status-notifier/
bitbucketStatusNotify(buildState: 'INPROGRESS', buildName: 'Code checkout')
// Debug information on available environment
echo sh(script: 'env|sort', returnStdout: true)
// Checkout main project to GIT_CHECKOUT_DIR
dir(env.GIT_CHECKOUT_DIR) {
checkout scm
}
}
}
stage('Install') {
steps {
bitbucketStatusNotify(buildState: 'INPROGRESS', buildName: 'Installing nrp-frontend')
// Build operations (starting in .ci directory)
dir(env.GIT_CHECKOUT_DIR){
// Determine explicitly the shell as bash
sh 'rm -rf node_modules'
sh 'npm install'
}
}
}
stage('Test') {
steps {
bitbucketStatusNotify(buildState: 'INPROGRESS', buildName: 'Testin nrp-frontend')
// Build operations (starting in .ci directory)
dir(env.GIT_CHECKOUT_DIR){
sh 'cp src/config.json.sample.local src/config.json'
sh 'npm run coverage || echo "Tests failed"'
// Fail on failed tests
junit(allowEmptyResults: true, testResults: 'junit.xml')
sh "test ${currentBuild.currentResult} != UNSTABLE"
// get coverage reports
catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE', message: 'Test coverage has dropped') {
step([$class: 'CoberturaPublisher',
autoUpdateHealth: true,
autoUpdateStability: true,
coberturaReportFile: 'coverage/cobertura-coverage.xml',
failUnhealthy: false,
failUnstable: true,
maxNumberOfBuilds: 0,
onlyStable: false,
sourceEncoding: 'ASCII',
zoomCoverageChart: false,
lineCoverageTargets: "0.0, 0.0, 0.0"])
}
}
}
}
}
post {
always {
cleanWs()
}
aborted {
bitbucketStatusNotify(buildState: 'FAILED', buildDescription: 'Build aborted!')
}
failure {
bitbucketStatusNotify(buildState: 'FAILED', buildDescription: 'Build failed, see console output!')
}
success{
bitbucketStatusNotify(buildState: 'SUCCESSFUL', buildDescription: 'branch ' + env.BRANCH_NAME)
}
}
}
README.md
+ 14
− 1
View file @ ac7a8e39
# README #
NRP web-frontend 4.0 using React
### Prerequisites
......@@ -15,4 +16,16 @@ NRP web-frontend 4.0 using React
- "nvm use 14"
- "npm start" (dev server)
- "npm run build" (build for production)
\ No newline at end of file
- "npm run build" (build for production)
## Acknowledgments
This repository is part of the Neurorobotics Platform software
Copyright (C) Human Brain Project
https://neurorobotics.ai
The Human Brain Project is a European Commission funded project
in the frame of the [Horizon2020 FET Flagship plan](http://ec.europa.eu/programmes/horizon2020/en/h2020-section/fet-flagships).
This work has received funding from the European Union’s Horizon 2020 Framework Programme for Research and Innovation under the Specific Grant Agreement No. 720270 (Human Brain Project SGA1), and the Specific Grant Agreement No. 785907 (Human Brain Project SGA2), and under the Specific Grant Agreement No. 945539 (Human Brain Project SGA3).
bitbucket-pipelines.yml deleted 100644 → 0
+ 0
− 31
View file @ c01d3e4b
# Template NodeJS build
# This template allows you to validate your NodeJS code.
# The workflow allows running tests and code linting on the default branch.
image: node:15.0.1
pipelines:
branches:
development:
- step:
name: Build and Test
caches:
- node
script:
- cp src/mocks/config_test.json src/config.json
- npm install
- npm test
# Coverage check
- npm run coverage
- chmod +x nrp_cobertura_check
- export NRP_COVERAGE_BRANCH=5
- export NRP_COVERAGE_LINE=12
- ./nrp_cobertura_check coverage/cobertura-coverage.xml
- step:
name: Code linting
script:
- npm install eslint
- npx eslint .
caches:
- node
\ No newline at end of file
nrp_cobertura_check deleted 100755 → 0
+ 0
− 11
View file @ c01d3e4b
#!/bin/bash
if [ "$#" -lt 1 ]; then echo "Usage: nrp_cobertura_check <coverage_xml_file>"; exit 1; fi
if [ -z "$NRP_COVERAGE_BRANCH" ]; then echo "nrp_cobertura_check: NRP_COVERAGE_BRANCH is not set"; exit 1; fi
if [ -z "$NRP_COVERAGE_LINE" ]; then echo "nrp_cobertura_check: NRP_COVERAGE_LINE is not set"; exit 1; fi
coverage_file="$1"
apt-get update && apt-get install -y libxml2-utils bc
covrate=$(xmllint --xpath "string(//coverage/@branch-rate)" "$coverage_file") && covrate=$(bc <<< "$covrate * 100") && if (( $(bc <<< "$covrate < $NRP_COVERAGE_BRANCH") )); then echo "COVERAGE FAILED branch rate $covrate is lower than $NRP_COVERAGE_BRANCH";exit 1;else echo "COVERAGE branch rate is $covrate";fi
covrate=$(xmllint --xpath "string(//coverage/@line-rate)" "$coverage_file") && covrate=$(bc <<< "$covrate * 100") && if (( $(bc <<< "$covrate < $NRP_COVERAGE_LINE") )); then echo "COVERAGE FAILED line rate $covrate is lower than $NRP_COVERAGE_LINE";exit 1;else echo "COVERAGE line rate is $covrate";fi
package-lock.json
+ 4249
− 3727
View file @ ac7a8e39
source diff could not be displayed: it is too large. Options to address this: view the blob.
package.json
+ 13
− 2
View file @ ac7a8e39
......@@ -7,14 +7,24 @@
],
"collectCoverageFrom": [
"src/services/**/*.js"
],
"coveragePathIgnorePatterns": [
"src/services/experiments/execution/running-simulation-service.js",
"src/services/roslib-service.js",
"src/services/experiments/files/import-experiment-service.js"
]
},
"version": "0.1.0",
"private": true,
"dependencies": {
"@babel/runtime": "^7.20.13",
"@codemirror/language": "6.2.1",
"@codemirror/legacy-modes": "6.1.0",
"@material-ui/core": "4.11.3",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "4.0.0-alpha.57",
"@uiw/react-codemirror": "4.12.4",
"babel-preset-react-app": "^7.0.0",
"bootstrap": "4.5",
"flexlayout-react": "0.5.5",
"google-protobuf": "3.21.0",
......@@ -25,7 +35,6 @@
"protobufjs": "6.11.2",
"react": "^17.0.1",
"react-bootstrap": "1.4.0",
"@uiw/react-codemirror": "4.11.5",
"react-dom": "^17.0.1",
"react-icons": "4.1.0",
"react-router-dom": "5.2.0",
......@@ -42,6 +51,7 @@
"@typescript-eslint/parser": "4.14.2",
"eslint": "7.19.0",
"jest-fetch-mock": "^3.0.3",
"jest-junit": "^15.0.0",
"jest-localstorage-mock": "2.4.6",
"msw": "^0.23.0",
"node": "16.1.0",
......@@ -53,8 +63,9 @@
"startHTTPS": "HTTPS=true react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"test-ci": "jest --coverage --coverageDirectory=output/coverage/jest",
"eject": "react-scripts eject",
"coverage": "npm run test -- --coverage --watchAll=false"
"coverage": "npm run test -- --coverage --ci --watchAll=false --testResultsProcessor=\"jest-junit\""
},
"browserslist": {
"production": [
......
public/thumbnails/Two-sided_Brain.jpg 0 → 100644
+ 0
− 0
View file @ ac7a8e39
public/thumbnails/Two-sided_Brain.jpg

6.29 KiB

public/thumbnails/Two-sided_Brain_BW.jpg 0 → 100644
+ 0
− 0
View file @ ac7a8e39
public/thumbnails/Two-sided_Brain_BW.jpg

4.34 KiB

public/thumbnails/brain.png 0 → 100644
+ 0
− 0
View file @ ac7a8e39
public/thumbnails/brain.png

53 KiB

src/App.js
+ 4
− 3
View file @ ac7a8e39
......@@ -6,13 +6,14 @@ import EntryPage from './components/entry-page/entry-page';
import ErrorDialog from './components/dialog/error-dialog.js';
import ExperimentsOverview from './components/experiments-overview/experiments-overview';
import ExperimentWorkbench from './components/experiment-workbench/experiment-workbench';
import SimulationView from './components/simulation-view/simulation-view';
// import SimulationView from './components/simulation-view/simulation-view';
import NotificationDialog from './components/dialog/notification-dialog.js';
//import MqttClientService from './services/nrp-core/mqtt-client-service';
import MqttClientService from './services/mqtt-client-service';
class App extends React.Component {
componentDidMount() {
this.mqttClientService = MqttClientService.instance;
//MqttClientService.instance.connect('ws://' + window.location.hostname + ':1884');
}
......@@ -25,7 +26,7 @@ class App extends React.Component {
<Switch>
<Route path='/experiments-overview' component={ExperimentsOverview} />
<Route path='/experiment/:experimentID' component={ExperimentWorkbench} />
<Route path='/simulation-view/:serverIP/:simulationID' component={SimulationView} />
{/* <Route path='/simulation-view/:serverIP/:simulationID' component={SimulationView} /> */}
<Route path='/' component={EntryPage} />
</Switch>
</BrowserRouter>
......
src/components/dialog/error-dialog.css
+ 10
− 1
View file @ ac7a8e39
......@@ -3,10 +3,19 @@
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.8);
z-index: 999;
z-index: 1300;
}
.modal-header{
background-color: rgb(238, 173, 173);
color: rgb(138, 41, 41);
}
.modal-dialog{
overflow-y: initial !important
}
.modal-body {
max-height: 60vh;
overflow-y: auto;
}
\ No newline at end of file
src/components/dialog/error-dialog.js
+ 8
− 5
View file @ ac7a8e39
......@@ -28,9 +28,12 @@ class ErrorDialog extends React.Component{
}
onError(error) {
this.setState({
error: error
});
// Do not overwrite with the new incoming errors
if (!this.state.error) {
this.setState({
error: error
});
}
}
handleClose() {
......@@ -53,11 +56,11 @@ class ErrorDialog extends React.Component{
{error?
<div className="error-dialog-wrapper">
<Modal.Dialog>
<Modal.Header className="modal-header">
<Modal.Header>
<h4>{error.type}</h4>
</Modal.Header>
<Modal.Body>
{error.message}
<pre>{error.message}</pre>
{this.state.isErrorSourceDisplayed
? <div>
{!error.code && !error.data && !error.stack
......
src/components/dialog/notification-dialog.css
+ 1
− 1
View file @ ac7a8e39
......@@ -2,7 +2,7 @@
position: fixed;
bottom: 0;
right: 0;
z-index: 498;
z-index: 1250;
}
.no-style{
......
src/components/dialog/notification-dialog.js
+ 8
− 3
View file @ ac7a8e39
......@@ -11,6 +11,8 @@ class NotificationDialog extends React.Component{
this.state = {
notifications: []
};
this.infoDelayMS = 6000;
this.warnDelayMS = 15000;
}
async componentDidMount() {
......@@ -30,7 +32,8 @@ class NotificationDialog extends React.Component{
// avoid duplicates
var isIn = false;
this.state.notifications.forEach((notif) =>{
if (notification.type===notif.type && notification.message===notif.message){
if (notification.type===notif.type
&& notification.message===notif.message){
isIn = true;
}
});
......@@ -49,6 +52,7 @@ class NotificationDialog extends React.Component{
});
}
// TODO: [NRRPLT-8774] the Toast doesn't disappear if there are more than one notification
render(){
let notifications = this.state.notifications;
return(
......@@ -59,8 +63,9 @@ class NotificationDialog extends React.Component{
return (
<li key={index} className='no-style'>
<Toast className='toast-width' onClose={(index) => this.handleClose(index)}
delay={notification.type==='Warning'? 60000: 10000} autohide>
<Toast.Header className={notification.type==='Warning'? 'warning': 'info'} >
delay={notification.type === 'Warning' ? this.warnDelayMS : this.infoDelayMS}
animation={true} autohide={true}>
<Toast.Header className={notification.type === 'Warning' ? 'warning' : 'info'} >
<strong className='mr-auto'>{notification.type}</strong>
</Toast.Header>
<Toast.Body>
......
src/components/entry-page/entry-page.js
+ 2
− 2
View file @ ac7a8e39
......@@ -29,9 +29,9 @@ export default class EntryPage extends React.Component {
<p>Experiment 2 Placeholder</p>
</div>
<div className='sidebar-right'></div>*/}
<div>
{/* <div>
<div><b>!!! NRP Core testing !!!</b></div>
</div>
</div> */}
<NrpCoreDashboard />
{/*<TransceiverFunctionEditor experimentId='mqtt_simple_1'/>*/}
</div>
......
src/components/experiment-files-viewer/experiment-files-viewer.js
+ 1
− 1
View file @ ac7a8e39
......@@ -170,7 +170,7 @@ export default class ExperimentFilesViewer extends React.Component {
});
}
}}>
{experiment.configuration.name}
{experiment.configuration.SimulationName}
<div className='experiment-li-buttons'>
<button className='nrp-btn'
disabled={!RemoteExperimentFilesService.instance.localSyncDirectoryHandle
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment