5htp-core 0.6.0-3 → 0.6.0-6

package/client/assets/css/components/card.less

@@ -101,15 +101,6 @@
         }
     }
 
-    &.active {
-
-        box-shadow: 0 0 0 3px @c1;
-
-        > * {
-            --cTxtImportant: @c1;
-        }
-    }
-
     /*----------------------------------
     - VARIANTS
     ----------------------------------*/

package/client/assets/css/components/mantine.less

@@ -63,13 +63,14 @@
 
 .mantine-TextInput-input,
 .mantine-Input-input {
-
     border: solid 1px var(--cLine) !important;
+}
 
-    &:focus {
-        border-color: @c1 !important;
-        box-shadow: 0 0 0 4px fade(@c1, 20%) !important;
-    }
+.card.active,
+.mantine-TextInput-input:focus,
+.mantine-Input-input:focus {
+    border: solid 1px @c1 !important;
+    box-shadow: 0 0 0 4px fade(@c1, 20%) !important;
 }
 
 .mantine-MultiSelect-pill {

package/client/components/ConnectedInput.tsx

@@ -0,0 +1,34 @@
+import React from "react";
+
+import type { Choice } from '@client/components/Select';
+
+const ConnectedInput = <TComponent extends React.ComponentType<any>>({ 
+    component: Component, data: dataInit, ...props 
+}: {
+    component: TComponent,
+    data?: Choice[] | ((search?: string) => Promise<Choice[]>),
+} & Omit<React.ComponentProps<TComponent>, 'data' | 'onSearchChange'>) => {
+
+    const [data, setData] = React.useState<Choice[]>([]);
+    const [search, setSearch] = React.useState<string>('');
+
+    React.useEffect(() => {
+
+        if (!dataInit) return;
+        if (Array.isArray(dataInit))
+            setData(dataInit);
+        else
+            dataInit(search).then(setData);
+
+    }, [dataInit, search]);
+
+    return (
+        <Component 
+            {...props} 
+           data={data}
+           onSearchChange={setSearch}
+        />
+    )
+}
+
+export default ConnectedInput;

package/client/components/Table/index.tsx

@@ -99,7 +99,7 @@ export default function Liste<TRow extends TDonneeInconnue>({
                 <td>
                     <Checkbox
                         id={"selectionner" + iDonnee}
-                        value={selection.current.some(s => s.id === row.id)}
+                        value={selection.current.some(s => s?.id === row?.id)}
                         onChange={(isSelected: boolean) => {
                             selection.set(current => isSelected
                                 // Ajoute
@@ -230,7 +230,7 @@ export default function Liste<TRow extends TDonneeInconnue>({
                                 <Checkbox
                                     value={selection.current.length >= rows.length}
                                     onChange={(status: boolean) => {
-                                        selection.set(status ? rows : []);
+                                        selection.set(status ? rows.filter(r => r?.id) : []);
                                     }}
                                 />
                             </th>

package/client/components/containers/Popover/index.tsx

@@ -156,6 +156,8 @@ export default (props: Props) => {
             {React.cloneElement( children, {
                 onClick: (e) => {
                     show(isShown => !isShown);
+                    e.stopPropagation();
+                    return false;
                 }
             })}
 

package/client/components/index.ts

@@ -22,7 +22,9 @@ export { default as Date } from './Date';
 export { default as Select } from './Select';
 export { default as Checkbox } from './Checkbox';
 export { InputWrapper } from './utils';
-export { default as DropDown } from './DropDown';   
+export { default as DropDown } from './DropDown';  
+
+export { default as ConnectedInput } from './ConnectedInput';
 
 // Mantine
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.0-3",
+	"version": "0.6.0-6",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/server/services/email/index.ts

@@ -2,10 +2,6 @@
 - DEPENDANCES
 ----------------------------------*/
 
-/* NOTE: On évite d'utiliser les alias ici,
-        Afin que l'envoi des rapports de bug fonctionne même en cas d'erreur avec les alias
-*/
-
 // Core
 import type { Application } from '@server/app';
 import Service from '@server/app/service';
@@ -13,7 +9,6 @@ import markdown from '@common/data/markdown';
 
 // Speciic
 import { jsonToHtml } from './utils';
-import type { Transporter } from './transporter';
 
 /*----------------------------------
 - SERVICE CONFIG
@@ -25,16 +20,12 @@ export type Config = {
     debug: boolean,
     simulateWhenLocal: boolean,
     default: {
-        transporter: string,
         from: TPerson
     },
     bugReport: {
         from: TPerson,
         to: TPerson
     },
-    transporters: {
-        [transporterId: string]: Transporter
-    }
 }
 
 export type Hooks = {
@@ -49,9 +40,7 @@ export type Services = {
 - TYPES: EMAILS
 ----------------------------------*/
 
-export { Transporter } from './transporter';
-
-export type TEmail = THtmlEmail | TMarkdownEmail// | TTemplateEmail;
+export type TEmail = THtmlEmail | TMarkdownEmail;
 
 type TPerson = {
     name?: string,
@@ -74,11 +63,6 @@ export type TMarkdownEmail = TBaseEmail & {
     markdown: string,
 }
 
-/*export type TTemplateEmail = TBaseEmail & {
-    template: keyof typeof templates,
-    data?: TObjetDonnees
-}*/
-
 export type TCompleteEmail = With<THtmlEmail, {
     to: TPerson[],
     from: TPerson,
@@ -109,14 +93,15 @@ type TOptions = {
 /*----------------------------------
 - FONCTIONS
 ----------------------------------*/
-export default class Email extends Service<Config, Hooks, Application> {
-    
-    private transporters = this.config.transporters;
+export default abstract class Email<TConfig extends Config> 
+    extends Service<TConfig, Hooks, Application> {
 
     /*----------------------------------
     - ACTIONS
     ----------------------------------*/
 
+    protected abstract sendNow( emails: TCompleteEmail[] ): Promise<void>;
+
     public async send( to: string, subject: string, markdown: string, options?: TOptions );
     public async send( emails: TEmail | TEmail[], options?: TOptions ): Promise<void>;
     public async send( ...args: TEmailSendArgs ): Promise<void> {
@@ -162,30 +147,7 @@ export default class Email extends Service<Config, Hooks, Application> {
                 ? email.to
                 : [email.to];
 
-            // Via template
-            // TODO: Restore templates feature
-            /*if ('template' in email) {
-
-                const template = templates[email.template];
-
-                if (template === undefined)
-                    throw new Error(`Impossible de charger la template email ${email.template} depuis le cache (NotFound).`);
-
-                const txt = template(email.data || {})
-
-                const delimTitre = txt.indexOf('\n\n');
-
-                return {
-                    ...email,
-                    // Vire le "> " au début
-                    subject: txt.substring(2, delimTitre),
-                    html: htmlWarning + txt.substring(delimTitre + 2),
-                    from,
-                    to,
-                    cc
-                }
-
-            } else */if ('markdown' in email) {
+            if ('markdown' in email) {
 
                 return {
                     ...email,
@@ -209,11 +171,7 @@ export default class Email extends Service<Config, Hooks, Application> {
             
         });
 
-        const transporterName = options.transporter || this.config.default.transporter;
-        if (transporterName === undefined)
-            throw new Error(`Please define at least one mail transporter.`);
-
-        console.info(LogPrefix, `Sending ${emailsToSend.length} emails via transporter "${transporterName}"`, emailsToSend[0].subject);
+        console.info(LogPrefix, `Sending ${emailsToSend.length} emails via transporter`, emailsToSend[0].subject);
 
         // Pas d'envoi d'email quand local
         if (this.app.env.name === 'local' && this.config.simulateWhenLocal === true) {
@@ -224,8 +182,7 @@ export default class Email extends Service<Config, Hooks, Application> {
             return;
         }
 
-        const transporter = this.transporters[ transporterName ];
-        await transporter.send(emailsToSend);
+        await this.sendNow(emailsToSend);
 
     }
 }

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "solid/spinner-third"|"long-arrow-right"|"traffic-light-stop"|"times-circle"|"search"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"paper-plane"|"bookmark"|"download"|"times"|"angle-down"|"th-large"|"table"|"info-circle"|"check-circle"|"exclamation-circle"|"heart"|"bell"|"chart-bar"|"power-off"|"home"|"books"|"newspaper"|"box-full"|"planet-ringed"|"brands/linkedin"|"brands/twitter"|"brands/facebook"|"bars"|"rocket"|"database"|"brain"|"code"|"money-bill"|"check"|"at"|"image"|"key"|"seedling"|"palette"|"car"|"plane"|"university"|"briefcase"|"hard-hat"|"graduation-cap"|"bolt"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"globe"|"map-marked-alt"|"dumbbell"|"stethoscope"|"concierge-bell"|"book"|"shield-alt"|"gavel"|"industry"|"square-root-alt"|"pills"|"medal"|"capsules"|"balance-scale"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"brands/google"|"brands/github"|"solid/heart"|"regular/heart"|"eye"|"trash"|"arrow-left"|"arrow-right"|"meh-rolling-eyes"|"link"|"file"|"unlink"|"pen"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"font"|"empty-set"|"plus-circle"|"horizontal-rule"|"page-break"|"poll"|"columns"|"sticky-note"|"caret-right"|"plus"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"
+export type TIcones = "solid/spinner-third"|"long-arrow-right"|"search"|"paper-plane"|"bookmark"|"solid/download"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"times"|"angle-down"|"th-large"|"table"|"traffic-light-stop"|"times-circle"|"info-circle"|"check-circle"|"exclamation-circle"|"heart"|"bell"|"chart-bar"|"power-off"|"seedling"|"palette"|"car"|"plane"|"university"|"briefcase"|"hard-hat"|"graduation-cap"|"bolt"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"globe"|"map-marked-alt"|"dumbbell"|"stethoscope"|"concierge-bell"|"book"|"shield-alt"|"gavel"|"industry"|"square-root-alt"|"newspaper"|"pills"|"medal"|"capsules"|"balance-scale"|"home"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"chart-line"|"lock"|"eye"|"credit-card"|"at"|"brands/linkedin"|"image"|"key"|"brands/google"|"check"|"bars"|"books"|"box-full"|"planet-ringed"|"brands/twitter"|"brands/facebook"|"database"|"brain"|"download"|"code"|"money-bill"|"rocket"|"user-circle"|"plus-circle"|"solid/heart"|"regular/heart"|"trash"|"arrow-left"|"arrow-right"|"meh-rolling-eyes"|"unlink"|"pen"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"link"|"file"|"plus"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"poll"|"columns"|"sticky-note"|"caret-right"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"

package/server/services/email/service.json

@@ -1,6 +0,0 @@
-{
-    "id": "Core/Email",
-    "name": "Email",
-    "parent": "app",
-    "dependences": []
-}

package/server/services/email/templates.ts

@@ -1,49 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-import Handlebars, { TemplateDelegate } from 'handlebars';
-
-//import * as templates from '@cache/serveur/emails';
-import templatesDefault from '@root/default/serveur/emails/*.hbs';
-import templatesProjet from '@/*/serveur/emails/*.hbs';
-const templates = { ...templatesDefault, ...templatesProjet }
-import url from '@commun/routeur/url';
-
-/*----------------------------------
-- HELPERS   
-----------------------------------*/
-
-Handlebars.registerHelper('plur', (mot: string, nb: number) =>
-    mot + (nb > 1 ? 's' : '')
-)
-
-Handlebars.registerHelper('url', (route: string, params?: any, absolu?: boolean) =>
-    url(route, params, absolu)
-)
-
-/*----------------------------------
-- FONCTIONS
-----------------------------------*/
-const cache: {[nomTemplate: string]: TemplateDelegate} = {}
-
-export const compiler = async () => {
-
-    console.log(`[boot] Précompilation de ${Object.keys(templates).length} templates email`);
-
-    try {
-        for (const nomTemplate in templates) {
-
-            const template = templates[nomTemplate];
-
-            cache[ nomTemplate ] = Handlebars.compile(template, {
-                strict: true, // Erreur quand variable inexistante
-            });
-    
-        }
-    } catch (error) {
-        console.error(`Erreur lors de la précompilation des templates email:`, error);
-    }
-}
-
-export default cache

package/server/services/email/transporter.ts

@@ -1,31 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-
-// Core
-import type Application from "@server/app";
-import Service from '@server/app/service';
-import type EmailService from '@server/services/email';
-
-// Specific
-import type { TCompleteEmail } from ".";
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-export type TBasicConfig = {
-    api: string,
-    debug: boolean
-}
-
-/*----------------------------------
-- CLASS 
-----------------------------------*/
-export abstract class Transporter<TConfig extends TBasicConfig = TBasicConfig>
-    extends Service<TConfig, {}, Application> {
-
-    public abstract send( emails: TCompleteEmail[] ): Promise<void>;
-}