Skip to content

Commit

Permalink
Merge pull request #12 from React-Automation-Studio/V5.1.0-update
Browse files Browse the repository at this point in the history 
V5.1.0 update
  • Loading branch information
@wduckitt
wduckitt authored May 22, 2024
2 parents 091d6a0 + 3f2c1c5 commit 2ac866a
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 47 deletions.
23 changes: 17 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Current Release: V5.0.1
Current Release: V5.1.0

# Introduction

[Migrate from V4.0.3 to V5.0.X](docs/migrate-from-V4-to-V5.md)
[Migrate from V4.0.3 to V5.1.0](docs/migrate-from-V4-to-V5.md)

This repository pulls in the src from the React Automation Studio repository https:/React-Automation-Studio/React-Automation-Studio and acts a standalone boiler plate example project for React Automation Studio without having to delve into the source code of the master repository.

Expand All @@ -18,7 +18,7 @@ Each of the Docker containers are deployed as micro services and environment var

The microservices that form part of React Automation Studio are shown in Fig. 1 and an overview of the system components are give below:

![picture](./ReactApp/img/microServices.png)
![picture](./ReactApp/img/sysDiag.PNG)

*Fig 1. The microservices that form part of React Automation Studio*

Expand Down Expand Up @@ -153,9 +153,9 @@ git tag
```


To checkout version 5.0.1 run:
To checkout version 5.1.0 run:
```bash
git checkout tags/V5.0.1
git checkout tags/V5.1.0
```


Expand All @@ -164,7 +164,7 @@ To confirm the correct git submodule version :
```bash
git submodule status
```
Should contain `submodules/React-Automation-Studio (V5.0.1)` in the output for version 5.0.1 .
Should contain `submodules/React-Automation-Studio (V5.1.0)` in the output for version 5.1.0 .

If not and you previously checked out a different version run:
```bash
Expand Down Expand Up @@ -582,6 +582,17 @@ or: https://doi.org/10.18429/JACoW-ICALEPCS2023-FR2BCO01

# Changelog

V5.1.0 Thursday 25 April 2024 Minor Updates:
<ul>
<li>Package updates to Backend modules</li>
<li>Updated to Python 3.12.3</li>
<li>Package updates to all Node modules</li>
<li>Updated to the latest Node LTS 20.12.2 </li>
<li>Updates to the documentation </li>
</ul>
</br>


