Merge pull request #150 from ISISComputingGroup/make_faster

Make faster

Author: rerpha

.eslintrc

@@ -0,0 +1,4 @@
+{
+  "extends": "next",
+  "root": true
+}

.eslintrc.json

@@ -17,7 +17,7 @@ Allows monitoring of instrument PVs via a web page.
 To install all dependencies, use:
 
 ```bash
-  npm install
+  npm ci
 ```
 
 ### Running

README.md

@@ -1,4 +1,3 @@
-import React from "react";
 import Link from "next/link";
 
 export default function Footer() {

app/Footer.tsx

@@ -1,6 +1,6 @@
 "use client";
 import { IfcBlock } from "@/app/types";
-import React, { useState } from "react";
+import { useState } from "react";
 
 const grafana_stub =
   "https://shadow.nd.rl.ac.uk/grafana/d/wMlwwaHMk/block-history?viewPanel=2&orgId=1&var-block=";

app/components/Block.tsx

@@ -1,4 +1,4 @@
-import React, { Dispatch, SetStateAction } from "react";
+import { Dispatch, SetStateAction } from "react";
 
 export default function CheckToggle({
   checked,

app/components/CheckToggle.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import Block from "./Block";
 import { checkIfAllBlocksInGroupAreHidden } from "./GroupUtils";
 

app/components/Group.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import Group from "./Group";
 
 import { IfcGroup } from "@/app/types";

app/components/Groups.tsx

@@ -1,11 +1,6 @@
 "use client";
-import React, { useEffect, useState } from "react";
-import {
-  IfcPVWSMessage,
-  IfcPVWSRequest,
-  instList,
-  PVWSRequestType,
-} from "@/app/types";
+import { useEffect, useState } from "react";
+import { IfcPVWSMessage, IfcPVWSRequest, PVWSRequestType } from "@/app/types";
 import {
   findPVInDashboard,
   findPVInGroups,
@@ -58,12 +53,11 @@ export function InstrumentData({ instrumentName }: { instrumentName: string }) {
 
   const {
     sendJsonMessage,
-    lastJsonMessage,
   }: {
     sendJsonMessage: (a: IfcPVWSRequest) => void;
     lastJsonMessage: IfcPVWSMessage;
   } = useWebSocket(socketURL, {
-    shouldReconnect: (closeEvent) => true,
+    shouldReconnect: () => true,
     onOpen: () => {
       setWebSockErr("");
       setLastUpdate(""); // if this is called on a reconnect, we want to clear the last update so we can re-subscribe to everything again
@@ -175,7 +169,7 @@ export function InstrumentData({ instrumentName }: { instrumentName: string }) {
         }
       }
     },
-    onError: (err) => {
+    onError: () => {
       setWebSockErr(
         "Failed to connect to websocket - please check your network connection and contact Experiment Controls if this persists.",
       );

app/components/InstrumentData.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import {
   IfcPVWSMessage,
   IfcPVWSRequest,
@@ -58,13 +58,12 @@ export default function InstrumentsDisplay({
 
   const {
     sendJsonMessage,
-    lastJsonMessage,
   }: {
     sendJsonMessage: (a: IfcPVWSRequest) => void;
     lastJsonMessage: IfcPVWSMessage;
   } = useWebSocket(socketURL, {
-    shouldReconnect: (closeEvent) => true,
-    onError(err) {
+    shouldReconnect: () => true,
+    onError() {
       setWebSockErr(
         "Failed to connect to websocket - please check your network connection and contact Experiment Controls if this persists.",
       );