From f668edda86905d1bc8d45888026aea1a6511615b Mon Sep 17 00:00:00 2001 From: Philippe Pittoli Date: Tue, 20 Feb 2024 19:46:16 +0100 Subject: [PATCH] New API for logs, no more SimpleLog. --- src/App/AdministrationInterface.purs | 2 +- src/App/AuthenticationInterface.purs | 10 ++++------ src/App/DomainListInterface.purs | 6 +++--- src/App/Log.purs | 1 - src/App/LogMessage.purs | 3 +-- src/App/MailValidationInterface.purs | 2 +- src/App/RegistrationInterface.purs | 2 +- src/App/WS.purs | 2 +- 8 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/App/AdministrationInterface.purs b/src/App/AdministrationInterface.purs index 5aacc4f..9a488d4 100644 --- a/src/App/AdministrationInterface.purs +++ b/src/App/AdministrationInterface.purs @@ -14,7 +14,7 @@ import Prelude (Unit, bind, discard, not, pure, show, ($), (<<<), (<>), (=<<), m import Bulma as Bulma -import Data.Maybe (Maybe(..), maybe) +import Data.Maybe (Maybe(..)) import Data.Array as A import Effect.Aff.Class (class MonadAff) import Halogen as H diff --git a/src/App/AuthenticationInterface.purs b/src/App/AuthenticationInterface.purs index b039311..7a590aa 100644 --- a/src/App/AuthenticationInterface.purs +++ b/src/App/AuthenticationInterface.purs @@ -166,7 +166,7 @@ handleAction = case _ of login, pass -> do H.raise $ AuthenticateToAuthd (Tuple login pass) - H.raise $ Log $ SimpleLog $ "[😇] Trying to authenticate (login: " <> login <> ")" + H.raise $ Log $ SystemLog $ "authenticate (login: " <> login <> ")" PasswordRecoveryAttempt ev -> do H.liftEffect $ Event.preventDefault ev @@ -176,14 +176,12 @@ handleAction = case _ of email = passwordRecoveryForm.email case login, email of - "", "" -> - H.raise $ Log $ UnableToSend "Write at least either your login or your email!" - + "", "" -> H.raise $ Log $ UnableToSend "Write your login or your email!" _, _ -> do message <- H.liftEffect $ AuthD.serialize $ AuthD.MkAskPasswordRecovery { user: (Just login), email: Just (Email.Email email) } H.raise $ MessageToSend message - H.raise $ Log $ SimpleLog "[😇] Trying to recover the password!" + H.raise $ Log $ SystemLog "password recovery" handleQuery :: forall a m. MonadAff m => Query a -> H.HalogenM State Action () Output m (Maybe a) handleQuery = case _ of @@ -192,7 +190,7 @@ handleQuery = case _ of MessageReceived message _ -> do case message of _ -> do - H.raise $ Log $ SimpleLog $ "[😈] Message not handled in AuthenticationInterface." + H.raise $ Log $ ErrorLog $ "Message not handled in AuthenticationInterface." pure Nothing ConnectionIsDown a -> do diff --git a/src/App/DomainListInterface.purs b/src/App/DomainListInterface.purs index 5a0aa55..6dec4cc 100644 --- a/src/App/DomainListInterface.purs +++ b/src/App/DomainListInterface.purs @@ -242,7 +242,7 @@ handleAction = case _ of RemoveDomain domain -> do message <- H.liftEffect $ DNSManager.serialize $ DNSManager.MkDeleteDomain { domain: domain } H.raise $ MessageToSend message - H.raise $ Log $ SimpleLog $ "[😇] Removing domain: " <> domain + H.raise $ Log $ SystemLog $ "Remove domain: " <> domain H.modify_ _ { active_modal = Nothing } NewDomainAttempt ev -> do @@ -261,7 +261,7 @@ handleAction = case _ of $ DNSManager.serialize $ DNSManager.MkNewDomain { domain: new_domain } H.raise $ MessageToSend message - H.raise $ Log $ SimpleLog $ "[😇] Trying to add a new domain (" <> new_domain <> ")" + H.raise $ Log $ SystemLog $ "Add a new domain (" <> new_domain <> ")" handleAction $ HandleNewDomainInput $ INP_newdomain "" where show_error :: Maybe DomainError -> String @@ -295,7 +295,7 @@ handleQuery = case _ of (DNSManager.MkDomainDeleted response) -> do { my_domains } <- H.get handleAction $ UpdateMyDomains $ A.filter ((/=) response.domain) my_domains - _ -> H.raise $ Log $ SimpleLog $ "[😈] Message not handled in DomainListInterface." + _ -> H.raise $ Log $ ErrorLog $ "Message not handled in DomainListInterface." pure (Just a) ConnectionIsDown a -> do diff --git a/src/App/Log.purs b/src/App/Log.purs index eb9d30a..2a8f18c 100644 --- a/src/App/Log.purs +++ b/src/App/Log.purs @@ -52,7 +52,6 @@ handleQuery :: forall a m. MonadAff m => Query a -> H.HalogenM State Action () O handleQuery = case _ of Log message a -> do case message of - SimpleLog str -> appendMessage str SystemLog str -> systemMessage str UnableToSend str -> unableToSend str ErrorLog str -> errorMessage str diff --git a/src/App/LogMessage.purs b/src/App/LogMessage.purs index 8d4b02a..0fce9e3 100644 --- a/src/App/LogMessage.purs +++ b/src/App/LogMessage.purs @@ -1,8 +1,7 @@ module App.LogMessage where data LogMessage - = SimpleLog String - | SystemLog String + = SystemLog String | UnableToSend String | ErrorLog String | SuccessLog String diff --git a/src/App/MailValidationInterface.purs b/src/App/MailValidationInterface.purs index e1d67b7..e825721 100644 --- a/src/App/MailValidationInterface.purs +++ b/src/App/MailValidationInterface.purs @@ -153,7 +153,7 @@ handleAction = case _ of let { login, token } = mailValidationForm message <- H.liftEffect $ AuthD.serialize $ AuthD.MkValidateUser { user: login, activation_key: token } H.raise $ MessageToSend message - H.raise $ Log $ SimpleLog $ "[😇] Trying to register (login: " <> login <> ")" + H.raise $ Log $ SystemLog $ "Trying to validate email address of user \"" <> login <> "\"" show_error :: Error -> String show_error = case _ of diff --git a/src/App/RegistrationInterface.purs b/src/App/RegistrationInterface.purs index fcb6b53..cf6bdb3 100644 --- a/src/App/RegistrationInterface.purs +++ b/src/App/RegistrationInterface.purs @@ -168,7 +168,7 @@ handleAction = case _ of message <- H.liftEffect $ AuthD.serialize $ AuthD.MkRegister { login, email: Just (Email.Email email), password: pass } H.raise $ MessageToSend message - H.raise $ Log $ SimpleLog $ "[😇] Trying to register (login: " <> login <> ")" + H.raise $ Log $ SystemLog $ "Trying to register (login: " <> login <> ")" show_error :: Error -> String show_error = case _ of diff --git a/src/App/WS.purs b/src/App/WS.purs index 09e00df..504d73f 100644 --- a/src/App/WS.purs +++ b/src/App/WS.purs @@ -177,7 +177,7 @@ handleAction action = do SendMessage array_buffer_to_send -> do case wsInfo.connection of - Nothing -> H.raise $ Log $ SimpleLog $ "[🤖] Can't send a message, websocket is down!" + Nothing -> H.raise $ Log $ UnableToSend $ "Websocket is down!" Just webSocket -> H.liftEffect $ do sendArrayBuffer webSocket array_buffer_to_send