diff --git a/monoscope.cabal b/monoscope.cabal index 72f12216a..5e072b394 100644 --- a/monoscope.cabal +++ b/monoscope.cabal @@ -73,7 +73,7 @@ library Models.Apis.Reports Models.Apis.RequestDumps Models.Apis.Shapes - Models.Apis.Slack + Models.Apis.Bots Models.Projects.Dashboards Models.Projects.ProjectApiKeys Models.Projects.ProjectMembers @@ -90,6 +90,7 @@ library Pages.Api Pages.BodyWrapper Pages.Bots.Discord + Pages.Bots.Github Pages.Bots.Slack Pages.Bots.Utils Pages.Bots.Whatsapp diff --git a/src/Models/Apis/Slack.hs b/src/Models/Apis/Bots.hs similarity index 73% rename from src/Models/Apis/Slack.hs rename to src/Models/Apis/Bots.hs index 53473c74e..37baa4a02 100644 --- a/src/Models/Apis/Slack.hs +++ b/src/Models/Apis/Bots.hs @@ -1,4 +1,4 @@ -module Models.Apis.Slack ( +module Models.Apis.Bots ( SlackData (..), DiscordData (..), insertAccessToken, @@ -12,8 +12,12 @@ module Models.Apis.Slack ( getDashboardsForSlack, getDashboardsForWhatsapp, getDiscordData, + insertOrUpdateGithubInstallation, + getGithubInstallationByProjectId, + GithubInstallation (..), ) where +import Data.Time (UTCTime) import Data.Vector qualified as V import Database.PostgreSQL.Simple (FromRow, Only (Only), ToRow) import Database.PostgreSQL.Simple.SqlQQ (sql) @@ -122,3 +126,37 @@ getDashboardsForDiscord :: DB es => Text -> Eff es [(Text, Text)] getDashboardsForDiscord guildId = PG.query q (Only guildId) where q = [sql|SELECT d.title, d.id::text FROM projects.dashboards d JOIN apis.discord dd ON d.project_id = dd.project_id where guild_id=?|] + + +data GithubInstallation = GithubInstallation + { installationId :: Int64 + , projectId :: Projects.ProjectId + , accessToken :: Maybe Text + , tokenExpiresAt :: Maybe UTCTime + , createdAt :: UTCTime + , updatedAt :: UTCTime + } + deriving stock (Eq, Generic, Show) + deriving anyclass (FromRow, NFData) + deriving (AE.FromJSON) via DAE.CustomJSON '[DAE.OmitNothingFields, DAE.FieldLabelModifier '[DAE.CamelToSnake]] GithubInstallation + + +-- Additional functions for GithubInstallation can be added here +getGithubInstallationByProjectId :: DB es => Projects.ProjectId -> Eff es (Maybe GithubInstallation) +getGithubInstallationByProjectId pid = listToMaybe <$> PG.query q (Only pid) + where + q = + [sql|SELECT installation_id, project_id, access_token, token_expires_at, created_at, updated_at + FROM apis.github_installations WHERE project_id =? |] + + +insertOrUpdateGithubInstallation :: DB es => Int -> Projects.ProjectId -> Maybe Text -> Maybe UTCTime -> Eff es Int64 +insertOrUpdateGithubInstallation instId pid mToken mExpiresAt = PG.execute q params + where + q = + [sql|INSERT INTO apis.github_installations + (installation_id, project_id, access_token, token_expires_at) + VALUES (?,?,?,?) + ON CONFLICT (project_id) + DO UPDATE SET installation_id = EXCLUDED.installation_id, access_token = EXCLUDED.access_token, token_expires_at = EXCLUDED.token_expires_at |] + params = (instId, pid, mToken, mExpiresAt) diff --git a/src/Pages/BodyWrapper.hs b/src/Pages/BodyWrapper.hs index a9267cfe4..533b0503a 100644 --- a/src/Pages/BodyWrapper.hs +++ b/src/Pages/BodyWrapper.hs @@ -92,7 +92,7 @@ bodyWrapper bcfg child = do 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_ $(hashAssetFile "/public/assets/css/tailwind.min.css")] + link_ [rel_ "stylesheet", type_ "text/css", href_ "/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 diff --git a/src/Pages/Bots/Discord.hs b/src/Pages/Bots/Discord.hs index 5f9201e10..7f53ff426 100644 --- a/src/Pages/Bots/Discord.hs +++ b/src/Pages/Bots/Discord.hs @@ -11,7 +11,7 @@ import Data.Vector qualified as V import Deriving.Aeson qualified as DAE import Effectful.Error.Static (throwError) import Effectful.Reader.Static (ask, asks) -import Models.Apis.Slack (DiscordData (..), getDashboardsForDiscord, getDiscordData, insertDiscordData, updateDiscordNotificationChannel) +import Models.Apis.Bots (DiscordData (..), getDashboardsForDiscord, getDiscordData, insertDiscordData, updateDiscordNotificationChannel) import Models.Projects.Projects qualified as Projects import Pages.BodyWrapper (BWConfig (..), PageCtx (..)) import Relude hiding (ask, asks) diff --git a/src/Pages/Bots/Github.hs b/src/Pages/Bots/Github.hs new file mode 100644 index 000000000..17c09e638 --- /dev/null +++ b/src/Pages/Bots/Github.hs @@ -0,0 +1,54 @@ +module Pages.Bots.Github (setupGetH) where + +import Data.Aeson qualified as AE +import Data.ByteString qualified as BS +import Data.ByteString.Base16 qualified as Base16 +import Data.Default (Default (def)) +import Data.Text qualified as T +import Data.UUID qualified as UUID +import Data.Vector qualified as V +import Database.Postgres.Temp.Internal.Config (addErrorContext) +import Effectful.Error.Static (throwError) +import Effectful.Reader.Static (ask, asks) +import Lucid +import Models.Apis.Bots qualified as Bots +import Models.Projects.Projects qualified as Projects +import Pages.BodyWrapper (BWConfig (..), PageCtx (..)) +import Relude hiding (ask, asks) +import System.Config (AuthContext (..)) +import System.Types (ATAuthCtx, ATBaseCtx, RespHeaders, addErrorToast, addRespHeaders, addSuccessToast) +import Utils (faSprite_) + + +setupGetH :: Maybe Int -> Maybe Projects.ProjectId -> ATBaseCtx (PageCtx (Html ())) +setupGetH installationId pid' = do + appCtx <- asks env + let bwconf = (def :: BWConfig){pageTitle = "GitHub Bot Setup", isSettingsPage = True} + case (pid', installationId) of + (Just p, Just iid) -> do + res <- Bots.insertOrUpdateGithubInstallation iid p Nothing Nothing + pure $ PageCtx bwconf setupPage + _ -> do + pure $ PageCtx bwconf setupPage + + +setupPage :: Html () +setupPage = div_ [class_ "w-full h-full flex flex-col pt-16"] do + div_ [class_ "max-w-2xl mx-auto mt-16 p-6"] $ do + div_ [class_ "flex justify-center mb-4"] $ do + faSprite_ "circle-check" "regular" "fill-green-400 h-16 w-16" + + h1_ [class_ "text-3xl font-bold text-center mb-2"] "Installation Successful!" + + p_ [class_ "text-center text-textWeak max-w-lg text-sm mb-6"] "Monoscope GitHub app has been installed you can now configure a repo for syncing dashboards" + + div_ [class_ "bg-fillWeak p-4 rounded border border-strokeWeak"] $ do + p_ [class_ "font-semibold mb-2"] "What's Next?" + ul_ [class_ "list-disc list-inside text-sm space-y-1 ml-4"] $ do + li_ [] "You can now **close this window** and return to your application." + li_ [] "Check your repository for initial configuration changes or first runs." + + -- Optional: Link back to main app page + div_ [class_ "mt-6 text-center"] + $ a_ [href_ "/", class_ "text-blue-500 hover:text-blue-700 font-medium"] + $ "Return to the Application Dashboard" diff --git a/src/Pages/Bots/Slack.hs b/src/Pages/Bots/Slack.hs index 00550e9f0..0aeae15ee 100644 --- a/src/Pages/Bots/Slack.hs +++ b/src/Pages/Bots/Slack.hs @@ -30,8 +30,8 @@ import Effectful.Error.Static (throwError) import Effectful.Log qualified as Log import Effectful.Reader.Static (ask, asks) import Effectful.Time qualified as Time +import Models.Apis.Bots (SlackData (..), getDashboardsForSlack, getSlackDataByTeamId, insertAccessToken, updateSlackNotificationChannel) import Models.Apis.RequestDumps qualified as RequestDumps -import Models.Apis.Slack (SlackData (..), getDashboardsForSlack, getSlackDataByTeamId, insertAccessToken, updateSlackNotificationChannel) import Models.Projects.Dashboards qualified as Dashboards import Models.Projects.Projects qualified as Projects import Network.Wreq qualified as Wreq diff --git a/src/Pages/Bots/Whatsapp.hs b/src/Pages/Bots/Whatsapp.hs index 9ff538e4a..d4461e6b7 100644 --- a/src/Pages/Bots/Whatsapp.hs +++ b/src/Pages/Bots/Whatsapp.hs @@ -12,8 +12,8 @@ import Effectful import Effectful.Concurrent (forkIO) import Effectful.Reader.Static qualified import Effectful.Time qualified as Time +import Models.Apis.Bots (getDashboardsForWhatsapp) import Models.Apis.RequestDumps qualified as RequestDumps -import Models.Apis.Slack (getDashboardsForWhatsapp) import Models.Projects.Dashboards qualified as Dashboards import Models.Projects.Projects qualified as Projects import Network.HTTP.Types (urlEncode) diff --git a/src/Pages/Monitors/Testing.hs b/src/Pages/Monitors/Testing.hs index 79ff96a4a..645ef88af 100644 --- a/src/Pages/Monitors/Testing.hs +++ b/src/Pages/Monitors/Testing.hs @@ -22,8 +22,8 @@ import Fmt.Internal.Core (fmt) import Fmt.Internal.Numeric (commaizeF) import Lucid import Lucid.Htmx +import Models.Apis.Bots qualified as Slack import Models.Apis.Monitors qualified as Monitors -import Models.Apis.Slack qualified as Slack import Models.Projects.ProjectMembers (Team (discord_channels, slack_channels)) import Models.Projects.ProjectMembers qualified as ManageMembers import Models.Projects.Projects qualified as Projects diff --git a/src/Pages/Onboarding/Onboarding.hs b/src/Pages/Onboarding/Onboarding.hs index ff91ec211..daa2be071 100644 --- a/src/Pages/Onboarding/Onboarding.hs +++ b/src/Pages/Onboarding/Onboarding.hs @@ -40,7 +40,7 @@ import Lucid import Lucid.Aria qualified as Aria import Lucid.Htmx import Lucid.Hyperscript (__) -import Models.Apis.Slack (getDiscordDataByProjectId, getProjectSlackData) +import Models.Apis.Bots (getDiscordDataByProjectId, getProjectSlackData) import Models.Projects.ProjectApiKeys qualified as ProjectApiKeys import Models.Projects.Projects qualified as Projects import Models.Users.Sessions qualified as Sessions diff --git a/src/Pages/Projects.hs b/src/Pages/Projects.hs index 9215a43b1..7f8487c81 100644 --- a/src/Pages/Projects.hs +++ b/src/Pages/Projects.hs @@ -72,10 +72,11 @@ import Effectful.Reader.Static (ask) import Fmt import GHC.Records (HasField (getField)) import Lucid +import Lucid (href_) import Lucid.Htmx import Lucid.Hyperscript (__) -import Models.Apis.Slack (SlackData, getDiscordDataByProjectId, getProjectSlackData) -import Models.Apis.Slack qualified as Slack +import Models.Apis.Bots (SlackData, getDiscordDataByProjectId, getProjectSlackData) +import Models.Apis.Bots qualified as Slack import Models.Projects.ProjectApiKeys qualified as ProjectApiKeys import Models.Projects.ProjectMembers (TeamMemberVM (..), TeamVM (..)) import Models.Projects.ProjectMembers qualified as ProjectMembers @@ -370,6 +371,15 @@ integrationsBody IntegrationsConfig{..} = do h2_ [class_ "text-textStrong text-3xl font-medium mb-5"] "Project Notifications" div_ [class_ "flex flex-col gap-4"] do p_ [] "Select channels to receive updates on this project." + div_ [class_ "flex flex-col gap-2 p-6 bg-bgRaised rounded-lg border border-strokeWeak shadow-xs"] do + div_ [class_ "flex items-center gap-2"] do + faSprite_ "github" "solid " "h-6 w-6 text-textBrand" + div_ [class_ "flex flex-col gap-2"] do + span_ [class_ "text-textStrong text-lg font-semibold"] "GitHub" + p_ [class_ "text-textWeak text-sm"] "Integrate with github for syncing dashboards with your repositories." + let ghInstallUrl = envConfig.githubAppInstallUrl <> "?state=" <> pid + a_ [class_ "btn text-white bg-black w-max", href_ ghInstallUrl] "Connect GitHub" + 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 envConfig "" slackData) renderNotificationOption "Discord" "Send notifications to Discord servers" "discord" Projects.NDiscord notifChannel (faSprite_ "discord" "solid" "h-6 w-6") (renderDiscordIntegration envConfig "") diff --git a/src/Pkg/Mail.hs b/src/Pkg/Mail.hs index 45b3eb719..77ae4218e 100644 --- a/src/Pkg/Mail.hs +++ b/src/Pkg/Mail.hs @@ -17,8 +17,8 @@ import Effectful ( import Effectful.Log (Log) import Effectful.PostgreSQL (WithConnection) import Effectful.Reader.Static (Reader, ask) +import Models.Apis.Bots (DiscordData (..), SlackData (..), getDiscordDataByProjectId, getProjectSlackData) import Models.Apis.RequestDumps qualified as RequestDumps -import Models.Apis.Slack (DiscordData (..), SlackData (..), getDiscordDataByProjectId, getProjectSlackData) import Models.Projects.Projects qualified as Projects import Network.HTTP.Types (urlEncode) import Relude hiding (Reader, ask) diff --git a/src/System/Config.hs b/src/System/Config.hs index 61745f3a9..33eb99054 100644 --- a/src/System/Config.hs +++ b/src/System/Config.hs @@ -127,6 +127,7 @@ data EnvConfig = EnvConfig , enableDailyJobScheduling :: Bool , maxConcurrentJobs :: Int , showDemoProject :: Bool + , githubAppInstallUrl :: Text } deriving stock (Generic, Show) deriving anyclass (Default, FromEnv) diff --git a/src/Web/Routes.hs b/src/Web/Routes.hs index ac366a327..3046ec56e 100644 --- a/src/Web/Routes.hs +++ b/src/Web/Routes.hs @@ -80,6 +80,7 @@ import Pages.Anomalies qualified as AnomalyList import Pages.Api qualified as Api import Pages.BodyWrapper (PageCtx (..)) import Pages.Bots.Discord qualified as Discord +import Pages.Bots.Github qualified as Github import Pages.Bots.Slack qualified as Slack import Pages.Bots.Utils qualified as BotUtils import Pages.Bots.Whatsapp qualified as Whatsapp @@ -124,6 +125,7 @@ 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 +type QPID a = QueryParam a Projects.ProjectId -- Custom type for handling all query parameters @@ -189,6 +191,7 @@ data Routes mode = Routes , chartsDataShot :: mode :- "chart_data_shot" :> QueryParam "data_type" Charts.DataType :> QueryParam "pid" Projects.ProjectId :> QPT "query" :> QPT "query_sql" :> QPT "since" :> QPT "from" :> QPT "to" :> QPT "source" :> AllQueryParams :> Get '[JSON] Charts.MetricsData , rrwebPost :: mode :- "rrweb" :> ProjectId :> ReqBody '[JSON] Replay.ReplayPost :> Post '[JSON] AE.Value , avatarGet :: mode :- "api" :> "avatar" :> Capture "user_id" Users.UserId :> Get '[OctetStream] (Headers '[Header "Cache-Control" Text, Header "Content-Type" Text] LBS.ByteString) + , githubSetupGet :: mode :- "github" :> "setup" :> QPI "installation_id" :> QPID "state" :> Get '[HTML] (PageCtx (Html ())) } deriving stock (Generic) @@ -388,6 +391,7 @@ server pool = , chartsDataShot = Charts.queryMetrics , rrwebPost = Replay.replayPostH , avatarGet = avatarGetH + , githubSetupGet = Github.setupGetH , cookieProtected = \sessionWithCookies -> Servant.hoistServerWithContext (Proxy @(Servant.NamedRoutes CookieProtectedRoutes)) diff --git a/static/migrations/0020_github_sync.sql b/static/migrations/0020_github_sync.sql new file mode 100644 index 000000000..c551ba9d3 --- /dev/null +++ b/static/migrations/0020_github_sync.sql @@ -0,0 +1,17 @@ +BEGIN; + +CREATE TABLE IF NOT EXISTS apis.github_installations ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + updated_at TIMESTAMPTZ NOT NULL DEFAULT now(), + installation_id BIGINT NOT NULL UNIQUE, + project_id UUID NOT NULL UNIQUE + REFERENCES projects.projects(id) ON DELETE CASCADE, + access_token TEXT, + token_expires_at TIMESTAMPTZ +); + +SELECT manage_updated_at('apis.github_installations'); +CREATE INDEX idx_github_installations_project_id ON apis.github_installations(project_id); + +COMMIT; diff --git a/static/public/assets/svgs/fa-sprites/solid.svg b/static/public/assets/svgs/fa-sprites/solid.svg index 4d88f9ae5..f55180a16 100644 --- a/static/public/assets/svgs/fa-sprites/solid.svg +++ b/static/public/assets/svgs/fa-sprites/solid.svg @@ -170,5 +170,7 @@ - + + + \ No newline at end of file diff --git a/test/integration/Pages/Projects/ManageMembersSpec.hs b/test/integration/Pages/Projects/ManageMembersSpec.hs index 869db0a1e..286d65c21 100644 --- a/test/integration/Pages/Projects/ManageMembersSpec.hs +++ b/test/integration/Pages/Projects/ManageMembersSpec.hs @@ -123,6 +123,7 @@ spec = aroundAll withTestResources do , slackChannels = V.empty , phoneNumbers = V.empty , teamId = Nothing + , phoneNumbers = [] } it "Should create team" \tr -> do