Avoid partial app + jsx -> js for domain and service

uqbar-project · Nov 8, 2023 · 33edce7 · 33edce7
1 parent 3fff8b8
commit 33edce7
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/src/App.test.jsx b/src/App.test.jsx
@@ -5,7 +5,7 @@ import App from './App'
 import { MailReader } from './components/MailReader'
 import { MailsGrid } from './components/MailsGrid'
 import { MailsSummary } from './components/MailsSummary'
-import { mailService } from './service/mail'
+import { mailService } from './service/mailService'
 
 describe('smoke test de la app', () => {
   test('la app levanta', async () => {

diff --git a/src/components/MailReader.jsx b/src/components/MailReader.jsx
@@ -3,7 +3,7 @@ import { InputText } from 'primereact/inputtext'
 import { Panel } from 'primereact/panel'
 import { useEffect, useState } from 'react'
 
-import { mailService } from '../service/mail'
+import { mailService } from '../service/mailService'
 import { MailsGrid } from './MailsGrid'
 import { MailsSummary } from './MailsSummary'
 

diff --git a/src/components/MailsGrid.jsx b/src/components/MailsGrid.jsx
@@ -4,39 +4,39 @@ import { DataTable } from 'primereact/datatable'
 import { Mail } from '../domain/mail'
 import PropTypes from 'prop-types'
 
-const fechaTemplate = (mail) => {
-  return (
-    <span data-testid="fecha">{mail.fechaCorta}</span>
-  )
-}
-
-const marcarComoLeidoTemplate = (alLeerMail) => (mail) => {
-  return (
-    mail.leido ? '' : <Button type="button" data-testid={'btnMarcarLeido' + mail.id} icon="pi pi-check" className="p-button-secondary" title="Marcar como leído" onClick={() => alLeerMail(mail)}></Button>
-  )
-}
-
-const recienteTemplate = (mail) => {
-  return (
-    mail.esReciente() ?
-      <span title="Reciente" data-testid={'reciente' + mail.id} className="p-badge p-badge-info icon-badge" style={{ display: 'flex', alignItems: 'center', alignContent: 'center', justifyContent: 'center' }}>
-        <i className="pi pi-calendar"></i>
-      </span> : ''
-  )
-}
-
-const leidoTemplate = ({ id, leido }) => {
-  return (
-    leido ?
-      '' :
-      <span title="No leído" data-testid={'noLeido' + id} className="p-badge p-badge-warning icon-badge" style={{ display: 'flex', alignItems: 'center', alignContent: 'center', justifyContent: 'center' }}>
-        <i className="pi pi-eye"></i>
-      </span>
-  )
-}
-
 // Componente que sabe mostrar los mails en una tabla
 export const MailsGrid = ({ mails, alLeerMail }) => {
+  const fechaTemplate = (mail) => {
+    return (
+      <span data-testid="fecha">{mail.fechaCorta}</span>
+    )
+  }
+
+  const marcarComoLeidoTemplate = (mail) => {
+    return (
+      mail.leido ? '' : <Button type="button" data-testid={'btnMarcarLeido' + mail.id} icon="pi pi-check" className="p-button-secondary" title="Marcar como leído" onClick={() => alLeerMail(mail)}></Button>
+    )
+  }
+
+  const recienteTemplate = (mail) => {
+    return (
+      mail.esReciente() ?
+        <span title="Reciente" data-testid={'reciente' + mail.id} className="p-badge p-badge-info icon-badge" style={{ display: 'flex', alignItems: 'center', alignContent: 'center', justifyContent: 'center' }}>
+          <i className="pi pi-calendar"></i>
+        </span> : ''
+    )
+  }
+
+  const leidoTemplate = ({ id, leido }) => {
+    return (
+      leido ?
+        '' :
+        <span title="No leído" data-testid={'noLeido' + id} className="p-badge p-badge-warning icon-badge" style={{ display: 'flex', alignItems: 'center', alignContent: 'center', justifyContent: 'center' }}>
+          <i className="pi pi-eye"></i>
+        </span>
+    )
+  }
+
   return (
     <DataTable value={mails} autoLayout={true} className="p-datatable-striped">
       <Column header="Fecha" body={fechaTemplate} field="fechaOrdenamiento" sortable></Column>
@@ -45,7 +45,7 @@ export const MailsGrid = ({ mails, alLeerMail }) => {
       <Column field="texto" header="Texto" sortable></Column>
       <Column body={recienteTemplate} ></Column>
       <Column body={leidoTemplate} ></Column>
-      <Column body={marcarComoLeidoTemplate(alLeerMail)} ></Column>
+      <Column body={marcarComoLeidoTemplate} ></Column>
     </DataTable >
   )
 }

diff --git a/src/domain/mail.jsx → src/domain/mail.js b/src/domain/mail.jsx → src/domain/mail.js
diff --git a/src/domain/mail.test.jsx → src/domain/mail.test.js b/src/domain/mail.test.jsx → src/domain/mail.test.js
diff --git a/src/service/mail.jsx → src/service/mailService.js b/src/service/mail.jsx → src/service/mailService.js
diff --git a/src/service/mail.test.jsx → src/service/mailService.test.js b/src/service/mail.test.jsx → src/service/mailService.test.js
@@ -1,6 +1,6 @@
 import { subDays } from "date-fns"
 import { Mail } from "../domain/mail"
-import { mailService } from "./mail"
+import { mailService } from "./mailService"
 
 describe('test del service', () => {