refactor the types

Author: yassa-tamer

.eslintignore

@@ -4,4 +4,4 @@ public/
 client/app/libs/i18n/translations.js
 client/app/libs/i18n/default.js
 postcss.config.js
-client/app/bundles/comments/src/
+client/app/bundles/comments/rescript/

client/app/bundles/comments/rescript/Actions/Actions.res

@@ -13,7 +13,7 @@ module Create = {
       },
       {
         responseType: "json",
-        headers: {
+        headers: { // see https://github.com/shakacode/react_on_rails/blob/249c69812474e0f532df432581bf5e618df0e1ec/node_package/src/Authenticity.ts#L13C1-L18C1
           "X-CSRF-Token": ReactOnRails.authenticityToken(),
           "X-Requested-With": "XMLHttpRequest",
         }

client/app/bundles/comments/rescript/CommentForm/CommentForm.res

@@ -1,7 +1,7 @@
 let reducer = (
-  state: Types.commentFormState, 
-  action: Types.commentFormAction
-): Types.commentFormState => {
+  state: CommentFormTypes.state, 
+  action: CommentFormTypes.action
+): CommentFormTypes.state => {
   switch (action) {
   | SetAuthor(author) => {...state, author}
   | SetText(text) => {...state, text}
@@ -11,7 +11,7 @@ let reducer = (
 
 
 @react.component
-let make = (~storeComment: Types.storeCommentAction, ~disabled: bool, ~storeCommentError: bool) => {
+let make = (~storeComment: ReScriptShowTypes.storeComment, ~disabled: bool, ~storeCommentError: bool) => {
   let (state, dispatch) = React.useReducer(
     reducer, {
       author: "",
@@ -32,10 +32,10 @@ let make = (~storeComment: Types.storeCommentAction, ~disabled: bool, ~storeComm
 
   let handleSubmit = (event) => {
     ReactEvent.Form.preventDefault(event)
-    storeComment(state.author, state.text)
+    storeComment({author: state.author, text: state.text})
   }
 
-  let forms: array<Types.formData> = 
+  let forms: array<CommentFormTypes.formData> = 
   [
     {formName: "Horizontal Form", formType: Horizontal},
     {formName: "Inline Form", formType: Inline},

client/app/bundles/comments/rescript/Actions/Types.res renamed to client/app/bundles/comments/rescript/CommentForm/CommentFormTypes.res

@@ -1,26 +1,17 @@
 type formDisplay = Horizontal | Inline | Stacked
 
-type commentFormState = {
-  author: string,
-  text: string,
-  form: formDisplay
-}
-
-type commentFormAction =
-    | SetAuthor(string)
-    | SetText(string)
-    | SetFormType(formDisplay)
-
 type formData = {
   formName: string,
   formType: formDisplay
 }
 
-type storeCommentAction = (string, string) => unit
-
-type storeCommentData = {
+type state = {
   author: string,
-  text: string
+  text: string,
+  form: formDisplay
 }
 
-type error = NoError | FailedToSaveComment | FailedToFetchComments
+type action =
+    | SetAuthor(string)
+    | SetText(string)
+    | SetFormType(formDisplay)

client/app/bundles/comments/rescript/ReScriptShow.res

@@ -1,27 +1,7 @@
-type savingStatus = Free | BusySaving
-
-type status = {
-  commentsFetchError: bool,
-  commentStoreError: bool,
-  saving: savingStatus
-}
-
-type state = {
-  comments: Actions.Fetch.comments,
-  status: status
-}
-
-type action =
-  | SetComments(Actions.Fetch.comments)
-  | SetFetchError(bool)
-  | SetStoreError(bool)
-  | SetSavingStatus(savingStatus)
-
-
 let reducer = (
-  state: state, 
-  action: action
-): state => {
+  state: ReScriptShowTypes.state, 
+  action: ReScriptShowTypes.action
+): ReScriptShowTypes.state => {
   switch (action) {
   | SetComments(comments) => {comments, status: {...state.status, commentsFetchError: false}}
   | SetFetchError(error) => {...state, status: {...state.status, commentsFetchError: error}}
@@ -43,12 +23,12 @@ let default = () => {
     }
   )
 
-  let storeComment = (author, text) => {
+  let storeComment: ReScriptShowTypes.storeComment = (newComment: Actions.Create.t) => {
     SetStoreError(false)->dispatch 
     SetSavingStatus(BusySaving)->dispatch
     let saveAndFetchComments = async () => {
       try {
-        let _ = await Actions.Create.storeComment({author, text})
+        let _ = await Actions.Create.storeComment(newComment)
         SetSavingStatus(Free)->dispatch
 
         let comments = await Actions.Fetch.fetchComments()

client/app/bundles/comments/rescript/ReScriptShowTypes.res

@@ -0,0 +1,20 @@
+type savingStatus = Free | BusySaving
+
+type status = {
+  commentsFetchError: bool,
+  commentStoreError: bool,
+  saving: savingStatus
+}
+
+type state = {
+  comments: Actions.Fetch.comments,
+  status: status
+}
+
+type action =
+  | SetComments(Actions.Fetch.comments)
+  | SetFetchError(bool)
+  | SetStoreError(bool)
+  | SetSavingStatus(savingStatus)
+
+type storeComment = (Actions.Create.t) => unit

client/app/bundles/comments/rescript/bindings/Axios.res

@@ -5,4 +5,10 @@ type reqOptions = {
     "X-Requested-With": string
   } 
 }
-@module("axios") external post: (string, Types.storeCommentData, reqOptions) => promise<unit> = "post"
+
+type commentData = {
+  author: string,
+  text: string
+}
+
+@module("axios") external post: (string, commentData, reqOptions) => promise<unit> = "post"