diff --git a/app/components/Group.tsx b/app/components/Group.tsx
index 7e16859..56e57a0 100644
--- a/app/components/Group.tsx
+++ b/app/components/Group.tsx
@@ -1,5 +1,5 @@
import { memo } from "react";
-import { tBlockMapping } from "@/app/types";
+import type { tBlockMapping } from "@/app/types";
import Block from "./Block";
import { checkIfAllBlocksInGroupAreHidden } from "./GroupUtils";
diff --git a/app/components/GroupUtils.ts b/app/components/GroupUtils.ts
index d2fdfa7..e3edd6a 100644
--- a/app/components/GroupUtils.ts
+++ b/app/components/GroupUtils.ts
@@ -1,4 +1,4 @@
-import { tBlockMapping } from "@/app/types";
+import type { tBlockMapping } from "@/app/types";
export function checkIfAllBlocksInGroupAreHidden(
blocks: tBlockMapping,
diff --git a/app/components/Groups.tsx b/app/components/Groups.tsx
index 0dacee4..971edae 100644
--- a/app/components/Groups.tsx
+++ b/app/components/Groups.tsx
@@ -1,4 +1,4 @@
-import { tGroups } from "@/app/types";
+import type { tGroups } from "@/app/types";
import Group from "./Group";
export default function Groups({
diff --git a/app/components/Instrument.ts b/app/components/Instrument.ts
index f0055f9..ad74d53 100644
--- a/app/components/Instrument.ts
+++ b/app/components/Instrument.ts
@@ -1,5 +1,5 @@
import { ExponentialOnThresholdFormat } from "@/app/components/PVutils";
-import {
+import type {
ConfigOutput,
ConfigOutputBlock,
IfcBlock,
@@ -176,7 +176,7 @@ export class Instrument {
}
clone(): Instrument {
- let cloned = new Instrument(this.prefix);
+ const cloned = new Instrument(this.prefix);
cloned.groups = structuredClone(this.groups);
cloned.runInfoPVs = structuredClone(this.runInfoPVs);
cloned.dashboard = structuredClone(this.dashboard);
@@ -241,10 +241,10 @@ export function getGroupsWithBlocksFromConfigOutput(
configOutput: ConfigOutput,
): tGroups {
const configOutputGroups = configOutput.groups;
- let newGroups: tGroups = new Map();
+ const newGroups: tGroups = new Map();
for (const configOutputGroup of configOutputGroups) {
const groupName = configOutputGroup.name;
- let blocks: tBlockMapping = new Map();
+ const blocks: tBlockMapping = new Map();
for (const configOutputBlock of configOutputGroup.blocks) {
const newBlock = configOutput.blocks.find(
(b: ConfigOutputBlock) => b.name === configOutputBlock,
diff --git a/app/components/InstrumentData.tsx b/app/components/InstrumentData.tsx
index 12a285e..48defe0 100644
--- a/app/components/InstrumentData.tsx
+++ b/app/components/InstrumentData.tsx
@@ -1,5 +1,5 @@
"use client";
-import { RefObject, useEffect, useRef, useState } from "react";
+import { type RefObject, useEffect, useRef, useState } from "react";
import useWebSocket from "react-use-websocket";
import {
instListPV,
@@ -27,7 +27,11 @@ import {
} from "@/app/components/Instrument";
import { getPrefix, getPvValue } from "@/app/components/PVutils";
import TopBar from "@/app/components/TopBar";
-import { IfcPVWSMessage, IfcPVWSRequest, PVWSRequestType } from "@/app/types";
+import {
+ type IfcPVWSMessage,
+ type IfcPVWSRequest,
+ PVWSRequestType,
+} from "@/app/types";
export function InstrumentData({ instrumentName }: { instrumentName: string }) {
const [showHiddenBlocks, setShowHiddenBlocks] = useState(false);
@@ -46,7 +50,7 @@ export function InstrumentData({ instrumentName }: { instrumentName: string }) {
}
}, [instName]);
- let messageQueue: RefObject
> = useRef([]);
+ const messageQueue: RefObject> = useRef([]);
const {
sendJsonMessage,
@@ -88,7 +92,7 @@ export function InstrumentData({ instrumentName }: { instrumentName: string }) {
// config hasnt actually changed so do nothing
return;
}
- let newInstrument = currentInstrument.clone();
+ const newInstrument = currentInstrument.clone();
newInstrument.groups = getGroupsWithBlocksFromConfigOutput(
newInstrument.prefix,
JSON.parse(dehex_and_decompress(atob(updatedPVbytes))),
@@ -130,7 +134,7 @@ export function InstrumentData({ instrumentName }: { instrumentName: string }) {
);
// Clone the instrument object here to avoid mutating the state without calling setState()
- let newInstrument = currentInstrument.clone();
+ const newInstrument = currentInstrument.clone();
while (true) {
const updatedPV = messageQueue.current.shift();
diff --git a/app/components/InstrumentWallCard.tsx b/app/components/InstrumentWallCard.tsx
index 283aa36..376c418 100644
--- a/app/components/InstrumentWallCard.tsx
+++ b/app/components/InstrumentWallCard.tsx
@@ -1,5 +1,5 @@
import Link from "next/link";
-import { instListEntryWithRunstatePVandValue } from "@/app/types";
+import type { instListEntryWithRunstatePVandValue } from "@/app/types";
import {
getForegroundColour,
getStatusColour,
diff --git a/app/components/InstrumentsDisplay.tsx b/app/components/InstrumentsDisplay.tsx
index 9a3a069..4d07e80 100644
--- a/app/components/InstrumentsDisplay.tsx
+++ b/app/components/InstrumentsDisplay.tsx
@@ -12,9 +12,9 @@ import { instListFromBytes } from "@/app/components/dehex_and_decompress";
import ScienceGroup from "@/app/components/ScienceGroup";
import TargetStation from "@/app/components/TargetStation";
import {
- IfcPVWSMessage,
- IfcPVWSRequest,
- instList,
+ type IfcPVWSMessage,
+ type IfcPVWSRequest,
+ type instList,
PVWSRequestType,
} from "@/app/types";
@@ -24,7 +24,7 @@ const instrumentsExcludeList = ["SUPPORT"];
export function createInstrumentGroups(
instruments: instList,
): Map {
- let newInstrumentGroups: Map = new Map();
+ const newInstrumentGroups: Map = new Map();
instruments.forEach((inst) => {
inst.groups
.filter((group) => !instrumentsExcludeList.includes(group))
diff --git a/app/components/PVutils.ts b/app/components/PVutils.ts
index 2d6d530..fa798fb 100644
--- a/app/components/PVutils.ts
+++ b/app/components/PVutils.ts
@@ -1,4 +1,4 @@
-import { IfcPVWSMessage, instListEntry } from "@/app/types";
+import type { IfcPVWSMessage, instListEntry } from "@/app/types";
/**
* Formats a given PV value input such that above or below a threshold value,
diff --git a/app/components/ScienceGroup.tsx b/app/components/ScienceGroup.tsx
index 64e2d9d..5c7c62d 100644
--- a/app/components/ScienceGroup.tsx
+++ b/app/components/ScienceGroup.tsx
@@ -1,5 +1,8 @@
import InstrumentWallCard from "@/app/components/InstrumentWallCard";
-import { instList, instListEntryWithRunstatePVandValue } from "@/app/types";
+import type {
+ instList,
+ instListEntryWithRunstatePVandValue,
+} from "@/app/types";
export default function ScienceGroup({
name,
diff --git a/app/components/TargetStation.tsx b/app/components/TargetStation.tsx
index 6ee0544..9a50401 100644
--- a/app/components/TargetStation.tsx
+++ b/app/components/TargetStation.tsx
@@ -1,4 +1,4 @@
-import { instListEntryWithRunstatePVandValue } from "@/app/types";
+import type { instListEntryWithRunstatePVandValue } from "@/app/types";
import InstrumentWallCard from "./InstrumentWallCard";
export default function TargetStation({
diff --git a/app/components/TopBar.tsx b/app/components/TopBar.tsx
index 4575236..6d0eb81 100644
--- a/app/components/TopBar.tsx
+++ b/app/components/TopBar.tsx
@@ -1,6 +1,6 @@
import { memo } from "react";
import { DASHBOARD } from "@/app/components/Instrument";
-import { tBlockMapping } from "@/app/types";
+import type { tBlockMapping } from "@/app/types";
import {
getForegroundColour,
getStatusColour,
diff --git a/app/components/dehex_and_decompress.ts b/app/components/dehex_and_decompress.ts
index ad051bf..28fc180 100644
--- a/app/components/dehex_and_decompress.ts
+++ b/app/components/dehex_and_decompress.ts
@@ -1,5 +1,5 @@
import { unzipSync } from "zlib";
-import { instList } from "@/app/types";
+import type { instList } from "@/app/types";
/**
* dehex_and_decompress
* - synonymous to dehex_and_decompress in inst_servers
diff --git a/app/page.tsx b/app/page.tsx
index 0a1d2f0..12287cc 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -84,6 +84,7 @@ export default function Home() {
href="https://stfc365.sharepoint.com/sites/isis-hub/SitePages/Instrument-Quick-Links.aspx"
className="inline-flex p-2 text-blue-500 capitalize transition-colors duration-200 transform bg-blue-100 rounded-full dark:bg-blue-500 dark:text-white hover:underline hover:bg-blue-400 dark:hover:bg-blue-400"
target="_blank"
+ rel="noopener"
>