From 0f0eda8af51bd6170ef1623d9c8232ef67b9bde7 Mon Sep 17 00:00:00 2001 From: Philippe Pittoli Date: Sat, 26 Jul 2025 11:01:12 +0200 Subject: [PATCH] Remove useless module. --- src/App/Page/Zone.purs | 15 +++++++-------- src/App/Templates/Modal.purs | 16 ++++++++-------- src/App/Type/RRId.purs | 3 --- src/App/Type/RRModal.purs | 7 +++---- src/App/Type/ResourceRecord.purs | 4 +++- 5 files changed, 21 insertions(+), 24 deletions(-) delete mode 100644 src/App/Type/RRId.purs diff --git a/src/App/Page/Zone.purs b/src/App/Page/Zone.purs index 1664950..ea11704 100644 --- a/src/App/Page/Zone.purs +++ b/src/App/Page/Zone.purs @@ -40,7 +40,6 @@ import CSSClasses as C import App.Text.Explanations as Explanations -import App.Type.RRId (RRId) import App.Type.ResourceRecord as RR import App.Type.Delegation (mkEmptyDelegationForm, update, Form, Field) as Delegation import App.Type.RRModal (RRModal(..)) @@ -89,9 +88,9 @@ type Input = String -- | 4. `AddRR RR.AcceptedRRTypes RR.ResourceRecord`: send a message to `dnsmanagerd`. -- | -- | Steps to update an entry: --- | 1. `CreateUpdateRRModal RRId`: create a modal from the values of the RR in `_resources` to update. +-- | 1. `CreateUpdateRRModal RR.RRId`: create a modal from the values of the RR in `_resources` to update. -- | 2. `UpdateCurrentRR Field`: modify the currently displayed RR. --- | 3. `ValidateLocal RRId RR.AcceptedRRTypes`: validate the RR. +-- | 3. `ValidateLocal RR.RRId RR.AcceptedRRTypes`: validate the RR. -- | 4. `SaveRR RR.ResourceRecord`: save the _validated_ RR by sending a message to `dnsmanagerd`. data Action @@ -108,10 +107,10 @@ data Action | CreateDelegationModal -- | Create modal (a form) for a resource record to update. - | CreateUpdateRRModal RRId + | CreateUpdateRRModal RR.RRId -- | Create a modal to ask confirmation before deleting a resource record. - | DeleteRRModal RRId + | DeleteRRModal RR.RRId -- | Change the current tab. | ChangeTab Tab @@ -149,7 +148,7 @@ data Action -- | Send a message to remove a resource record. -- | Automatically closes the modal. - | RemoveRR RRId + | RemoveRR RR.RRId -- | Ask `dnsmanagerd` for the generated zone file. | AskGeneratedZoneFile @@ -158,7 +157,7 @@ data Action | RRUpdate RR.RRUpdateValue -- | Ask a (new) token for a resource record. - | NewToken RRId + | NewToken RR.RRId data Tab = Zone | TheBasics | TokenExplanation derive instance eqTab :: Eq Tab @@ -177,7 +176,7 @@ type State = -- | All resource records. , _resources :: Array RR.ResourceRecord - --, _local_errors :: Hash.HashMap RRId (Array Validation.Error) + --, _local_errors :: Hash.HashMap RR.RRId (Array Validation.Error) -- Unique RR form. , _rr_form :: RR.Form diff --git a/src/App/Templates/Modal.purs b/src/App/Templates/Modal.purs index c9585c1..f202a94 100644 --- a/src/App/Templates/Modal.purs +++ b/src/App/Templates/Modal.purs @@ -12,20 +12,20 @@ import Data.Maybe (Maybe(..), fromMaybe, maybe) import Data.Tuple (Tuple) -import App.Type.ResourceRecord.CAA as CAA -import App.Text.Explanations as Explanations import Web as Web import Halogen.HTML as HH import Halogen.HTML.Properties as HP -import App.Type.RRId (RRId) -import App.Type.ResourceRecord.DMARC as DMARC -import App.Type.ResourceRecord.DKIM as DKIM -import App.Type.Delegation as Delegation -import App.Templates.Table as Table import Data.String (toLower) +import App.Text.Explanations as Explanations +import App.Templates.Table as Table + +import App.Type.Delegation as Delegation import App.Type.RRModal (RRModal(..)) +import App.Type.ResourceRecord.CAA as CAA +import App.Type.ResourceRecord.DMARC as DMARC +import App.Type.ResourceRecord.DKIM as DKIM import App.Type.ResourceRecord.SPF (mechanism_types, modifier_types, qualifier_types, show_qualifier) as SPF import App.Type.ResourceRecord as RR @@ -80,7 +80,7 @@ delegation_modal selected_domain form action_update_form action_validate action_ type Domain = String type ActionUpdateForm i = (RR.Field -> i) -type ActionNewToken i = (RRId -> i) +type ActionNewToken i = (RR.RRId -> i) type ActionUpdateRR i = (RR.RRUpdateValue -> i) type ActionValidateNewRR i = (RR.AcceptedRRTypes -> i) type ActionValidateLocalRR :: forall k. k -> k diff --git a/src/App/Type/RRId.purs b/src/App/Type/RRId.purs deleted file mode 100644 index 340729c..0000000 --- a/src/App/Type/RRId.purs +++ /dev/null @@ -1,3 +0,0 @@ -module App.Type.RRId where - -type RRId = Int diff --git a/src/App/Type/RRModal.purs b/src/App/Type/RRModal.purs index 90fe696..b639b24 100644 --- a/src/App/Type/RRModal.purs +++ b/src/App/Type/RRModal.purs @@ -6,12 +6,11 @@ -- | FIXME: TODO: WIP: should this be replaced by something like `CRUD`? module App.Type.RRModal where -import App.Type.RRId -import App.Type.ResourceRecord (AcceptedRRTypes) +import App.Type.ResourceRecord (AcceptedRRTypes, RRId) as RR data RRModal = NoModal - | NewRRModal AcceptedRRTypes + | NewRRModal RR.AcceptedRRTypes | UpdateRRModal - | RemoveRRModal RRId + | RemoveRRModal RR.RRId | DelegationModal diff --git a/src/App/Type/ResourceRecord.purs b/src/App/Type/ResourceRecord.purs index 516b3a0..6ac169e 100644 --- a/src/App/Type/ResourceRecord.purs +++ b/src/App/Type/ResourceRecord.purs @@ -28,9 +28,11 @@ import App.Type.ResourceRecord.DMARC as DMARC import App.Type.ResourceRecord.SPF as SPF import App.Type.ResourceRecord.CAA as CAA +type RRId = Int + type ResourceRecord = { rrtype :: String - , rrid :: Int + , rrid :: RRId , name :: String , ttl :: Int , target :: String