convert simulation action/reducer to slice

8 files changed, 47 insertions, 51 deletions

diff --git a/blocks/eda-frontend/package-lock.json b/blocks/eda-frontend/package-lock.json
index 04155da6..ad81cac3 100644
--- a/blocks/eda-frontend/package-lock.json
+++ b/blocks/eda-frontend/package-lock.json
@@ -3533,6 +3533,7 @@
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.1.tgz",
       "integrity": "sha512-SSlIqZNYhqm/oMkXbtofwZSt9lrncblzo6YcZ9zoX+zLngRBrCOjK4lNLdkNucJF58RHOWrD9txT3bT3piH7Zw==",
+      "license": "MIT",
       "dependencies": {
         "immer": "^10.0.3",
         "redux": "^5.0.1",
@@ -3556,6 +3557,7 @@
       "version": "10.1.1",
       "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
       "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/immer"
@@ -3564,12 +3566,14 @@
     "node_modules/@reduxjs/toolkit/node_modules/redux": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
-      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+      "license": "MIT"
     },
     "node_modules/@reduxjs/toolkit/node_modules/redux-thunk": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
       "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+      "license": "MIT",
       "peerDependencies": {
         "redux": "^5.0.0"
       }
@@ -17065,7 +17069,8 @@
     "node_modules/reselect": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
