From 3ff8b1344e50278a836260f73fdeb9eae5996847 Mon Sep 17 00:00:00 2001 From: c-bata Date: Mon, 22 May 2023 21:17:30 +0900 Subject: [PATCH] Fix lint errors --- package.json | 2 +- .../src/components/PlotImportance.tsx | 2 +- .../src/components/StorageLoader.tsx | 2 +- standalone_app/src/sqlite3.ts | 8 ++++---- standalone_app/src/vscode_entry.tsx | 18 ++++++++++++------ 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 00581d94..e626ef09 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "fmt": "prettier --write \"optuna_dashboard/ts/**/*.{ts,tsx}\" \"typescript_tests/**/*.{ts,tsx}\" \"standalone_app/src/**/*.{ts,tsx}\"", "lint": "npm run lint:eslint && npm run lint:fmt", "lint:eslint": "eslint . --ext .ts,.tsx", - "lint:fmt": "prettier --list-different \"optuna_dashboard/ts/**/*.{ts,tsx}\" \"typescript_tests/*.{ts,tsx}\" \"standalone_app/*.{ts,tsx}\"", + "lint:fmt": "prettier --list-different \"optuna_dashboard/ts/**/*.{ts,tsx}\" \"typescript_tests/**/*.{ts,tsx}\" \"standalone_app/src/**/*.{ts,tsx}\"", "watch": "NODE_ENV=development TYPESCRIPT_LOADER=esbuild-loader webpack --watch", "build": "webpack", "build:dev": "NODE_ENV=development TYPESCRIPT_LOADER=esbuild-loader webpack", diff --git a/standalone_app/src/components/PlotImportance.tsx b/standalone_app/src/components/PlotImportance.tsx index 45940946..24e9cd8f 100644 --- a/standalone_app/src/components/PlotImportance.tsx +++ b/standalone_app/src/components/PlotImportance.tsx @@ -19,7 +19,7 @@ export const PlotImportance: FC<{ study: Study }> = ({ study }) => { await init() const x: ParamImportance[][] = study.directions.map((d, objectiveId) => { - let filteredTrials = study.trials.filter((t) => + const filteredTrials = study.trials.filter((t) => filterFunc(t, objectiveId) ) if (filteredTrials.length === 0) { diff --git a/standalone_app/src/components/StorageLoader.tsx b/standalone_app/src/components/StorageLoader.tsx index 6265c86c..f513e307 100644 --- a/standalone_app/src/components/StorageLoader.tsx +++ b/standalone_app/src/components/StorageLoader.tsx @@ -18,7 +18,7 @@ import { } from "@mui/material" import UploadFileIcon from "@mui/icons-material/UploadFile" -export const StorageLoader: FC<{}> = () => { +export const StorageLoader: FC = () => { const theme = useTheme() const [dragOver, setDragOver] = useState(false) diff --git a/standalone_app/src/sqlite3.ts b/standalone_app/src/sqlite3.ts index e02f70a4..4cabd91f 100644 --- a/standalone_app/src/sqlite3.ts +++ b/standalone_app/src/sqlite3.ts @@ -43,7 +43,7 @@ export const loadStorage = ( } // Get studies - let studies: Study[] = [] + const studies: Study[] = [] db.exec({ sql: "SELECT s.study_id, s.study_name, sd.direction, sd.objective" + @@ -86,11 +86,11 @@ export const loadStorage = ( const state: TrialState = vals[3] === "COMPLETE" ? "Complete" - : "PRUNED" + : vals[3] === "PRUNED" ? "Pruned" - : "RUNNING" + : vals[3] === "RUNNING" ? "Running" - : "WAITING" + : vals[3] === "WAITING" ? "Waiting" : "Fail" const trial: Trial = { diff --git a/standalone_app/src/vscode_entry.tsx b/standalone_app/src/vscode_entry.tsx index 9c75e2ec..ad36ebdc 100644 --- a/standalone_app/src/vscode_entry.tsx +++ b/standalone_app/src/vscode_entry.tsx @@ -10,7 +10,7 @@ export const AppWrapper: FC = () => { const setStudies = useSetRecoilState(studiesState) const onceSetStudies: SetterOrUpdater = ( - setter: ((currVal: Study) => Study) | Study + setter: (currVal: Study[]) => Study[] ): void => { const studies = setter([]) setStudies(studies) @@ -19,16 +19,22 @@ export const AppWrapper: FC = () => { useEffect(() => { window.addEventListener("message", (event) => { const message = event.data + let fileContentBase64: string + let binaryString: string + let len: number + let bytes: Uint8Array + let arrayBuffer: ArrayBuffer + switch (message.type) { case "optunaStorage": - const fileContentBase64 = message.content - const binaryString = atob(fileContentBase64) - const len = binaryString.length - const bytes = new Uint8Array(len) + fileContentBase64 = message.content + binaryString = atob(fileContentBase64) + len = binaryString.length + bytes = new Uint8Array(len) for (let i = 0; i < len; i++) { bytes[i] = binaryString.charCodeAt(i) } - const arrayBuffer = bytes.buffer + arrayBuffer = bytes.buffer loadStorage(arrayBuffer, onceSetStudies) break }