From e244fc7039f08ca961784bb7f615afb375653e5e Mon Sep 17 00:00:00 2001 From: dawkaka Date: Fri, 11 Apr 2025 20:37:30 +0000 Subject: [PATCH] format --- src/BackgroundJobs.hs | 12 +++---- src/Models/Tests/TestToDump.hs | 4 +-- src/Pages/BodyWrapper.hs | 18 +++++----- src/Pages/Log.hs | 56 ++++++++++++++++---------------- src/Pages/LogExplorer/LogItem.hs | 4 +-- src/Pages/Monitors/Testing.hs | 24 +++++++------- src/Pages/Telemetry/Spans.hs | 4 +-- src/Pages/Telemetry/Trace.hs | 50 ++++++++++++++-------------- 8 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/BackgroundJobs.hs b/src/BackgroundJobs.hs index a69703478..ab72e2980 100644 --- a/src/BackgroundJobs.hs +++ b/src/BackgroundJobs.hs @@ -302,8 +302,8 @@ handleQueryMonitorThreshold monitorE isAlert = do jobsWorkerInit :: Log.Logger -> Config.AuthContext -> IO () jobsWorkerInit logger appCtx = - startJobRunner $ - mkConfig jobLogger "background_jobs" appCtx.jobsPool (MaxConcurrentJobs 1) (jobsRunner logger appCtx) id + startJobRunner + $ mkConfig jobLogger "background_jobs" appCtx.jobsPool (MaxConcurrentJobs 1) (jobsRunner logger appCtx) id where jobLogger :: LogLevel -> LogEvent -> IO () jobLogger logLevel logEvent = Log.runLogT "OddJobs" logger Log.LogAttention $ Log.logInfo "Background jobs ping." (show @Text logLevel, show @Text logEvent) -- logger show (logLevel, logEvent) @@ -585,9 +585,9 @@ We have detected a new endpoint on *{project.title}* errs <- dbtToEff $ Anomalies.errorsByHashes pid targetHashes issueId <- liftIO $ Anomalies.AnomalyId <$> UUIDV4.nextRandom _ <- - dbtToEff $ - Anomalies.insertIssues $ - ( \err -> + dbtToEff + $ Anomalies.insertIssues + $ ( \err -> Anomalies.Issue { id = issueId , createdAt = err.createdAt @@ -602,7 +602,7 @@ We have detected a new endpoint on *{project.title}* , archivedAt = Nothing } ) - <$> errs + <$> errs forM_ project.notificationsChannel \case Projects.NSlack -> diff --git a/src/Models/Tests/TestToDump.hs b/src/Models/Tests/TestToDump.hs index f5c3cfdb9..d9d7bb8a4 100644 --- a/src/Models/Tests/TestToDump.hs +++ b/src/Models/Tests/TestToDump.hs @@ -27,8 +27,8 @@ import System.Config qualified as Config methodPath :: Testing.CollectionStepData -> Maybe (Text, Text) methodPath stepData = - listToMaybe $ - catMaybes + listToMaybe + $ catMaybes [ ("POST",) <$> stepData.post , ("GET",) <$> stepData.get , ("PUT",) <$> stepData.put diff --git a/src/Pages/BodyWrapper.hs b/src/Pages/BodyWrapper.hs index 9b9bf07b0..b6ea1d4fc 100644 --- a/src/Pages/BodyWrapper.hs +++ b/src/Pages/BodyWrapper.hs @@ -270,8 +270,8 @@ bodyWrapper bcfg child = do , tabindex_ "-1" ] do - div_ [class_ "relative mx-auto max-h-full", style_ "width: min(90vw, 500px)"] $ - div_ [class_ "bg-base-100 rounded-lg drop-shadow-md border-1 w-full"] do + div_ [class_ "relative mx-auto max-h-full", style_ "width: min(90vw, 500px)"] + $ div_ [class_ "bg-base-100 rounded-lg drop-shadow-md border-1 w-full"] do div_ [class_ "flex items-start justify-between p-6 space-x-2 border-b rounded-t"] do h3_ [class_ "text-3xl font-bold "] "Only Desktop Browsers are Supported for now!" -- Modal body @@ -283,17 +283,17 @@ bodyWrapper bcfg child = do div_ [class_ "flex w-full justify-end items-center p-6 space-x-2 border-t border-gray-200 rounded-b"] pass case bcfg.sessM of Nothing -> do - section_ [class_ "flex flex-col grow h-screen overflow-y-hidden"] $ - section_ [class_ "flex-1 overflow-y-auto"] $ - child + section_ [class_ "flex flex-col grow h-screen overflow-y-hidden"] + $ section_ [class_ "flex-1 overflow-y-auto"] + $ child Just sess -> let currUser = sess.persistentSession.user.getUser sideNav' = bcfg.currProject & maybe "" \project -> sideNav sess project (fromMaybe bcfg.pageTitle bcfg.prePageTitle) bcfg.menuItem bcfg.hasIntegrated in section_ [class_ "flex flex-row grow-0 h-screen overflow-hidden"] do sideNav' section_ [class_ "h-screen overflow-y-hidden grow"] do - when (currUser.email == "hello@apitoolkit.io") $ - loginBanner + when (currUser.email == "hello@apitoolkit.io") + $ loginBanner navbar bcfg.currProject (fromMaybe [] (bcfg.currProject <&> \p -> menu p.id)) currUser bcfg.prePageTitle bcfg.pageTitle bcfg.pageTitleModalId bcfg.docsLink bcfg.navTabs bcfg.pageActions section_ [class_ "overflow-y-hidden h-full flex-1"] child Components.drawer_ "global-data-drawer" Nothing Nothing "" @@ -352,8 +352,8 @@ projectsDropDown currProject projects = do nav_ [] do a_ [href_ [text| /p/$pidTxt/integrations|], class_ "p-3 flex gap-3 items-center rounded-sm hover:bg-gray-100"] do faSprite_ "arrows-turn-right" "regular" "h-5 w-5" >> span_ "Integrations" - when (currProject.paymentPlan == "UsageBased" || currProject.paymentPlan == "GraduatedPricing") $ - a_ + when (currProject.paymentPlan == "UsageBased" || currProject.paymentPlan == "GraduatedPricing") + $ a_ [class_ "p-3 flex gap-3 items-center rounded-sm hover:bg-gray-100 cursor-pointer", hxGet_ [text| /p/$pidTxt/manage_subscription |]] (faSprite_ "dollar-sign" "regular" "h-5 w-5" >> span_ "Manage billing") div_ [class_ "border-t border-gray-100 p-2"] do diff --git a/src/Pages/Log.hs b/src/Pages/Log.hs index 4aeb4eb6a..5e5ef833e 100644 --- a/src/Pages/Log.hs +++ b/src/Pages/Log.hs @@ -92,8 +92,8 @@ apiLogH pid queryM queryASTM cols' cursorM' sinceM fromM toM layoutM sourceM tar (queryLibRecent, queryLibSaved) <- V.partition (\x -> Projects.QLTHistory == (x.queryType)) <$> Projects.queryLibHistoryForUser pid sess.persistentSession.userId freeTierExceeded <- - dbtToEff $ - if project.paymentPlan == "Free" + dbtToEff + $ if project.paymentPlan == "Free" then (> 10000) <$> RequestDumps.getLastSevenDaysTotalRequest pid else pure False @@ -246,8 +246,8 @@ apiLogJson pid queryM queryASTM cols' cursorM' sinceM fromM toM layoutM sourceM else [] traceLogs <- Telemetry.getLogsByTraceIds pid traceIDs let colors = getServiceColors (V.catMaybes serviceNames) - addRespHeaders $ - AE.object + addRespHeaders + $ AE.object [ "logsData" AE..= requestVecs , "traceLogs" AE..= traceLogs , "serviceColors" AE..= colors @@ -330,8 +330,8 @@ logQueryBox_ pid currentRange source targetSpan queryAST queryLibRecent queryLib queryLibrary_ :: Projects.ProjectId -> V.Vector Projects.QueryLibItem -> V.Vector Projects.QueryLibItem -> Html () queryLibrary_ pid queryLibSaved queryLibRecent = div_ [class_ "dropdown dropdown-hover dropdown-bottom dropdown-start", id_ "queryLibraryParentEl"] do - div_ [class_ "cursor-pointer relative bg-fillWeak text-textWeak rounded-lg border border-strokeWeaker h-full flex gap-2 items-center px-2", tabindex_ "0", role_ "button"] $ - (toHtml "Presets" >> faSprite_ "chevron-down" "regular" "w-3 h-3") + div_ [class_ "cursor-pointer relative bg-fillWeak text-textWeak rounded-lg border border-strokeWeaker h-full flex gap-2 items-center px-2", tabindex_ "0", role_ "button"] + $ (toHtml "Presets" >> faSprite_ "chevron-down" "regular" "w-3 h-3") div_ [class_ "dropdown-content z-20"] $ div_ [class_ "tabs tabs-box tabs-md tabs-outline items-center bg-fillWeak p-0 h-full", role_ "tablist", id_ "queryLibraryTabListEl"] do tabPanel_ "Saved" (queryLibraryContent_ "Saved" queryLibSaved) tabPanel_ "Recent" (queryLibraryContent_ "Recent" queryLibRecent) @@ -399,9 +399,9 @@ queryLibItem_ qli = li_ "Send query to alert" li_ "Send query to a dashboard" strong_ $ whenJust qli.title \title -> (toHtml title) - pre_ $ - code_ [class_ "language-js bg-transparent! queryText whitespace-pre-wrap break-words"] $ - toHtml qli.queryText + pre_ + $ code_ [class_ "language-js bg-transparent! queryText whitespace-pre-wrap break-words"] + $ toHtml qli.queryText div_ [class_ "gap-3 flex"] $ time_ [datetime_ "", term "data-tippy-content" "created on"] (toHtml $ displayTimestamp $ formatUTC qli.createdAt) >> when qli.byMe " by me" @@ -497,9 +497,9 @@ apiLogsPage page = do ] do div_ [class_ "relative ml-auto w-full", style_ ""] do - div_ [class_ "flex justify-end w-full p-4 "] $ - button_ [[__|on click add .hidden to #expand-log-modal|]] $ - faSprite_ "xmark" "regular" "h-8" + div_ [class_ "flex justify-end w-full p-4 "] + $ button_ [[__|on click add .hidden to #expand-log-modal|]] + $ faSprite_ "xmark" "regular" "h-8" form_ [ hxPost_ $ "/p/" <> page.pid.toText <> "/share/" , hxSwap_ "innerHTML" @@ -515,18 +515,18 @@ apiLogsPage page = do div_ [class_ "flex flex-row gap-4 mt-3 group-has-[.toggle-chart:checked]/pg:hidden w-full", style_ "aspect-ratio: 10 / 1;"] do Widget.widget_ $ (def :: Widget.Widget){Widget.query = Just "timechart count(*)", Widget.unit = Just "reqs", Widget.title = Just "All requests", Widget.hideLegend = Just True, Widget._projectId = Just page.pid, Widget.standalone = Just True, Widget.yAxis = Just (def{showOnlyMaxLabel = Just True})} - unless (page.source == "logs") $ - Widget.widget_ $ - (def :: Widget.Widget) - { Widget.wType = WTTimeseriesLine - , Widget.standalone = Just True - , Widget.title = Just "Latency percentiles (ms)" - , Widget.hideSubtitle = Just True - , Widget.yAxis = Just (def{showOnlyMaxLabel = Just True}) - , Widget.summarizeBy = Just Widget.SBMax - , Widget.sql = - Just - [text| + unless (page.source == "logs") + $ Widget.widget_ + $ (def :: Widget.Widget) + { Widget.wType = WTTimeseriesLine + , Widget.standalone = Just True + , Widget.title = Just "Latency percentiles (ms)" + , Widget.hideSubtitle = Just True + , Widget.yAxis = Just (def{showOnlyMaxLabel = Just True}) + , Widget.summarizeBy = Just Widget.SBMax + , Widget.sql = + Just + [text| SELECT timeB, value, quantile FROM ( SELECT extract(epoch from time_bucket('1h', created_at))::integer AS timeB, ARRAY[ @@ -543,10 +543,10 @@ apiLogsPage page = do ) s, LATERAL unnest(s.values, s.quantiles) AS u(value, quantile); |] - , Widget.unit = Just "ms" - , Widget.hideLegend = Just True - , Widget._projectId = Just page.pid - } + , Widget.unit = Just "ms" + , Widget.hideLegend = Just True + , Widget._projectId = Just page.pid + } div_ [class_ "flex h-full gap-3.5 overflow-hidden"] do div_ [class_ "w-1/5 shrink-0 flex flex-col gap-2 p-2 hidden group-has-[.toggle-filters:checked]/pg:hidden "] do diff --git a/src/Pages/LogExplorer/LogItem.hs b/src/Pages/LogExplorer/LogItem.hs index 757ab3d4f..2d5d9be74 100644 --- a/src/Pages/LogExplorer/LogItem.hs +++ b/src/Pages/LogExplorer/LogItem.hs @@ -279,8 +279,8 @@ spanBadge val key = do -- Function to selectively convert RequestDumpLogItem to JSON selectiveReqToJson :: RequestDumps.RequestDumpLogItem -> AE.Value selectiveReqToJson req = - AE.object $ - concat @[] + AE.object + $ concat @[] [ ["created_at" AE..= req.createdAt] , ["duration_ns" AE..= req.durationNs] , ["errors" AE..= req.errors] diff --git a/src/Pages/Monitors/Testing.hs b/src/Pages/Monitors/Testing.hs index 29d214848..4dd357123 100644 --- a/src/Pages/Monitors/Testing.hs +++ b/src/Pages/Monitors/Testing.hs @@ -69,8 +69,8 @@ testingGetH pid filterTM timeFilter = do [ ItemsList.BulkAction{icon = Just "check", title = "deactivate", uri = "/p/" <> pid.toText <> "/anomalies/bulk_actions/acknowlege"} ] , zeroState = - Just $ - ItemsList.ZeroState + Just + $ ItemsList.ZeroState { icon = "empty-set" , title = "No Multistep Test/Monitor yet." , description = "You're can create one to start monitoring your services." @@ -89,16 +89,16 @@ testingGetH pid filterTM timeFilter = do , docsLink = Just "https://apitoolkit.io/docs/monitors/multistep-tests/" , pageActions = Just $ a_ [href_ $ "/p/" <> pid.toText <> "/monitors/collection", class_ "btn btn-sm blue-outline-btn space-x-2"] $ Utils.faSprite_ "plus" "regular" "h-4" >> "new tests" , navTabs = - Just $ - toHtml $ - Components.TabFilter - { current = currentFilterTab - , currentURL - , options = - [ Components.TabFilterOpt{name = "Active", count = Nothing} - , Components.TabFilterOpt{name = "Inactive", count = Just inactiveColsCount} - ] - } + Just + $ toHtml + $ Components.TabFilter + { current = currentFilterTab + , currentURL + , options = + [ Components.TabFilterOpt{name = "Active", count = Nothing} + , Components.TabFilterOpt{name = "Inactive", count = Just inactiveColsCount} + ] + } } addRespHeaders $ PageCtx bwconf (ItemsList.ItemsPage listCfg $ V.map (\col -> CollectionListItemVM pid col currTime) colls) diff --git a/src/Pages/Telemetry/Spans.hs b/src/Pages/Telemetry/Spans.hs index c314ad61d..7fd1b5223 100644 --- a/src/Pages/Telemetry/Spans.hs +++ b/src/Pages/Telemetry/Spans.hs @@ -234,8 +234,8 @@ spanBadge val key = do selectiveReqToJson :: RequestMessage -> AE.Value selectiveReqToJson req = - AE.object $ - concat @[] + AE.object + $ concat @[] [ ["created_at" AE..= req.timestamp] , ["errors" AE..= fromMaybe [] req.errors] , ["host" AE..= req.host] diff --git a/src/Pages/Telemetry/Trace.hs b/src/Pages/Telemetry/Trace.hs index 61f358831..747405a02 100644 --- a/src/Pages/Telemetry/Trace.hs +++ b/src/Pages/Telemetry/Trace.hs @@ -164,8 +164,8 @@ tracePage p = do span_ [class_ ""] $ toHtml s div_ [class_ "flex gap-1 items-center"] $ do span_ [class_ "text-xs max-w-52 truncate"] $ toHtml $ T.take 4 percent <> "%" - div_ [class_ "w-[100px] h-3 bg-gray-200 rounded-sm overflow-hidden"] $ - div_ [class_ $ "h-full pl-2 text-xs font-medium " <> color, style_ $ "width:" <> percent <> "%"] pass + div_ [class_ "w-[100px] h-3 bg-gray-200 rounded-sm overflow-hidden"] + $ div_ [class_ $ "h-full pl-2 text-xs font-medium " <> color, style_ $ "width:" <> percent <> "%"] pass div_ [role_ "tabpanel", class_ "a-tab-content pt-2 hidden", id_ "water_fall"] do div_ [class_ "border border-slate-200 flex w-full rounded-2xl min-h-[230px] overflow-y-auto overflow-x-hidden "] do @@ -260,22 +260,22 @@ renderSpanListTable services colors records = th_ "Avg. Duration" th_ "Exec. Time" th_ "%Exec. Time" - tbody_ [class_ "space-y-0"] $ - mapM_ (renderSpanRecordRow records colors) services + tbody_ [class_ "space-y-0"] + $ mapM_ (renderSpanRecordRow records colors) services spanTable :: V.Vector Telemetry.SpanRecord -> Html () spanTable records = div_ [class_ "rounded-xl my-2 mx-3 border border-slate-200"] do table_ [class_ "table w-full"] do - thead_ [class_ "border-b border-slate-200"] $ - tr_ [class_ "p-2 border-b font-medium"] $ - do - td_ "Time" - td_ "Span name" - td_ "Event type" - td_ "Span kind" - td_ "Exec. time" + thead_ [class_ "border-b border-slate-200"] + $ tr_ [class_ "p-2 border-b font-medium"] + $ do + td_ "Time" + td_ "Span name" + td_ "Event type" + td_ "Span kind" + td_ "Exec. time" tbody_ do forM_ records $ \spanRecord -> do let pidText = UUID.toText spanRecord.projectId @@ -347,19 +347,19 @@ buildTree spanMap parentId = Nothing -> [] Just spans -> [ SpanTree - SpanMin - { parentSpanId = sp.parentSpanId - , spanId = sp.spanId - , uSpanId = sp.uSpanId - , spanName = sp.spanName - , spanDurationNs = sp.spanDurationNs - , serviceName = getServiceName sp - , startTime = utcTimeToNanoseconds sp.startTime - , endTime = utcTimeToNanoseconds <$> sp.endTime - , hasErrors = spanHasErrors sp - , timestamp = sp.timestamp - } - (buildTree spanMap (Just sp.spanId)) + SpanMin + { parentSpanId = sp.parentSpanId + , spanId = sp.spanId + , uSpanId = sp.uSpanId + , spanName = sp.spanName + , spanDurationNs = sp.spanDurationNs + , serviceName = getServiceName sp + , startTime = utcTimeToNanoseconds sp.startTime + , endTime = utcTimeToNanoseconds <$> sp.endTime + , hasErrors = spanHasErrors sp + , timestamp = sp.timestamp + } + (buildTree spanMap (Just sp.spanId)) | sp <- spans ]