-      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="
+      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
+      "license": "MIT"
     },
     "node_modules/resolve": {
       "version": "1.22.8",
diff --git a/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js b/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js
index 805c03db..a80e495c 100644
--- a/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js
+++ b/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js
@@ -15,17 +15,10 @@ import ExpandMoreIcon from '@material-ui/icons/ExpandMore'
 import { makeStyles } from '@material-ui/core/styles'
 import { useSelector, useDispatch } from 'react-redux'
 
-// import { setResultTitle, setResultTaskId } from '../../redux/actions/index'
+import { setResultTitle, setResultTaskId, resetResult } from '../../redux/simulationSlice'
 import { saveXml } from './Helper/ToolbarTools'
 import SimulationScreen, { setGraphStatusClosed } from './SimulationScreen'
 import api from '../../utils/Api'
-import {
-  setResultTitle,
-  setResultGraph,
-  setResultText,
-  setResultTaskId,
-  setScriptTaskId
-} from '../../redux/simulationSlice'
 
 const useStyles = makeStyles((theme) => ({
   toolbar: {
@@ -125,6 +118,8 @@ export default function SimulationProperties () {
   }
 
   const startSimulate = (type) => {
+    dispatch(resetResult())
+
     const compNetlist = saveXml()
     switch (type) {
       case 'Transient':
@@ -134,8 +129,6 @@ export default function SimulationProperties () {
         break
     }
 
-    dispatch(setResultTaskId(''))
-
     const netlist = compNetlist
 
     prepareNetlist(netlist)
diff --git a/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js b/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js
index e2553512..a9ffe287 100644
--- a/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js
+++ b/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js
@@ -7,7 +7,6 @@ import CloseIcon from '@material-ui/icons/Close'
 import { useSelector, useDispatch } from 'react-redux'
 
 import Graph, { setStatusDone, setStatusClosed } from '../Shared/Graph'
-// import { setResultGraph } from '../../redux/actions/index'
 import { setResultGraph } from '../../redux/simulationSlice'
 import api from '../../utils/Api'
 
@@ -624,7 +623,7 @@ export default function SimulationScreen ({ open, close }) {
           case 'SUCCESS':
             streamSimulationResult(streamingUrl)
             setIsResult(true)
-            dispatch(setResultGraph(null))
+            dispatch(setResultGraph({}))
             if (timeoutRef.current !== null) {
               clearTimeout(timeoutRef.current)
               timeoutRef.current = null
@@ -769,7 +768,7 @@ export default function SimulationScreen ({ open, close }) {
             {isResult === true
               ? <>
                 {
-                  (isGraph === 'true')
+                  isGraph
                     ? <>
                       <Grid item xs={12} sm={12}>
                         <Paper className={classes.paper}>
diff --git a/blocks/eda-frontend/src/components/SchematicEditor/ToolbarExtension.js b/blocks/eda-frontend/src/components/SchematicEditor/ToolbarExtension.js
index 074f6a0c..b629f76c 100644
--- a/blocks/eda-frontend/src/components/SchematicEditor/ToolbarExtension.js
+++ b/blocks/eda-frontend/src/components/SchematicEditor/ToolbarExtension.js
@@ -36,7 +36,7 @@ import {
 import { makeStyles } from '@material-ui/core/styles'
 import CloseIcon from '@material-ui/icons/Close'
 import { useSelector, useDispatch } from 'react-redux'
-import { fetchSchematics, fetchSchematic, fetchDiagram, fetchGallery, setSchScriptDump /* setScriptTaskId */ } from '../../redux/actions/index'
+import { fetchSchematics, fetchSchematic, fetchDiagram, fetchGallery, setSchScriptDump } from '../../redux/actions/index'
 import { setScriptTaskId } from '../../redux/simulationSlice'
 import { blue } from '@material-ui/core/colors'
 import { getDateTime as getDate, getUppercaseInitial, saveToFile } from '../../utils/GalleryUtils'
diff --git a/blocks/eda-frontend/src/redux/actions/actions.js b/blocks/eda-frontend/src/redux/actions/actions.js
index dd25c855..3dc9f29b 100644
--- a/blocks/eda-frontend/src/redux/actions/actions.js
+++ b/blocks/eda-frontend/src/redux/actions/actions.js
@@ -17,12 +17,6 @@ export const SET_NETLIST = 'SET_NETLIST'
 export const SET_TITLE = 'SET_TITLE'
 export const SET_MODEL = 'SET_MODEL'
 
-// Actions for handling simulation result display
-export const SET_RESULT_TITLE = 'SET_RESULT_TITLE'
-export const SET_RESULT_GRAPH = 'SET_RESULT_GRAPH'
-export const SET_RESULT_TEXT = 'SET_RESULT_TEXT'
-export const SET_RESULT_TASK_ID = 'SET_RESULT_TASK_ID'
-
 // Actions for handling user authentication and registration
 export const USER_LOADING = 'USER_LOADING'
 export const USER_LOADED = 'USER_LOADED'
@@ -46,7 +40,6 @@ export const SET_SCH_SHARED = 'SET_SCH_SHARED'
 export const CLEAR_DETAILS = 'CLEAR_DETAILS'
 export const LOAD_GALLERY = 'LOAD_GALLERY'
 export const SET_SCH_SCRIPT_DUMP = 'SET_SCH_SCRIPT_DUMP'
-export const SET_SCRIPT_TASK_ID = 'SET_SCRIPT_TASK_ID'
 
 // Action for fetching on-cloud saved schematics for authenticated user to display in dashboard
 export const FETCH_SCHEMATICS = 'FETCH_SCHEMATICS'
diff --git a/blocks/eda-frontend/src/redux/reducers/index.js b/blocks/eda-frontend/src/redux/reducers/index.js
index a694d2b2..5827bdec 100644
--- a/blocks/eda-frontend/src/redux/reducers/index.js
+++ b/blocks/eda-frontend/src/redux/reducers/index.js
@@ -2,7 +2,6 @@ import { combineReducers } from 'redux'
 import schematicEditorReducer from './schematicEditorReducer'
 import componentPropertiesReducer from './componentPropertiesReducer'
 import netlistReducer from './netlistReducer'
-import simulationReducer from './simulationReducer'
 import authReducer from './authReducer'
 import saveSchematicReducer from './saveSchematicReducer'
 import dashboardReducer from './dashboardReducer'
@@ -10,7 +9,6 @@ export default combineReducers({
   schematicEditorReducer,
   componentPropertiesReducer,
   netlistReducer,
-  simulationReducer,
   authReducer,
   saveSchematicReducer,
   dashboardReducer
diff --git a/blocks/eda-frontend/src/redux/simulationSlice.js b/blocks/eda-frontend/src/redux/simulationSlice.js
index e7b6a174..c4618de5 100644
--- a/blocks/eda-frontend/src/redux/simulationSlice.js
+++ b/blocks/eda-frontend/src/redux/simulationSlice.js
@@ -1,47 +1,56 @@
-import { createSlice } from "@reduxjs/toolkit";
+import { createSlice } from '@reduxjs/toolkit'
 
 const initialState = {
-  title: "",
+  title: '',
   isGraph: false,
   text: [],
   graph: {},
   isSimRes: false,
-  taskId: "",
-  scriptTaskId: "",
-};
+  taskId: '',
+  scriptTaskId: ''
+}
 
 const simulationSlice = createSlice({
-  name: "simulation",
+  name: 'simulation',
   initialState,
   reducers: {
+    resetResult: (state) => {
+      state.title = ''
+      state.isGraph = false
+      state.text = []
+      state.graph = {}
+      state.isSimRes = false
+      state.taskId = ''
+    },
     setResultTitle: (state, action) => {
-      state.title = action.payload;
+      state.title = action.payload
     },
     setResultGraph: (state, action) => {
-      state.isSimRes = true;
-      state.isGraph = true;
-      state.graph = action.payload;
+      state.isSimRes = true
+      state.isGraph = true
+      state.graph = action.payload
     },
     setResultText: (state, action) => {
-      state.isSimRes = true;
-      state.isGraph = false;
-      state.text = action.payload;
+      state.isSimRes = true
+      state.isGraph = false
+      state.text = action.payload
     },
     setResultTaskId: (state, action) => {
-      state.taskId = action.payload;
+      state.taskId = action.payload
     },
     setScriptTaskId: (state, action) => {
-      state.scriptTaskId = action.payload;
-    },
-  },
-});
+      state.scriptTaskId = action.payload
+    }
+  }
+})
 
 export const {
+  resetResult,
   setResultTitle,
   setResultGraph,
   setResultText,
   setResultTaskId,
-  setScriptTaskId,
-} = simulationSlice.actions;
+  setScriptTaskId
+} = simulationSlice.actions
 
-export default simulationSlice.reducer;
+export default simulationSlice.reducer
diff --git a/blocks/eda-frontend/src/redux/store.js b/blocks/eda-frontend/src/redux/store.js
index c3131239..9e280bba 100644
--- a/blocks/eda-frontend/src/redux/store.js
+++ b/blocks/eda-frontend/src/redux/store.js
@@ -1,12 +1,11 @@
 import { configureStore } from '@reduxjs/toolkit'
 import simulationReducer from './simulationSlice'
-import thunk from 'redux-thunk'
 
 const store = configureStore({
-    reducer: {
-        simulation: simulationReducer
-    },
-    middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(thunk)
+  reducer: {
+    simulation: simulationReducer
+  },
+  middleware: (getDefaultMiddleware) => getDefaultMiddleware()
 })
 
 export default store