diff options
author | Sunil Shetye | 2022-06-03 16:12:52 +0530 |
---|---|---|
committer | Sunil Shetye | 2022-06-03 16:27:00 +0530 |
commit | b079b731cf577a1b316483195959005dbd53b821 (patch) | |
tree | b68075c384357d58f3f32e61ff3a7aaf756ab4c4 | |
parent | b0d89e2802cacfcdd311223474df83d96a10250e (diff) | |
download | Common-Interface-Project-b079b731cf577a1b316483195959005dbd53b821.tar.gz Common-Interface-Project-b079b731cf577a1b316483195959005dbd53b821.tar.bz2 Common-Interface-Project-b079b731cf577a1b316483195959005dbd53b821.zip |
disable new-cap eslint error
-rw-r--r-- | blocks/eda-frontend/.eslintrc.json | 6 | ||||
-rw-r--r-- | blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js | 15 | ||||
-rw-r--r-- | blocks/eda-frontend/src/components/SchematicEditor/Helper/KeyboardShortcuts.js (renamed from blocks/eda-frontend/src/components/SchematicEditor/Helper/KeyboardShorcuts.js) | 15 | ||||
-rw-r--r-- | blocks/eda-frontend/src/components/SchematicEditor/Helper/SideBar.js | 3 | ||||
-rw-r--r-- | blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js | 1 | ||||
-rw-r--r-- | blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js | 30 | ||||
-rw-r--r-- | blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js | 21 | ||||
-rw-r--r-- | blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js | 4 | ||||
-rw-r--r-- | blocks/eda-frontend/src/redux/reducers/componentPropertiesReducer.js | 4 |
9 files changed, 51 insertions, 48 deletions
diff --git a/blocks/eda-frontend/.eslintrc.json b/blocks/eda-frontend/.eslintrc.json index 94e63641..af439549 100644 --- a/blocks/eda-frontend/.eslintrc.json +++ b/blocks/eda-frontend/.eslintrc.json @@ -26,12 +26,6 @@ "plugins": [ "react" ], - "rules": { - "new-cap": "warn", - "no-new": "warn", - "no-unused-vars": "warn", - "react/prop-types": "warn" - }, "settings": { "react": { "version": "latest" diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js b/blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js index c698d61f..cfb8cb92 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/Helper/ComponentDrag.js @@ -1,3 +1,4 @@ +/* eslint new-cap: ["error", {"newIsCapExceptionPattern": "^mx"}] */ import 'mxgraph/javascript/src/css/common.css' import mxGraphFactory from 'mxgraph' @@ -6,9 +7,9 @@ import dot from '../../../static/dot.gif' import blockstyle from '../../../static/style.json' import { getCompProperties, closeCompProperties } from '../../../redux/actions/index' -import ToolbarTools from './ToolbarTools.js' -import KeyboardShorcuts from './KeyboardShorcuts.js' -import { SideBar } from './SideBar.js' +import toolbarTools from './ToolbarTools.js' +import keyboardShortcuts from './KeyboardShortcuts.js' +import { sideBar } from './SideBar.js' let graph @@ -117,7 +118,7 @@ export default function LoadGrid (container, sidebar, outline) { graph.setEnterStopsCellEditing(true) // Adds rubberband selection - new mxRubberband(graph) + new mxRubberband(graph) // eslint-disable-line no-new // Alternative solution for implementing connection points without child cells. // This can be extended as shown in portrefs.html example to allow for per-port @@ -229,10 +230,10 @@ export default function LoadGrid (container, sidebar, outline) { style.rounded = '1' style.strokeWidth = strokeWidth - SideBar(graph, sidebar) - KeyboardShorcuts(graph) + sideBar(graph, sidebar) + keyboardShortcuts(graph) // NetlistInfoFunct(graph) - ToolbarTools(graph) + toolbarTools(graph) store.subscribe(() => { const id = store.getState().componentPropertiesReducer.id diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Helper/KeyboardShorcuts.js b/blocks/eda-frontend/src/components/SchematicEditor/Helper/KeyboardShortcuts.js index 4d650ab5..a0750b6b 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/Helper/KeyboardShorcuts.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/Helper/KeyboardShortcuts.js @@ -1,7 +1,8 @@ +/* eslint new-cap: ["error", {"newIsCapExceptionPattern": "^mx"}] */ import 'mxgraph/javascript/src/css/common.css' import mxGraphFactory from 'mxgraph' -import { Undo, Redo, ZoomIn, ZoomOut, ZoomAct } from './ToolbarTools' +import { editorUndo, editorRedo, editorZoomIn, editorZoomOut, editorZoomAct } from './ToolbarTools' const { mxKeyHandler, @@ -9,7 +10,7 @@ const { mxClient } = new mxGraphFactory() -export default function KeyboardShortcuts (graph) { +export default function keyboardShortcuts (graph) { const keyHandler = new mxKeyHandler(graph) keyHandler.getFunction = function (evt) { @@ -30,35 +31,35 @@ export default function KeyboardShortcuts (graph) { // Undo - Ctrl + Z keyHandler.bindControlKey(90, function (evt) { if (graph.isEnabled()) { - Undo() + editorUndo() } }) // Redo - Ctrl + A keyHandler.bindControlKey(65, function (evt) { if (graph.isEnabled()) { - Redo() + editorRedo() } }) // Zoom In - Ctrl + I keyHandler.bindControlKey(73, function (evt) { if (graph.isEnabled()) { - ZoomIn() + editorZoomIn() } }) // Zoom Out - Ctrl + O keyHandler.bindControlKey(79, function (evt) { if (graph.isEnabled()) { - ZoomOut() + editorZoomOut() } }) // Zoom Out - Ctrl + Y keyHandler.bindControlKey(89, function (evt) { if (graph.isEnabled()) { - ZoomAct() + editorZoomAct() } }) } diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Helper/SideBar.js b/blocks/eda-frontend/src/components/SchematicEditor/Helper/SideBar.js index 768478a1..2cba3d97 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/Helper/SideBar.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/Helper/SideBar.js @@ -1,3 +1,4 @@ +/* eslint new-cap: ["error", {"newIsCapExceptionPattern": "^mx"}] */ import 'mxgraph/javascript/src/css/common.css' import mxGraphFactory from 'mxgraph' @@ -12,7 +13,7 @@ const { let graph -export function SideBar (getGraph) { +export function sideBar (getGraph) { graph = getGraph } diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js b/blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js index cf7349ad..710cad25 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js @@ -1,3 +1,4 @@ +/* eslint new-cap: ["error", {"newIsCapExceptionPattern": "^mx"}] */ import 'mxgraph/javascript/src/css/common.css' import mxGraphFactory from 'mxgraph' diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js b/blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js index 66cd44f8..d378a0a1 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/Helper/ToolbarTools.js @@ -1,3 +1,4 @@ +/* eslint new-cap: ["error", {"newIsCapExceptionPattern": "^mx"}] */ import 'mxgraph/javascript/src/css/common.css' import mxGraphFactory from 'mxgraph' @@ -19,7 +20,7 @@ const { mxPoint } = new mxGraphFactory() -export default function ToolbarTools (grid, unredo) { +export default function toolbarTools (grid, unredo) { graph = grid undoManager = new mxUndoManager() @@ -31,8 +32,8 @@ export default function ToolbarTools (grid, unredo) { } // SAVE -export function Save (description = '') { - XMLWireConnections() +export function saveXml (description = '') { + xmlWireConnections() const enc = new mxCodec(mxUtils.createXmlDocument()) const model = graph.getModel() const firstCell = model.cells[0] @@ -44,32 +45,32 @@ export function Save (description = '') { } // UNDO -export function Undo () { +export function editorUndo () { undoManager.undo() } // REDO -export function Redo () { +export function editorRedo () { undoManager.redo() } // Zoom IN -export function ZoomIn () { +export function editorZoomIn () { graph.zoomIn() } // ZOOM OUT -export function ZoomOut () { +export function editorZoomOut () { graph.zoomOut() } // ZOOM ACTUAL -export function ZoomAct () { +export function editorZoomAct () { graph.zoomActual() } // DELETE COMPONENT -export function DeleteComp () { +export function deleteComp () { graph.removeCells() } @@ -195,7 +196,8 @@ export function ErcCheck () { } } } -function ErcCheckNets () { + +function ercCheckNets () { const NoAddition = 'No ' + process.env.REACT_APP_BLOCK_NAME + ' added' const list = graph.getModel().cells // mapping the grid let vertexCount = 0 @@ -237,14 +239,14 @@ function ErcCheckNets () { } // GENERATE NETLIST -export function GenerateNetList () { +export function generateNetList () { let c = 1 const spiceModels = '' const netlist = { componentlist: [], nodelist: [] } - const erc = ErcCheckNets() + const erc = ercCheckNets() let k = '' if (erc === false) { alert('ERC check failed') @@ -331,6 +333,7 @@ export function GenerateNetList () { } return netobj } + function annotate (graph) { return graph.getModel().cells } @@ -341,6 +344,7 @@ export function renderXML () { const xmlDoc = mxUtils.parseXml(xml) parseXmlToGraph(xmlDoc, graph) } + function parseXmlToGraph (xmlDoc, graph) { const cells = xmlDoc.documentElement.children[0].children const parent = graph.getDefaultParent() @@ -474,7 +478,7 @@ export function renderGalleryXML (xml) { parseXmlToGraph(xmlDoc, graph) } -function XMLWireConnections () { +function xmlWireConnections () { const erc = true if (erc === false) { alert('ERC check failed') diff --git a/blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js b/blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js index b6c12849..a4324007 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js @@ -1,3 +1,4 @@ +/* eslint new-cap: ["error", {"newIsCapExceptionPattern": "^mx"}] */ import React from 'react' import PropTypes from 'prop-types' import Canvg from 'canvg' @@ -27,7 +28,7 @@ import beautify from 'xml-beautifier' import mxGraphFactory from 'mxgraph' import { NetlistModal, HelpScreen, ImageExportDialog, OpenSchDialog } from './ToolbarExtension' -import { ZoomIn, ZoomOut, ZoomAct, DeleteComp, PrintPreview, Rotate, GenerateNetList, Undo, Redo, Save, ClearGrid } from './Helper/ToolbarTools' +import { editorZoomIn, editorZoomOut, editorZoomAct, deleteComp, PrintPreview, Rotate, generateNetList, editorUndo, editorRedo, saveXml, ClearGrid } from './Helper/ToolbarTools' import { useSelector, useDispatch } from 'react-redux' import { toggleSimulate, closeCompProperties, setSchXmlData, saveSchematic, openLocalSch } from '../../redux/actions/index' @@ -100,7 +101,7 @@ export default function SchematicToolbar ({ mobileClose, gridRef }) { const [netlist, genNetlist] = React.useState('') const handleClickOpen = () => { - const compNetlist = GenerateNetList() + const compNetlist = generateNetList() const netlist = netfile.title + '\n\n' + compNetlist.models + '\n' + compNetlist.main + '\n' + @@ -127,7 +128,7 @@ export default function SchematicToolbar ({ mobileClose, gridRef }) { // Handle Delete component const handleDeleteComp = () => { - DeleteComp() + deleteComp() dispatch(closeCompProperties()) } @@ -272,7 +273,7 @@ export default function SchematicToolbar ({ mobileClose, gridRef }) { handleSnacClick() } else { const description = schSave.description - const xml = Save(description) + const xml = saveXml(description) dispatch(setSchXmlData(xml)) const title = schSave.title exportImage('PNG') @@ -286,7 +287,7 @@ export default function SchematicToolbar ({ mobileClose, gridRef }) { // Save Schematics Locally const handleLocalSchSave = () => { - const blob = new Blob([beautify(Save(schSave.description))], { type: 'application/xml' }) + const blob = new Blob([beautify(saveXml(schSave.description))], { type: 'application/xml' }) const evt = new MouseEvent('click', { view: window, bubbles: false, @@ -406,12 +407,12 @@ export default function SchematicToolbar ({ mobileClose, gridRef }) { <span className={classes.pipe}>|</span> <Tooltip title='Undo'> - <IconButton color='inherit' className={classes.tools} size='small' onClick={Undo}> + <IconButton color='inherit' className={classes.tools} size='small' onClick={editorUndo}> <UndoIcon fontSize='small' /> </IconButton> </Tooltip> <Tooltip title='Redo'> - <IconButton color='inherit' className={classes.tools} size='small' onClick={Redo}> + <IconButton color='inherit' className={classes.tools} size='small' onClick={editorRedo}> <RedoIcon fontSize='small' /> </IconButton> </Tooltip> @@ -423,17 +424,17 @@ export default function SchematicToolbar ({ mobileClose, gridRef }) { <span className={classes.pipe}>|</span> <Tooltip title='Zoom In'> - <IconButton color='inherit' className={classes.tools} size='small' onClick={ZoomIn}> + <IconButton color='inherit' className={classes.tools} size='small' onClick={editorZoomIn}> <ZoomInIcon fontSize='small' /> </IconButton> </Tooltip> <Tooltip title='Zoom Out'> - <IconButton color='inherit' className={classes.tools} size='small' onClick={ZoomOut}> + <IconButton color='inherit' className={classes.tools} size='small' onClick={editorZoomOut}> <ZoomOutIcon fontSize='small' /> </IconButton> </Tooltip> <Tooltip title='Default Size'> - <IconButton color='inherit' className={classes.tools} size='small' onClick={ZoomAct}> + <IconButton color='inherit' className={classes.tools} size='small' onClick={editorZoomAct}> <SettingsOverscanIcon fontSize='small' /> </IconButton> </Tooltip> diff --git a/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js b/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js index f39a876d..8e3ebc7a 100644 --- a/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js +++ b/blocks/eda-frontend/src/components/SchematicEditor/SimulationProperties.js @@ -16,7 +16,7 @@ import { makeStyles } from '@material-ui/core/styles' import { useSelector, useDispatch } from 'react-redux' import { setResultTitle, setResultTaskId } from '../../redux/actions/index' -import { Save } from './Helper/ToolbarTools' +import { saveXml } from './Helper/ToolbarTools' import SimulationScreen from './SimulationScreen' import api from '../../utils/Api' @@ -115,7 +115,7 @@ export default function SimulationProperties () { } const startSimulate = (type) => { - const compNetlist = Save() + const compNetlist = saveXml() switch (type) { case 'Transient': dispatch(setResultTitle('Transient Analysis Output')) diff --git a/blocks/eda-frontend/src/redux/reducers/componentPropertiesReducer.js b/blocks/eda-frontend/src/redux/reducers/componentPropertiesReducer.js index 16270bb8..61bf8c38 100644 --- a/blocks/eda-frontend/src/redux/reducers/componentPropertiesReducer.js +++ b/blocks/eda-frontend/src/redux/reducers/componentPropertiesReducer.js @@ -1,5 +1,5 @@ import * as actions from '../actions/actions' -import { ZoomAct } from '../../components/SchematicEditor/Helper/ToolbarTools.js' +import { editorZoomAct } from '../../components/SchematicEditor/Helper/ToolbarTools.js' const InitialState = { block: null, @@ -34,7 +34,7 @@ export default function componentPropertiesReducer (state = InitialState, action } case actions.CLOSE_COMP_PROPERTIES: { - ZoomAct() + editorZoomAct() return { ...state, isPropertiesWindowOpen: false |