From fd71714fc0311a6cbc1745707032c4916762342c Mon Sep 17 00:00:00 2001 From: Dunemask Date: Tue, 12 Jul 2022 22:07:44 +0000 Subject: [PATCH] Prettier --- src/views/Navbar.jsx | 10 ++++---- src/views/Views.jsx | 1 - src/views/catalog/Catalog.jsx | 2 -- src/views/failing/Failing.jsx | 1 - tests/assets/suite/failing.js | 6 ++--- tests/assets/suite/primary.js | 6 ++--- tests/assets/suite/runner.js | 43 +++++++++++++++++++++------------ tests/assets/suite/secondary.js | 6 ++--- tests/assets/suite/single.js | 6 ++--- tests/index.js | 5 ++-- vite.config.js | 20 +++++++-------- 11 files changed, 56 insertions(+), 50 deletions(-) diff --git a/src/views/Navbar.jsx b/src/views/Navbar.jsx index 63147c1..6d3037d 100644 --- a/src/views/Navbar.jsx +++ b/src/views/Navbar.jsx @@ -2,10 +2,7 @@ import { useContext, useState } from "react"; import StoreContext from "../ctx/StoreContext.jsx"; import JobContext from "../ctx/JobContext.jsx"; -import { - Link, - useLocation, -} from "react-router-dom"; +import { Link, useLocation } from "react-router-dom"; import AppBar from "@mui/material/AppBar"; import Badge from "@mui/material/Badge"; import { styled } from "@mui/material/styles"; @@ -101,7 +98,10 @@ export default function Navbar(props) { sx={{ zIndex: drawerIndex(true) }} > - + {pages.map((text, index) => ( diff --git a/src/views/catalog/Catalog.jsx b/src/views/catalog/Catalog.jsx index 1edf101..9608aee 100644 --- a/src/views/catalog/Catalog.jsx +++ b/src/views/catalog/Catalog.jsx @@ -6,8 +6,6 @@ import CatalogSearch from "./CatalogSearch.jsx"; import TextField from "@mui/material/TextField"; - - export default function Catalog() { const { state: jobState, diff --git a/src/views/failing/Failing.jsx b/src/views/failing/Failing.jsx index 0786385..e8192fc 100644 --- a/src/views/failing/Failing.jsx +++ b/src/views/failing/Failing.jsx @@ -17,7 +17,6 @@ import DialogTitle from "@mui/material/DialogTitle"; import ReplayIcon from "@mui/icons-material/Replay"; - export default function Failing() { const { state: jobState, retryAll, activeJobStates } = useContext(JobContext); diff --git a/tests/assets/suite/failing.js b/tests/assets/suite/failing.js index 99fb0f3..1339946 100644 --- a/tests/assets/suite/failing.js +++ b/tests/assets/suite/failing.js @@ -1,4 +1,4 @@ -export default function failingTest(){ +export default function failingTest() { console.log("This came from a failing test!"); - return {status:1}; -} \ No newline at end of file + return { status: 1 }; +} diff --git a/tests/assets/suite/primary.js b/tests/assets/suite/primary.js index d0cc4a4..aa33eb0 100644 --- a/tests/assets/suite/primary.js +++ b/tests/assets/suite/primary.js @@ -1,4 +1,4 @@ -export default function primaryTest(){ +export default function primaryTest() { console.log("This came from a primary test!"); - return {status:0, pipelineData:"SomeData"}; -} \ No newline at end of file + return { status: 0, pipelineData: "SomeData" }; +} diff --git a/tests/assets/suite/runner.js b/tests/assets/suite/runner.js index 87772ab..7476c7c 100644 --- a/tests/assets/suite/runner.js +++ b/tests/assets/suite/runner.js @@ -9,21 +9,29 @@ const endLiveCount = 5; const reportingUrl = `${process.env.QUALITEER_URL}/api/dev/rabbit/TestResults`; // Pull args const args = process.argv.slice(2); -const test = (args.find((v)=>v.includes("test=")) ?? "").replace("test=",""); -const pipelineData = (args.find((v)=>v.includes("pipelineData=")) ?? "").replace("pipelineData=",""); -const pipelineTriggers = (args.find((v)=>v.includes("pipelineTriggers=")) ?? "").replace("pipelineTriggers=",""); -const pipelineDashboardSocket = (args.find((v)=>v.includes("pipelineDashboardSocket=")) ?? "").replace("pipelineDashboardSocket=","") || undefined; +const test = (args.find((v) => v.includes("test=")) ?? "").replace("test=", ""); +const pipelineData = ( + args.find((v) => v.includes("pipelineData=")) ?? "" +).replace("pipelineData=", ""); +const pipelineTriggers = ( + args.find((v) => v.includes("pipelineTriggers=")) ?? "" +).replace("pipelineTriggers=", ""); +const pipelineDashboardSocket = + (args.find((v) => v.includes("pipelineDashboardSocket=")) ?? "").replace( + "pipelineDashboardSocket=", + "" + ) || undefined; const logNow = () => console.log(Date.now()); const liveIndicator = () => { for (var i = 0; i < endLiveCount; i++) setTimeout(logNow, i * 1000); -} +}; const runTests = () => { switch (test) { case "primary": return primary(); - case "secondary": + case "secondary": return secondary(pipelineData); case "single": return single(); @@ -32,16 +40,19 @@ const runTests = () => { default: return single(); } -} +}; // Run liveIndicator(); -setTimeout(()=>{ -const status = runTests(); -const testResult = {...status, name:test, pipelineTriggers: pipelineTriggers ? pipelineTriggers : undefined, pipelineDashboardSocket} -axios.post(reportingUrl, {testResult}).catch((e)=>{console.log(e.response.status)}); -},endLiveCount * 1000); - - - - +setTimeout(() => { + const status = runTests(); + const testResult = { + ...status, + name: test, + pipelineTriggers: pipelineTriggers ? pipelineTriggers : undefined, + pipelineDashboardSocket, + }; + axios.post(reportingUrl, { testResult }).catch((e) => { + console.log(e.response.status); + }); +}, endLiveCount * 1000); diff --git a/tests/assets/suite/secondary.js b/tests/assets/suite/secondary.js index b83cd69..00246fe 100644 --- a/tests/assets/suite/secondary.js +++ b/tests/assets/suite/secondary.js @@ -1,4 +1,4 @@ -export default function secondaryTest(pipelineData){ +export default function secondaryTest(pipelineData) { console.log("This came from a secondary test!"); - return {status: + (pipelineData !== "SomeData")}; -} \ No newline at end of file + return { status: +(pipelineData !== "SomeData") }; +} diff --git a/tests/assets/suite/single.js b/tests/assets/suite/single.js index 3d05a6c..2680727 100644 --- a/tests/assets/suite/single.js +++ b/tests/assets/suite/single.js @@ -1,4 +1,4 @@ -export default function singleTest(){ +export default function singleTest() { console.log("This came from a single test!"); - return {status:0}; -} \ No newline at end of file + return { status: 0 }; +} diff --git a/tests/index.js b/tests/index.js index cd24216..ddf0e2a 100644 --- a/tests/index.js +++ b/tests/index.js @@ -19,7 +19,6 @@ const job = { image: "node", }; -const launchJob = () => primary.newPipelineJob(job, null, () => - console.log("Primary Job Concluded") -); +const launchJob = () => + primary.newPipelineJob(job, null, () => console.log("Primary Job Concluded")); launchJob(); diff --git a/vite.config.js b/vite.config.js index 26fa0fe..967e159 100644 --- a/vite.config.js +++ b/vite.config.js @@ -2,13 +2,13 @@ import { defineConfig } from "vite"; import react from "@vitejs/plugin-react"; export default () => { - return defineConfig({ - plugins: [react()], - server: { - host: '0.0.0.0', - hmr: { - port: 443, - } - } - }); -} + return defineConfig({ + plugins: [react()], + server: { + host: "0.0.0.0", + hmr: { + port: 443, + }, + }, + }); +};