diff --git a/hie.yaml b/hie.yaml index 4d7c4b9bf..daf97e6f4 100644 --- a/hie.yaml +++ b/hie.yaml @@ -1,16 +1,2 @@ cradle: - stack: - - path: './src' - component: 'monoscope:lib' - - - path: './app/Main.hs' - component: 'monoscope:exe:monoscope-exe' - - - path: './app/Paths_monoscope.hs' - component: 'monoscope:exe:monoscope-exe' - - - path: './test' - component: 'monoscope:test:monoscope-test' - -dependencies: - - package.yaml + cabal: {} diff --git a/monoscope.cabal b/monoscope.cabal index f600630bc..b0bebfdaf 100644 --- a/monoscope.cabal +++ b/monoscope.cabal @@ -42,6 +42,7 @@ extra-source-files: static/migrations/0015_summary_pattern.sql static/migrations/0016_drop_overly_restrictive_issues_constraint.sql static/migrations/0016_reports_start_and_end_time.sql + static/migrations/0017_teams_table.sql source-repository head type: git @@ -435,6 +436,7 @@ test-suite integration-tests Pages.LogExplorer.LogSpec Pages.MonitorsSpec Pages.Projects.ManageMembersSpec + Pages.DashboardsSpec Pages.Projects.ProjectsSpec Pages.ReportsSpec Pages.ShareSpec diff --git a/src/BackgroundJobs.hs b/src/BackgroundJobs.hs index 68efde0a2..d3db81a32 100644 --- a/src/BackgroundJobs.hs +++ b/src/BackgroundJobs.hs @@ -45,6 +45,7 @@ import Models.Apis.Reports qualified as Reports import Models.Apis.RequestDumps (ATError (..)) import Models.Apis.RequestDumps qualified as RequestDumps import Models.Apis.Shapes qualified as Shapes +import Models.Projects.ProjectMembers qualified as ProjectMembers import Models.Projects.Projects qualified as Projects import Models.Telemetry.Telemetry qualified as Telemetry import Models.Users.Users qualified as Users @@ -59,7 +60,7 @@ import Pages.Charts.Charts qualified as Charts import Pages.Reports qualified as RP import Pkg.DeriveUtils (UUIDId (..)) import Pkg.Drain qualified as Drain -import Pkg.Mail (NotificationAlerts (EndpointAlert, ReportAlert, RuntimeErrorAlert), sendDiscordAlert, sendPostmarkEmail, sendSlackAlert, sendSlackMessage, sendWhatsAppAlert) +import Pkg.Mail (NotificationAlerts (..), sendDiscordAlert, sendPostmarkEmail, sendSlackAlert, sendSlackMessage, sendWhatsAppAlert) import Pkg.Parser import ProcessMessage (processSpanToEntities) import PyF (fmtTrim) @@ -153,7 +154,7 @@ processBackgroundJob :: Config.AuthContext -> Job -> BgJobs -> ATBackgroundCtx ( processBackgroundJob authCtx job bgJob = case bgJob of GenerateOtelFacetsBatch pids timestamp -> generateOtelFacetsBatch pids timestamp - QueryMonitorsTriggered queryMonitorIds -> queryMonitorsTriggered queryMonitorIds + QueryMonitorsTriggered queryMonitorIds -> queryMonitorsTriggered queryMonitorIds authCtx NewAnomaly{projectId, createdAt, anomalyType, anomalyAction, targetHashes} -> newAnomalyJob projectId createdAt anomalyType anomalyAction (V.fromList targetHashes) InviteUserToProject userId projectId reciever projectTitle' -> do userM <- Users.userById userId @@ -747,52 +748,62 @@ reportUsageToLemonsqueezy subItemId quantity apiKey = do pass -queryMonitorsTriggered :: V.Vector Monitors.QueryMonitorId -> ATBackgroundCtx () -queryMonitorsTriggered queryMonitorIds = do +queryMonitorsTriggered :: V.Vector Monitors.QueryMonitorId -> Config.AuthContext -> ATBackgroundCtx () +queryMonitorsTriggered queryMonitorIds authCtx = do monitorsEvaled <- dbtToEff $ Monitors.queryMonitorsById queryMonitorIds forM_ monitorsEvaled \monitorE -> if (monitorE.triggerLessThan && monitorE.evalResult >= monitorE.alertThreshold) || (not monitorE.triggerLessThan && monitorE.evalResult <= monitorE.alertThreshold) - then handleQueryMonitorThreshold monitorE True + then handleQueryMonitorThreshold monitorE True authCtx.config.hostUrl else do if Just True == ( monitorE.warningThreshold <&> \warningThreshold -> (monitorE.triggerLessThan && monitorE.evalResult >= warningThreshold) || (not monitorE.triggerLessThan && monitorE.evalResult <= warningThreshold) ) - then handleQueryMonitorThreshold monitorE False + then handleQueryMonitorThreshold monitorE False authCtx.config.hostUrl else pass -handleQueryMonitorThreshold :: Monitors.QueryMonitorEvaled -> Bool -> ATBackgroundCtx () -handleQueryMonitorThreshold monitorE isAlert = do +handleQueryMonitorThreshold :: Monitors.QueryMonitorEvaled -> Bool -> Text -> ATBackgroundCtx () +handleQueryMonitorThreshold monitorE isAlert hostUrl = do Log.logTrace "Query Monitors Triggered " monitorE _ <- dbtToEff $ Monitors.updateQMonitorTriggeredState monitorE.id isAlert + project <- dbtToEff $ Projects.projectById monitorE.projectId + whenJustM (dbtToEff $ Projects.projectById monitorE.projectId) \p -> do + teams <- dbtToEff $ ProjectMembers.getTeamsById monitorE.projectId monitorE.teams + let thresholdType = if monitorE.triggerLessThan then "below" else "above" + threshold = fromIntegral monitorE.alertThreshold - -- Create query alert issue - let thresholdType = if monitorE.triggerLessThan then "below" else "above" - threshold = fromIntegral monitorE.alertThreshold + issue <- + liftIO + $ Issues.createQueryAlertIssue + monitorE.projectId + (show monitorE.id) + monitorE.alertConfig.title + monitorE.logQuery + threshold + (fromIntegral monitorE.evalResult :: Double) + thresholdType - issue <- - liftIO - $ Issues.createQueryAlertIssue - monitorE.projectId - (show monitorE.id) - monitorE.alertConfig.title - monitorE.logQuery - threshold - (fromIntegral monitorE.evalResult :: Double) - thresholdType + dbtToEff $ Issues.insertIssue issue - dbtToEff $ Issues.insertIssue issue + let alert = MonitorsAlert{monitorTitle = monitorE.alertConfig.title, monitorUrl = hostUrl <> "/p/" <> monitorE.projectId.toText <> "/anomalies/" <> issue.id.toText} + if null teams + then do + Relude.when monitorE.alertConfig.emailAll do + users <- dbtToEff $ Projects.usersByProjectId monitorE.projectId + forM_ users \u -> emailQueryMonitorAlert monitorE u.email (Just u) + forM_ monitorE.alertConfig.emails \email -> emailQueryMonitorAlert monitorE email Nothing + unless (null monitorE.alertConfig.slackChannels) $ sendSlackMessage monitorE.projectId [fmtTrim| 🤖 *Log Alert triggered for `{monitorE.alertConfig.title}`*|] + else do + forM_ teams \team -> do + forM_ team.notify_emails \email -> emailQueryMonitorAlert monitorE (CI.mk email) Nothing + forM_ team.slack_channels (sendSlackAlert alert monitorE.projectId p.title . Just) + forM_ team.discord_channels (sendDiscordAlert alert monitorE.projectId p.title . Just) - -- Send notifications - Relude.when monitorE.alertConfig.emailAll do - users <- dbtToEff $ Projects.usersByProjectId monitorE.projectId - forM_ users \u -> emailQueryMonitorAlert monitorE u.email (Just u) - forM_ monitorE.alertConfig.emails \email -> emailQueryMonitorAlert monitorE email Nothing - unless (null monitorE.alertConfig.slackChannels) $ sendSlackMessage monitorE.projectId [fmtTrim| 🤖 *Log Alert triggered for `{monitorE.alertConfig.title}`*|] +-- Send notifications -- way to get emails for company. for email all -- TODO: based on monitor send emails or slack @@ -947,9 +958,9 @@ sendReportForProject pid rType = do Relude.when pr.weeklyNotif $ forM_ pr.notificationsChannel \case Projects.NDiscord -> do - sendDiscordAlert alert pid pr.title + sendDiscordAlert alert pid pr.title Nothing Projects.NSlack -> do - sendSlackAlert alert pid pr.title + sendSlackAlert alert pid pr.title Nothing Projects.NPhone -> do sendWhatsAppAlert alert pid pr.title pr.whatsappNumbers _ -> do @@ -1060,9 +1071,9 @@ newAnomalyJob pid createdAt anomalyTypesT anomalyActionsT targetHashes = do Relude.when project.errorAlerts do forM_ project.notificationsChannel \case Projects.NSlack -> - forM_ errors \err -> do sendSlackAlert (RuntimeErrorAlert err.errorData) pid project.title + forM_ errors \err -> do sendSlackAlert (RuntimeErrorAlert err.errorData) pid project.title Nothing Projects.NDiscord -> - forM_ errors \err -> do sendDiscordAlert (RuntimeErrorAlert err.errorData) pid project.title + forM_ errors \err -> do sendDiscordAlert (RuntimeErrorAlert err.errorData) pid project.title Nothing Projects.NPhone -> forM_ errors \err -> do sendWhatsAppAlert (RuntimeErrorAlert err.errorData) pid project.title project.whatsappNumbers @@ -1163,8 +1174,8 @@ processAPIChangeAnomalies pid targetHashes = do let alert = EndpointAlert project.title (V.fromList endpointInfo) (fromMaybe "" $ viaNonEmpty head $ V.toList targetHashes) forM_ project.notificationsChannel \case - Projects.NSlack -> sendSlackAlert alert pid project.title - Projects.NDiscord -> sendDiscordAlert alert pid project.title + Projects.NSlack -> sendSlackAlert alert pid project.title Nothing + Projects.NDiscord -> sendDiscordAlert alert pid project.title Nothing Projects.NPhone -> sendWhatsAppAlert alert pid project.title project.whatsappNumbers Projects.NEmail -> do forM_ users \u -> do diff --git a/src/Data/Effectful/Notify.hs b/src/Data/Effectful/Notify.hs index 351d49d2c..3ac6c20c2 100644 --- a/src/Data/Effectful/Notify.hs +++ b/src/Data/Effectful/Notify.hs @@ -36,6 +36,7 @@ module Data.Effectful.Notify ( import Control.Lens ((.~)) import Control.Lens.Setter ((?~)) import Data.Aeson qualified as AE +import Data.Aeson.KeyMap qualified as AEK import Data.Aeson.QQ (aesonQQ) import Effectful import Effectful.Dispatch.Dynamic @@ -59,7 +60,7 @@ data EmailData = EmailData data SlackData = SlackData - { webhookUrl :: Text + { channelId :: Text , message :: AE.Value } deriving stock (Eq, Generic, Show) @@ -111,7 +112,7 @@ emailNotification receiver templateOptions subjectMessage = slackNotification :: Text -> AE.Value -> Notification -slackNotification webhookUrl message = +slackNotification channelId message = SlackNotification SlackData{..} @@ -155,8 +156,12 @@ runNotifyProduction = interpret $ \_ -> \case _ <- liftIO $ postWith opts url payload pass SlackNotification SlackData{..} -> do - let opts = defaults & header "Content-Type" .~ ["application/json"] - _ <- liftIO $ postWith opts (toString webhookUrl) message + appCtx <- ask @Config.AuthContext + let opts = defaults & header "Content-Type" .~ ["application/json"] & header "Authorization" .~ [encodeUtf8 $ "Bearer " <> appCtx.config.slackBotToken] + let messageF = case message of + AE.Object obj -> AE.Object $ obj <> (AEK.fromList [("channel", AE.String channelId)]) + _ -> message + _ <- liftIO $ postWith opts "https://slack.com/api/chat.postMessage" messageF pass DiscordNotification DiscordData{..} -> do appCtx <- ask @Config.AuthContext @@ -196,7 +201,7 @@ runNotifyTest eff = do EmailNotification emailData -> ("Email" :: Text, emailData.receiver, fmap fst emailData.templateOptions) SlackNotification slackData -> - ("Slack" :: Text, slackData.webhookUrl, Nothing :: Maybe Text) + ("Slack" :: Text, slackData.channelId, Nothing :: Maybe Text) DiscordNotification discordData -> ("Discord" :: Text, discordData.channelId, Nothing :: Maybe Text) WhatsAppNotification whatsappData -> diff --git a/src/Models/Apis/Monitors.hs b/src/Models/Apis/Monitors.hs index 358a12efc..d96f19f5a 100644 --- a/src/Models/Apis/Monitors.hs +++ b/src/Models/Apis/Monitors.hs @@ -9,6 +9,7 @@ module Models.Apis.Monitors ( MonitorAlertConfig (..), QueryMonitorId (..), updateQMonitorTriggeredState, + getAlertsByTeamHandle, ) where import Data.Aeson qualified as AE @@ -87,6 +88,7 @@ data QueryMonitor = QueryMonitor , deactivatedAt :: Maybe UTCTime , deletedAt :: Maybe UTCTime , visualizationType :: Text + , teams :: V.Vector UUID.UUID } deriving stock (Generic, Show) deriving anyclass (Default, FromRow, NFData, ToRow) @@ -113,6 +115,7 @@ data QueryMonitorEvaled = QueryMonitorEvaled , deactivatedAt :: Maybe UTCTime , deletedAt :: Maybe UTCTime , visualizationType :: Text + , teams :: V.Vector UUID.UUID , evalResult :: Int } deriving stock (Generic, Show) @@ -138,13 +141,14 @@ queryMonitorUpsert qm = , qm.alertConfig , qm.checkIntervalMins , qm.visualizationType + , qm.teams ) where q = [sql| INSERT INTO monitors.query_monitors (id, project_id, alert_threshold, warning_threshold, log_query, log_query_as_sql, last_evaluated, warning_last_triggered, alert_last_triggered, trigger_less_than, - threshold_sustained_for_mins, alert_config, check_interval_mins, visualization_type) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?) + threshold_sustained_for_mins, alert_config, check_interval_mins, visualization_type, teams) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?::uuid[]) ON CONFLICT (id) DO UPDATE SET alert_threshold=EXCLUDED.alert_threshold, warning_threshold=EXCLUDED.warning_threshold, @@ -157,7 +161,8 @@ queryMonitorUpsert qm = threshold_sustained_for_mins=EXCLUDED.threshold_sustained_for_mins, alert_config=EXCLUDED.alert_config, check_interval_mins=EXCLUDED.check_interval_mins, - visualization_type=EXCLUDED.visualization_type; + visualization_type=EXCLUDED.visualization_type, + teams=EXCLUDED.teams |] @@ -174,7 +179,7 @@ queryMonitorsById ids [sql| SELECT id, created_at, updated_at, project_id, check_interval_mins, alert_threshold, warning_threshold, log_query, log_query_as_sql, last_evaluated, warning_last_triggered, alert_last_triggered, trigger_less_than, - threshold_sustained_for_mins, alert_config, deactivated_at, deleted_at, visualization_type, eval(log_query_as_sql) + threshold_sustained_for_mins, alert_config, deactivated_at, deleted_at, visualization_type, teams, eval(log_query_as_sql) FROM monitors.query_monitors where id=ANY(?::UUID[]) |] @@ -202,3 +207,16 @@ monitorToggleActiveById id' = execute q (Only id') queryMonitorsAll :: Projects.ProjectId -> DBT IO (V.Vector QueryMonitor) queryMonitorsAll pid = selectManyByField @QueryMonitor [DAT.field| project_id |] pid + + +getAlertsByTeamHandle :: Projects.ProjectId -> UUID.UUID -> DBT IO (V.Vector QueryMonitor) +getAlertsByTeamHandle pid teamId = query q (pid, teamId) + where + q = + [sql| + SELECT qm.id, qm.created_at, qm.updated_at, qm.project_id, qm.check_interval_mins, qm.alert_threshold, qm.warning_threshold, + qm.log_query, qm.log_query_as_sql, qm.last_evaluated, qm.warning_last_triggered, qm.alert_last_triggered, qm.trigger_less_than, + qm.threshold_sustained_for_mins, qm.alert_config, qm.deactivated_at, qm.deleted_at, qm.visualization_type, qm.teams + FROM monitors.query_monitors qm + WHERE qm.project_id = ? AND ? = ANY(qm.teams) + |] diff --git a/src/Models/Projects/Dashboards.hs b/src/Models/Projects/Dashboards.hs index ec98d07b9..a0cccc842 100644 --- a/src/Models/Projects/Dashboards.hs +++ b/src/Models/Projects/Dashboards.hs @@ -1,10 +1,27 @@ -module Models.Projects.Dashboards (Dashboard (..), DashboardVM (..), DashboardId, readDashboardFile, Variable (..), VariableType (..), Tab (..), getDashboardById, readDashboardsFromDirectory, readDashboardEndpoint, replaceQueryVariables) where +module Models.Projects.Dashboards ( + Dashboard (..), + DashboardVM (..), + DashboardId, + readDashboardFile, + Variable (..), + VariableType (..), + Tab (..), + getDashboardById, + readDashboardsFromDirectory, + readDashboardEndpoint, + replaceQueryVariables, + deleteDashboardsByIds, + addTeamsToDashboards, + insert, + selectDashboardsByTeam, +) where import Control.Exception (try) import Control.Lens import Data.Aeson qualified as AE import Data.ByteString qualified as BS import Data.Default +import Data.Effectful.UUID qualified as UUID import Data.Effectful.Wreq (HTTP) import Data.Effectful.Wreq qualified as W import Data.Generics.Labels () @@ -18,6 +35,7 @@ import Database.PostgreSQL.Simple (FromRow, ToRow) import Database.PostgreSQL.Simple.FromField import Database.PostgreSQL.Simple.Newtypes (Aeson (..)) import Database.PostgreSQL.Simple.ToField +import Database.PostgreSQL.Simple.TypeInfo.Static (uuid) import Database.PostgreSQL.Simple.Types (Only (Only), Query (Query)) import Database.PostgreSQL.Transact qualified as DBT import Deriving.Aeson qualified as DAE @@ -51,6 +69,7 @@ data DashboardVM = DashboardVM , homepageSince :: Maybe UTCTime , tags :: V.Vector Text , title :: Text + , teams :: V.Vector UUID.UUID } deriving stock (Generic, Show) deriving anyclass (FromRow, NFData, ToRow) @@ -117,6 +136,29 @@ data Tab = Tab deriving (AE.FromJSON, AE.ToJSON) via DAES.Snake Tab +insert :: DB :> es => DashboardVM -> Eff es Int64 +insert dashboardVM = do + dbtToEff $ DBT.execute (Query $ encodeUtf8 q) params + where + q = + [text| INSERT INTO projects.dashboards (id, project_id, created_at, updated_at, created_by, base_template, schema, starred_since, homepage_since, tags, title, teams) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?::uuid[]) |] + params = + ( dashboardVM.id + , dashboardVM.projectId + , dashboardVM.createdAt + , dashboardVM.updatedAt + , dashboardVM.createdBy + , dashboardVM.baseTemplate + , dashboardVM.schema + , dashboardVM.starredSince + , dashboardVM.homepageSince + , dashboardVM.tags + , dashboardVM.title + , dashboardVM.teams + ) + + readDashboardsFromDirectory :: FilePath -> Q Exp readDashboardsFromDirectory dir = do files <- runIO $ listDirectory dir @@ -161,4 +203,29 @@ replaceQueryVariables pid mf mt allParams currentTime variable = getDashboardById :: DB :> es => Text -> Eff es (Maybe DashboardVM) getDashboardById did = dbtToEff $ DBT.queryOne (Query $ encodeUtf8 q) (Only did) where - q = [text|SELECT id, project_id, created_at, updated_at, created_by, base_template, schema, starred_since, homepage_since, tags, title FROM projects.dashboards WHERE id = ?|] + q = [text| SELECT id, project_id, created_at, updated_at, created_by, base_template, schema, starred_since, homepage_since, tags, title, teams FROM projects.dashboards WHERE id = ?|] + + +deleteDashboardsByIds :: DB :> es => Projects.ProjectId -> V.Vector DashboardId -> Eff es Int64 +deleteDashboardsByIds pid dids = dbtToEff $ DBT.execute (Query $ encodeUtf8 q) (pid, dids) + where + q = [text|DELETE FROM projects.dashboards WHERE project_id = ? AND id = ANY(?::uuid[])|] + + +addTeamsToDashboards :: DB :> es => Projects.ProjectId -> V.Vector DashboardId -> V.Vector UUID.UUID -> Eff es Int64 +addTeamsToDashboards pid dids teamIds = do + dbtToEff $ DBT.execute (Query $ encodeUtf8 q) (teamIds, pid, dids) + where + q = + [text| + UPDATE projects.dashboards + SET teams = teams || ?::uuid[] + WHERE project_id = ? AND id = ANY(?::uuid[]) + |] + + +selectDashboardsByTeam :: DB :> es => Projects.ProjectId -> UUID.UUID -> Eff es [DashboardVM] +selectDashboardsByTeam pid teamId = do + dbtToEff $ DBT.query (Query $ encodeUtf8 q) (pid, teamId) + where + q = [text| SELECT id, project_id, created_at, updated_at, created_by, base_template, schema, starred_since, homepage_since, tags, title, teams FROM projects.dashboards WHERE project_id = ? AND teams @> ARRAY[?::uuid]|] diff --git a/src/Models/Projects/ProjectMembers.hs b/src/Models/Projects/ProjectMembers.hs index 05a499b0f..b325bdbdc 100644 --- a/src/Models/Projects/ProjectMembers.hs +++ b/src/Models/Projects/ProjectMembers.hs @@ -7,15 +7,27 @@ module Models.Projects.ProjectMembers ( selectActiveProjectMembers, updateProjectMembersPermissons, softDeleteProjectMembers, + createTeam, + updateTeam, + getTeams, + getTeamByHandle, + getTeamsVM, + TeamVM (..), + deleteTeamByHandle, + deleteTeams, + getTeamsById, + Team (..), + TeamMemberVM (..), ) where import Control.Error (note) +import Data.Aeson qualified as AE import Data.CaseInsensitive (CI) import Data.Default.Instances () -import Data.Time (ZonedTime) +import Data.Time (UTCTime, ZonedTime) import Data.UUID qualified as UUID import Data.Vector qualified as V -import Database.PostgreSQL.Entity.DBT (query) +import Database.PostgreSQL.Entity.DBT (query, queryOne) import Database.PostgreSQL.Entity.Types ( CamelToSnake, Entity, @@ -25,12 +37,16 @@ import Database.PostgreSQL.Entity.Types ( Schema, TableName, ) -import Database.PostgreSQL.Simple (FromRow, Only (Only), ResultError (..), ToRow) +import Database.PostgreSQL.Simple (FromRow, In, Only (Only), ResultError (..), ToRow) import Database.PostgreSQL.Simple.FromField (FromField, fromField, returnError) +import Database.PostgreSQL.Simple.Newtypes (Aeson (..)) import Database.PostgreSQL.Simple.SqlQQ (sql) import Database.PostgreSQL.Simple.ToField (Action (Escape), ToField, toField) +import Database.PostgreSQL.Simple.TypeInfo.Static (uuid) import Database.PostgreSQL.Transact (DBT, execute, executeMany) import Database.PostgreSQL.Transact qualified as PgT +import Deriving.Aeson qualified as DAE +import Effectful.PostgreSQL.Transact.Effect (DB) import Models.Projects.Projects qualified as Projects import Models.Users.Users qualified as Users import Relude @@ -114,6 +130,8 @@ data ProjectMemberVM = ProjectMemberVM , userId :: Users.UserId , permission :: Permissions , email :: CI Text + , first_name :: Text + , last_name :: Text } deriving stock (Eq, Generic, Show) deriving anyclass (FromRow, NFData) @@ -123,7 +141,7 @@ selectActiveProjectMembers :: Projects.ProjectId -> DBT IO (V.Vector ProjectMemb selectActiveProjectMembers = query q where q = - [sql| SELECT pm.id, pm.user_id, pm.permission,us.email from projects.project_members pm + [sql| SELECT pm.id, pm.user_id, pm.permission,us.email, us.first_name, us.last_name from projects.project_members pm JOIN users.users us ON (pm.user_id=us.id) WHERE pm.project_id=?::uuid and pm.active=TRUE ORDER BY pm.created_at ASC; @@ -141,10 +159,186 @@ updateProjectMembersPermissons vals = void $ executeMany q vals softDeleteProjectMembers :: [UUID.UUID] -> DBT IO () -softDeleteProjectMembers [] = pass -softDeleteProjectMembers vals = void $ execute q (Only (V.fromList vals)) +softDeleteProjectMembers vals = unless (null vals) $ void $ execute q (Only $ V.fromList vals) where q = [sql| UPDATE projects.project_members SET active = FALSE WHERE id = Any(?::uuid[]); |] + + +createTeam :: Projects.ProjectId -> Users.UserId -> Text -> Text -> Text -> V.Vector Users.UserId -> V.Vector Text -> V.Vector Text -> V.Vector Text -> DBT IO Int64 +createTeam pid uid name description handle memberIds notifEmails slackChannels discordChannels = execute q (pid, uid, name, description, handle, memberIds, notifEmails, slackChannels, discordChannels) + where + q = + [sql| INSERT INTO projects.teams + (project_id,created_by, name, description, handle, members, notify_emails, slack_channels, discord_channels) + VALUES (?,?, ?,?,?,?::uuid[],?,?,?) |] + + +updateTeam :: Projects.ProjectId -> UUID.UUID -> Text -> Text -> Text -> V.Vector Users.UserId -> V.Vector Text -> V.Vector Text -> V.Vector Text -> DBT IO Int64 +updateTeam pid tid name description handle memberIds notifEmails slackChannels discordChannels = do + execute q (name, description, handle, memberIds, notifEmails, slackChannels, discordChannels, pid, tid) + where + q = + [sql| UPDATE projects.teams + SET name = ?, description = ?, handle = ?, members = ?::uuid[], notify_emails = ?, slack_channels = ?, discord_channels = ? + WHERE project_id = ? AND id = ? |] + + +data Team = Team + { id :: UUID.UUID + , name :: Text + , description :: Text + , handle :: Text + , members :: V.Vector Users.UserId + , created_by :: Users.UserId + , created_at :: UTCTime + , updated_at :: UTCTime + , notify_emails :: V.Vector Text + , slack_channels :: V.Vector Text + , discord_channels :: V.Vector Text + } + deriving stock (Eq, Generic, Show) + deriving anyclass (FromRow, NFData) + + +getTeams :: Projects.ProjectId -> DBT IO (V.Vector Team) +getTeams pid = query q (Only pid) + where + q = + [sql| + SELECT t.id, t.name, t.description, t.handle, t.members, t.created_by, t.created_at, t.updated_at, t.notify_emails, t.slack_channels, t.discord_channels + FROM projects.teams t + WHERE t.project_id = ? AND t.deleted_at is null + |] + + +getTeamsVM :: Projects.ProjectId -> DBT IO (V.Vector TeamVM) +getTeamsVM pid = query q (Only pid) + where + q = + [sql| + SELECT + t.id, + t.created_at, + t.updated_at, + t.created_by, + t.name, + t.handle, + t.description, + t.notify_emails, + t.slack_channels, + t.discord_channels, +ARRAY( + SELECT jsonb_build_object( + 'memberId', u.id, + 'memberName', concat_ws(' ', u.first_name, u.last_name), + 'memberEmail', u.email, + 'memberAvatar', u.display_image_url + ) + FROM unnest(t.members) AS mid + JOIN users.users u ON u.id = mid +) AS members + FROM projects.teams t + WHERE t.project_id = ? AND t.deleted_at is null + |] + + +data TeamVM = TeamVM + { id :: UUID.UUID + , created_at :: UTCTime + , updated_at :: UTCTime + , created_by :: Users.UserId + , name :: Text + , handle :: Text + , description :: Text + , notify_emails :: V.Vector Text + , slack_channels :: V.Vector Text + , discord_channels :: V.Vector Text + , members :: V.Vector TeamMemberVM + } + deriving stock (Eq, Generic, Show) + deriving anyclass (FromRow, NFData) + + +data TeamMemberVM = TeamMemberVM + { memberId :: UUID.UUID + , memberEmail :: Text + , memberName :: Text + , memberAvatar :: Text + } + deriving stock (Eq, Generic, Show) + deriving anyclass (AE.FromJSON, NFData) + deriving (FromField) via Aeson TeamMemberVM + + +getTeamByHandle :: Projects.ProjectId -> Text -> DBT IO (Maybe TeamVM) +getTeamByHandle pid handle = queryOne q (pid, handle) + where + q = + [sql| + SELECT + t.id, + t.created_at, + t.updated_at, + t.created_by, + t.name, + t.handle, + t.description, + t.notify_emails, + t.slack_channels, + t.discord_channels, +ARRAY( + SELECT jsonb_build_object( + 'memberId', u.id, + 'memberName', concat_ws(' ', u.first_name, u.last_name), + 'memberEmail', u.email, + 'memberAvatar', u.display_image_url + ) + FROM unnest(t.members) AS mid + JOIN users.users u ON u.id = mid +) AS members + FROM projects.teams t + WHERE t.project_id = ? + AND t.handle = ? + AND t.deleted_at is null + |] + + +deleteTeamByHandle :: Projects.ProjectId -> Text -> DBT IO () +deleteTeamByHandle pid handle = void $ execute q (pid, handle) + where + q = + [sql| UPDATE projects.teams SET deleted_at = now() WHERE project_id = ? AND handle = ? |] + + +deleteTeams :: Projects.ProjectId -> V.Vector UUID.UUID -> DBT IO () +deleteTeams pid tids + | V.null tids = pure () + | otherwise = void $ execute q (pid, tids) + where + q = + [sql| UPDATE projects.teams SET deleted_at = now() WHERE project_id = ? AND id=ANY(?::UUID[]) |] + + +getTeamsById :: Projects.ProjectId -> V.Vector UUID.UUID -> DBT IO (V.Vector Team) +getTeamsById pid tids = if V.null tids then pure V.empty else query q (pid, tids) + where + q = + [sql| + SELECT + t.id, + t.name, + t.description, + t.handle, + t.members, + t.created_by, + t.created_at, + t.updated_at, + t.notify_emails, + t.slack_channels, + t.discord_channels + FROM projects.teams t + WHERE t.project_id = ? AND t.id=ANY(?::UUID[]) AND t.deleted_at is null + |] diff --git a/src/Pages/BodyWrapper.hs b/src/Pages/BodyWrapper.hs index 5ada0f023..f7550a00c 100644 --- a/src/Pages/BodyWrapper.hs +++ b/src/Pages/BodyWrapper.hs @@ -92,11 +92,11 @@ bodyWrapper bcfg child = do meta_ [name_ "msapplication-TileColor", content_ "#da532c"] meta_ [name_ "theme-color", content_ "#ffffff"] link_ [rel_ "stylesheet", type_ "text/css", href_ $(hashAssetFile "/public/assets/css/thirdparty/notyf3.min.css")] - link_ [rel_ "stylesheet", href_ "https://cdn.jsdelivr.net/npm/@yaireo/tagify/dist/tagify.css", type_ "text/css"] + link_ [rel_ "stylesheet", href_ $(hashAssetFile "/public/assets/css/thirdparty/tagify.min.css"), type_ "text/css"] link_ [rel_ "stylesheet", href_ $(hashAssetFile "/public/assets/deps/gridstack/gridstack.min.css")] link_ [rel_ "stylesheet", href_ $(hashAssetFile "/public/assets/css/thirdparty/rrweb.css")] - link_ [rel_ "stylesheet", type_ "text/css", href_ "/public/assets/css/tailwind.min.css"] + link_ [rel_ "stylesheet", type_ "text/css", href_ $(hashAssetFile "/public/assets/css/tailwind.min.css")] link_ [rel_ "stylesheet", type_ "text/css", href_ $(hashAssetFile "/public/assets/web-components/dist/css/index.css")] -- Include optional head content from the page @@ -694,6 +694,7 @@ navBottomList pidTxt = [ ("gear", "bg-fillBrand-weak", "text-textBrand", "Project settings", "/p/" <> pidTxt <> "/settings", Nothing, Nothing, Nothing) , ("key", "bg-fillSuccess-weak", "text-textSuccess", "API keys", "/p/" <> pidTxt <> "/apis", Nothing, Nothing, Nothing) , ("user-plus", "bg-fillWarning-weak", "text-textWarning", "Manage members", "/p/" <> pidTxt <> "/manage_members", Nothing, Nothing, Nothing) + , ("users", "bg-fillInfo-weak", "text-textInfo", "Manage teams", "/p/" <> pidTxt <> "/manage_teams", Nothing, Nothing, Nothing) , ("dollar", "bg-fillWarning-weak", "text-textWarning", "Manage billing", "/p/" <> pidTxt <> "/manage_billing", Nothing, Nothing, Nothing) , ("arrows-turn-right", "bg-fillBrand-weak", "text-textBrand", "Integrations", "/p/" <> pidTxt <> "/integrations", Nothing, Nothing, Nothing) , ("bucket", "", "", "Your S3 bucket", "/p/" <> pidTxt <> "/byob_s3", Nothing, Nothing, Nothing) diff --git a/src/Pages/Bots/Discord.hs b/src/Pages/Bots/Discord.hs index fbf42b96a..a8a253485 100644 --- a/src/Pages/Bots/Discord.hs +++ b/src/Pages/Bots/Discord.hs @@ -1,6 +1,6 @@ {-# LANGUAGE PackageImports #-} -module Pages.Bots.Discord (linkDiscordGetH, discordInteractionsH, DiscordInteraction) where +module Pages.Bots.Discord (linkDiscordGetH, discordInteractionsH, getDiscordChannels, DiscordInteraction) where import Data.Aeson qualified as AE import Data.ByteString qualified as BS @@ -35,7 +35,7 @@ import Models.Projects.Dashboards qualified as Dashboards import Network.HTTP.Types (urlEncode) import Network.Wreq qualified as Wreq import Network.Wreq.Types (FormParam) -import Pages.Bots.Utils (BotResponse (..), BotType (..), authHeader, chartImageUrl, contentTypeHeader, handleTableResponse) +import Pages.Bots.Utils (BotResponse (..), BotType (..), Channel, authHeader, chartImageUrl, contentTypeHeader, handleTableResponse) import Pkg.AI (callOpenAIAPI, systemPrompt) import Pkg.AI qualified as AI import Pkg.Components.Widget qualified as Widget @@ -117,7 +117,7 @@ data DiscordInteraction = Interaction , data_i :: Maybe InteractionData , channel_id :: Maybe Text , guild_id :: Maybe Text - , channel :: Maybe Channel + , channel :: Maybe Channel' } deriving (Generic, Show) @@ -135,7 +135,7 @@ data ThreadMetadata = ThreadMetadata instance AE.FromJSON ThreadMetadata -data Channel = Channel +data Channel' = Channel' { id :: Text , name :: Text , guild_id :: Maybe Text @@ -147,7 +147,7 @@ data Channel = Channel deriving (Generic, Show) -instance AE.FromJSON Channel where +instance AE.FromJSON Channel' where parseJSON = AE.genericParseJSON AE.defaultOptions{AE.fieldLabelModifier = \f -> if f == "type_" then "type" else f} @@ -197,6 +197,15 @@ data InteractionOption = InteractionOption deriving anyclass (AE.FromJSON) +getDiscordChannels :: HTTP :> es => Text -> Text -> Eff es [Channel] +getDiscordChannels token guildId = do + let url = "https://discord.com/api/v10/guilds/" <> toString guildId <> "/channels" + opts = defaults & header "Authorization" .~ ["Bot " <> encodeUtf8 token] + r <- getWith opts url + let body = r ^. responseBody + pure $ fromRight [] $ AE.eitherDecode body + + discordInteractionsH :: BS.ByteString -> Maybe BS.ByteString -> Maybe BS.ByteString -> ATBaseCtx AE.Value discordInteractionsH rawBody signatureM timestampM = do authCtx <- Effectful.Reader.Static.ask @AuthContext @@ -428,7 +437,7 @@ getThreadStarterMessage :: HTTP :> es => DiscordInteraction -> Text -> Eff es (M getThreadStarterMessage interaction botToken = do case interaction.channel_id of Just channelId -> case interaction.channel of - Just Channel{type_ = 11, parent_id = Just pId} -> do + Just Channel'{type_ = 11, parent_id = Just pId} -> do let baseUrl = "https://discord.com/api/v10/channels/" url = toString $ baseUrl <> channelId <> "/messages?limit=50" starterMessageUrl = toString $ baseUrl <> pId <> "/messages/" <> channelId diff --git a/src/Pages/Bots/Slack.hs b/src/Pages/Bots/Slack.hs index 2e12a27e4..7a12780e0 100644 --- a/src/Pages/Bots/Slack.hs +++ b/src/Pages/Bots/Slack.hs @@ -1,9 +1,10 @@ {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-} -module Pages.Bots.Slack (linkProjectGetH, slackActionsH, SlackEventPayload, slackEventsPostH, SlackActionForm, externalOptionsH, slackInteractionsH, SlackInteraction) where +module Pages.Bots.Slack (linkProjectGetH, slackActionsH, SlackEventPayload, slackEventsPostH, getSlackChannels, SlackChannelsResponse (..), SlackActionForm, externalOptionsH, slackInteractionsH, SlackInteraction) where import BackgroundJobs qualified as BgJobs import Control.Lens ((.~), (^.)) +import Data.Aeson (withObject) import Data.Aeson qualified as AE import Data.Aeson.Key qualified as KEM import Data.Aeson.KeyMap qualified as KEMP @@ -38,7 +39,7 @@ import Network.Wreq qualified as Wreq import Network.Wreq.Types (FormParam) import OddJobs.Job (createJob) import Pages.BodyWrapper (BWConfig, PageCtx (..), currProject, pageTitle, sessM) -import Pages.Bots.Utils (BotResponse (..), BotType (..), contentTypeHeader, handleTableResponse) +import Pages.Bots.Utils (BotResponse (..), BotType (..), Channel, contentTypeHeader, handleTableResponse) import Pkg.AI (callOpenAIAPI, systemPrompt) import Pkg.AI qualified as AI import Pkg.Components.Widget (Widget (..)) @@ -635,6 +636,28 @@ data SlackThreadedMessage = SlackThreadedMessage deriving (Generic, Show) +data SlackChannelsResponse = SlackChannelsResponse + { ok :: Bool + , channels :: [Channel] + } + deriving (Generic, Show) + deriving anyclass (AE.FromJSON) + + +-- | Internal helper to call Slack API +getSlackChannels :: HTTP :> es => Text -> Text -> Eff es (Maybe SlackChannelsResponse) +getSlackChannels token team_id = do + let url = "https://slack.com/api/conversations.list" + opts = + defaults & header "Authorization" .~ ["Bearer " <> encodeUtf8 token] & Wreq.param "team_id" .~ [team_id] + + r <- getWith opts url + let resBody = r ^. responseBody + case AE.eitherDecode resBody of + Right val -> return $ Just val + Left err -> return Nothing + + instance AE.FromJSON SlackThreadedMessage where parseJSON = AE.genericParseJSON AE.defaultOptions{AE.fieldLabelModifier = \f -> if f == "type_" then "type" else f} diff --git a/src/Pages/Bots/Utils.hs b/src/Pages/Bots/Utils.hs index 99f0b4a09..ea924bee3 100644 --- a/src/Pages/Bots/Utils.hs +++ b/src/Pages/Bots/Utils.hs @@ -1,4 +1,4 @@ -module Pages.Bots.Utils (handleTableResponse, BotType (..), BotResponse (..), chartImageUrl, authHeader, contentTypeHeader) where +module Pages.Bots.Utils (handleTableResponse, BotType (..), BotResponse (..), Channel (..), chartImageUrl, authHeader, contentTypeHeader) where import Control.Lens ((.~)) import Data.Aeson qualified as AE @@ -8,6 +8,7 @@ import Data.Text qualified as T import Data.Time qualified as Time import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds) import Data.Vector qualified as V +import Deriving.Aeson qualified as DAE import Lucid import Models.Projects.Projects qualified as Projects import Network.HTTP.Types (urlEncode) @@ -191,3 +192,14 @@ installedSuccess botPlatform = do p_ [class_ "text-textStrong text-sm"] "Set up this channel to receive automated error reports, weekly summaries, and daily performance alerts." + + +data Channel = Channel + { channelName :: Text + , channelId :: Text + , channelType :: Maybe Int + } + deriving (Generic, Show) + deriving + (AE.FromJSON, AE.ToJSON) + via DAE.CustomJSON '[DAE.OmitNothingFields, DAE.FieldLabelModifier '[DAE.StripPrefix "channel", DAE.CamelToSnake]] Channel diff --git a/src/Pages/Components.hs b/src/Pages/Components.hs index 9d41fd31b..ad7c8de2f 100644 --- a/src/Pages/Components.hs +++ b/src/Pages/Components.hs @@ -401,7 +401,7 @@ modal_ modalId btnTrigger contentHtml = do on closeModal from body set my.checked to false end |] ] - div_ [class_ "modal w-screen", role_ "dialog"] do + div_ [class_ "modal w-screen", role_ "dialog", style_ "--color-base-100: var(--color-fillWeaker)"] do label_ [class_ "modal-backdrop", Lucid.for_ modalId] "" div_ [class_ "modal-box w-auto flex flex-col gap-5 max-w-5xl"] do label_ [Lucid.for_ modalId, class_ "btn btn-sm btn-circle btn-ghost absolute right-2 top-2"] "✕" diff --git a/src/Pages/Dashboards.hs b/src/Pages/Dashboards.hs index 5b84a170c..8c4dda2a6 100644 --- a/src/Pages/Dashboards.hs +++ b/src/Pages/Dashboards.hs @@ -1,4 +1,28 @@ -module Pages.Dashboards (dashboardGetH, entrypointRedirectGetH, DashboardGet (..), dashboardsGetH, DashboardsGet (..), dashboardsPostH, DashboardForm (..), dashboardWidgetPutH, dashboardWidgetReorderPatchH, WidgetReorderItem (..), dashboardDeleteH, dashboardRenamePatchH, DashboardRenameForm (..), dashboardDuplicatePostH, WidgetMoveForm (..), dashboardDuplicateWidgetPostH, dashboardWidgetExpandGetH, visTypes, processEagerWidget) where +module Pages.Dashboards ( + dashboardGetH, + entrypointRedirectGetH, + DashboardGet (..), + dashboardsGetH, + DashboardsGet (..), + dashboardsPostH, + DashboardForm (..), + dashboardWidgetPutH, + dashboardWidgetReorderPatchH, + WidgetReorderItem (..), + dashboardDeleteH, + dashboardRenamePatchH, + DashboardRenameForm (..), + dashboardDuplicatePostH, + WidgetMoveForm (..), + DashboardBulkActionForm (..), + DashboardRes (..), + DashboardsGetD (..), + dashboardDuplicateWidgetPostH, + dashboardWidgetExpandGetH, + visTypes, + processEagerWidget, + dashboardBulkActionPostH, +) where import Control.Lens import Data.Aeson qualified as AE @@ -13,6 +37,7 @@ import Data.List qualified as L import Data.Map qualified as Map import Data.Text qualified as T import Data.Time (UTCTime, defaultTimeLocale, formatTime) +import Data.Time qualified as Time import Data.Vector qualified as V import Database.PostgreSQL.Entity qualified as DBT import Database.PostgreSQL.Entity.DBT (query_) @@ -32,10 +57,12 @@ import Lucid.Htmx (hxConfirm_, hxDelete_, hxExt_, hxPatch_, hxPost_, hxPut_, hxS import Lucid.Hyperscript (__) import Models.Apis.Issues qualified as Issues import Models.Projects.Dashboards qualified as Dashboards +import Models.Projects.ProjectMembers qualified as ManageMembers import Models.Projects.Projects qualified as Projects import Models.Telemetry.Telemetry qualified as Telemetry import Models.Users.Sessions qualified as Sessions import Models.Users.Users +import Models.Users.Users qualified as Users import NeatInterpolation import Network.HTTP.Types.URI qualified as URI import Pages.Anomalies qualified as AnomalyList @@ -44,6 +71,7 @@ import Pages.Charts.Charts qualified as Charts import Pages.Components qualified as Components import Pages.LogExplorer.LogItem (getServiceName) import Pkg.Components.LogQueryBox (LogQueryBoxConfig (..), logQueryBox_, visTypes) +import Pkg.Components.Table (Config (..), Features (..), SearchMode (..), Table (..), ZeroState (..), col) import Pkg.Components.Table qualified as Table import Pkg.Components.TimePicker qualified as TimePicker import Pkg.Components.Widget qualified as Widget @@ -146,20 +174,12 @@ dashboardPage_ pid dashId dash dashVM allParams = do [text| const tagifyInstances = new Map(); document.querySelectorAll('.tagify-select-input').forEach(input => { - const tgfy = new Tagify(input, { + const tgfy = createTagify(input, { whitelist: JSON.parse(input.dataset.whitelistjson || "[]"), enforceWhitelist: true, tagTextProp: 'name', mode: input.dataset.mode || "", - dropdown: { - enabled: 0, - mapValueTo: "name", - highlightFirst: true, - searchKeys: ["name", "value"], - placeAbove: false, - maxItems: 50 - }, - }) + }); const inputKey = input.getAttribute('name') || input.id; tagifyInstances.set(inputKey, tgfy); @@ -367,6 +387,18 @@ processEagerWidget pid now (sinceStr, fromDStr, toDStr) allParams widget = case let issuesVM = V.map (AnomalyList.IssueVM False True now "24h") issues pure $ widget + & #html + ?~ renderText + ( div_ [class_ "flex flex-col gap-4 h-full w-full overflow-hidden"] + $ forM_ issuesVM \vm@(AnomalyList.IssueVM hideByDefault _ _ _ issue) -> + div_ [class_ "border border-strokeWeak rounded-2xl overflow-hidden"] do + Table.renderRowWithColumns + [ class_ $ "flex gap-8 items-start itemsListItem " <> if hideByDefault then "card-round" else "px-0.5 py-4" + , style_ (if hideByDefault then "display:none" else "") + ] + (AnomalyList.issueColumns issue.projectId) + vm + ) & #html ?~ renderText ( div_ [class_ "flex flex-col gap-4 h-full w-full overflow-hidden"] @@ -770,23 +802,29 @@ newWidget_ pid currentRange = widgetViewerEditor_ pid Nothing currentRange Nothi -- Dashboard List -- -data DashboardsGet = DashboardsGet +data DashboardsGetD = DashboardsGetD { dashboards :: V.Vector Dashboards.DashboardVM , projectId :: Projects.ProjectId , embedded :: Bool -- Whether to render in embedded mode (for modals) + , teams :: V.Vector ManageMembers.Team } deriving (Generic, Show) +data DashboardsGet + = DashboardsGet (PageCtx DashboardsGetD) + | DashboardsGetSlim DashboardsGetD + deriving (Generic, Show) instance ToHtml DashboardsGet where - toHtml dash = toHtml $ dashboardsGet_ dash + toHtml (DashboardsGet (PageCtx pc dg)) = toHtml $ PageCtx pc $ dashboardsGet_ dg + toHtml (DashboardsGetSlim dash) = toHtml $ dashboardsGet_ dash toHtmlRaw = toHtml renderDashboardListItem :: Bool -> Text -> Text -> Text -> Maybe Text -> Maybe Text -> Maybe Text -> Html () renderDashboardListItem checked tmplClass title value description icon prview = label_ [ class_ - [text| cursor-pointer group/it border border-transparent hover:bg-fillWeaker hover:border-strokeWeak rounded-lg flex p-1.5 gap-2 items-center + [text| cursor-pointer group/it text-sm border border-transparent hover:bg-fillWeaker hover:border-strokeWeak rounded-lg flex p-1.5 gap-2 items-center group-has-[input:checked]/it:bg-fillWeaker group-has-[input:checked]/it:border-strokeWeak dashboardListItem|] , term "data-title" title , term "data-description" $ maybeToMonoid description @@ -806,110 +844,201 @@ renderDashboardListItem checked tmplClass title value description icon prview = ] do input_ $ [class_ $ "hidden " <> tmplClass, type_ "radio", name_ "file", value_ value] <> [checked_ | checked] - span_ [class_ "p-1 px-2 bg-fillWeak rounded-md"] $ faSprite_ (fromMaybe "square-dashed" icon) "regular" "w-4 h-4" + span_ [class_ "p-1 px-2 bg-fillWeak rounded-md"] $ faSprite_ (fromMaybe "square-dashed" icon) "regular" "w-3 h-3" span_ [class_ "grow"] $ toHtml title - span_ [class_ "px-2 p-1 invisible group-has-[input:checked]/it:visible"] $ faSprite_ "chevron-right" "regular" "w-4 h-4" + span_ [class_ "px-2 p-1 invisible group-has-[input:checked]/it:visible"] $ faSprite_ "chevron-right" "regular" "w-3 h-3" -dashboardsGet_ :: DashboardsGet -> Html () +dashboardsGet_ :: DashboardsGetD -> Html () dashboardsGet_ dg = do unless dg.embedded $ Components.modal_ "newDashboardMdl" "" $ form_ - [ class_ "grid grid-cols-7 overflow-hidden h-full gap-4 group/md" + [ class_ "flex h-[90vh] gap-4 group/md" , hxPost_ "" + , hxVals_ "js:{ teams: getSelectedTeams() }" ] do - div_ [class_ "col-span-2 space-y-4"] do - strong_ "Create dashboard" - label_ [class_ "input input-sm flex items-center "] do - faSprite_ "magnifying-glass" "regular" "w-4 h-4 opacity-70" - input_ - [ type_ "text" - , class_ "grow pl-2" - , placeholder_ "Search" - , [__| - on keyup - if the event's key is 'Escape' set my value to '' then trigger keyup - else show <.dashboardListItem/> in #dashListItemParent when its textContent.toLowerCase() contains my value.toLowerCase() |] - ] - kbd_ [class_ "kbd kbd-sm"] "/" - div_ [class_ "space-y-1", id_ "dashListItemParent"] do + div_ [class_ "w-2/7 space-y-4 h-full flex flex-col"] do + div_ [class_ "flex flex-col gap-2 border-b pb-4"] do + strong_ "Create dashboard" + label_ [class_ "input input-sm flex items-center "] do + faSprite_ "magnifying-glass" "regular" "w-4 h-4 opacity-70" + input_ + [ type_ "text" + , class_ "grow pl-2" + , placeholder_ "Search" + , [__| + on keyup + if the event's key is 'Escape' set my value to '' then trigger keyup + else show <.dashboardListItem/> in #dashListItemParent when its textContent.toLowerCase() contains my value.toLowerCase() |] + ] + kbd_ [class_ "kbd kbd-sm"] "/" + div_ [class_ "space-y-1 h-auto overflow-auto", id_ "dashListItemParent"] do renderDashboardListItem True "tmplRadio0" "Blank dashboard" "" (Just "Get started from a blank slate") (Just "cards-blank") Nothing iforM_ dashboardTemplates \idx dashTmpl -> do let tmplItemClass = "tmplRadio" <> show (idx + 1) renderDashboardListItem False tmplItemClass (maybeToMonoid dashTmpl.title) (maybeToMonoid dashTmpl.file) dashTmpl.description dashTmpl.icon dashTmpl.preview - div_ [class_ "col-span-5 px-3 py-5 divide-y h-full overflow-y-scroll "] do - div_ [class_ "flex gap-3 pb-5"] do - div_ $ div_ [class_ "p-2 bg-fillWeaker rounded-lg ", id_ "dItemIcon"] $ faSprite_ "cards-blank" "regular" "w-8 h-8" - div_ [class_ "flex-1"] do - strong_ [class_ "text-xl", id_ "dItemTitle"] "Custom Dashboard" - p_ [class_ "text-sm line-clamp-2 min-h-10", id_ "dItemDescription"] "Get started from a blank slate" - div_ [class_ "flex items-center justify-center shrink"] $ button_ [class_ "leading-none rounded-lg p-3 cursor-pointer bg-fillBrand-strong shadow-sm text-white", type_ "submit"] "Select template" + div_ [class_ "w-5/7 px-3 py-5 h-full overflow-y-scroll "] do + div_ [class_ "flex items-end justify-between gap-2"] do + div_ [class_ "flex items-center w-full justify-between gap-2"] do + label_ [class_ "flex flex-col gap-1 w-full"] do + span_ [class_ "text-sm font-medium"] "Dashboard name" + input_ + [ type_ "text" + , class_ "input input-sm w-full shrink-1" + , placeholder_ "Dashboard Title" + , name_ "title" + , required_ "required" + ] + label_ [class_ "flex flex-col gap-1 w-full"] do + span_ [class_ "text-sm font-medium"] "Teams" + input_ + [ type_ "text" + , class_ "input input-sm w-full shrink-1" + , id_ "teamHandlesInput" + , name_ "teams" + , placeholder_ "Add teams" + ] + + div_ [class_ "flex items-center justify-center shrink"] $ button_ [class_ "btn btn-primary btn-sm", type_ "submit"] "Create" + div_ [class_ "py-2 border-b border-b-strokeWeak"] do + span_ [class_ "text-sm "] "Using " + span_ [class_ "text-sm font-medium", id_ "dItemTitle"] "Custom Dashboard" + span_ [class_ "text-sm "] " template" + p_ [class_ "text-xs text-textWeak w-full overflow-ellipsis truncate", id_ "dItemDescription"] "Get started from a blank slate" div_ [class_ "pt-5"] - $ div_ [class_ "bg-[#1e9cff] px-5 py-8 rounded-xl aspect-square w-full flex items-center"] - $ img_ [src_ "/public/assets/svgs/screens/dashboard_blank.svg", class_ "w-full", id_ "dItemPreview"] + $ div_ [class_ "bg-fillBrand-strong px-2 py-4 rounded-xl w-full flex items-center"] + $ img_ [src_ "/public/assets/svgs/screens/dashboard_blank.svg", class_ "w-full rounded overflow-hidden", id_ "dItemPreview"] + let teamList = decodeUtf8 $ AE.encode $ (\x -> AE.object ["name" AE..= x.handle, "value" AE..= x.id]) <$> dg.teams + script_ + [text| + window.addEventListener('DOMContentLoaded', (event) => { + const tagify = createTagify('#teamHandlesInput', {tagTextProp: 'name',whitelist: $teamList,}); + }); + const getSelectedTeams = () => { + return tagify.value.map(item => item.value); + } + |] - div_ [id_ "itemsListPage", class_ "mx-auto px-6 pt-4 gap-8 w-full flex flex-col h-full overflow-hidden pb-2 group/pg"] do - div_ [class_ "flex"] $ label_ [class_ "input input-md flex-1 flex bg-fillWeaker border-strokeWeak shadow-none overflow-hidden items-center gap-2"] do - faSprite_ "magnifying-glass" "regular" "w-4 h-4 opacity-70" - input_ - [ type_ "text" - , class_ "grow" - , placeholder_ "Search" - , [__|on keyup if the event's key is 'Escape' set my value to '' then trigger keyup - else show <.itemListItem/> in #itemsListPage when its textContent.toLowerCase() contains my value.toLowerCase() |] - ] + div_ [id_ "itemsListPage", class_ $ "mx-auto gap-8 w-full flex flex-col h-full overflow-hidden group/pg" <> if dg.embedded then "" else "pb-2 px-6 pt-8"] do + let getTeams x = mapMaybe (\xx -> find (\t -> t.id == xx) dg.teams) (V.toList x.teams) + let dashboardCardItems = + V.map + ( \d -> + DashboardCard + { id = d.id + , title = d.title + , createdAt = d.createdAt + , createdBy = d.createdBy + , starredSince = d.starredSince + , homepageSince = d.homepageSince + , teams = V.fromList $ getTeams d + , widgetCount = maybe 0 (\x -> length x.widgets) $ loadDashboardFromVM d + } + ) + dg.dashboards - when dg.embedded $ h3_ [class_ "text-lg font-normal"] "Select a dashboard below, and the widget will be copied there" - - div_ [class_ $ "grid gap-5 " <> if dg.embedded then "grid-cols-1" else "grid-cols-2"] do - forM_ dg.dashboards \dashVM -> do - let dash = loadDashboardFromVM dashVM - let attrs = - if dg.embedded - then - [ class_ "cursor-pointer" - , hxPut_ ("/p/" <> dg.projectId.toText <> "/dashboards/" <> dashVM.id.toText) - , hxVals_ "js:{...JSON.parse(document.getElementById(document.getElementById('dashboards-modal-widget-id').value + '_widgetEl').dataset.widget)}" - , hxSwap_ "none" - , hxExt_ "json-enc" - ] - else [href_ ("/p/" <> dg.projectId.toText <> "/dashboards/" <> dashVM.id.toText)] - a_ ([class_ "rounded-xl border border-strokeWeak hover:border-strokeBrand-strong gap-3.5 p-4 bg-fillWeaker flex itemListItem group/i"] <> attrs) do - div_ [class_ "flex-1 space-y-2"] do - div_ [class_ "flex items-center gap-2"] do - span_ [class_ "group-hover/i:underline underline-offset-2"] - $ strong_ [class_ "font-medium"] (toHtml $ bool "Untitled" dashVM.title (dashVM.title /= "")) - span_ [class_ "leading-none", term "data-tippy-content" "This dashboard is currently your homepage."] do - when (isJust dashVM.homepageSince) $ faSprite_ "house" "regular" "w-4 h-4" - div_ [class_ "gap-2 flex items-center"] do - time_ [class_ "mr-2 text-textWeak", term "data-tippy-content" "Date of dashboard creation", datetime_ $ Utils.formatUTC dashVM.createdAt] $ toHtml $ formatTime defaultTimeLocale "%eth %b %Y" dashVM.createdAt - forM_ dashVM.tags (span_ [class_ "badge badge-neutral"] . toHtml @Text) - div_ [class_ "flex items-end justify-center gap-5"] do - button_ [class_ "leading-none", term "data-tippy-content" "click to star this dashboard"] - $ if isJust dashVM.starredSince - then faSprite_ "star" "solid" "w-5 h-5" - else faSprite_ "star" "regular" "w-5 h-5" - let widgetCount = maybe "0" (show . length . (.widgets)) dash - div_ [class_ "flex items-end gap-2", term "data-tippy-content" $ "There are " <> widgetCount <> " charts/widgets in this dashboard"] $ faSprite_ "chart-area" "regular" "w-5 h-5 text-iconNeutral" >> (span_ [class_ "leading-none"] . toHtml $ widgetCount) + let table = + Table + { config = def{elemID = "dashboardsListForm", renderAsTable = True} + , columns = + [ col "Title" renderDashboardTitle + , col "Modified" renderDateModified + , col "Teams" renderTeams + , col "Widgets" renderWidgetCount + ] + , rows = dashboardCardItems + , features = + def + { search = Just ClientSide + , zeroState = + Just + $ ZeroState + { icon = "empty-set" + , title = "No dashboards created yet" + , description = "Create dashboards to visualize and monitor your project's metrics and logs." + , actionText = "Create dashboard" + , destination = + Left $ "/p/" <> dg.projectId.toText <> "/log_explorer#create-alert-toggle" + } + } + } + div_ [class_ "w-full overflow-y-auto", id_ "dashboardsTableContainer"] do + toHtml table -dashboardsGetH :: Projects.ProjectId -> Maybe Text -> ATAuthCtx (RespHeaders (PageCtx DashboardsGet)) -dashboardsGetH pid embeddedM = do +data DashboardCard = DashboardCard + { id :: Dashboards.DashboardId + , title :: Text + , createdAt :: Time.UTCTime + , createdBy :: Users.UserId + , starredSince :: Maybe Time.UTCTime + , homepageSince :: Maybe Time.UTCTime + , teams :: V.Vector ManageMembers.Team + , widgetCount :: Int + } + deriving (Generic, Show) + + +renderDashboardTitle :: DashboardCard -> Html () +renderDashboardTitle dc = div_ [class_ "flex items-center gap-2"] do + span_ [class_ "text-sm font-medium"] $ toHtml dc.title + when (isJust dc.starredSince) $ span_ [class_ "text-yellow-400"] $ faSprite_ "star" "solid" "w-4 h-4" + when (isJust dc.homepageSince) $ span_ [class_ "text-green-500"] $ faSprite_ "home" "solid" "w-4 h-4" + + +renderDateModified :: DashboardCard -> Html () +renderDateModified dc = div_ [class_ "text-sm text-textWeak"] $ toHtml $ formatTime defaultTimeLocale "%b %-d, %Y %-I:%M %p" dc.createdAt + + +renderTeams :: DashboardCard -> Html () +renderTeams dc = div_ [class_ "flex items-center gap-2"] do + if V.null dc.teams + then span_ [class_ "text-sm text-textWeak"] "No teams" + else forM_ dc.teams \team -> do + span_ [class_ "px-2 py-1 bg-fillWeak rounded-full text-sm"] $ toHtml team.handle + + +renderWidgetCount :: DashboardCard -> Html () +renderWidgetCount dc = div_ [class_ "text-sm text-textWeak"] $ toHtml $ show dc.widgetCount + + +addTeamsDrowndown_ :: Projects.ProjectId -> V.Vector ManageMembers.Team -> Html () +addTeamsDrowndown_ pid teams = div_ [class_ "dropdown dropdown-end"] do + label_ [tabindex_ "0", role_ "button", class_ "flex items-center gap-2 btn btn-sm"] do + faSprite_ "plus" "regular" "w-3 h-3" + span_ "Add teams" + ul_ [tabindex_ "0", class_ "dropdown-content rounded w-52 px-0 py-3"] do + h6_ [class_ "font-medium mb-2 px-2"] "Add up to 5 teams" + forM_ teams \team -> do + li_ [class_ "p-0"] do + label_ [class_ "flex flex-row items-center gap-1 px-2 text-sm hover:bg-fillWeak"] do + input_ [type_ "checkbox", class_ "checkbox checkbox-xs", name_ "teamHandles", value_ $ UUID.toText team.id] + span_ [class_ "px-2 py-1"] $ toHtml team.handle + button_ [class_ "btn btn-primary btn-xs float-right", hxPost_ $ "/p/" <> pid.toText <> "/dashboards/bulk_action/add_teams", hxSwap_ "none"] "Add teams" + + +dashboardsGetH :: Projects.ProjectId -> Maybe Text -> Maybe UUID.UUID -> ATAuthCtx (RespHeaders DashboardsGet) +dashboardsGetH pid embeddedM teamIdM = do (sess, project) <- Sessions.sessionAndProject pid appCtx <- ask @AuthContext now <- Time.currentTime - dashboards <- dbtToEff $ DBT.selectManyByField @Dashboards.DashboardVM [DBT.field| project_id |] pid + dashboards <- case teamIdM of + Just teamId -> do + ds <- Dashboards.selectDashboardsByTeam pid teamId + pure $ V.fromList ds + Nothing -> dbtToEff $ DBT.selectManyByField @Dashboards.DashboardVM [DBT.field| project_id |] pid + teams <- dbtToEff $ ManageMembers.getTeams pid -- Check if we're requesting in embedded mode (for modals, etc.) let embedded = embeddedM == Just "true" || embeddedM == Just "1" || embeddedM == Just "yes" - if embedded + if embedded || isJust teamIdM then -- For embedded mode, use a minimal BWConfig that will still work with ToHtml instance - addRespHeaders $ PageCtx def $ DashboardsGet{dashboards, projectId = pid, embedded = True} + addRespHeaders $ DashboardsGetSlim DashboardsGetD{dashboards, projectId = pid, embedded = True, teams} + -- PageCtx def $ DashboardsGetD{dashboards, projectId = pid, embedded = True, teams} else do freeTierExceeded <- dbtToEff $ checkFreeTierExceeded pid project.paymentPlan - let bwconf = (def :: BWConfig) { sessM = Just sess @@ -917,42 +1046,60 @@ dashboardsGetH pid embeddedM = do , pageTitle = "Dashboards" , freeTierExceeded = freeTierExceeded , config = appCtx.config - , pageActions = Just $ label_ [Lucid.for_ "newDashboardMdl", class_ "leading-none rounded-xl shadow-sm p-3 cursor-pointer bg-fillBrand-strong text-white"] "New Dashboard" + , pageActions = Just $ label_ [Lucid.for_ "newDashboardMdl", class_ "btn btn-primary text-white"] (faSprite_ "plus" "regular" "h-4 w-4 mr-2" >> "New Dashboard") } - addRespHeaders $ PageCtx bwconf $ DashboardsGet{dashboards, projectId = pid, embedded = False} + addRespHeaders $ DashboardsGet (PageCtx bwconf $ DashboardsGetD{dashboards, projectId = pid, embedded = False, teams}) -newtype DashboardForm = DashboardForm +data DashboardRes = DashboardNoContent | DashboardPostError Text + deriving (Generic, Show) + + +instance ToHtml DashboardRes where + toHtml DashboardNoContent = "" + toHtml (DashboardPostError msg) = div_ [class_ "text-textError"] $ toHtml msg + toHtmlRaw = toHtml + + +data DashboardForm = DashboardForm { file :: Text + , teams :: [UUID.UUID] + , title :: Text } deriving stock (Generic, Show) deriving anyclass (FromForm) -dashboardsPostH :: Projects.ProjectId -> DashboardForm -> ATAuthCtx (RespHeaders NoContent) +dashboardsPostH :: Projects.ProjectId -> DashboardForm -> ATAuthCtx (RespHeaders DashboardRes) dashboardsPostH pid form = do (sess, project) <- Sessions.sessionAndProject pid now <- Time.currentTime did <- UUIDId <$> UUID.genUUID - let dashM = find (\dashboard -> dashboard.file == Just form.file) dashboardTemplates - let redirectURI = "/p/" <> pid.toText <> "/dashboards/" <> did.toText - dbtToEff - $ DBT.insert @Dashboards.DashboardVM - $ Dashboards.DashboardVM - { id = did - , projectId = pid - , createdAt = now - , updatedAt = now - , createdBy = sess.user.id - , baseTemplate = if form.file == "" then Nothing else Just form.file - , schema = Nothing - , starredSince = Nothing - , homepageSince = Nothing - , tags = V.fromList $ fromMaybe [] $ dashM >>= (.tags) - , title = fromMaybe [] $ dashM >>= (.title) - } - redirectCS redirectURI - addRespHeaders NoContent + if form.title == "" + then do + addErrorToast "Dashboard title is required" Nothing + addRespHeaders $ DashboardPostError "Dashboard title is required" + else do + let dashM = find (\dashboard -> dashboard.file == Just form.file) dashboardTemplates + let redirectURI = "/p/" <> pid.toText <> "/dashboards/" <> did.toText + let dbd = + Dashboards.DashboardVM + { id = did + , projectId = pid + , createdAt = now + , updatedAt = now + , createdBy = sess.user.id + , baseTemplate = if form.file == "" then Nothing else Just form.file + , schema = Nothing + , starredSince = Nothing + , homepageSince = Nothing + , tags = V.fromList $ fromMaybe [] $ dashM >>= (.tags) + , title = form.title + , teams = V.fromList form.teams + } + _ <- Dashboards.insert dbd + redirectCS redirectURI + addRespHeaders DashboardNoContent -- -- Template Haskell splice to generate the list of dashboards by reading the dashboards folder in filesystem @@ -989,6 +1136,7 @@ entrypointRedirectGetH baseTemplate title tags pid qparams = do , homepageSince = Nothing , tags = V.fromList tags , title = title + , teams = V.empty } pure did.toText redirectTo <- @@ -1017,11 +1165,13 @@ newtype DashboardRenameForm = DashboardRenameForm -- | Handler for renaming a dashboard. -- It updates the title of the specified dashboard. -dashboardRenamePatchH :: Projects.ProjectId -> Dashboards.DashboardId -> DashboardRenameForm -> ATAuthCtx (RespHeaders (Html ())) +dashboardRenamePatchH :: Projects.ProjectId -> Dashboards.DashboardId -> DashboardRenameForm -> ATAuthCtx (RespHeaders DashboardRes) dashboardRenamePatchH pid dashId form = do mDashboard <- dbtToEff $ DBT.selectOneByField @Dashboards.DashboardVM [DBT.field| id |] (Only dashId) case mDashboard of - Nothing -> throwError $ err404{errBody = "Dashboard not found or does not belong to this project"} + Nothing -> do + addErrorToast "Dashboard not found or does not belong to this project" Nothing + addRespHeaders $ DashboardPostError "Dashboard not found or does not belong to this project" Just dashVM -> do _ <- dbtToEff $ DBT.updateFieldsBy @Dashboards.DashboardVM [[DBT.field| title |]] ([DBT.field| id |], dashId) (Only form.title) @@ -1037,17 +1187,18 @@ dashboardRenamePatchH pid dashId form = do addSuccessToast "Dashboard renamed successfully" Nothing addTriggerEvent "closeModal" "" - addRespHeaders (toHtml form.title) + addRespHeaders DashboardNoContent -- | Handler for duplicating a dashboard. -- It creates a new dashboard with the same content but with "(Copy)" appended to the title. -dashboardDuplicatePostH :: Projects.ProjectId -> Dashboards.DashboardId -> ATAuthCtx (RespHeaders NoContent) +dashboardDuplicatePostH :: Projects.ProjectId -> Dashboards.DashboardId -> ATAuthCtx (RespHeaders DashboardRes) dashboardDuplicatePostH pid dashId = do mDashboard <- dbtToEff $ DBT.selectOneByField @Dashboards.DashboardVM [DBT.field| id |] (Only dashId) - case mDashboard of - Nothing -> throwError $ err404{errBody = "Dashboard not found or does not belong to this project"} + Nothing -> do + addErrorToast "Dashboard not found or does not belong to this project" Nothing + addRespHeaders $ DashboardPostError "Dashboard not found or does not belong to this project" Just dashVM -> do (sess, _) <- Sessions.sessionAndProject pid now <- Time.currentTime @@ -1080,13 +1231,13 @@ dashboardDuplicatePostH pid dashId = do let redirectURI = "/p/" <> pid.toText <> "/dashboards/" <> newDashId.toText redirectCS redirectURI addSuccessToast "Dashboard was duplicated successfully" Nothing - addRespHeaders NoContent + addRespHeaders DashboardNoContent -- | Handler for deleting a dashboard. -- It verifies the dashboard exists and belongs to the project before deletion. -- After deletion, redirects to the dashboard list page. -dashboardDeleteH :: Projects.ProjectId -> Dashboards.DashboardId -> ATAuthCtx (RespHeaders NoContent) +dashboardDeleteH :: Projects.ProjectId -> Dashboards.DashboardId -> ATAuthCtx (RespHeaders DashboardRes) dashboardDeleteH pid dashId = do mDashboard <- dbtToEff $ DBT.selectOneByField @Dashboards.DashboardVM [DBT.field| id |] (Only dashId) case mDashboard of @@ -1097,6 +1248,30 @@ dashboardDeleteH pid dashId = do let redirectURI = "/p/" <> pid.toText <> "/dashboards" redirectCS redirectURI addSuccessToast "Dashboard was deleted successfully" Nothing + addRespHeaders DashboardNoContent + + +data DashboardBulkActionForm = DashboardBulkActionForm + { dashboardId :: [Dashboards.DashboardId] + , teamHandles :: [UUID.UUID] + } + deriving stock (Generic, Show) + deriving anyclass (FromForm) + + +dashboardBulkActionPostH :: Projects.ProjectId -> Text -> DashboardBulkActionForm -> ATAuthCtx (RespHeaders NoContent) +dashboardBulkActionPostH pid action DashboardBulkActionForm{..} = do + case action of + "delete" -> do + _ <- Dashboards.deleteDashboardsByIds pid $ V.fromList dashboardId + addSuccessToast "Selected dashboards were deleted successfully" Nothing + addRespHeaders NoContent + "add_teams" -> do + _ <- Dashboards.addTeamsToDashboards pid (V.fromList dashboardId) (V.fromList teamHandles) + addSuccessToast "Teams added to selected dashboards successfully" Nothing + addRespHeaders NoContent + _ -> do + addErrorToast "Invalid action" Nothing addRespHeaders NoContent diff --git a/src/Pages/LogExplorer/Log.hs b/src/Pages/LogExplorer/Log.hs index d5862a6b0..032662818 100644 --- a/src/Pages/LogExplorer/Log.hs +++ b/src/Pages/LogExplorer/Log.hs @@ -50,7 +50,10 @@ import Utils (checkFreeTierExceeded, faSprite_, formatUTC, getServiceColors, lev import Data.Time.Format.ISO8601 (iso8601ParseM, iso8601Show) import Data.UUID qualified as UUID +import Models.Apis.Monitors (MonitorAlertConfig (..)) import Models.Apis.Monitors qualified as Monitors +import Models.Projects.ProjectMembers (TeamVM (..)) +import Models.Projects.ProjectMembers qualified as ManageMembers import Pkg.AI (callOpenAIAPI, systemPrompt) import Pkg.AI qualified as AI @@ -461,6 +464,9 @@ apiLogH pid queryM' cols' cursorM' sinceM fromM toM layoutM sourceM targetSpansM freeTierExceeded <- dbtToEff $ checkFreeTierExceeded pid project.paymentPlan + -- Fetch teams + teams <- dbtToEff $ ManageMembers.getTeams pid + patterns <- case effectiveVizType of Just "patterns" -> do patternsResult <- RequestDumps.fetchLogPatterns pid queryAST (fromD, toD) (parseMaybe pSource =<< sourceM) pTargetM (fromMaybe 0 skipM) @@ -567,6 +573,7 @@ apiLogH pid queryM' cols' cursorM' sinceM fromM toM layoutM sourceM targetSpansM , patternsToSkip , targetPattern = pTargetM , project = project + , teams } let jsonResponse = LogsGetJson finalVecs colors nextLogsURL resetLogsURL recentLogsURL curatedColNames colIdxMap resultCount @@ -653,6 +660,7 @@ data ApiLogsPageData = ApiLogsPageData , patternsToSkip :: Int , targetPattern :: Maybe Text , project :: Projects.Project + , teams :: V.Vector ManageMembers.Team } @@ -855,7 +863,7 @@ apiLogsPage page = do div_ [class_ "hidden group-has-[#create-alert-toggle:checked]/pg:block"] $ resizer_ "alert_container" "alert_width" False div_ [class_ "grow-0 shrink-0 overflow-y-auto overflow-x-hidden h-full c-scroll hidden group-has-[#create-alert-toggle:checked]/pg:block", id_ "alert_container", style_ "width: 500px;"] do - alertConfigurationForm_ page.project page.alert + alertConfigurationForm_ page.project page.alert page.teams div_ [class_ $ "transition-opacity duration-200 hidden group-has-[#viz-logs:checked]/pg:block " <> if isJust page.targetEvent then "" else "opacity-0 pointer-events-none hidden", id_ "resizer-details_width-wrapper"] $ resizer_ "log_details_container" "details_width" False @@ -954,8 +962,8 @@ curateCols summaryCols cols = sortBy sortAccordingly filteredCols -- | Render alert configuration form for creating log-based alerts -alertConfigurationForm_ :: Projects.Project -> Maybe Monitors.QueryMonitor -> Html () -alertConfigurationForm_ project alertM = do +alertConfigurationForm_ :: Projects.Project -> Maybe Monitors.QueryMonitor -> V.Vector ManageMembers.Team -> Html () +alertConfigurationForm_ project alertM teams = do let pid = project.id isByos = project.paymentPlan == "Bring your own storage" div_ [class_ "bg-fillWeaker h-full flex flex-col group/alt"] do @@ -980,7 +988,7 @@ alertConfigurationForm_ project alertM = do form_ [ id_ "alert-form" , hxPost_ $ "/p/" <> pid.toText <> "/monitors/alerts" - , hxVals_ "js:{query:getQueryFromEditor(), since: getTimeRange().since, from: getTimeRange().from, to:getTimeRange().to, source: params().source || 'spans', vizType: getVizType()}" + , hxVals_ "js:{query:getQueryFromEditor(), since: getTimeRange().since, from: getTimeRange().from, to:getTimeRange().to, source: params().source || 'spans', vizType: getVizType(), teams: getSelectedTeams()}" , hxSwap_ "none" , class_ "flex flex-col gap-3" , [__|on htmx:afterRequest @@ -1188,6 +1196,37 @@ alertConfigurationForm_ project alertM = do div_ [class_ "flex items-center gap-1.5 ml-2 hidden", id_ "stopAfterInput"] do input_ [type_ "number", class_ "input input-sm w-16", value_ "5", name_ "stopAfter", min_ "1", max_ "100"] span_ [class_ "text-xs text-textWeak"] "occurrences" + -- Teams + div_ [class_ "border-t border-strokeWeak pt-4 mt-4"] do + div_ [class_ "flex flex-col gap-1"] do + span_ [class_ "text text-sm"] "Teams" + span_ [class_ "text-xs text-textWeak"] "Add teams to notify (if no team is added, project level notification channels will be used)" + textarea_ [class_ "input max-h-max w-full mt-2 resize-none", name_ "teams"] "" + let teamList = decodeUtf8 $ AE.encode $ (\x -> AE.object ["name" AE..= x.handle, "value" AE..= x.id]) <$> teams + -- alertConfig.teams is a list of team IDs + -- teams is a list of TeamVM with id and name + -- map all team IDs to names + teamName tId teamVMs = + case V.find (\t -> t.id == tId) teamVMs of + Just t -> t.handle + Nothing -> "Unknown Team" + + existingTeams = decodeUtf8 $ AE.encode $ case alertM of + Nothing -> [] + Just am -> (\tId -> AE.object ["name" AE..= teamName tId teams, "value" AE..= tId]) <$> am.teams + script_ + [text| + window.addEventListener('DOMContentLoaded', () => { + const tagify = createTagify('#alert-form textarea[name="teams"]', { + tagTextProp: 'name', + whitelist: $teamList, + }); + tagify.addTags($existingTeams); + }) + const getSelectedTeams = () => { + return tagify.value.map(item => item.value); + } + |] -- Recipients checkbox with better spacing div_ [class_ "flex items-center gap-2 mt-4 pt-3 border-t border-strokeWeak"] do diff --git a/src/Pages/Monitors.hs b/src/Pages/Monitors.hs index 42ffc4188..fc09bcd97 100644 --- a/src/Pages/Monitors.hs +++ b/src/Pages/Monitors.hs @@ -58,6 +58,7 @@ data AlertUpsertForm = AlertUpsertForm , conditionType :: Maybe Text , source :: Maybe Text , vizType :: Maybe Text + , teams :: [UUID.UUID] } deriving stock (Generic, Show) deriving anyclass (FromForm) @@ -104,6 +105,7 @@ convertToQueryMonitor projectId now queryMonitorId alertForm = , deletedAt = Nothing , deactivatedAt = Nothing , visualizationType = fromMaybe "timeseries" alertForm.vizType + , teams = V.fromList alertForm.teams } diff --git a/src/Pages/Monitors/Testing.hs b/src/Pages/Monitors/Testing.hs index 1cc35c603..b3e16d7de 100644 --- a/src/Pages/Monitors/Testing.hs +++ b/src/Pages/Monitors/Testing.hs @@ -4,6 +4,7 @@ module Pages.Monitors.Testing ( unifiedMonitorsGetH, unifiedMonitorOverviewH, statusBadge_, + teamAlertsGetH, ) where @@ -26,6 +27,7 @@ import Models.Users.Sessions qualified as Sessions import Pages.BodyWrapper (BWConfig (..), PageCtx (..)) import Pages.Components (statBox_) import Pkg.Components.Table (Config (..), Features (..), SearchMode (..), TabFilter (..), TabFilterOpt (..), Table (..), ZeroState (..), col, withAttrs) +import Pkg.Components.Table qualified as Table import Pkg.Components.Widget (Widget (..)) import Pkg.Components.Widget qualified as Widget import Relude hiding (ask) @@ -68,6 +70,17 @@ data UnifiedMonitorDetails } +teamAlertsGetH :: Projects.ProjectId -> UUID.UUID -> ATAuthCtx (RespHeaders (Table.TableRows UnifiedMonitorItem)) +teamAlertsGetH pid teamId = do + (sess, project) <- Sessions.sessionAndProject pid + appCtx <- ask @AuthContext + alerts <- dbtToEff $ Monitors.getAlertsByTeamHandle pid teamId + currTime <- Time.currentTime + let alerts' = V.map (toUnifiedMonitorItem pid currTime) alerts + + addRespHeaders $ Table.TableRows Nothing [] alerts' + + -- | Unified handler for monitors endpoint showing both alerts and multi-step monitors unifiedMonitorsGetH :: Projects.ProjectId diff --git a/src/Pages/Onboarding/Onboarding.hs b/src/Pages/Onboarding/Onboarding.hs index 585d42038..4ebb14f7e 100644 --- a/src/Pages/Onboarding/Onboarding.hs +++ b/src/Pages/Onboarding/Onboarding.hs @@ -356,7 +356,7 @@ onboardingConfPostH pid form = do onboardingCompleteBody :: Projects.ProjectId -> Html () onboardingCompleteBody pid = do - div_ [class_ "w-[550px] h-full flex items-center mx-auto relative"] $ do + div_ [class_ "w-xl h-full flex items-center mx-auto relative"] $ do canvas_ [id_ "drawing_canvas", class_ "absolute top-0 left-0 w-full"] pass div_ [class_ "flex-col gap-4 flex w-full p-14 my-auto border border-weak rounded-2xl"] $ do div_ [class_ "p-3 bg-fillSuccess-weak rounded-full w-max border-strokeSuccess-weak gap-2 inline-flex"] @@ -508,7 +508,7 @@ integrationsPage pid apikey = div_ [class_ "w-full flex h-screen overflow-hidden group/pg"] do div_ [class_ "w-1/2 bg-bgRaised h-full flex flex-col"] do div_ [class_ "pt-[156px] px-12 flex-shrink-0"] - $ div_ [class_ "max-w-[550px]"] + $ div_ [class_ "max-w-xl"] $ stepIndicator 4 "Instrument your apps or servers" $ "/p/" <> pid.toText @@ -796,7 +796,7 @@ formField labelText inputType inputName inputId inputValue = do notifChannelsWithUrls :: Text -> Text -> Projects.ProjectId -> Text -> V.Vector Text -> Bool -> Bool -> Html () notifChannelsWithUrls slackUrl discordUrl pid phone emails hasDiscord hasSlack = do - div_ [class_ "w-[550px] mx-auto mt-[156px] mb-10"] $ do + div_ [class_ "w-xl mx-auto mt-[156px] mb-10"] $ do div_ [id_ "inviteModalContainer"] pass div_ [class_ "flex-col gap-4 flex w-full"] $ do stepIndicator 3 "How should we notify you about issues?" $ "/p/" <> pid.toText <> "/onboarding?step=Survey" @@ -847,7 +847,7 @@ notifChannelsWithUrls slackUrl discordUrl pid phone emails hasDiscord hasSlack = onboardingInfoBody :: Projects.ProjectId -> Text -> Text -> Text -> Text -> Text -> Html () onboardingInfoBody pid firstName lastName cName cSize fUsFrm = do - div_ [class_ "w-[550px] mx-auto mt-[156px]"] $ do + div_ [class_ "w-xl mx-auto mt-[156px]"] $ do div_ [class_ "flex-col gap-4 flex w-full"] $ do stepIndicator 1 "Tell us a little bit about you" "" form_ [class_ "flex-col w-full gap-8 flex", hxPost_ $ "/p/" <> pid.toText <> "/onboarding/info", hxIndicator_ "#loadingIndicator"] $ do @@ -861,7 +861,7 @@ onboardingInfoBody pid firstName lastName cName cSize fUsFrm = do onboardingConfigBody :: Projects.ProjectId -> Text -> [Text] -> Html () onboardingConfigBody pid loca func = do - div_ [class_ "w-[550px] mx-auto mt-[156px]"] $ do + div_ [class_ "w-xl mx-auto mt-[156px]"] $ do div_ [class_ "flex-col gap-4 flex w-full"] $ do stepIndicator 2 "Let's configure your project" $ "/p/" <> pid.toText <> "/onboarding?step=Info" form_ [class_ "flex-col w-full gap-8 flex", hxPost_ $ "/p/" <> pid.toText <> "/onboarding/survey", hxIndicator_ "#loadingIndicator"] $ do diff --git a/src/Pages/Projects.hs b/src/Pages/Projects.hs index 4e1bc718a..9e9fda933 100644 --- a/src/Pages/Projects.hs +++ b/src/Pages/Projects.hs @@ -19,6 +19,8 @@ module Pages.Projects ( ManageMembersForm (..), manageSubGetH, ManageMembers (..), + -- ManageTeams + manageTeamsGetH, -- CreateProject createProjectPostH, createProjectFormV, @@ -33,6 +35,12 @@ module Pages.Projects ( CreateProject (..), pricingUpdateGetH, CreateProjectResp (..), + manageTeamPostH, + manageTeamBulkActionH, + TeamForm (..), + teamGetH, + ManageTeams (..), + TBulkActionForm (..), ) where @@ -42,13 +50,17 @@ import Data.Aeson qualified as AE import Data.Base64.Types qualified as B64 import Data.CaseInsensitive (original) import Data.CaseInsensitive qualified as CI +import Data.Char (isAlphaNum, isDigit, isLower) import Data.Default (Default (..)) +import Data.Effectful.UUID (UUID) import Data.Effectful.UUID qualified as UUID import Data.Effectful.Wreq import Data.Effectful.Wreq qualified as W import Data.List.Unique (uniq) +import Data.Map qualified as Map import Data.Pool (withResource) import Data.Text qualified as T +import Data.Time import Data.UUID qualified as RealUUID import Data.Valor (Valor, check1, failIf, validateM) import Data.Valor qualified as Valor @@ -61,10 +73,15 @@ import Effectful.Reader.Static (ask) import Fmt import GHC.Records (HasField (getField)) import Lucid +import Lucid (Term (term), div_, href_, min_, pattern_, required_) import Lucid.Htmx +import Lucid.Htmx (hxPost_, hxSelect_, hxSwapOob_, hxTrigger_) import Lucid.Hyperscript (__) +import Models.Apis.Monitors qualified as Monitors import Models.Apis.Slack (SlackData, getDiscordDataByProjectId, getProjectSlackData) +import Models.Apis.Slack qualified as Slack import Models.Projects.ProjectApiKeys qualified as ProjectApiKeys +import Models.Projects.ProjectMembers (ProjectMembers (ProjectMembers), TeamMemberVM (..), TeamVM (..)) import Models.Projects.ProjectMembers qualified as ProjectMembers import Models.Projects.Projects qualified as Projects import Models.Users.Sessions qualified as Sessions @@ -73,7 +90,14 @@ import NeatInterpolation (text) import Network.Wreq (getWith) import OddJobs.Job (createJob) import Pages.BodyWrapper (BWConfig (..), PageCtx (..), bodyWrapper) +import Pages.Bots.Discord qualified as Discord +import Pages.Bots.Slack (channels, getSlackChannels) +import Pages.Bots.Slack qualified as Slack +import Pages.Bots.Slack qualified as SlackP +import Pages.Bots.Utils qualified as BotUtils import Pages.Components (paymentPlanPicker) +import Pkg.Components.Table (Config (renderAsTable), Features (bulkActions, rowId, search, zeroState), SearchMode (ClientSide), Table (..), ZeroState (ZeroState), col, elemID) +import Pkg.Components.Table qualified as Table import Pkg.Components.Widget (Widget (..), WidgetType (..), widget_) import Pkg.ConvertKit qualified as ConvertKit import Pkg.DeriveUtils (UUIDId (..)) @@ -84,8 +108,8 @@ import Servant.API (Header) import Servant.API.ResponseHeaders (Headers) import Servant.Server (err302, errHeaders) import System.Config (AuthContext (..), EnvConfig (..)) -import System.Types (ATAuthCtx, RespHeaders, addErrorToast, addRespHeaders, addSuccessToast, addTriggerEvent, redirectCS) -import Utils (faSprite_, insertIfNotExist, isDemoAndNotSudo, lookupValueText) +import System.Types (ATAuthCtx, RespHeaders, addErrorToast, addRespHeaders, addReswap, addSuccessToast, addTriggerEvent, redirectCS) +import Utils (faSprite_, formatUTC, insertIfNotExist, isDemoAndNotSudo, lookupValueText) import Web.FormUrlEncoded (FromForm) import "base64" Data.ByteString.Base64 qualified as B64 @@ -243,7 +267,7 @@ integrationsSettingsGetH pid = do slackInfo <- getProjectSlackData pid let bwconf = (def :: BWConfig){sessM = Just sess, currProject = Just project, pageTitle = "Integrations", isSettingsPage = True, config = appCtx.config} - addRespHeaders $ bodyWrapper bwconf $ integrationsBody sess.persistentSession appCtx.config True createProj (Just project.notificationsChannel) project.whatsappNumbers slackInfo + addRespHeaders $ bodyWrapper bwconf $ integrationsBody pid sess.persistentSession appCtx.config True createProj (Just project.notificationsChannel) project.whatsappNumbers slackInfo data NotifListForm = NotifListForm @@ -310,11 +334,33 @@ validateWhatsapp :: [Text] -> [Text] -> Either Text () validateWhatsapp notificationsChannel numbers = if "phone" `elem` notificationsChannel && null numbers then Left "Provide at least one whatsapp number" else Right () -integrationsBody :: Sessions.PersistentSession -> EnvConfig -> Bool -> CreateProjectForm -> Maybe (V.Vector Projects.NotificationChannel) -> V.Vector Text -> Maybe SlackData -> Html () -integrationsBody sess envCfg isUpdate cp notifChannel phones slackData = do +validateTeamDetails :: Text -> Text -> Either Text () +validateTeamDetails name handle = do + validateName name + validateHandle handle + pure () + where + validNameChar c = isAlphaNum c || c == ' ' || c == '-' || c == '_' + validHandleChar c = isLower c || isDigit c || c == '-' + validateName n + | T.null n = Left "Team name is required" + | T.length n < 3 = Left "Team name must be at least 3 characters" + | not (T.all validNameChar n) = + Left "Invalid characters in team name" + | otherwise = Right () + validateHandle h + | T.null h = Left "Handle is required" + | not (validHandleChar <$> T.unpack h & and) = + Left "Handle must be lowercase, no spaces, and hyphens only" + | not (isLower (T.head h)) = Left "Handle must start with a lowercase letter" + | otherwise = Right () + + +integrationsBody :: Projects.ProjectId -> Sessions.PersistentSession -> EnvConfig -> Bool -> CreateProjectForm -> Maybe (V.Vector Projects.NotificationChannel) -> V.Vector Text -> Maybe SlackData -> Html () +integrationsBody pid' sess envCfg isUpdate cp notifChannel phones slackData = do section_ [id_ "main-content", class_ "p-3 py-5 sm:p-6 overflow-y-scroll h-full"] do div_ [class_ "mx-auto", style_ "max-width:1000px"] do - let pid = cp.title -- Using title as pid placeholder, will be fixed + let pid = pid'.toText div_ [ class_ "mt-10" , hxPost_ [text|/p/$pid/notifications-channels|] @@ -328,9 +374,9 @@ integrationsBody sess envCfg isUpdate cp notifChannel phones slackData = do div_ [class_ "flex flex-col gap-4"] do p_ [] "Select channels to receive updates on this project." renderNotificationOption "Email Notifications" "Receive project updates via email" "email" Projects.NEmail notifChannel (faSprite_ "envelope" "solid" "h-6 w-6") "" - renderNotificationOption "Slack" "Send notifications to Slack channels" "slack" Projects.NSlack notifChannel (faSprite_ "slack" "solid" "h-6 w-6") (renderSlackIntegration envCfg "" slackData) - renderNotificationOption "Discord" "Send notifications to Discord servers" "discord" Projects.NDiscord notifChannel (faSprite_ "discord" "solid" "h-6 w-6") (renderDiscordIntegration envCfg "") - renderNotificationOption "WhatsApp" "Send notificataoin via WhatsApp" "phone" Projects.NPhone notifChannel (faSprite_ "whatsapp" "solid" "h-6 w-6") renderWhatsappIntegration + renderNotificationOption "Slack" "Send notifications to Slack channels" "slack" Projects.NSlack notifChannel (faSprite_ "slack" "solid" "h-6 w-6") (renderSlackIntegration envCfg pid slackData) + renderNotificationOption "Discord" "Send notifications to Discord servers" "discord" Projects.NDiscord notifChannel (faSprite_ "discord" "solid" "h-6 w-6") (renderDiscordIntegration envCfg pid) + renderNotificationOption "WhatsApp" "Send notification via WhatsApp" "phone" Projects.NPhone notifChannel (faSprite_ "whatsapp" "solid" "h-6 w-6") renderWhatsappIntegration button_ [class_ "btn btn-primary w-max", [__| on click htmx.trigger("#notifsForm", "submit")|]] "Save Selections" let tgs = decodeUtf8 $ AE.encode $ V.toList phones script_ @@ -477,6 +523,450 @@ manageMembersPostH pid onboardingM form = do addRespHeaders $ ManageMembersPost projMembers +data TeamForm = TeamForm + { teamName :: Text + , teamDescription :: Text + , teamHandle :: Text + , teamMembers :: V.Vector Users.UserId + , notifEmails :: V.Vector Text + , slackChannels :: V.Vector Text + , discordChannels :: V.Vector Text + , teamId :: Maybe UUID.UUID + } + deriving stock (Eq, Generic, Show) + deriving anyclass (FromForm) +instance AE.FromJSON TeamForm where + parseJSON = AE.withObject "TeamForm" $ \o -> do + TeamForm + <$> o + AE..: "teamName" + <*> o + AE..: "teamDescription" + <*> o + AE..: "teamHandle" + <*> o + AE..:? "teamMembers" + AE..!= V.empty + <*> o + AE..:? "notifEmails" + AE..!= V.empty + <*> o + AE..:? "slackChannels" + AE..!= V.empty + <*> o + AE..:? "discordChannels" + AE..!= V.empty + <*> o + AE..:? "teamId" + + +manageTeamPostH :: Projects.ProjectId -> TeamForm -> Maybe Text -> ATAuthCtx (RespHeaders ManageTeams) +manageTeamPostH pid TeamForm{teamName, teamDescription, teamHandle, teamMembers, notifEmails, slackChannels, discordChannels, teamId} tmView = do + (sess, project) <- Sessions.sessionAndProject pid + appCtx <- ask @AuthContext + let currUserId = sess.persistentSession.userId + let res = validateTeamDetails teamName teamHandle + case (res, teamId) of + (Right _, Just tid) -> do + _ <- dbtToEff $ ProjectMembers.updateTeam pid tid teamName teamDescription teamHandle teamMembers notifEmails slackChannels discordChannels + addSuccessToast "Team updated successfully" Nothing + case tmView of + Just _ -> teamGetH pid teamHandle (Just "main-page") + _ -> manageTeamsGetH pid (Just "from_post") + (Right _, Nothing) -> do + teamVM <- dbtToEff $ ProjectMembers.getTeamByHandle pid teamHandle + case teamVM of + Just _ -> do + addErrorToast "Team handle already exists" Nothing + addRespHeaders $ ManageTeamsPostError "Team handle already exists for this project." + _ -> do + _ <- dbtToEff $ ProjectMembers.createTeam pid currUserId teamName teamDescription teamHandle teamMembers notifEmails slackChannels discordChannels + addSuccessToast "Team saved successfully" Nothing + manageTeamsGetH pid (Just "from_post") + (Left e, _) -> do + addErrorToast e Nothing + addReswap "" + addRespHeaders $ ManageTeamsPostError e + + +newtype TBulkActionForm = TBulkActionForm + { teamId :: [UUID.UUID] + } + deriving stock (Eq, Generic, Show) + deriving anyclass (FromForm) + + +manageTeamBulkActionH :: Projects.ProjectId -> Text -> TBulkActionForm -> Maybe Text -> ATAuthCtx (RespHeaders ManageTeams) +manageTeamBulkActionH pid action TBulkActionForm{teamId} listViewM = do + (sess, project) <- Sessions.sessionAndProject pid + appCtx <- ask @AuthContext + case action of + "delete" -> do + teamVm <- dbtToEff $ ProjectMembers.getTeamsById pid $ V.fromList teamId + let canDelete = all (\team -> sess.user.id == team.created_by) teamVm + if canDelete + then do + _ <- dbtToEff $ ProjectMembers.deleteTeams pid $ V.fromList teamId + when (isNothing listViewM) do + redirectCS ("/p/" <> pid.toText <> "/manage_teams") + addRespHeaders ManageTeamsDelete + else do + addErrorToast "You may only delete teams you own" Nothing + addRespHeaders $ ManageTeamsPostError "You may only delete teams you own" + _ -> do + addErrorToast "Invalid action" Nothing + addRespHeaders $ ManageTeamsPostError "Invalid action" + + +data ManageTeams + = ManageTeamsGet (PageCtx (Projects.ProjectId, V.Vector ProjectMembers.ProjectMemberVM, [BotUtils.Channel], [BotUtils.Channel], (V.Vector ProjectMembers.TeamVM))) + | ManageTeamsGet' (Projects.ProjectId, V.Vector ProjectMembers.ProjectMemberVM, [BotUtils.Channel], [BotUtils.Channel], (V.Vector ProjectMembers.TeamVM)) + | ManageTeamsPostError Text + | ManageTeamsDelete + | ManageTeamGet (PageCtx (Projects.ProjectId, ProjectMembers.TeamVM, V.Vector ProjectMembers.ProjectMemberVM, [BotUtils.Channel], [BotUtils.Channel])) + | ManageTeamGet' (Projects.ProjectId, ProjectMembers.TeamVM, V.Vector ProjectMembers.ProjectMemberVM, [BotUtils.Channel], [BotUtils.Channel]) + | ManageTeamGetError (PageCtx (Projects.ProjectId, Text)) + + +instance ToHtml ManageTeams where + toHtml (ManageTeamsGet (PageCtx bwconf (pid, members, slackChannels, discordChannels, teams))) = toHtml $ PageCtx bwconf $ manageTeamsPage pid members slackChannels discordChannels teams + toHtml (ManageTeamsGet' (pid, members, slackChannels, discordChannels, teams)) = toHtml $ manageTeamsPage pid members slackChannels discordChannels teams + toHtml (ManageTeamsPostError msg) = span_ [] $ "" + toHtml ManageTeamsDelete = toHtml "" + toHtml (ManageTeamGet (PageCtx bwconf (pid, team, members, slackChannels, discordChannels))) = toHtml $ PageCtx bwconf $ teamPage pid team members slackChannels discordChannels + toHtml (ManageTeamGet' (pid, team, members, slackChannels, discordChannels)) = toHtml $ teamPage pid team members slackChannels discordChannels + toHtml (ManageTeamGetError (PageCtx bwconf (pid, message))) = toHtml $ PageCtx bwconf $ teamPageNF pid message + toHtmlRaw = toHtml + + +manageTeamsGetH :: Projects.ProjectId -> Maybe Text -> ATAuthCtx (RespHeaders ManageTeams) +manageTeamsGetH pid layoutM = do + (sess, project) <- Sessions.sessionAndProject pid + appCtx <- ask @AuthContext + projMembers <- dbtToEff $ ProjectMembers.selectActiveProjectMembers pid + slackDataM <- Slack.getProjectSlackData pid + channels <- case slackDataM of + Just slackData -> do + channels' <- SlackP.getSlackChannels appCtx.env.slackBotToken slackData.teamId + case channels' of + Just chs -> return chs.channels + Nothing -> return [] + Nothing -> return [] + + discordDataM <- Slack.getDiscordDataByProjectId pid + discordChannels <- case discordDataM of + Just discordData -> Discord.getDiscordChannels appCtx.env.discordBotToken discordData.guildId + Nothing -> return [] + teams <- dbtToEff $ ProjectMembers.getTeamsVM pid + let bwconf = + (def :: BWConfig) + { sessM = Just sess + , pageTitle = "Manage teams" + , currProject = Just project + , isSettingsPage = True + , config = appCtx.config + } + case layoutM of + Just _ -> do + addRespHeaders $ ManageTeamsGet' (pid, projMembers, channels, discordChannels, teams) + _ -> do + addRespHeaders $ ManageTeamsGet (PageCtx bwconf (pid, projMembers, channels, discordChannels, teams)) + + +manageTeamsPage :: Projects.ProjectId -> V.Vector ProjectMembers.ProjectMemberVM -> [BotUtils.Channel] -> [BotUtils.Channel] -> V.Vector ProjectMembers.TeamVM -> Html () +manageTeamsPage pid projMembers channels discordChannels teams = do + let whiteList = decodeUtf8 $ AE.encode $ (\x -> AE.object ["name" AE..= (x.first_name <> " " <> x.last_name), "email" AE..= x.email, "value" AE..= x.userId]) <$> projMembers + let channelWhiteList = decodeUtf8 $ AE.encode $ (\x -> AE.object ["name" AE..= ("#" <> x.channelName), "value" AE..= x.channelId]) <$> channels + let discordWhiteList = decodeUtf8 $ AE.encode $ (\x -> AE.object ["name" AE..= ("#" <> x.channelName), "value" AE..= x.channelId]) <$> discordChannels + section_ [id_ "main-content", class_ "w-full py-8"] do + div_ [class_ "p-6 w-full"] do + div_ [class_ "mb-8 w-full flex items-center justify-between"] do + div_ [class_ "flex flex-col gap-2"] do + h2_ [class_ "text-textStrong text-3xl font-semibold"] "Teams" + p_ [class_ "text-textWeak text-sm"] "Manage your project teams and their access" + label_ [class_ "btn btn-primary btn-sm text-white", Lucid.for_ "n-new-team-modal"] (faSprite_ "plus" "regular" "h-4 w-4 mr-2" >> "New Team") + input_ [type_ "checkbox", id_ "n-new-team-modal", class_ "modal-toggle"] + teamModal pid Nothing whiteList channelWhiteList discordWhiteList False + -- let mapColumn x = + -- (Table.mkColumn x x) + -- { columnWidth = if x == "Name" then Just "60%" else if x == "Modified" then Just "20%" else Nothing + -- , columnCheckBox = x == "teamId" + -- , columnActionable = x == "Name" + -- } + -- let tableCols = (\x -> mapColumn x) <$> ["teamId", "Name", "Modified", "Members", "Notifications"] + -- let mapRow x = + -- Map.fromList + -- [ ("teamId", CellCheckbox $ UUID.toText x.id) + -- , ("Name", CellCustom $ nameCell pid x.name x.description x.handle) + -- , ("Modified", CellText $ toText $ formatTime defaultTimeLocale "%b %-e, %-l:%M %P" x.updated_at) + -- , ("Members", CellCustom $ memberCell x.members) + -- , ("Notifications", CellCustom $ notifsCell x) + -- ] + -- tableRows = (mapRow <$> V.toList teams) + -- table = + -- (Table.defaultTable tableCols tableRows) + -- { tableId = Just "teams_table" + -- , tableClass = "border rounded border-strokeWeak" + -- , tableHasSearch = True + -- , tableHasCheckboxes = True + -- , tableActions = + -- Just + -- $ [ button_ [class_ "flex items-center gap-2 btn btn-sm text-textError", type_ "button", hxPost_ $, hxSwap_ "none"] do + -- faSprite_ "trash" "regular" "w-3 h-3" + -- "Delete" + -- ] + -- } + let table = + Table + { config = def{elemID = "teamsListForm", renderAsTable = True} + , columns = [col "Name" (nameCell pid), col "Modified" modifiedCell, col "Members" memberCell, col "Notifications" notifsCell] + , rows = teams + , features = + def + { search = Just ClientSide + , rowId = Just (\team -> UUID.toText team.id) + , bulkActions = + [ Table.BulkAction + { title = "Delete" + , icon = Just "trash" + , uri = "/p/" <> pid.toText <> "/manage_teams/bulk_action/delete" + } + ] + , zeroState = + Just + $ ZeroState + { icon = "empty-set" + , title = "You haven't created any teams yet" + , description = "Create teams to manage access and collaboration" + , actionText = "Create team" + , destination = + Left $ "/p/" <> pid.toText <> "/manage_teams#new-team-modal" + } + } + } + + div_ [class_ "w-full"] do + toHtml table + + +modifiedCell :: ProjectMembers.TeamVM -> Html () +modifiedCell team = do + time_ [datetime_ $ fmt $ dateDashF team.updated_at, class_ "text text-sm"] $ toHtml $ formatTime defaultTimeLocale "%b %-d, %Y %-I:%M %p" team.updated_at + + +nameCell :: Projects.ProjectId -> ProjectMembers.TeamVM -> Html () +nameCell pid team = do + a_ [class_ "flex items-center gap-2", href_ ("/p/" <> pid.toText <> "/manage_teams/" <> team.handle)] do + span_ [class_ "text-textStrong text-sm font-medium"] $ toHtml team.name + span_ [class_ "text-textWeak text-sm overflow-ellipsis truncate "] $ toHtml team.description + + +memberCell :: ProjectMembers.TeamVM -> Html () +memberCell team = do + div_ [class_ "inline-block flex -space-x-2"] do + forM_ team.members $ \m -> do + div_ [class_ "inline-block mx-0.5", term "data-tippy-content" m.memberName] + $ img_ [class_ "inline-block h-6 w-6 rounded-full border border-strokeWeak ", src_ m.memberAvatar, alt_ "User avatar"] + + +notifsCell :: ProjectMembers.TeamVM -> Html () +notifsCell team = do + div_ [class_ "flex items-center gap-2"] do + unless (V.null team.slack_channels) do + div_ [term "data-tippy-content" "Slack"] do + faSprite_ "slack" "solid" "h-3.5 w-3.5" + unless (V.null team.discord_channels) do + div_ [term "data-tippy-content" "Discord"] do + faSprite_ "discord" "solid" "h-3.5 w-3.5" + unless (V.null team.notify_emails) do + div_ [term "data-tippy-content" "Email"] do + faSprite_ "envelope" "solid" "h-3.5 w-3.5" + + +teamGetH :: Projects.ProjectId -> Text -> Maybe Text -> ATAuthCtx (RespHeaders ManageTeams) +teamGetH pid handle layoutM = do + (sess, project) <- Sessions.sessionAndProject pid + appCtx <- ask @AuthContext + teamVm <- dbtToEff $ ProjectMembers.getTeamByHandle pid handle + projMembers <- dbtToEff $ ProjectMembers.selectActiveProjectMembers pid + slackDataM <- Slack.getProjectSlackData pid + channels <- case slackDataM of + Just slackData -> do + channels' <- SlackP.getSlackChannels appCtx.env.slackBotToken slackData.teamId + case channels' of + Just chs -> return chs.channels + Nothing -> return [] + Nothing -> return [] + + discordDataM <- Slack.getDiscordDataByProjectId pid + discordChannels <- case discordDataM of + Just discordData -> Discord.getDiscordChannels appCtx.env.discordBotToken discordData.guildId + Nothing -> return [] + let bwconf = + (def :: BWConfig) + { sessM = Just sess + , pageTitle = "Team details" + , currProject = Just project + , config = appCtx.config + } + case teamVm of + Just team -> case layoutM of + Just _ -> addRespHeaders $ ManageTeamGet' (pid, team, projMembers, channels, discordChannels) + _ -> addRespHeaders $ ManageTeamGet (PageCtx bwconf (pid, team, projMembers, channels, discordChannels)) + Nothing -> addRespHeaders $ ManageTeamGetError (PageCtx bwconf (pid, handle)) + + +teamPage :: Projects.ProjectId -> ProjectMembers.TeamVM -> V.Vector ProjectMembers.ProjectMemberVM -> [BotUtils.Channel] -> [BotUtils.Channel] -> Html () +teamPage pid team projMembers slackChannels discordChannels = do + let whiteList = decodeUtf8 $ AE.encode $ (\x -> AE.object ["name" AE..= (x.first_name <> " " <> x.last_name), "email" AE..= x.email, "value" AE..= x.userId]) <$> projMembers + let channelWhiteList = decodeUtf8 $ AE.encode $ (\x -> AE.object ["name" AE..= ("#" <> x.channelName), "value" AE..= x.channelId]) <$> slackChannels + let discordWhiteList = decodeUtf8 $ AE.encode $ (\x -> AE.object ["name" AE..= ("#" <> x.channelName), "value" AE..= x.channelId]) <$> discordChannels + section_ [id_ "main-content", class_ "w-full h-full"] do + div_ [class_ "flex h-full border-t border-strokeWeak"] do + div_ [class_ "p-4 w-4/12 space-y-6 mx-auto h-full overflow-y-auto"] do + div_ [] do + div_ [class_ "flex items-center gap-3"] do + h2_ [class_ "text-xl font-semibold"] $ toHtml team.name + span_ [class_ "text-textWeak flex items-center gap-1 text-sm"] do + faSprite_ "copy" "regular" "w-3 h-3" + toHtml team.handle + p_ [class_ "text-textWeak mt-3 text-sm"] $ toHtml team.description + div_ [class_ "rounded-lg p-4 border border-strokeWeak"] do + div_ [class_ "flex items-center justify-between mb-2"] do + span_ [class_ "flex items-center gap-2 font-semibold py-2"] do + faSprite_ "users" "regular" "h-5 w-5" + toHtml $ "Members" + span_ [class_ "text-textWeak"] $ ("(" <> show (V.length team.members) <> ")") + label_ [class_ "btn btn-outline border border-strokeWeak btn-xs", Lucid.for_ $ team.handle <> "-new-team-modal"] (faSprite_ "plus" "regular" "h-3 w-3 mr-1" >> "Add") + input_ [type_ "checkbox", id_ $ team.handle <> "-new-team-modal", class_ "modal-toggle"] + teamModal pid (Just team) whiteList channelWhiteList discordWhiteList True + div_ [] do + forM_ team.members \m -> do + div_ [class_ "flex flex-col gap-1 py-3 "] do + div_ [class_ "flex gap-2 text-sm"] do + img_ [src_ m.memberAvatar, class_ "w-5 h-5 rounded-full border border-strokeWeak"] + span_ [] $ toHtml m.memberName + span_ [class_ "text-textWeak text-xs"] $ toHtml m.memberEmail + + div_ [class_ "p-4 rounded-lg border border-strokeWeak"] do + div_ [class_ "flex items-center justify-between mb-2"] do + span_ [class_ "flex items-center gap-2 py-2 font-semibold"] do + faSprite_ "bell" "regular" "h-5 w-5" + "Notifications" + label_ [class_ "btn btn-outline border border-strokeWeak btn-xs", Lucid.for_ $ team.handle <> "-new-team-modal"] (faSprite_ "plus" "regular" "h-3 w-3 mr-1" >> "Add") + div_ [] do + div_ [class_ "flex flex-col gap-2 py-3"] do + div_ [class_ "flex items-center text-sm gap-2 font-medium"] do + faSprite_ "envelope" "regular" "h-4 w-4" + "Email addresses" + div_ [class_ "flex items-center gap-2 text-xs text-textWeak"] do + when (V.null team.notify_emails) $ span_ [] "No emails added" + forM_ team.notify_emails \e -> span_ [] $ toHtml e + div_ [class_ "flex flex-col gap-2 py-3"] do + div_ [class_ "flex items-center text-sm gap-2 font-medium"] do + faSprite_ "slack" "solid" "h-4 w-4" + "Slack channels" + div_ [class_ "flex items-center gap-2 text-xs text-textWeak"] do + when (V.null team.slack_channels) $ span_ [] "No slack channel configured" + forM_ team.slack_channels \e -> do + let tar = maybe e (.channelName) $ find (\x -> x.channelId == e) slackChannels + span_ [] $ toHtml tar + div_ [class_ "flex flex-col gap-2 py-3"] do + div_ [class_ "flex items-center text-sm gap-2 font-medium"] do + faSprite_ "discord" "solid" "h-4 w-4" + "Discord channels" + div_ [class_ "flex items-center gap-2 text-xs text-textWeak"] do + when (V.null team.discord_channels) $ span_ [] "No discord channel configured" + forM_ team.discord_channels \e -> do + let tar = maybe e (.channelName) $ find (\x -> x.channelId == e) discordChannels + span_ [] $ toHtml tar + + div_ [class_ "h-full w-8/12 overflow-y-auto p-4 space-y-6"] do + monitorsSection pid team.id + dashboardsSection pid team.id + servicesSection pid team.id + + +monitorsSection :: Projects.ProjectId -> UUID.UUID -> Html () +monitorsSection pid teamId = div_ [class_ "rounded-xl border border-strokeWeak overflow-x-hidden"] do + div_ + [ class_ "flex items-center justify-between w-full p-2 hover:bg-fillWeaker cursor-pointer" + , [__|on click toggle .hidden on the next
+ then toggle .rotate-270 on the first in me|] + ] + do + h4_ [class_ "text-sm font-medium"] (faSprite_ "list-check" "regular" "h-4 w-4 mr-2" >> "Alerts") + div_ [class_ "flex items-center gap-4"] do + label_ [class_ "input input-sm w-72 border-0 bg-fillWeaker focus:outline-0 focus:ring-0"] do + faSprite_ "magnifying-glass" "regular" "h-4 w-4 text-textWeak" + input_ [type_ "text", placeholder_ "Search alerts...", class_ "", [__| on click halt|]] + button_ [class_ ""] do + faSprite_ "p-chevron-down" "regular" "h-4 w-4" + + div_ [class_ "p-3 border-t border-strokeWeak w-full max-h-96 overflow-y-auto", id_ "monitors-section"] do + a_ [hxGet_ ("/p/" <> pid.toText <> "/monitors/alerts/team/" <> UUID.toText teamId), hxTrigger_ "intersect once", hxTarget_ "#monitors-section", hxSwap_ "outerHTML"] "" + span_ [class_ "htmx-indicator query-indicator loading loading-dots loading-sm"] "" + emptySectionState "No monitors are currently linked to this team" + + +dashboardsSection :: Projects.ProjectId -> UUID.UUID -> Html () +dashboardsSection pid teamId = div_ [class_ "rounded-xl border border-strokeWeak overflow-x-hidden"] do + div_ + [ class_ "flex items-center justify-between w-full p-2 bg-fillWeaker cursor-pointer" + , [__|on click toggle .hidden on the next + then toggle .rotate-270 on the first in me + |] + ] + do + h4_ [class_ "text-sm font-medium"] (faSprite_ "chart-area" "regular" "h-4 w-4 mr-2" >> "Dashboards") + div_ [class_ "flex items-center gap-4"] do + label_ [class_ "input input-sm w-72 border-0 bg-fillWeaker focus:outline-0 focus:ring-0"] do + faSprite_ "magnifying-glass" "regular" "h-4 w-4 text-textWeak" + input_ [type_ "text", placeholder_ "Search dashboards...", class_ "", [__| on click halt|]] + button_ [class_ ""] do + faSprite_ "p-chevron-down" "regular" "h-4 w-4" + div_ [class_ "-mt-4 w-full max-h-96 overflow-y-auto", id_ "dashboards-section"] do + a_ [hxGet_ ("/p/" <> pid.toText <> "/dashboards/?teamId=" <> UUID.toText teamId), hxTrigger_ "intersect once", hxTarget_ "#dashboards-section", hxSwap_ "innerHTML"] "" + span_ [class_ "htmx-indicator query-indicator loading loading-dots loading-sm"] "" + emptySectionState "No dashboards are currently linked to this team" + + +servicesSection :: Projects.ProjectId -> UUID.UUID -> Html () +servicesSection pid teamId = div_ [class_ "rounded-xl border border-strokeWeak overflow-x-hidden"] do + div_ + [ class_ "flex items-center justify-between w-full p-2 hover:bg-fillWeaker cursor-pointer" + , [__|on click toggle .hidden on the next + then toggle .rotate-270 on the first in me + |] + ] + do + h4_ [class_ "text-sm font-medium"] (faSprite_ "server" "regular" "h-4 w-4 mr-2" >> "Services") + div_ [class_ "flex items-center gap-4"] do + label_ [class_ "input input-sm w-72 border-0 bg-fillWeaker focus:outline-0 focus:ring-0"] do + faSprite_ "magnifying-glass" "regular" "h-4 w-4 text-textWeak" + input_ [type_ "text", placeholder_ "Search services...", class_ "", [__| on click halt|]] + button_ [class_ ""] do + faSprite_ "p-chevron-down" "regular" "h-4 w-4" + div_ [class_ "p-3 border-t w-full border-strokeWeak"] do + emptySectionState "No services are currently linked to this team" + + +emptySectionState :: Text -> Html () +emptySectionState message = + div_ [class_ "flex flex-col items-center justify-center py-10 text-center text-textWeak gap-3"] do + faSprite_ "empty" "regular" "h-8 w-8 text-textWeak" + div_ [class_ "text-sm"] $ toHtml message + button_ [class_ "btn btn-primary btn-sm"] "Create dashboard" + + +teamPageNF :: Projects.ProjectId -> Text -> Html () +teamPageNF pid handle = do + section_ [id_ "main-content", class_ "w-full py-16"] do + div_ [class_ "p-6 w-[606px] mx-auto"] do + h2_ [class_ "text-textStrong mb-4 text-xl font-semibold"] $ "Team not found: " <> toHtml handle + p_ [class_ "text-textWeak text-sm leading-tight"] "We couldn't find the team you're looking for." + + manageMembersGetH :: Projects.ProjectId -> ATAuthCtx (RespHeaders ManageMembers) manageMembersGetH pid = do (sess, project) <- Sessions.sessionAndProject pid @@ -1022,3 +1512,246 @@ alertConfiguration newEndpointsAlerts errorAlerts weeklyReportsAlerts dailyRepor switchRow "Receive weekly reports alerts" "weeklyNotifs" "Get a summary of your project activity every week" weeklyReportsAlerts hr_ [class_ "border-border my-2"] switchRow "Receive daily reports alerts" "dailyNotifs" "Receive daily summaries of your project metrics" dailyReportsAlerts + + +-- Types +data TeamMember = TeamMember + { memberId :: Text + , memberEmail :: Text + , memberName :: Text + , memberRole :: Role + } + + +data Role = Owner | Admin | Member | Viewer + deriving (Eq, Show) + + +data NotificationChannel + = EmailChannel Text + | SlackChannel Text Text -- url, name + | DiscordChannel Text Text + | WhatsAppChannel Text + + +-- Main Modal Component +teamModal :: Projects.ProjectId -> Maybe ProjectMembers.TeamVM -> Text -> Text -> Text -> Bool -> Html () +teamModal pid team whiteList channelWhiteList discordWhiteList isInTeamView = do + let name = maybe "" (.name) team + let handle = maybe "" (.handle) team + let description = maybe "" (.description) team + let teamId = fmap (.id) team + let prefix = maybe "n" (\x -> x.handle) team + let membersTags = decodeUtf8 $ AE.encode $ maybe [] (\t -> ((\m -> UUID.toText m.memberId) <$> t.members)) team + let notifEmails = decodeUtf8 $ AE.encode $ maybe [] (.notify_emails) team + let slackChannels = decodeUtf8 $ AE.encode $ maybe [] (.slack_channels) team + let discordChannels = decodeUtf8 $ AE.encode $ maybe [] (.discord_channels) team + + div_ [class_ "modal", role_ "dialog"] $ do + div_ [class_ "modal-box max-w-max"] $ do + form_ + [ hxPost_ $ "/p/" <> pid.toText <> "/manage_teams?" <> (if isInTeamView then "teamView=true" else "") + , hxExt_ "json-enc" + , hxVals_ [text|js:{...getTagValues(`$prefix`)}|] + , hxTarget_ "#main-content" + , hxSwap_ "outerHTML" + , class_ "w-xl" + ] + do + div_ [class_ "px-2 max-h-[75vh] overflow-y-auto"] $ do + whenJust teamId $ \tid -> + input_ + [ type_ "hidden" + , id_ $ prefix <> "-team-id" + , name_ "teamId" + , value_ $ UUID.toText tid + ] + div_ [class_ "sticky top-0 pb-2 bg-[var(--color-bgOverlay)] border-b border-border z-50"] $ do + h2_ [class_ "text-lg font-semibold flex items-center gap-2"] do + faSprite_ "users" "solid" "w-4 h-4 " + toHtml $ if isJust team then "Edit Team " <> name else "Create Team" + p_ [class_ "text-sm text-textWeak"] "Manage team details, members, and notification channels" + div_ [class_ "flex-1 overflow-y-auto space-y-8 mt-4"] $ do + teamDetailsSection name handle description + div_ [class_ "pb-2 space-y-4"] $ do + h3_ [class_ "text-sm font-medium flex items-center gap-2 pb-2 border-b border-strokeWeak"] $ do + "Add Members" + div_ [class_ "flex gap-2"] $ do + textarea_ + [ class_ "min-h-10 w-full rounded border-strokeWeak input resize-none" + , type_ "email" + , placeholder_ "Add members" + , id_ $ prefix <> "-team-members-input" + , name_ "teamMembers" + , style_ "border: 1px solid var(--color-strokeWeak)" + ] + pass + notificationChannelsSection prefix + div_ [class_ "modal-action"] $ do + label_ [Lucid.for_ (prefix <> "-new-team-modal"), class_ "btn btn-sm btn-outline", type_ "button"] "Cancel" + button_ [class_ "btn btn-sm btn-primary ml-4", type_ "submit"] "Save Team" + label_ [class_ "modal-backdrop", Lucid.for_ (prefix <> "-new-team-modal")] "Close" + script_ + [text| +function getTagValues(prefix) { + const val = { + teamMembers: window[`$${prefix}-membersTagify`].value.map(item => item.value), + notifEmails: window[`$${prefix}-notifEmailsTagify`].value.map(item => item.value), + slackChannels: window[`$${prefix}-slackTagify`].value.map(item => item.value), + discordChannels: window[`$${prefix}-discordTagify`].value.map(item => item.value) + } + return val +} + window.addEventListener('DOMContentLoaded', (event) => { + +window[`$prefix-membersTagify`] = createTagify('#$prefix-team-members-input', { + enforceWhitelist: true, + whitelist: $whiteList, + placeholder: "Add member", +}); + +var existingMembers = $membersTags +var memberTags = [] +existingMembers.forEach(member => { + const target = $whiteList.find(v => v.value == member) + if(target) { + memberTags.push(target) + } +}) +window[`$prefix-membersTagify`].addTags(memberTags) + +window[`$prefix-notifEmailsTagify`] = createTagify('#$prefix-notif-emails-input', { placeholder: "Add email"}); +window[`$prefix-notifEmailsTagify`].addTags($notifEmails) + +window[`$prefix-slackTagify`] = createTagify('#$prefix-slack-channels-input', { + enforceWhitelist: true, + whitelist: $channelWhiteList, + placeholder: "Add Slack channel", +}); + +var slackChannels = $slackChannels +var channels = [] +slackChannels.forEach(channel => { + const target = $channelWhiteList.find(v => v.value == channel) + if(target) { + channels.push(target) + } +}) +window[`$prefix-slackTagify`].addTags(channels) + +window[`$prefix-discordTagify`] = createTagify('#$prefix-discord-channels-input', { + enforceWhitelist: true, + whitelist: $discordWhiteList, + placeholder: "Add Discord channel", +}); + +var discordChannels = $discordChannels +var discordChannelTags = [] +discordChannels.forEach(channel => { + const target = $discordWhiteList.find(v => v.value === channel) + if(target) { + discordChannelTags.push(target) + } +}) +window[`$prefix-discordTagify`].addTags(discordChannelTags) +// Update email whitelist when members change +window[`$prefix-membersTagify`].on("change", (e) => { + window[`$prefix-notifEmailsTagify`].settings.whitelist = window[`$prefix-membersTagify`].value.map(item => item.email); +}); + }); + |] + + +teamDetailsSection :: Text -> Text -> Text -> Html () +teamDetailsSection name handle description = do + let prefix = if T.null handle then "n" else handle + div_ [class_ "space-y-4"] $ do + div_ [class_ "flex items-center w-full gap-2 justify-between"] do + div_ [class_ "flex flex-col w-full gap-2"] $ do + label_ [class_ "text-sm font-medium ", Lucid.for_ "team-name", required_ "true"] "Team Name" + input_ + [ class_ "input w-full" + , type_ "text" + , id_ $ prefix <> "-team-name" + , name_ "teamName" + , placeholder_ "e.g. Backend Team" + , value_ name + ] + span_ [id_ $ prefix <> "-team-name-error", class_ "text-xs text-red-500 h-4"] "" + + div_ [class_ "flex flex-col gap-2 w-full"] $ do + label_ [class_ "text-sm font-medium ", Lucid.for_ "team-handle"] "Team Handle" + input_ + [ class_ "input w-full" + , type_ "text" + , id_ $ prefix <> "-team-handle" + , name_ "teamHandle" + , placeholder_ "e.g. backend-team" + , value_ handle + , required_ "true" + , min_ "3" + , max_ "30" + , pattern_ "^[a-z][a-z0-9-]*$" + ] + span_ [id_ $ prefix <> "-team-handle-error", class_ "text-xs text-red-500 h-4"] "" + div_ [class_ "flex flex-col gap-2"] $ do + label_ [class_ "text-sm font-medium ", Lucid.for_ "team-description"] "Description" + textarea_ + [ class_ "w-full p-2 min-h-[80px] input focus:outline-none focus:ring-2 focus:ring-ring resize-none" + , id_ $ prefix <> "-team-description" + , name_ "teamDescription" + , placeholder_ "What does this team do?" + ] + $ toHtml description + script_ + [text| + +document.addEventListener("DOMContentLoaded", () => { + const nameInput = document.getElementById("$prefix-team-name"); + const handleInput = document.getElementById("$prefix-team-handle"); + let handleManuallyEdited = false; + + handleInput.addEventListener("input", () => { + handleManuallyEdited = true; + }); + + nameInput.addEventListener("input", () => { + if (!handleManuallyEdited) { + const val = nameInput.value.toLowerCase().trim(); + const generated = val + .replace(/[^a-z0-9\s-]/g, "") // remove invalid chars + .replace(/\s+/g, "-") // spaces → hyphens + .replace(/-{2,}/g, "-") // collapse multiple hyphens + .replace(/^-+|-+$/g, ""); // trim hyphens + handleInput.value = generated; + showError(handleInput, handleError, validators.handle()); + } + }); + +}); +|] + + +-- Notification Channels Section +notificationChannelsSection :: Text -> Html () +notificationChannelsSection prefix = do + div_ [class_ "space-y-4"] $ do + h3_ [class_ "text-sm font-medium flex items-center gap-2 pb-2 border-b border-strokeWeak"] "Notification Channels" + div_ [class_ "w-full space-y-8"] $ do + channelBlock "Email addresses" (prefix <> "-notif-emails-input") "Add email addresses" "notifEmails" "envelope" + channelBlock "Slack Channels" (prefix <> "-slack-channels-input") "Add slack channels" "slackChannels" "slack" + channelBlock "Discord Channels" (prefix <> "-discord-channels-input") "Add channels" "discordChannels" "discord" + + +-- Reusable helper +channelBlock :: Text -> Text -> Text -> Text -> Text -> Html () +channelBlock title inputId placeholder name icon = div_ [class_ "flex flex-col gap-2"] do + label_ [class_ "text-sm font-medium flex items-center gap-2", Lucid.for_ inputId] do + faSprite_ icon "solid" "w-4 h-4" + toHtml title + textarea_ + [ class_ "input w-full min-h-10 resize-none rounded" + , id_ inputId + , placeholder_ placeholder + ] + "" diff --git a/src/Pages/Telemetry.hs b/src/Pages/Telemetry.hs index 4a627590e..211829fc5 100644 --- a/src/Pages/Telemetry.hs +++ b/src/Pages/Telemetry.hs @@ -623,11 +623,11 @@ tracePage p = do waterFallTree pid rootSpans traceItem.traceId serviceColors div_ [class_ "shrink-0 px-2"] do div_ - [ class_ "w-[550px] sticky top-0 border-b border-b-strokeWeak h-10 text-xs relative" + [ class_ "w-xl sticky top-0 border-b border-b-strokeWeak h-10 text-xs relative" , id_ "waterfall-time-container" ] pass - div_ [class_ "w-[550px] overflow-x-hidden py-2 relative flex flex-col gap-2", id_ $ "waterfall-" <> traceItem.traceId] pass + div_ [class_ "w-xl overflow-x-hidden py-2 relative flex flex-col gap-2", id_ $ "waterfall-" <> traceItem.traceId] pass div_ [role_ "tabpanel", class_ "a-tab-content pt-2 hidden", id_ "span_list"] do div_ [class_ "border border-strokeWeak w-full rounded-2xl min-h-[230px] overflow-x-hidden "] do diff --git a/src/Pkg/Components/Table.hs b/src/Pkg/Components/Table.hs index c4ce9ef15..b45d6c62a 100644 --- a/src/Pkg/Components/Table.hs +++ b/src/Pkg/Components/Table.hs @@ -147,8 +147,8 @@ instance Default (Features a) where instance Default Config where def = Config - { tableClasses = "table table-zebra table-sm w-full relative" - , thClasses = "text-left bg-bgRaised sticky top-0" + { tableClasses = "table table-sm w-full relative" + , thClasses = "text-left bg-fillWeaker sticky top-0" , tdClasses = "px-6 py-4" , containerClasses = "w-full mx-auto px-6 pt-4 space-y-4 pb-16 overflow-y-scroll h-full" , showHeader = True @@ -233,7 +233,23 @@ renderTable tbl = div_ [class_ tbl.config.containerClasses, id_ $ tbl.config.ele renderRows :: Table a -> Html () renderRows tbl = if tbl.config.renderAsTable - then V.mapM_ (renderTableRow tbl) tbl.rows + then div_ [class_ "overflow-hidden rounded-lg border border-strokeWeak"] do + table_ [class_ tbl.config.tableClasses] do + when tbl.config.showHeader + $ thead_ do + tr_ do + when (isJust tbl.features.rowId) + $ th_ [class_ $ tbl.config.thClasses <> " w-8"] + $ input_ + [ term "aria-label" "Select All" + , type_ "checkbox" + , class_ "checkbox h-6 w-6 checked:checkbox-primary" + , [__| on click set .bulkactionItemCheckbox.checked to my.checked |] + ] + forM_ tbl.columns \c -> + th_ [class_ $ tbl.config.thClasses <> " " <> tbl.config.tdClasses <> maybe "" (" " <>) c.align] $ toHtml c.name + tbody_ do + V.mapM_ (renderTableRow tbl) tbl.rows else V.mapM_ (renderListRow tbl) tbl.rows @@ -272,11 +288,11 @@ renderTableRow tbl row = renderToolbar :: Table a -> Html () renderToolbar tbl = - div_ [class_ "flex py-3 gap-8 items-center bg-fillWeaker"] do - div_ [class_ "h-4 flex space-x-3 w-8 items-center"] do - span_ [class_ "w-2 h-full"] "" - when (isJust tbl.features.rowId) - $ input_ + div_ [class_ $ "flex py-3 gap-8 items-center " <> if tbl.config.renderAsTable then "" else "bg-fillWeaker"] do + when (isJust tbl.features.rowId && not tbl.config.renderAsTable) do + div_ [class_ "h-4 flex space-x-3 w-8 items-center"] do + span_ [class_ "w-2 h-full"] "" + input_ [ term "aria-label" "Select All" , type_ "checkbox" , class_ "checkbox h-6 w-6 checked:checkbox-primary" @@ -291,7 +307,7 @@ renderToolbar tbl = , hxSwap_ "none" ] do - whenJust blkA.icon \icon -> faSprite_ icon "solid" "h-4 w-4 inline-block" + whenJust blkA.icon \icon -> faSprite_ icon "regular" "h-4 w-4 inline-block" span_ (toHtml blkA.title) whenJust tbl.features.sort renderSortMenu diff --git a/src/Pkg/Mail.hs b/src/Pkg/Mail.hs index 0dfdab6cc..0db078a1d 100644 --- a/src/Pkg/Mail.hs +++ b/src/Pkg/Mail.hs @@ -58,20 +58,34 @@ data NotificationAlerts , allChartUrl :: Text , errorChartUrl :: Text } + | MonitorsAlert + { monitorTitle :: Text + , monitorUrl :: Text + } -sendDiscordAlert :: (DB :> es, Notify.Notify :> es, Reader Config.AuthContext :> es) => NotificationAlerts -> Projects.ProjectId -> Text -> Eff es () -sendDiscordAlert alert pid pTitle = do +sendDiscordAlert :: (DB :> es, Notify.Notify :> es, Reader Config.AuthContext :> es) => NotificationAlerts -> Projects.ProjectId -> Text -> Maybe Text -> Eff es () +sendDiscordAlert alert pid pTitle channelIdM' = do appCtx <- ask @Config.AuthContext - discordDataM <- getDiscordDataByProjectId pid - whenJust discordDataM \discordData -> do - let send = sendAlert discordData.notifsChannelId + channelIdM <- case channelIdM' of + Just d -> pure $ Just d + Nothing -> do + discordDataM <- getDiscordDataByProjectId pid + pure $ discordDataM >>= (\x -> x.notifsChannelId) + + whenJust channelIdM \cid -> do + let send = sendAlert (Just cid) let projectUrl = appCtx.env.hostUrl <> "p/" <> pid.toText case alert of RuntimeErrorAlert a -> send $ discordErrorAlert a pTitle projectUrl EndpointAlert{..} -> send $ discordNewEndpointAlert project endpoints endpointHash projectUrl ShapeAlert -> pass ReportAlert{..} -> send $ discordReportAlert reportType startTime endTime totalErrors totalEvents breakDown pTitle reportUrl allChartUrl errorChartUrl + MonitorsAlert{..} -> + send + $ AE.object + [ "text" AE..= ("🤖 *Log Alert triggered for `" <> monitorTitle <> "`* \n<" <> monitorUrl <> "|View Monitor>") + ] where sendAlert :: Notify.Notify :> es => Maybe Text -> AE.Value -> Eff es () sendAlert channelId content = @@ -79,21 +93,28 @@ sendDiscordAlert alert pid pTitle = do Notify.sendNotification $ Notify.discordNotification cid content -sendSlackAlert :: (DB :> es, Notify.Notify :> es, Reader Config.AuthContext :> es) => NotificationAlerts -> Projects.ProjectId -> Text -> Eff es () -sendSlackAlert alert pid pTitle = do +sendSlackAlert :: (DB :> es, Notify.Notify :> es, Reader Config.AuthContext :> es) => NotificationAlerts -> Projects.ProjectId -> Text -> Maybe Text -> Eff es () +sendSlackAlert alert pid pTitle channelM = do appCtx <- ask @Config.AuthContext - slackDataM <- getProjectSlackData pid - whenJust slackDataM \slackData -> do + channelIdM <- case channelM of + Just c -> pure $ Just c + Nothing -> do + slackDataM <- getProjectSlackData pid + pure $ slackDataM >>= (\x -> Just x.channelId) + whenJust channelIdM \cid -> do let projectUrl = appCtx.env.hostUrl <> "p/" <> pid.toText case alert of - RuntimeErrorAlert a -> sendAlert slackData.webhookUrl $ slackErrorAlert a pTitle slackData.channelId projectUrl - EndpointAlert{..} -> sendAlert slackData.webhookUrl $ slackNewEndpointsAlert project endpoints slackData.channelId endpointHash projectUrl + RuntimeErrorAlert a -> sendAlert cid $ slackErrorAlert a pTitle cid projectUrl + EndpointAlert{..} -> sendAlert cid $ slackNewEndpointsAlert project endpoints cid endpointHash projectUrl ShapeAlert -> pass - ReportAlert{..} -> sendAlert slackData.webhookUrl $ slackReportAlert reportType startTime endTime totalErrors totalEvents breakDown pTitle slackData.channelId reportUrl allChartUrl errorChartUrl + ReportAlert{..} -> sendAlert cid $ slackReportAlert reportType startTime endTime totalErrors totalEvents breakDown pTitle cid reportUrl allChartUrl errorChartUrl + MonitorsAlert{..} -> + sendAlert cid + $ AE.object ["blocks" AE..= AE.Array (V.fromList [AE.object ["type" AE..= "section", "text" AE..= AE.object ["type" AE..= "mrkdwn", "text" AE..= ("🤖 Alert triggered for " <> monitorTitle)]]])] where sendAlert :: Notify.Notify :> es => Text -> AE.Value -> Eff es () - sendAlert webhookUrl content = - Notify.sendNotification $ Notify.slackNotification webhookUrl content + sendAlert channelId content = + Notify.sendNotification $ Notify.slackNotification channelId content sendWhatsAppAlert :: (Notify.Notify :> es, Reader Config.AuthContext :> es) => NotificationAlerts -> Projects.ProjectId -> Text -> V.Vector Text -> Eff es () @@ -130,6 +151,7 @@ sendWhatsAppAlert alert pid pTitle tos = do sendAlert templateErr (AE.Object $ contentVars <> KEM.fromList ["3" AE..= ("*" <> show totalErrors <> "*"), "6" AE..= eUrl]) pass ShapeAlert -> pass + MonitorsAlert a b -> pass where sendAlert :: Notify.Notify :> es => Text -> AE.Value -> Eff es () sendAlert template vars = diff --git a/src/Pkg/TestUtils.hs b/src/Pkg/TestUtils.hs index c292ecfde..baeff07b7 100644 --- a/src/Pkg/TestUtils.hs +++ b/src/Pkg/TestUtils.hs @@ -352,7 +352,7 @@ testSessionHeader :: MonadIO m => Pool Connection -> m (Servant.Headers '[Servan testSessionHeader pool = do pSessId <- Auth.authorizeUserAndPersist Nothing "firstName" "lastName" "https://placehold.it/500x500" "test@monoscope.tech" - & runStaticUUID (map (UUID.fromWords 0 0 0) [1 .. 10]) + & runStaticUUID (map (UUID.fromWords 0 0 0) [1 .. 100]) & runHTTPGolden "./tests/golden/" & DB.runDB pool & runTime @@ -438,9 +438,9 @@ runTestBackgroundWithLogger logger appCtx process = do Data.Effectful.Notify.EmailNotification emailData -> ("Email" :: Text, Data.Effectful.Notify.receiver emailData, fmap fst (Data.Effectful.Notify.templateOptions emailData)) Data.Effectful.Notify.SlackNotification slackData -> - ("Slack" :: Text, Data.Effectful.Notify.webhookUrl slackData, Nothing :: Maybe Text) + ("Slack" :: Text, slackData.channelId, Nothing :: Maybe Text) Data.Effectful.Notify.DiscordNotification discordData -> - ("Discord" :: Text, Data.Effectful.Notify.channelId discordData, Nothing :: Maybe Text) + ("Discord" :: Text, discordData.channelId, Nothing :: Maybe Text) Data.Effectful.Notify.WhatsAppNotification whatsappData -> ("WhatsApp" :: Text, Data.Effectful.Notify.to whatsappData, Just (Data.Effectful.Notify.template whatsappData)) Log.logInfo "Notification" notifInfo diff --git a/src/System/Types.hs b/src/System/Types.hs index bace609ff..c9e607c29 100644 --- a/src/System/Types.hs +++ b/src/System/Types.hs @@ -14,6 +14,7 @@ module System.Types ( addSuccessToast, addErrorToast, addWidgetJSON, + addReswap, HXRedirectDest, XWidgetJSON, TriggerEvents, @@ -74,6 +75,7 @@ newtype WidgetJSON = WidgetJSON {unWidgetJSON :: Text} type XWidgetJSON = Maybe WidgetJSON +type HXReswap = Maybe Text type CommonWebEffects = @@ -206,6 +208,7 @@ type RespHeaders = '[ HXTriggerAfterSettle , HXRedirect , Header "X-Widget-JSON" Text + , Header "HX-Reswap" Text ] @@ -214,9 +217,11 @@ addRespHeaders resp = do triggerEvents <- State.get @TriggerEvents redirectDest <- State.get @HXRedirectDest widgetJSON <- State.get @XWidgetJSON + reswap <- State.get @HXReswap pure $ addHeader (decodeUtf8 $ AE.encode triggerEvents) $ maybe noHeader addHeader redirectDest + $ maybe noHeader addHeader reswap $ maybe noHeader (\w -> addHeader w.unWidgetJSON) widgetJSON resp @@ -241,6 +246,10 @@ addSuccessToast :: State.State TriggerEvents :> es => Text -> Maybe Text -> Eff addSuccessToast = addToast "success" +addReswap :: State.State HXReswap :> es => Text -> Eff es () +addReswap x = State.modify $ \_ -> Just x + + addErrorToast :: (IOE :> es, Log :> es, State.State TriggerEvents :> es) => Text -> Maybe Text -> Eff es () addErrorToast msg msg2 = do Logging.logAttention_ $ "ERROR: " <> msg <> " => " <> maybeToMonoid msg2 diff --git a/src/Web/Routes.hs b/src/Web/Routes.hs index ed36bd2ce..84f383419 100644 --- a/src/Web/Routes.hs +++ b/src/Web/Routes.hs @@ -108,6 +108,7 @@ type QP a b = QueryParam a b type QPB a = QueryParam a Bool type QPI a = QueryParam a Int type QEID a = QueryParam a Endpoints.EndpointId +type QPUUId a = QueryParam a UUID.UUID -- Custom type for handling all query parameters @@ -180,15 +181,16 @@ data CookieProtectedRoutes mode = CookieProtectedRoutes dashboardRedirectGet :: mode :- "p" :> ProjectId :> AllQueryParams :> GetRedirect '[HTML] (Headers '[Header "Location" Text] NoContent) , endpointDetailsRedirect :: mode :- "p" :> ProjectId :> "endpoints" :> "details" :> AllQueryParams :> GetRedirect '[HTML] (Headers '[Header "Location" Text] NoContent) , dashboardsGet :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> QPT "file" :> QPT "from" :> QPT "to" :> QPT "since" :> AllQueryParams :> Get '[HTML] (RespHeaders (PageCtx Dashboards.DashboardGet)) - , dashboardsGetList :: mode :- "p" :> ProjectId :> "dashboards" :> QPT "embedded" :> Get '[HTML] (RespHeaders (PageCtx Dashboards.DashboardsGet)) - , dashboardsPost :: mode :- "p" :> ProjectId :> "dashboards" :> ReqBody '[FormUrlEncoded] Dashboards.DashboardForm :> Post '[HTML] (RespHeaders NoContent) + , dashboardsGetList :: mode :- "p" :> ProjectId :> "dashboards" :> QPT "embedded" :> QPUUId "teamId" :> Get '[HTML] (RespHeaders Dashboards.DashboardsGet) + , dashboardsPost :: mode :- "p" :> ProjectId :> "dashboards" :> ReqBody '[FormUrlEncoded] Dashboards.DashboardForm :> Post '[HTML] (RespHeaders Dashboards.DashboardRes) , dashboardWidgetPut :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> QPT "widget_id" :> ReqBody '[JSON] Widget.Widget :> Put '[HTML] (RespHeaders Widget.Widget) , dashboardWidgetReorderPatchH :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> "widgets_order" :> ReqBody '[JSON] (Map Text Dashboards.WidgetReorderItem) :> Patch '[HTML] (RespHeaders NoContent) - , dashboardDelete :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> Delete '[HTML] (RespHeaders NoContent) - , dashboardRenamePatch :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> "rename" :> ReqBody '[FormUrlEncoded] Dashboards.DashboardRenameForm :> Patch '[HTML] (RespHeaders (Html ())) - , dashboardDuplicatePost :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> "duplicate" :> Post '[HTML] (RespHeaders NoContent) + , dashboardDelete :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> Delete '[HTML] (RespHeaders Dashboards.DashboardRes) + , dashboardRenamePatch :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> "rename" :> ReqBody '[FormUrlEncoded] Dashboards.DashboardRenameForm :> Patch '[HTML] (RespHeaders Dashboards.DashboardRes) + , dashboardDuplicatePost :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> "duplicate" :> Post '[HTML] (RespHeaders Dashboards.DashboardRes) , dashboardDuplicateWidget :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> "widgets" :> Capture "widget_id" Text :> "duplicate" :> Post '[HTML] (RespHeaders Widget.Widget) , dashboardWidgetExpandGet :: mode :- "p" :> ProjectId :> "dashboards" :> Capture "dashboard_id" Dashboards.DashboardId :> "widgets" :> Capture "widget_id" Text :> "expand" :> Get '[HTML] (RespHeaders (Html ())) + , dashboardBulkActionPost :: mode :- "p" :> ProjectId :> "dashboards" :> "bulk_action" :> Capture "action" Text :> ReqBody '[FormUrlEncoded] Dashboards.DashboardBulkActionForm :> Post '[HTML] (RespHeaders NoContent) , -- API routes apiGet :: mode :- "p" :> ProjectId :> "apis" :> Get '[HTML] (RespHeaders Api.ApiGet) , apiDelete :: mode :- "p" :> ProjectId :> "apis" :> Capture "keyID" ProjectApiKeys.ProjectApiKeyId :> Delete '[HTML] (RespHeaders Api.ApiMut) @@ -283,6 +285,7 @@ data MonitorsRoutes' mode = MonitorsRoutes' , alertSingleGet :: mode :- "alerts" :> Capture "alert_id" Monitors.QueryMonitorId :> Get '[HTML] (RespHeaders Alerts.Alert) , alertSingleToggleActive :: mode :- "alerts" :> Capture "alert_id" Monitors.QueryMonitorId :> "toggle_active" :> Post '[HTML] (RespHeaders Alerts.Alert) , alertOverviewGet :: mode :- "alerts" :> Capture "alert_id" Monitors.QueryMonitorId :> "overview" :> Get '[HTML] (RespHeaders Alerts.Alert) + , teamAlertsGetH :: mode :- "alerts" :> "team" :> Capture "team_id" UUID.UUID :> Get '[HTML] (RespHeaders (Table.TableRows Testing.UnifiedMonitorItem)) } deriving stock (Generic) @@ -306,6 +309,10 @@ data ProjectsRoutes' mode = ProjectsRoutes' , -- Member management membersManageGet :: mode :- "p" :> Capture "projectId" Projects.ProjectId :> "manage_members" :> Get '[HTML] (RespHeaders ManageMembers.ManageMembers) , membersManagePost :: mode :- "p" :> Capture "projectId" Projects.ProjectId :> "manage_members" :> QPT "onboarding" :> ReqBody '[FormUrlEncoded] ManageMembers.ManageMembersForm :> Post '[HTML] (RespHeaders ManageMembers.ManageMembers) + , teamsManageGet :: mode :- "p" :> Capture "projectId" Projects.ProjectId :> "manage_teams" :> QPT "what" :> Get '[HTML] (RespHeaders ManageMembers.ManageTeams) + , teamsManagePost :: mode :- "p" :> Capture "projectId" Projects.ProjectId :> "manage_teams" :> ReqBody '[JSON] ManageMembers.TeamForm :> QPT "teamView" :> Post '[HTML] (RespHeaders ManageMembers.ManageTeams) + , teamGet :: mode :- "p" :> Capture "projectId" Projects.ProjectId :> "manage_teams" :> Capture "teamHandle" Text :> QPT "layout" :> Get '[HTML] (RespHeaders ManageMembers.ManageTeams) + , teamBulkAction :: mode :- "p" :> Capture "projectId" Projects.ProjectId :> "manage_teams" :> "bulk_action" :> Capture "action" Text :> ReqBody '[FormUrlEncoded] ManageMembers.TBulkActionForm :> QPT "teamView" :> Post '[HTML] (RespHeaders ManageMembers.ManageTeams) , manageSubscriptionGet :: mode :- "p" :> Capture "projectId" Projects.ProjectId :> "manage_subscription" :> Get '[HTML] (RespHeaders (Html ())) , -- Notifications notificationsUpdateChannelPost :: mode :- "p" :> Capture "projectId" Projects.ProjectId :> "notifications-channels" :> ReqBody '[FormUrlEncoded] Integrations.NotifListForm :> Post '[HTML] (RespHeaders Integrations.NotificationsUpdatePost) @@ -385,6 +392,7 @@ cookieProtectedServer = , dashboardDuplicatePost = Dashboards.dashboardDuplicatePostH , dashboardDuplicateWidget = Dashboards.dashboardDuplicateWidgetPostH , dashboardWidgetExpandGet = Dashboards.dashboardWidgetExpandGetH + , dashboardBulkActionPost = Dashboards.dashboardBulkActionPostH , -- API handlers apiGet = Api.apiGetH , apiDelete = Api.apiDeleteH @@ -463,6 +471,7 @@ monitorsServer pid = , alertSingleGet = Alerts.alertSingleGetH pid , alertSingleToggleActive = Alerts.alertSingleToggleActiveH pid , alertOverviewGet = Alerts.alertOverviewGetH pid + , teamAlertsGetH = Testing.teamAlertsGetH pid } @@ -481,6 +490,10 @@ projectsServer = , deleteProjectGet = CreateProject.deleteProjectGetH , membersManageGet = ManageMembers.manageMembersGetH , membersManagePost = ManageMembers.manageMembersPostH + , teamsManageGet = ManageMembers.manageTeamsGetH + , teamsManagePost = ManageMembers.manageTeamPostH + , teamGet = ManageMembers.teamGetH + , teamBulkAction = ManageMembers.manageTeamBulkActionH , manageSubscriptionGet = ManageMembers.manageSubGetH , onboading = Onboarding.onboardingGetH , onboardingInfoPost = Onboarding.onboardingInfoPostH diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index 3c6a0e677..000000000 --- a/stack.yaml +++ /dev/null @@ -1,113 +0,0 @@ -# resolver: nightly-2024-12-16 -# resolver: lts-23.0 -# resolver: nightly-2024-08-23 -resolver: nightly-2025-05-19 -packages: - - . - -ghc-options: - 'grpc-haskell-core': -Wno-x-partial - -extra-deps: - - pg-entity-0.0.6.0 - - Unique-0.4.7.9@sha256:7c37e22b7bb9df935c22112e67043177461aedcebe3a958854f6c0e9ecb54083,2155 - - dotenv-0.12.0.0@sha256:2f25615cec37ff9a66a48ef0ebf2ac96ae989911d0c26c6796fc2f5247bdd665,4702 - - hiedb-plugin-0.1.0@sha256:480d8836e7d21b91a6205010af534cb739a2079d4bdeac7893cf85c9a4d75f32,1439 - - insert-ordered-containers-0.2.6@sha256:8f46527a04f92e1a1b11fb45633f85d2dd73c2ab7b5de13ccf504c8f98a079f1,2358 - - log-effectful-1.0.1.0@sha256:79d1c821db1c1d95cf109f813f13a2588e45dbacb5f797eefc200ff7a5984923,2466 - - monad-time-effectful-1.0.0.0@sha256:4994617545bb4b25ba01eaf2bdb1c2c74f7cefab36945af8eb92dca9842fc4b6,1528 - - nyan-interpolation-0.9.2@sha256:fb0b07ef6a9f8ca4d2e1db2f2df841c649556d9f6cff894ebf6b9ffbb7c25003,4276 - # Dependencies are now directly taken from git repo below - - servant-htmx-0.1.0.2@sha256:cdafd3165d28694ec4bf81fff3b87b4721415293d75a394a97c26d0d4d57e38c,1817 - - slugify-0.1.0.2@sha256:b16f953401390212faf0450f6044f9c9a44ee07370995ab01dc46d3394e14c7a,1396 - - strict-containers-0.2.1@sha256:ea58d1f30c9867a4c4241864881e0d2576ad72fb6333c49d88c5e42c8f7a04b1,9408 - - swagger2-2.8.9@sha256:8434f71bf8017c1421d85ee8021e3f56f45f15c8ba50fff55f7329ace4cb0076,4518 - - timing-convenience-0.1@sha256:7ff807a9a9e5596f2b18d45c5a01aefb91d4a98f6a1008d183b5c550f68f7cb7,2092 - - hiedb-0.6.0.1@sha256:7398fe3115c239f421286dbb1db3b5ac359568955e7585bcf27a45c99420b46f,2962 - - hie-compat-0.3.1.2@sha256:74a8585a90e3c06667134939cd170cff24067d5a988e14829785af0dfa6bd10f,1535 - - nyan-interpolation-core-0.9.2@sha256:930202fafc4e9472f9aed3d216a459e23454db500bfd0e0a5af2a4e5c5202096,4523 - - wai-log-0.4.0.1@sha256:0b4b57ae218cf5ec59523c8cf405802a588d4e299436b5a663a6001ea34bb7e6,1583 - - thread-utils-context-0.3.0.4@sha256:e763da1c6cab3b6d378fb670ca74aa9bf03c9b61b6fcf7628c56363fb0e3e71e,1671 - - thread-utils-finalizers-0.1.1.0@sha256:24944b71d9f1d01695a5908b4a3b44838fab870883114a323336d537995e0a5b,1381 - - hs-opentelemetry-instrumentation-auto-0.1.0.2 - - lucid-aria-0.1.0.1@sha256:d4f37b67a28f2e38eb3cf9fca4cbed5dcc6bf335c880113c618ca50fa933cd40,920 - - lucid-htmx-0.1.0.7@sha256:05d0bec34cd3c3d99d69a02c5c5f87385a9e53de8fa2e57a0c7c477dd3e5a6af,1491 - - lucid-hyperscript-0.1.0.2@sha256:c3b048424e75c0e9cbadc30f7ebeb6abc164c2b45b2c995fd0674d4cc57be216,2035 - - lucid-svg-0.7.2.0@sha256:ac145997d5d6976d5c77e09992b5b204d7ddb7edba3002801927ed2acc69692b,1091 - - aeson-extra-0.5.1.3@sha256:7719f2da8930ded5cbeaa4cb35aba04ee3b68d5d882557962990555e2bfe3433,2682 - # Dependencies are now directly taken from git repo below - # - streamly-0.10.1@sha256:eec2e8e14ac64b9e389600b964541c5e9e0a3d3e657dc54412691df47300a1fd,20899 - # - streamly-core-0.2.2@sha256:7245ac46f380af62ce16adb70d26d2710d615f393867cfa8789c29b32d2ff979,20274 - - ki-effectful-0.1.1.0@sha256:15a4bc01c4195d9e3ed3d0ae25e419b0c035c897494dadefc2d676a43f1f5082,1815 - - http2-tls-0.4.5@sha256:2084af1e64a4f4c2523cd0aa264fe1bebca8333e4dde0e25cf4820f27c012c97,2398 - - snappy-c-0.1.1@sha256:b113aa1c7c095325cc218e8fcc4ad05e719f5ed0d2febb910d42e21387759ac9,3993 - - microlens-pro-0.2.0.4@sha256:af8fc5760d913704c5283e649dd90feaf6bddd739f9b75bf52495b7964830bea,3377 - - git: https://github.com/iand675/hs-opentelemetry - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - subdirs: - - api - - sdk - - otlp - - exporters/otlp - - propagators/w3c - - instrumentation/postgresql-simple - - instrumentation/wai - - utils/exceptions - - propagators/datadog - - propagators/b3 - - git: https://github.com/MercuryTechnologies/openai - commit: 3a5c00527bcda652a188ee7c54127eea90ce1bb7 - subdir: . - - - git: https://github.com/google/proto-lens - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - subdirs: - - proto-lens-setup - - proto-lens-protoc - - proto-lens-runtime - - proto-lens - - proto-lens-protobuf-types - # - . - - git: https://github.com/Kleidukos/pg-transact-effectful - commit: bcd3aeb5ca63a02ba026be4f02f4ce5767fb4f78 - subdirs: - - . - - git: https://github.com/tonyalaribe/odd-jobs.git - commit: 7a0eee112cb582746f14cfe6a527a86ef1c4c5e0 - subdirs: - - . - - git: https://github.com/well-typed/grapesy.git - commit: 4d374aca55bb5392e3b91ae47d6ca5625ffc59b6 - subdirs: - - grapesy - - grpc-spec - # - git: https://github.com/brendanhay/gogol.git - # commit: 881cd14c9844131b4a8d96ca1bbb2bd9a2409ed9 - - git: https://github.com/tonyalaribe/gogol.git - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - subdirs: - - lib/gogol-core - - lib/gogol - - lib/services/gogol-pubsub - - lib/services/gogol-logging - - lib/services/gogol-cloudtrace - - - git: https://github.com/tonyalaribe/xxhash - commit: 0fa01adb871e66996d4ed2c27a3e97fac39ac466 - subdirs: - - . - - git: https://github.com/tonyalaribe/tmp-postgres - # branch: support-homebrew-initdb - commit: 893368e6010a87c3a2d33227af675b4fb8fe411f - subdirs: - - . - - git: https://github.com/tusharad/langchain-hs - commit: b0d490111477b8e5766b64da933fd0548fc5e0f5 - subdirs: - - . - - git: https://github.com/minio/minio-hs - commit: 3e665784228cba7261560c104b8f1d928e7b5bd4 - subdirs: - - . - -allow-newer: true diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 100644 index 1ca980432..000000000 --- a/stack.yaml.lock +++ /dev/null @@ -1,592 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/topics/lock_files - -packages: -- completed: - hackage: pg-entity-0.0.6.0@sha256:b1459028b1571a14a32a5149c7957463dd05034c34bfee2c1723006d58bae85f,4112 - pantry-tree: - sha256: 8135da3e21eb6fbad6fd2257b4865f0fe667fd2dce19123d66d25ced72d1d011 - size: 3984 - original: - hackage: pg-entity-0.0.6.0 -- completed: - hackage: Unique-0.4.7.9@sha256:7c37e22b7bb9df935c22112e67043177461aedcebe3a958854f6c0e9ecb54083,2155 - pantry-tree: - sha256: 67d44a292c49ab6cf09225c05186f1ab64b359e965017d9d389411e4c79f0803 - size: 1366 - original: - hackage: Unique-0.4.7.9@sha256:7c37e22b7bb9df935c22112e67043177461aedcebe3a958854f6c0e9ecb54083,2155 -- completed: - hackage: dotenv-0.12.0.0@sha256:2f25615cec37ff9a66a48ef0ebf2ac96ae989911d0c26c6796fc2f5247bdd665,4702 - pantry-tree: - sha256: 31c08eb6dbd41eda9f0141dcb4cf8071e7650c6d97e4163d04f760e5a6fb4f79 - size: 1303 - original: - hackage: dotenv-0.12.0.0@sha256:2f25615cec37ff9a66a48ef0ebf2ac96ae989911d0c26c6796fc2f5247bdd665,4702 -- completed: - hackage: hiedb-plugin-0.1.0@sha256:480d8836e7d21b91a6205010af534cb739a2079d4bdeac7893cf85c9a4d75f32,1439 - pantry-tree: - sha256: f28fb4d0b21053e6038f7b215d3d0278f867cf943b773d891bf3c0c74a8f0b48 - size: 269 - original: - hackage: hiedb-plugin-0.1.0@sha256:480d8836e7d21b91a6205010af534cb739a2079d4bdeac7893cf85c9a4d75f32,1439 -- completed: - hackage: insert-ordered-containers-0.2.6@sha256:8f46527a04f92e1a1b11fb45633f85d2dd73c2ab7b5de13ccf504c8f98a079f1,2358 - pantry-tree: - sha256: d0124c42db056e67a9bb7b198570c39d1d1bd574ebc93be1fbf214504b12ba97 - size: 542 - original: - hackage: insert-ordered-containers-0.2.6@sha256:8f46527a04f92e1a1b11fb45633f85d2dd73c2ab7b5de13ccf504c8f98a079f1,2358 -- completed: - hackage: log-effectful-1.0.1.0@sha256:79d1c821db1c1d95cf109f813f13a2588e45dbacb5f797eefc200ff7a5984923,2466 - pantry-tree: - sha256: 5ab7c6b553ea50ce7b6218e86db9ff3632b0482dd00aaf749ebece93b968e0ca - size: 326 - original: - hackage: log-effectful-1.0.1.0@sha256:79d1c821db1c1d95cf109f813f13a2588e45dbacb5f797eefc200ff7a5984923,2466 -- completed: - hackage: monad-time-effectful-1.0.0.0@sha256:4994617545bb4b25ba01eaf2bdb1c2c74f7cefab36945af8eb92dca9842fc4b6,1528 - pantry-tree: - sha256: ca2ac18b97169e7734e190d2a0175ae1f6de7a2d2f355514250ab2625de36942 - size: 279 - original: - hackage: monad-time-effectful-1.0.0.0@sha256:4994617545bb4b25ba01eaf2bdb1c2c74f7cefab36945af8eb92dca9842fc4b6,1528 -- completed: - hackage: nyan-interpolation-0.9.2@sha256:fb0b07ef6a9f8ca4d2e1db2f2df841c649556d9f6cff894ebf6b9ffbb7c25003,4276 - pantry-tree: - sha256: 258878b8660782bef633fe3800c08fff2fa90165fd2a0793fa73836d8ff274c3 - size: 662 - original: - hackage: nyan-interpolation-0.9.2@sha256:fb0b07ef6a9f8ca4d2e1db2f2df841c649556d9f6cff894ebf6b9ffbb7c25003,4276 -- completed: - hackage: servant-htmx-0.1.0.2@sha256:cdafd3165d28694ec4bf81fff3b87b4721415293d75a394a97c26d0d4d57e38c,1817 - pantry-tree: - sha256: e2eac22dcc977e6081ba7614d748d7a6a83b2001d4e719d6afb9ae6edf6bb23d - size: 416 - original: - hackage: servant-htmx-0.1.0.2@sha256:cdafd3165d28694ec4bf81fff3b87b4721415293d75a394a97c26d0d4d57e38c,1817 -- completed: - hackage: slugify-0.1.0.2@sha256:b16f953401390212faf0450f6044f9c9a44ee07370995ab01dc46d3394e14c7a,1396 - pantry-tree: - sha256: a8069e3ad41fa69077b342c7f5e1500852176bda095482347f89a83ef188a5bd - size: 431 - original: - hackage: slugify-0.1.0.2@sha256:b16f953401390212faf0450f6044f9c9a44ee07370995ab01dc46d3394e14c7a,1396 -- completed: - hackage: strict-containers-0.2.1@sha256:ea58d1f30c9867a4c4241864881e0d2576ad72fb6333c49d88c5e42c8f7a04b1,9408 - pantry-tree: - sha256: 064e6ea419199891089ba3569ec0755156327dda715be61bfa2daea63bb8ed37 - size: 5178 - original: - hackage: strict-containers-0.2.1@sha256:ea58d1f30c9867a4c4241864881e0d2576ad72fb6333c49d88c5e42c8f7a04b1,9408 -- completed: - hackage: swagger2-2.8.9@sha256:8434f71bf8017c1421d85ee8021e3f56f45f15c8ba50fff55f7329ace4cb0076,4518 - pantry-tree: - sha256: 730792e758e42b95ee322bcb0d67c53eaba89fdc7f68184157ef5cb755e1aa1f - size: 2192 - original: - hackage: swagger2-2.8.9@sha256:8434f71bf8017c1421d85ee8021e3f56f45f15c8ba50fff55f7329ace4cb0076,4518 -- completed: - hackage: timing-convenience-0.1@sha256:7ff807a9a9e5596f2b18d45c5a01aefb91d4a98f6a1008d183b5c550f68f7cb7,2092 - pantry-tree: - sha256: fbcb00f5b8a4f7b8fd94b034b7f507ffdd7579848de782ce60ad2b661dcb2b42 - size: 469 - original: - hackage: timing-convenience-0.1@sha256:7ff807a9a9e5596f2b18d45c5a01aefb91d4a98f6a1008d183b5c550f68f7cb7,2092 -- completed: - hackage: hiedb-0.6.0.1@sha256:7398fe3115c239f421286dbb1db3b5ac359568955e7585bcf27a45c99420b46f,2962 - pantry-tree: - sha256: 2009246ce99ad0b351454ef4aac746ed80846ae648fa98e7205192e8bde7ba79 - size: 1020 - original: - hackage: hiedb-0.6.0.1@sha256:7398fe3115c239f421286dbb1db3b5ac359568955e7585bcf27a45c99420b46f,2962 -- completed: - hackage: hie-compat-0.3.1.2@sha256:74a8585a90e3c06667134939cd170cff24067d5a988e14829785af0dfa6bd10f,1535 - pantry-tree: - sha256: ae260dbc3c104bca9443d91350c781e1a4d5f93579247c50dfe6944240e5bf4f - size: 1019 - original: - hackage: hie-compat-0.3.1.2@sha256:74a8585a90e3c06667134939cd170cff24067d5a988e14829785af0dfa6bd10f,1535 -- completed: - hackage: nyan-interpolation-core-0.9.2@sha256:930202fafc4e9472f9aed3d216a459e23454db500bfd0e0a5af2a4e5c5202096,4523 - pantry-tree: - sha256: 5781e80383996a6bea95a545e4f0e70466bebf0fe2d388f334cd42e9f35469d5 - size: 1464 - original: - hackage: nyan-interpolation-core-0.9.2@sha256:930202fafc4e9472f9aed3d216a459e23454db500bfd0e0a5af2a4e5c5202096,4523 -- completed: - hackage: wai-log-0.4.0.1@sha256:0b4b57ae218cf5ec59523c8cf405802a588d4e299436b5a663a6001ea34bb7e6,1583 - pantry-tree: - sha256: 5c7291eaeb35ed9fb2c77a29ed2bc8b3e63c44247522e91ba426418cac66459d - size: 412 - original: - hackage: wai-log-0.4.0.1@sha256:0b4b57ae218cf5ec59523c8cf405802a588d4e299436b5a663a6001ea34bb7e6,1583 -- completed: - hackage: thread-utils-context-0.3.0.4@sha256:e763da1c6cab3b6d378fb670ca74aa9bf03c9b61b6fcf7628c56363fb0e3e71e,1671 - pantry-tree: - sha256: 57d909a991b5e0b4c7a28121cb52ee9c2db6c09e0419b89af6c82fae52be88d4 - size: 397 - original: - hackage: thread-utils-context-0.3.0.4@sha256:e763da1c6cab3b6d378fb670ca74aa9bf03c9b61b6fcf7628c56363fb0e3e71e,1671 -- completed: - hackage: thread-utils-finalizers-0.1.1.0@sha256:24944b71d9f1d01695a5908b4a3b44838fab870883114a323336d537995e0a5b,1381 - pantry-tree: - sha256: 8c2c2e2e22c20bf3696ee6f30b50b3a9eeae187a22beb536441eefb0a3f9c549 - size: 400 - original: - hackage: thread-utils-finalizers-0.1.1.0@sha256:24944b71d9f1d01695a5908b4a3b44838fab870883114a323336d537995e0a5b,1381 -- completed: - hackage: hs-opentelemetry-instrumentation-auto-0.1.0.2@sha256:98911aa698825c6cbb966a52dff8a76e818cb39111b00ab62e8684fdacf5d0c0,2265 - pantry-tree: - sha256: ea8566a8bd04d089abe2f31c4816fd5c670603d032e117afcd12417710cc3350 - size: 803 - original: - hackage: hs-opentelemetry-instrumentation-auto-0.1.0.2 -- completed: - hackage: lucid-aria-0.1.0.1@sha256:d4f37b67a28f2e38eb3cf9fca4cbed5dcc6bf335c880113c618ca50fa933cd40,920 - pantry-tree: - sha256: 86dc56b3e719f1cd436a3efad829cfd0fa75a29c8bdbbb9e866ec8d2ea96cac7 - size: 318 - original: - hackage: lucid-aria-0.1.0.1@sha256:d4f37b67a28f2e38eb3cf9fca4cbed5dcc6bf335c880113c618ca50fa933cd40,920 -- completed: - hackage: lucid-htmx-0.1.0.7@sha256:05d0bec34cd3c3d99d69a02c5c5f87385a9e53de8fa2e57a0c7c477dd3e5a6af,1491 - pantry-tree: - sha256: 02dcd0ec63f113e1c17e82108daa7282b4e27374a1be380fc132f9aa5fa2d813 - size: 428 - original: - hackage: lucid-htmx-0.1.0.7@sha256:05d0bec34cd3c3d99d69a02c5c5f87385a9e53de8fa2e57a0c7c477dd3e5a6af,1491 -- completed: - hackage: lucid-hyperscript-0.1.0.2@sha256:c3b048424e75c0e9cbadc30f7ebeb6abc164c2b45b2c995fd0674d4cc57be216,2035 - pantry-tree: - sha256: 4fad3e11a8a599a8bc05a9b70d22d29dbdc07740ab8ebd5e4236af37f20ee554 - size: 502 - original: - hackage: lucid-hyperscript-0.1.0.2@sha256:c3b048424e75c0e9cbadc30f7ebeb6abc164c2b45b2c995fd0674d4cc57be216,2035 -- completed: - hackage: lucid-svg-0.7.2.0@sha256:ac145997d5d6976d5c77e09992b5b204d7ddb7edba3002801927ed2acc69692b,1091 - pantry-tree: - sha256: d17d9c53627b0b05d62f6fc9b74a7c5a600126318df2b89aca205794be084de3 - size: 456 - original: - hackage: lucid-svg-0.7.2.0@sha256:ac145997d5d6976d5c77e09992b5b204d7ddb7edba3002801927ed2acc69692b,1091 -- completed: - hackage: aeson-extra-0.5.1.3@sha256:7719f2da8930ded5cbeaa4cb35aba04ee3b68d5d882557962990555e2bfe3433,2682 - pantry-tree: - sha256: 54f6f103f300810ed7293d0f916a1951eef2516d9954698aa4314f9eb2a957fd - size: 1007 - original: - hackage: aeson-extra-0.5.1.3@sha256:7719f2da8930ded5cbeaa4cb35aba04ee3b68d5d882557962990555e2bfe3433,2682 -- completed: - hackage: ki-effectful-0.1.1.0@sha256:15a4bc01c4195d9e3ed3d0ae25e419b0c035c897494dadefc2d676a43f1f5082,1815 - pantry-tree: - sha256: a0897588dabdae952547ee5e7758a0b58602a1f765a395fe628a6aebe94bdbf4 - size: 328 - original: - hackage: ki-effectful-0.1.1.0@sha256:15a4bc01c4195d9e3ed3d0ae25e419b0c035c897494dadefc2d676a43f1f5082,1815 -- completed: - hackage: http2-tls-0.4.5@sha256:2084af1e64a4f4c2523cd0aa264fe1bebca8333e4dde0e25cf4820f27c012c97,2398 - pantry-tree: - sha256: d7691292b9cba368b50ee0bb5da86feb002dc93ccb61cf5de8e3e7d7de91f170 - size: 894 - original: - hackage: http2-tls-0.4.5@sha256:2084af1e64a4f4c2523cd0aa264fe1bebca8333e4dde0e25cf4820f27c012c97,2398 -- completed: - hackage: snappy-c-0.1.1@sha256:b113aa1c7c095325cc218e8fcc4ad05e719f5ed0d2febb910d42e21387759ac9,3993 - pantry-tree: - sha256: 04170f8ee10717615b1f077e2bd96f8ac71dd6072fc73ffac5f12ed4d9a22bd9 - size: 1109 - original: - hackage: snappy-c-0.1.1@sha256:b113aa1c7c095325cc218e8fcc4ad05e719f5ed0d2febb910d42e21387759ac9,3993 -- completed: - hackage: microlens-pro-0.2.0.4@sha256:af8fc5760d913704c5283e649dd90feaf6bddd739f9b75bf52495b7964830bea,3377 - pantry-tree: - sha256: 6fc091c70de2fc1db2af16e5b64780f7dbdb570e4da02614f28bfb1ecd65db46 - size: 430 - original: - hackage: microlens-pro-0.2.0.4@sha256:af8fc5760d913704c5283e649dd90feaf6bddd739f9b75bf52495b7964830bea,3377 -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-api - pantry-tree: - sha256: 73c3fea9a055b9e628cd41ff0d3f2db8996ea5737c8f8f204bcbe959202033dc - size: 4732 - subdir: api - version: 0.2.0.0 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: api -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-sdk - pantry-tree: - sha256: b448c620fb76dab859f0e9c35658ee89ad613fcd4d2c23193e0d8f653c5e07bb - size: 2036 - subdir: sdk - version: 0.1.0.0 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: sdk -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-otlp - pantry-tree: - sha256: 67fe2435171ea289a2d9f14565a8ca723279ce503f54105dc0b59e2f37a797bc - size: 2857 - subdir: otlp - version: 0.1.0.0 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: otlp -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-exporter-otlp - pantry-tree: - sha256: db680557a0f51e859b40cea5adc138d98317740b35d50d33fd5f978832551ed0 - size: 664 - subdir: exporters/otlp - version: 0.1.0.0 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: exporters/otlp -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-propagator-w3c - pantry-tree: - sha256: a70d9546f518c8374b0382b605b49d49f9f12caaaa6ada3dea373f85c5399110 - size: 598 - subdir: propagators/w3c - version: 0.0.1.4 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: propagators/w3c -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-instrumentation-postgresql-simple - pantry-tree: - sha256: f94cb95a805aafceceeb6b6a7b0b2546901e640d1a91e3a80ea19583164818a0 - size: 541 - subdir: instrumentation/postgresql-simple - version: 0.2.0.0 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: instrumentation/postgresql-simple -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-instrumentation-wai - pantry-tree: - sha256: b385b9f17f79b15d88387ada739ade57a300a03cfeda5b2099dace7ab7e33a45 - size: 513 - subdir: instrumentation/wai - version: 0.1.1.0 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: instrumentation/wai -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-utils-exceptions - pantry-tree: - sha256: 3270bfb7a102a7ad6b0e455acb11313fdd83f24ba8d648bfbb4b9a974ce281ae - size: 458 - subdir: utils/exceptions - version: 0.2.0.1 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: utils/exceptions -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-propagator-datadog - pantry-tree: - sha256: 88e09ab9b9787f9da859fa3766a9724916b3177155842398b55fe98e93ef6670 - size: 781 - subdir: propagators/datadog - version: 0.0.1.0 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: propagators/datadog -- completed: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - name: hs-opentelemetry-propagator-b3 - pantry-tree: - sha256: 6e550839bc741f497d4e47b8432c3604a42c6e397ecc79e96e6c219cc9df3586 - size: 584 - subdir: propagators/b3 - version: 0.0.1.2 - original: - commit: ee8a6dad7db306eb67748ddcd77df4974ad8259e - git: https://github.com/iand675/hs-opentelemetry - subdir: propagators/b3 -- completed: - commit: 3a5c00527bcda652a188ee7c54127eea90ce1bb7 - git: https://github.com/MercuryTechnologies/openai - name: openai - pantry-tree: - sha256: 55d906d420a3e08346700ff456172921a2ab90e9a17abe6529117f815d7890d4 - size: 5200 - subdir: . - version: 2.2.1 - original: - commit: 3a5c00527bcda652a188ee7c54127eea90ce1bb7 - git: https://github.com/MercuryTechnologies/openai - subdir: . -- completed: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - name: proto-lens-setup - pantry-tree: - sha256: 739d6d07032630350de09c604a632b7e705dd6bc4cc320aeb51164c3a0ee2253 - size: 288 - subdir: proto-lens-setup - version: 0.4.0.9 - original: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - subdir: proto-lens-setup -- completed: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - name: proto-lens-protoc - pantry-tree: - sha256: 8a39323d03fd8317cd01764438680dc0b0f726bd72fccd97441b62fd06b0b61b - size: 1449 - subdir: proto-lens-protoc - version: 0.9.0.0 - original: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - subdir: proto-lens-protoc -- completed: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - name: proto-lens-runtime - pantry-tree: - sha256: 9f1ecf6a13ebe3dd447dcab3b17bd2fb00c223eb9497f696d0fc39929c3995f6 - size: 221 - subdir: proto-lens-runtime - version: 0.7.0.7 - original: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - subdir: proto-lens-runtime -- completed: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - name: proto-lens - pantry-tree: - sha256: 6726c34a41263cda7ab730b1af9936794d19c12a3f16027377f34b167b6559eb - size: 74962 - subdir: proto-lens - version: 0.7.1.6 - original: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - subdir: proto-lens -- completed: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - name: proto-lens-protobuf-types - pantry-tree: - sha256: 66ece4f49e6e83481f4b8ee4ced702ca92175377b1cfb9edaa18d089e62814f2 - size: 67707 - subdir: proto-lens-protobuf-types - version: 0.7.2.2 - original: - commit: 815c852b046612256fc0f5f7e8585ec4e55dd9b7 - git: https://github.com/google/proto-lens - subdir: proto-lens-protobuf-types -- completed: - commit: bcd3aeb5ca63a02ba026be4f02f4ce5767fb4f78 - git: https://github.com/Kleidukos/pg-transact-effectful - name: pg-transact-effectful - pantry-tree: - sha256: af3d153ac21625a3c5e7972055fc17b178cc78a7330a81b9bc468afaa4161fdb - size: 909 - subdir: . - version: 0.0.1.0 - original: - commit: bcd3aeb5ca63a02ba026be4f02f4ce5767fb4f78 - git: https://github.com/Kleidukos/pg-transact-effectful - subdir: . -- completed: - commit: 7a0eee112cb582746f14cfe6a527a86ef1c4c5e0 - git: https://github.com/tonyalaribe/odd-jobs.git - name: odd-jobs - pantry-tree: - sha256: 40c9ac8d3d829c840dfa1d2e0ff35e234caeae5e7b4ea0eab6f906dbec6457be - size: 3207 - subdir: . - version: 0.2.3 - original: - commit: 7a0eee112cb582746f14cfe6a527a86ef1c4c5e0 - git: https://github.com/tonyalaribe/odd-jobs.git - subdir: . -- completed: - commit: 4d374aca55bb5392e3b91ae47d6ca5625ffc59b6 - git: https://github.com/well-typed/grapesy.git - name: grapesy - pantry-tree: - sha256: 894961c5048ba0bf60ecb2c865456d3cd90c86c84ba15bce5f40581b0d3af041 - size: 12118 - subdir: grapesy - version: 1.0.1 - original: - commit: 4d374aca55bb5392e3b91ae47d6ca5625ffc59b6 - git: https://github.com/well-typed/grapesy.git - subdir: grapesy -- completed: - commit: 4d374aca55bb5392e3b91ae47d6ca5625ffc59b6 - git: https://github.com/well-typed/grapesy.git - name: grpc-spec - pantry-tree: - sha256: 66b9f22f2a73ae1cd5b7ab713122f1e3d5a7e49cf56a9c153247ab6306adaf15 - size: 4019 - subdir: grpc-spec - version: 1.0.0 - original: - commit: 4d374aca55bb5392e3b91ae47d6ca5625ffc59b6 - git: https://github.com/well-typed/grapesy.git - subdir: grpc-spec -- completed: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - name: gogol-core - pantry-tree: - sha256: 0025798c66f1150056dee10cda21062e4916236bcfa2adf5684d061f8ede2a83 - size: 567 - subdir: lib/gogol-core - version: 1.0.0.0 - original: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - subdir: lib/gogol-core -- completed: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - name: gogol - pantry-tree: - sha256: 786abce35654341f7ff3c3fcb800e9bcd1df0a0a44a0789c9557a610078051b7 - size: 1194 - subdir: lib/gogol - version: 1.0.0.0 - original: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - subdir: lib/gogol -- completed: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - name: gogol-pubsub - pantry-tree: - sha256: 72c744c90fe905238e79c39176e9a3a6a580f3839af7a056dc6207f85593a293 - size: 4631 - subdir: lib/services/gogol-pubsub - version: 1.0.0.0 - original: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - subdir: lib/services/gogol-pubsub -- completed: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - name: gogol-logging - pantry-tree: - sha256: 6d903a732edfd7b27c1cbc00c296f2ea6bdd3c5f6564c526c1b3a2fbbe5cc8c2 - size: 19371 - subdir: lib/services/gogol-logging - version: 1.0.0.0 - original: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - subdir: lib/services/gogol-logging -- completed: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - name: gogol-cloudtrace - pantry-tree: - sha256: 8536a13f9c62ba5d2fd55d4a110463766f79051923615e419d458fde89d36131 - size: 740 - subdir: lib/services/gogol-cloudtrace - version: 1.0.0.0 - original: - commit: b54294c179f8ce8e76c9549c953e2ee684fcef8a - git: https://github.com/tonyalaribe/gogol.git - subdir: lib/services/gogol-cloudtrace -- completed: - commit: 0fa01adb871e66996d4ed2c27a3e97fac39ac466 - git: https://github.com/tonyalaribe/xxhash - name: xxhash - pantry-tree: - sha256: 36e7f55c49eb37693fb7198c46e161319280bfbfa103fd7c40a8780c8ca61851 - size: 718 - subdir: . - version: 0.0.2 - original: - commit: 0fa01adb871e66996d4ed2c27a3e97fac39ac466 - git: https://github.com/tonyalaribe/xxhash - subdir: . -- completed: - commit: 893368e6010a87c3a2d33227af675b4fb8fe411f - git: https://github.com/tonyalaribe/tmp-postgres - name: tmp-postgres - pantry-tree: - sha256: 7a222e08cb994348632ea7436ff696635c1672e0ca8bbc996d073df7755f7cd6 - size: 1616 - subdir: . - version: 1.35.0.0 - original: - commit: 893368e6010a87c3a2d33227af675b4fb8fe411f - git: https://github.com/tonyalaribe/tmp-postgres - subdir: . -- completed: - commit: b0d490111477b8e5766b64da933fd0548fc5e0f5 - git: https://github.com/tusharad/langchain-hs - name: langchain-hs - pantry-tree: - sha256: fa8349e9ca596072c4560d16423e041f10b37448abc05a36c227f62183966c95 - size: 7440 - subdir: . - version: 0.0.2.0 - original: - commit: b0d490111477b8e5766b64da933fd0548fc5e0f5 - git: https://github.com/tusharad/langchain-hs - subdir: . -- completed: - commit: 3e665784228cba7261560c104b8f1d928e7b5bd4 - git: https://github.com/minio/minio-hs - name: minio-hs - pantry-tree: - sha256: b40b79fedd757eac8825f89eafc5ee13f3991898e407cb3d1c9b5a3b15bffdfc - size: 4744 - subdir: . - version: 1.7.0 - original: - commit: 3e665784228cba7261560c104b8f1d928e7b5bd4 - git: https://github.com/minio/minio-hs - subdir: . -snapshots: -- completed: - sha256: 9edc61981ea0123103c6f117744cd28d5890257b8104fea42f3d161217c5d856 - size: 714038 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/5/19.yaml - original: nightly-2025-05-19 diff --git a/static/migrations/0017_teams_table.sql b/static/migrations/0017_teams_table.sql new file mode 100644 index 000000000..4f445fc90 --- /dev/null +++ b/static/migrations/0017_teams_table.sql @@ -0,0 +1,30 @@ +BEGIN; + +CREATE TABLE IF NOT EXISTS projects.teams ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + project_id UUID NOT NULL REFERENCES projects.projects(id) ON DELETE CASCADE, + name VARCHAR(255) NOT NULL, + handle VARCHAR(255) NOT NULL, + description TEXT, + members UUID[] DEFAULT '{}', + notify_emails TEXT[] DEFAULT '{}', + slack_channels TEXT[] DEFAULT '{}', + discord_channels TEXT[] DEFAULT '{}', + phone_numbers TEXT[] DEFAULT '{}', + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + created_by UUID NOT NULL REFERENCES users.users(id) ON DELETE SET NULL, + deleted_at TIMESTAMP WITH TIME ZONE DEFAULT NULL, + UNIQUE(project_id, handle) +); +SELECT manage_updated_at('projects.teams'); + +ALTER TABLE monitors.query_monitors ADD COLUMN IF NOT EXISTS teams UUID[] DEFAULT '{}'; + +ALTER TABLE projects.dashboards ADD COLUMN IF NOT EXISTS teams UUID[] DEFAULT '{}'; + +CREATE INDEX idx_teams_project_id ON projects.teams(project_id) WHERE deleted_at IS NULL; +CREATE INDEX idx_teams_handle ON projects.teams(project_id, handle) WHERE deleted_at IS NULL; +CREATE INDEX idx_teams_members_gin ON projects.teams USING GIN(members); + +COMMIT; \ No newline at end of file diff --git a/static/public/assets/css/tailwind.css b/static/public/assets/css/tailwind.css index 0f101dd1e..83227e810 100644 --- a/static/public/assets/css/tailwind.css +++ b/static/public/assets/css/tailwind.css @@ -263,7 +263,9 @@ body, :host { .badge-outline { @apply inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 gap-1; } - + .badge-ghost { + @apply inline-flex items-center justify-center rounded-md px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 gap-1 text-textWeak; + } .tab-not-active { --tab-color: var(--fallback-bc, oklch(var(--bc) / 0.5)); --tab-bg: transparent; @@ -291,6 +293,7 @@ body, :host { .dropdown summary { list-style: none; } + .dropdown summary::-webkit-details-marker { display: none; } @@ -482,7 +485,7 @@ code, pre, .code, .monospace { } @utility badge-success { - @apply bg-fillSuccess-weak text-textSuccess font-medium; + @apply bg-fillSuccess-strong text-textSuccess font-medium; } @utility badge-error { @@ -646,6 +649,8 @@ code, pre, .code, .monospace { @apply bg-fillWeak text-textStrong border border-strokeWarning-strong; } +.tagify {} + @utility ctable { & :where(.table-pin-rows thead tr) { @apply sticky top-0 z-10 bg-bgBase; @@ -972,12 +977,11 @@ code, pre, .code, .monospace { --fallback-bc: rgba(255 255 255 / 0.6); } .btn-primary { - @apply bg-fillBrand-strong hover:bg-fillBrand-strong text-textInverse-strong; + @apply bg-fillBrand-strong hover:bg-fillBrand-strong text-white; } [data-theme="dark"] .btn-primary { - background-color: var(--color-iconBrand); - @apply hover:opacity-90 text-textInverse-weak ring-1 ring-strokeBrand-weak; + @apply hover:opacity-90 ring-strokeBrand-weak; } .input, .select, .checkbox, .textarea { @apply shadow-none; @@ -1131,7 +1135,12 @@ code, pre, .code, .monospace { } /****** Tagify *****/ -.dash-variable .tagify { + +.modal > tags { + @apply border-strokeWeak; + } + + .dash-variable .tagify { margin-top: -0.5rem; --tags-border-color: transparent; --tag-text-color: var(--color-textStrong); diff --git a/static/public/assets/css/thirdparty/tagify.min.css b/static/public/assets/css/thirdparty/tagify.min.css new file mode 100644 index 000000000..2df5d7b69 --- /dev/null +++ b/static/public/assets/css/thirdparty/tagify.min.css @@ -0,0 +1,571 @@ +@charset "UTF-8"; +:root { + --tagify-dd-color-primary: rgb(53, 149, 246); + --tagify-dd-text-color: black; + --tagify-dd-bg-color: white; + --tagify-dd-item-pad: 0.3em 0.5em; + --tagify-dd-max-height: 300px; +} +.tagify { + --tags-disabled-bg: #f1f1f1; + --tags-border-color: var(--color-strokeWeak); + --tags-hover-border-color: var(--color-strokeWeak); + --tags-focus-border-color: var(--color-strokeBrand-weak); + --tag-border-radius: var(--radius-field); + --tag-bg: var(--color-fillWeak); + --tag-hover: var(--color-fillWeaker); + --tag-text-color: var(--color-textStrong); + --tag-text-color--edit: var(--color-textStrong); + --tag-pad: 0.3em 0.5em; + --tag-inset-shadow-size: 1.2em; + --tag-invalid-color: #d39494; + --tag-invalid-bg: rgba(211, 148, 148, 0.5); + --tag--min-width: 1ch; + --tag--max-width: 100%; + --tag-hide-transition: 0.3s; + --tag-remove-bg: rgba(211, 148, 148, 0.3); + --tag-remove-btn-color: var(--color-textStrong); + --tag-remove-btn-bg: none; + --tag-remove-btn-bg--hover: #c77777; + --input-color: inherit; + --placeholder-color: var(--color-textWeak); + --placeholder-color-focus: var(--color-textWeak); + --loader-size: 0.8em; + --readonly-striped: 1; + display: inline-flex; + align-items: flex-start; + align-content: baseline; + flex-wrap: wrap; + border: 1px solid var(--tags-border-color); + padding: 0; + line-height: 0; + outline: 0; + position: relative; + box-sizing: border-box; + transition: 0.1s; +} +@keyframes tags--bump { + 30% { + transform: scale(1.2); + } +} +@keyframes rotateLoader { + to { + transform: rotate(1turn); + } +} +.tagify:has([contenteditable='true']) { + cursor: text; +} +.tagify:hover:not(.tagify--focus):not(.tagify--invalid) { + --tags-border-color: var(--tags-hover-border-color); +} +.tagify[disabled] { + background: var(--tags-disabled-bg); + filter: saturate(0); + opacity: 0.5; + pointer-events: none; +} +.tagify[disabled].tagify--empty > .tagify__input::before { + position: relative; +} +.tagify[disabled].tagify--select, +.tagify[readonly].tagify--select { + pointer-events: none; +} +.tagify[disabled]:not(.tagify--mix):not(.tagify--select):not(.tagify--empty), +.tagify[readonly]:not(.tagify--mix):not(.tagify--select):not(.tagify--empty) { + cursor: default; +} +.tagify[disabled]:not(.tagify--mix):not(.tagify--select):not(.tagify--empty) > .tagify__input, +.tagify[readonly]:not(.tagify--mix):not(.tagify--select):not(.tagify--empty) > .tagify__input { + visibility: hidden; + width: 0; + margin: 5px 0; +} +.tagify[disabled]:not(.tagify--mix):not(.tagify--select):not(.tagify--empty) .tagify__tag > div, +.tagify[readonly]:not(.tagify--mix):not(.tagify--select):not(.tagify--empty) .tagify__tag > div { + padding: var(--tag-pad); +} +.tagify[disabled]:not(.tagify--mix):not(.tagify--select):not(.tagify--empty) .tagify__tag > div::before, +.tagify[readonly]:not(.tagify--mix):not(.tagify--select):not(.tagify--empty) .tagify__tag > div::before { + animation: readonlyStyles 1s calc(-1s * (var(--readonly-striped) - 1)) paused; +} +@keyframes readonlyStyles { + 0% { + background: linear-gradient(45deg, var(--tag-bg) 25%, transparent 25%, transparent 50%, var(--tag-bg) 50%, var(--tag-bg) 75%, transparent 75%, transparent) 0/5px 5px; + box-shadow: none; + filter: brightness(0.95); + } +} +.tagify[disabled] .tagify__tag__removeBtn, +.tagify[readonly] .tagify__tag__removeBtn { + display: none; +} +.tagify--loading .tagify__input > br:last-child { + display: none; +} +.tagify--loading .tagify__input::before { + content: none; +} +.tagify--loading .tagify__input::after { + content: ''; + vertical-align: middle; + opacity: 1; + width: 0.7em; + height: 0.7em; + width: var(--loader-size); + height: var(--loader-size); + min-width: 0; + border: 3px solid; + border-color: #eee #bbb #888 transparent; + border-radius: 50%; + animation: rotateLoader 0.4s infinite linear; + content: '' !important; + margin: -2px 0 -2px 0.5em; +} +.tagify--loading .tagify__input:empty::after { + margin-left: 0; +} +.tagify + input, +.tagify + textarea { + position: absolute !important; + left: -9999em !important; + transform: scale(0) !important; +} +.tagify__tag { + display: inline-flex; + align-items: center; + max-width: var(--tag--max-width); + margin-inline: 5px 0; + margin-block: 5px; + position: relative; + z-index: 1; + outline: 0; + line-height: normal; + cursor: default; + transition: 0.13s ease-out; +} +.tagify__tag > div { + display: flex; + flex: 1; + vertical-align: top; + box-sizing: border-box; + max-width: 100%; + padding: var(--tag-pad); + color: var(--tag-text-color); + line-height: inherit; + border-radius: var(--tag-border-radius); + white-space: nowrap; + transition: 0.13s ease-out; +} +.tagify__tag > div > * { + white-space: pre-wrap; + overflow: hidden; + text-overflow: ellipsis; + display: inline-block; + vertical-align: top; + min-width: var(--tag--min-width); + max-width: var(--tag--max-width); + transition: 0.8s ease, 0.1s color; +} +.tagify__tag > div > [contenteditable] { + display: block; + outline: 0; + -webkit-user-select: text; + user-select: text; + cursor: text; + margin: -2px; + padding: 2px; + max-width: 350px; +} +.tagify__tag > div > :only-child { + width: 100%; +} +.tagify__tag > div::before { + content: ''; + position: absolute; + border-radius: inherit; + inset: var(--tag-bg-inset, 0); + z-index: -1; + pointer-events: none; + transition: 120ms ease; + animation: tags--bump 0.3s ease-out 1; + box-shadow: 0 0 0 var(--tag-inset-shadow-size) var(--tag-bg) inset; +} +.tagify__tag:focus div::before, +.tagify__tag:hover:not([readonly]) div::before { + --tag-bg-inset: -2.5px; + --tag-bg: var(--tag-hover); +} +.tagify__tag--loading { + pointer-events: none; +} +.tagify__tag--loading .tagify__tag__removeBtn { + display: none; +} +.tagify__tag--loading::after { + --loader-size: 0.4em; + content: ''; + vertical-align: middle; + opacity: 1; + width: 0.7em; + height: 0.7em; + width: var(--loader-size); + height: var(--loader-size); + min-width: 0; + border: 3px solid; + border-color: #eee #bbb #888 transparent; + border-radius: 50%; + animation: rotateLoader 0.4s infinite linear; + margin: 0 0.5em 0 -0.1em; +} +.tagify__tag--flash div::before { + animation: none; +} +.tagify__tag--hide { + width: 0 !important; + padding-left: 0; + padding-right: 0; + margin-left: 0; + margin-right: 0; + opacity: 0; + transform: scale(0); + transition: var(--tag-hide-transition); + pointer-events: none; +} +.tagify__tag--hide > div > * { + white-space: nowrap; +} +.tagify__tag.tagify--noAnim > div::before { + animation: none; +} +.tagify__tag.tagify--notAllowed:not(.tagify__tag--editable) div > span { + opacity: 0.5; +} +.tagify__tag.tagify--notAllowed:not(.tagify__tag--editable) div::before { + --tag-bg: var(--tag-invalid-bg); + transition: 0.2s; +} +.tagify__tag[readonly] .tagify__tag__removeBtn { + display: none; +} +.tagify__tag[readonly] > div::before { + animation: readonlyStyles 1s calc(-1s * (var(--readonly-striped) - 1)) paused; +} +@keyframes readonlyStyles { + 0% { + background: linear-gradient(45deg, var(--tag-bg) 25%, transparent 25%, transparent 50%, var(--tag-bg) 50%, var(--tag-bg) 75%, transparent 75%, transparent) 0/5px 5px; + box-shadow: none; + filter: brightness(0.95); + } +} +.tagify__tag--editable > div { + color: var(--tag-text-color--edit); +} +.tagify__tag--editable > div::before { + box-shadow: 0 0 0 2px var(--tag-hover) inset !important; +} +.tagify__tag--editable > .tagify__tag__removeBtn { + pointer-events: none; + opacity: 0; + transform: translateX(100%) translateX(5px); +} +.tagify__tag--editable.tagify--invalid > div::before { + box-shadow: 0 0 0 2px var(--tag-invalid-color) inset !important; +} +.tagify__tag__removeBtn { + order: 5; + display: inline-flex; + align-items: center; + justify-content: center; + border-radius: 50px; + cursor: pointer; + font: 14px/1 Arial; + background: var(--tag-remove-btn-bg); + color: var(--tag-remove-btn-color); + width: 14px; + height: 14px; + margin-inline: auto 4.6666666667px; + overflow: hidden; + transition: 0.2s ease-out; +} +.tagify__tag__removeBtn::after { + content: '×'; + transition: 0.3s, color 0s; +} +.tagify__tag__removeBtn:hover { + color: #fff; + background: var(--tag-remove-btn-bg--hover); +} +.tagify__tag__removeBtn:hover + div > span { + opacity: 0.5; +} +.tagify__tag__removeBtn:hover + div::before { + box-shadow: 0 0 0 var(--tag-inset-shadow-size) var(--tag-remove-bg, rgba(211, 148, 148, 0.3)) inset !important; + transition: box-shadow 0.2s; +} +.tagify:not(.tagify--mix) .tagify__input br { + display: none; +} +.tagify:not(.tagify--mix) .tagify__input * { + display: inline; + white-space: nowrap; +} +.tagify__input { + flex-grow: 1; + display: inline-block; + margin: 5px; + padding: var(--tag-pad); + line-height: normal; + min-width: 110px; + min-height: 1.5lh; + position: relative; + white-space: pre-wrap; + color: var(--input-color); + box-sizing: inherit; + overflow: hidden; +} +.tagify__input:focus { + outline: 0; +} +.tagify__input:focus::before { + transition: 0.2s ease-out; + opacity: 0; + transform: translatex(6px); +} +@supports (-ms-ime-align: auto) { + .tagify__input:focus::before { + display: none; + } +} +.tagify__input:focus:empty::before { + transition: 0.2s ease-out; + opacity: 1; + transform: none; + color: rgba(0, 0, 0, 0.25); + color: var(--placeholder-color-focus); +} +@-moz-document url-prefix() { + .tagify__input:focus:empty::after { + display: none; + } +} +.tagify__input::before { + content: attr(data-placeholder); + width: 100%; + height: 100%; + margin: auto 0; + z-index: 1; + color: var(--placeholder-color); + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + pointer-events: none; + opacity: 0; + position: absolute; +} +.tagify__input::after { + content: attr(data-suggest); + display: inline-block; + vertical-align: middle; + position: absolute; + min-width: calc(100% - 1.5em); + text-overflow: ellipsis; + overflow: hidden; + white-space: pre; + color: var(--tag-text-color); + opacity: 0.3; + pointer-events: none; + max-width: 100px; +} +.tagify__input .tagify__tag { + margin: 0 1px; +} +.tagify--mix { + display: block; +} +.tagify--mix .tagify__input { + padding: 5px; + margin: 0; + width: 100%; + height: 100%; + line-height: 1.5; + display: block; +} +.tagify--mix .tagify__input::before { + height: auto; + display: none; + line-height: inherit; +} +.tagify--mix .tagify__input::after { + content: none; +} +.tagify--select { + cursor: default; +} +.tagify--select::after { + content: '>'; + opacity: 0.5; + position: absolute; + top: 50%; + right: 0; + bottom: 0; + font: 16px monospace; + line-height: 8px; + height: 8px; + pointer-events: none; + transform: translate(-150%, -50%) scaleX(1.2) rotate(90deg); + transition: 0.2s ease-in-out; +} +.tagify--select[aria-expanded='true']::after { + transform: translate(-150%, -50%) rotate(270deg) scaleY(1.2); +} +.tagify--select[aria-expanded='true'] .tagify__tag__removeBtn { + pointer-events: none; + opacity: 0; + transform: translateX(100%) translateX(5px); +} +.tagify--select .tagify__tag { + flex: 1; + max-width: none; + margin-inline-end: 2em; + margin-block: 0; + padding-block: 5px; + cursor: text; +} +.tagify--select .tagify__tag div::before { + display: none; +} +.tagify--select .tagify__tag + .tagify__input { + display: none; +} +.tagify--empty .tagify__input::before { + transition: 0.2s ease-out; + opacity: 1; + transform: none; + display: inline-block; + width: auto; +} +.tagify--mix .tagify--empty .tagify__input::before { + display: inline-block; +} +.tagify--focus { + --tags-border-color: var(--tags-focus-border-color); + transition: 0s; +} +.tagify--invalid { + --tags-border-color: #d39494; +} +.tagify__dropdown { + position: absolute; + z-index: 9999; + transform: translateY(-1px); + border-top: 1px solid var(--tagify-dd-color-primary); + overflow: hidden; +} +.tagify__dropdown[dir='rtl'] { + transform: translate(-100%, -1px); +} +.tagify__dropdown[placement='top'] { + margin-top: 0; + transform: translateY(-100%); +} +.tagify__dropdown[placement='top'] .tagify__dropdown__wrapper { + border-top-width: 1.1px; + border-bottom-width: 0; +} +.tagify__dropdown[position='text'] { + box-shadow: 0 0 0 3px rgba(var(--tagify-dd-color-primary), 0.1); + font-size: 0.9em; +} +.tagify__dropdown[position='text'] .tagify__dropdown__wrapper { + border-width: 1px; +} +.tagify__dropdown__wrapper { + scroll-behavior: auto; + max-height: var(--tagify-dd-max-height); + overflow: hidden; + overflow-x: hidden; + color: var(--tagify-dd-text-color); + background: var(--tagify-dd-bg-color); + border: 1px solid; + border-color: var(--tagify-dd-color-primary); + border-bottom-width: 1.5px; + border-top-width: 0; + box-shadow: 0 2px 4px -2px rgba(0, 0, 0, 0.2); + transition: 0.3s cubic-bezier(0.5, 0, 0.3, 1), transform 0.15s; + animation: dd-wrapper-show 0s 0.3s forwards; +} +@keyframes dd-wrapper-show { + to { + overflow-y: auto; + } +} +.tagify__dropdown__header:empty { + display: none; +} +.tagify__dropdown__footer { + display: inline-block; + margin-top: 0.5em; + padding: var(--tagify-dd-item-pad); + font-size: 0.7em; + font-style: italic; + opacity: 0.5; +} +.tagify__dropdown__footer:empty { + display: none; +} +.tagify__dropdown--initial .tagify__dropdown__wrapper { + max-height: 20px; + transform: translateY(-1em); +} +.tagify__dropdown--initial[placement='top'] .tagify__dropdown__wrapper { + transform: translateY(2em); +} +.tagify__dropdown__item { + box-sizing: border-box; + padding: var(--tagify-dd-item-pad); + margin: 1px; + white-space: pre-wrap; + cursor: pointer; + border-radius: 2px; + position: relative; + outline: 0; + max-height: 60px; + max-width: 100%; + line-height: normal; + position: relative; +} +.tagify__dropdown__item--active { + background: var(--tagify-dd-color-primary); + color: #fff; +} +.tagify__dropdown__item:active { + filter: brightness(105%); +} +.tagify__dropdown__item--hidden { + padding-top: 0; + padding-bottom: 0; + margin: 0 1px; + pointer-events: none; + overflow: hidden; + max-height: 0; + transition: var(--tagify-dd-item--hidden-duration, 0.3s) !important; +} +.tagify__dropdown__item--hidden > * { + transform: translateY(-100%); + opacity: 0; + transition: inherit; +} +.tagify__dropdown__item--selected::before { + content: '✓'; + font-family: monospace; + position: absolute; + inset-inline-start: 6px; + text-indent: 0; + line-height: 1.1; +} +.tagify__dropdown:has(.tagify__dropdown__item--selected) .tagify__dropdown__item { + text-indent: 1em; +} diff --git a/static/public/assets/deps/htmx/json-enc-2.js b/static/public/assets/deps/htmx/json-enc-2.js index 3538c8737..03f59ad3d 100644 --- a/static/public/assets/deps/htmx/json-enc-2.js +++ b/static/public/assets/deps/htmx/json-enc-2.js @@ -18,18 +18,21 @@ const object = {} parameters.forEach(function (value, key) { // FormData encodes values as strings, restore hx-vals/hx-vars with their initial types - const typedValue = Object.hasOwn(vals, key) ? vals[key] : value - if (Object.hasOwn(object, key)) { - if (!Array.isArray(object[key])) { - object[key] = [object[key]] + typedValue = value + if (!Object.hasOwn(vals, key)) { + if (Object.hasOwn(object, key)) { + if (!Array.isArray(object[key])) { + object[key] = [object[key]] + } else { + object[key].push(typedValue) + } + } else { + object[key] = typedValue } - object[key].push(typedValue) - } else { - object[key] = typedValue } }) - return JSON.stringify(object) + return JSON.stringify({ ...object, ...vals }) }, }) })() diff --git a/test/integration/MonitoringSpec.hs b/test/integration/MonitoringSpec.hs index 3991142bd..e268fdfdc 100644 --- a/test/integration/MonitoringSpec.hs +++ b/test/integration/MonitoringSpec.hs @@ -6,8 +6,8 @@ import Data.HashMap.Strict qualified as HashMap import Data.Time (defaultTimeLocale, formatTime, getCurrentTime) import Data.UUID qualified as UUID import Database.PostgreSQL.Entity.DBT (withPool) -import Database.PostgreSQL.Transact qualified as PGT import Database.PostgreSQL.Simple.SqlQQ (sql) +import Database.PostgreSQL.Transact qualified as PGT import Models.Apis.Monitors qualified as Monitors import Models.Projects.Projects qualified as Projects import Pages.Monitors (AlertUpsertForm (..), convertToQueryMonitor) @@ -47,6 +47,7 @@ spec = aroundAll withTestResources do , conditionType = Nothing , source = Nothing , vizType = Nothing + , teams = [] } respC <- withPool tr.trPool $ Monitors.queryMonitorUpsert queryMonitor respC `shouldBe` 1 diff --git a/test/integration/Pages/BusinessFlowsSpec.hs b/test/integration/Pages/BusinessFlowsSpec.hs index fc9be34d2..2037413eb 100644 --- a/test/integration/Pages/BusinessFlowsSpec.hs +++ b/test/integration/Pages/BusinessFlowsSpec.hs @@ -1,5 +1,6 @@ module Pages.BusinessFlowsSpec (spec) where +import BackgroundJobs qualified import Data.Aeson qualified as AE import Data.Aeson.KeyMap qualified as KM import Data.ByteString.Lazy qualified as BL @@ -13,22 +14,21 @@ import Database.PostgreSQL.Entity.DBT qualified as DBT import Database.PostgreSQL.Simple (Connection, Only (..)) import Database.PostgreSQL.Simple.SqlQQ (sql) import Models.Projects.Projects qualified as Projects -import Pages.BodyWrapper (PageCtx (..)) -import Pkg.DeriveUtils (UUIDId (..)) -import Pkg.TestUtils -import Relude -import Servant.API (ResponseHeader(..), lookupResponseHeader) -import Servant.Server qualified as ServantS -import Test.Hspec -import Servant.Htmx -import BackgroundJobs qualified import OddJobs.Job (Job (..)) +import Pages.BodyWrapper (PageCtx (..)) import Pages.LemonSqueezy qualified as LemonSqueezy import Pages.Onboarding.Onboarding qualified as Onboarding import Pages.Projects qualified as CreateProject import Pages.Projects qualified as ManageMembers import Pages.Replay qualified as Replay import Pages.S3 qualified as S3 +import Pkg.DeriveUtils (UUIDId (..)) +import Pkg.TestUtils +import Relude +import Servant.API (ResponseHeader (..), lookupResponseHeader) +import Servant.Htmx +import Servant.Server qualified as ServantS +import Test.Hspec -- Test context that includes both test resources and a dynamically created project @@ -37,6 +37,7 @@ data TestContext = TestContext , tcProjectId :: Projects.ProjectId } + -- Create a new project for testing and provide it along with test resources withTestProject :: (TestContext -> IO ()) -> IO () withTestProject action = withTestResources $ \tr -> do @@ -65,7 +66,7 @@ spec = aroundAll withTestProject do describe "LemonSqueezy Billing" do lemonSqueezyWebhookTests - -- billingUsageTests + -- billingUsageTests describe "Replay Session Recording" do replayTests @@ -177,8 +178,8 @@ settingsTests = do it "should update alert configurations via POST and persist changes" \TestContext{tcResources = tr, tcProjectId = testPid} -> do let updateForm = CreateProject.CreateProjectForm - { title = "ACME Corp" -- Update project title - , description = "" -- Keep empty description + { title = "ACME Corp" -- Update project title + , description = "" -- Keep empty description , emails = [] , permissions = [] , timeZone = "America/New_York" @@ -217,31 +218,31 @@ settingsTests = do (_, _result) <- testServant tr $ CreateProject.deleteProjectGetH testPid pass - -- TODO: after creating the projects and verifying them on the onboarding forms again, - -- please verify the settings pages contain the same data. Eg - -- /p/