V5.0.1 Friday 08 March 2024 Minor Updates:
<ul>
<li>Package updates to Backend modules</li>
Expand Down
Binary file added ReactApp/img/sysDiag.PNG
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ReactApp/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="/manifest.json" />
<title>React Automation Studio V5.0.1</title>
<title>React Automation Studio V5.1.0</title>
</head>
<body>
<div id="root"></div>
Expand Down
70 changes: 35 additions & 35 deletions ReactApp/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-automation-studio",
"version": "5.0.1",
"version": "5.1.0",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -14,62 +14,62 @@
"test-debug": "vitest --inspect-brk --no-file-parallelism"
},
"dependencies": {
"@date-io/date-fns": "2.17.0",
"@date-io/date-fns": "3.0.0",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.0",
"@mui/icons-material": "5.15.12",
"@mui/material": "5.15.12",
"@mui/styles": "5.15.12",
"@mui/system": "5.15.12",
"@mui/x-date-pickers": "6.19.6",
"@emotion/styled": "11.11.5",
"@mui/icons-material": "5.15.15",
"@mui/material": "5.15.15",
"@mui/styles": "5.15.15",
"@mui/system": "5.15.15",
"@mui/x-date-pickers": "7.2.0",
"@react-oauth/google": "0.12.1",
"@react-three/fiber": "8.15.19",
"@types/three": "0.162.0",
"axios": "1.6.7",
"@react-three/fiber": "8.16.2",
"@types/three": "0.163.0",
"axios": "1.6.8",
"colormap": "2.3.2",
"date-fns": "2.30.0",
"date-fns": "3.6.0",
"lodash": "4.17.21",
"mathjs": "12.4.0",
"mathjs": "12.4.1",
"mdi-material-ui": "7.8.0",
"plotly.js": "2.30.0",
"plotly.js": "2.31.1",
"rc-slider": "10.5.0",
"react": "18.2.0",
"react-device-detect": "2.2.3",
"react-dom": "18.2.0",
"react-plotly.js": "2.6.0",
"react-router-dom": "6.22.3",
"socket.io-client": "4.7.4",
"three": "0.162.0",
"socket.io-client": "4.7.5",
"three": "0.163.0",
"typeface-roboto": "1.1.13",
"uuid": "9.0.1"
},
"devDependencies": {
"@storybook/addon-docs": "7.6.17",
"@storybook/addon-essentials": "7.6.17",
"@storybook/addon-interactions": "7.6.17",
"@storybook/addon-links": "7.6.17",
"@storybook/addon-onboarding": "1.0.11",
"@storybook/blocks": "7.6.17",
"@storybook/builder-vite": "7.6.17",
"@storybook/react": "7.6.17",
"@storybook/react-vite": "7.6.17",
"@storybook/addon-docs": "8.0.8",
"@storybook/addon-essentials": "8.0.8",
"@storybook/addon-interactions": "8.0.8",
"@storybook/addon-links": "8.0.8",
"@storybook/addon-onboarding": "8.0.8",
"@storybook/blocks": "8.0.8",
"@storybook/builder-vite": "8.0.8",
"@storybook/react": "8.0.8",
"@storybook/react-vite": "8.0.8",
"@storybook/testing-library": "0.2.2",
"@testing-library/react": "^14.2.1",
"@types/react": "18.2.64",
"@types/react-dom": "18.2.21",
"@testing-library/react": "15.0.2",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@vitejs/plugin-react": "4.2.1",
"cross-env": "7.0.3",
"eslint": "8.57.0",
"eslint-plugin-react": "7.34.0",
"eslint": "9.0.0",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-react-refresh": "0.4.5",
"eslint-plugin-react-refresh": "0.4.6",
"eslint-plugin-storybook": "0.8.0",
"jsdom": "24.0.0",
"prop-types": "15.8.1",
"socket.io": "4.7.4",
"storybook": "7.6.17",
"vite": "5.1.5",
"vitest": "1.3.1"
"socket.io": "4.7.5",
"storybook": "8.0.8",
"vite": "5.2.9",
"vitest": "1.5.0"
},
"homepage": ".",
"eslintConfig": {
Expand Down
4 changes: 2 additions & 2 deletions ReactApp/src/AppRoutes.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const AppRoutes = (props) => {
: true;

return (
//For all changes see the migration stragey from V4.0.3 to V5.0.5 in the documentation
//For all changes see the migration stragey from V4.0.3 to V5.1.0 in the documentation
<BrowserRouter>
<Routes>
<Route
Expand Down Expand Up @@ -85,7 +85,7 @@ const AppRoutes = (props) => {
<Route
exact
path="/Login"
element={<Login version="V5.0.1" timeout={5000} />}
element={<Login version="V5.1.0" timeout={5000} />}
/>
)}

Expand Down
2 changes: 1 addition & 1 deletion docker/epicsBase/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM python:3.12.2 as epicsbase
FROM python:3.12.3 as epicsbase
ENV EPICS_BASE=/epics/base/
WORKDIR /epics

Expand Down
2 changes: 1 addition & 1 deletion docker/node_cache/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.11.1 as node_cache
FROM node:20.12.2 as node_cache
ADD ./ReactApp/package.json /ReactApp/package.json
WORKDIR /ReactApp
ENV PATH /ReactApp/node_modules/.bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion submodules/React-Automation-Studio
Submodule React-Automation-Studio updated 15 files
+14 −4 README.md
+ − ReactApp/img/sysDiag.PNG
+1 −1 ReactApp/index.html
+35 −35 ReactApp/package.json
+1 −1 ReactApp/src/AppRoutes.jsx
+1 −1 ReactApp/src/components/AlarmHandler/EnableDialog.jsx
+1 −1 ReactApp/src/components/AlarmHandler/ScheduleDialog.jsx
+1 −1 ReactApp/src/components/ArchiverDataViewer/ArchiverDataViewer.jsx
+1 −1 ReactApp/src/components/SystemComponents/Login.md
+11 −3 ReactApp/src/components/UI/MainDashboard.jsx
+2 −2 ReactApp/src/docs/introduction.md
+1 −1 docker/epicsBase/Dockerfile
+1 −1 docker/node_cache/Dockerfile
+1 −1 pvServer/pvServer.py
+8 −8 pvServer/pyproject.toml

0 comments on commit 2ac866a

Please sign in to comment.