5htp-core 0.6.0-87 → 0.6.0-89

package/client/components/Select.tsx

@@ -178,16 +178,22 @@ export default (initProps: Props) => {
                             <Button key={choice.value} 
                                 size="s"
                                 suffix={isSelected ? <i src="check" /> : null}
-                                onClick={() => onChange( multiple 
-                                    ? (isSelected 
-                                        ? current.filter(c => c.value !== choice.value)
-                                        : [...(current || []), choice]
+                                onClick={() => {
+                                    onChange( multiple 
+                                        ? (isSelected 
+                                            ? current.filter(c => c.value !== choice.value)
+                                            : [...(current || []), choice]
+                                        )
+                                        : ((isSelected && !required) 
+                                            ? null 
+                                            : choice
+                                        )
                                     )
-                                    : ((isSelected && !required) 
-                                        ? null 
-                                        : choice
-                                    )
-                                )}>
+
+                                    if (!multiple)
+                                        setOpened(false);
+                                    
+                                }}>
                                     {choice.label}
                             </Button>
                         )

package/client/components/Table/index.tsx

@@ -32,8 +32,7 @@ export type Props<TRow> = {
     empty?: ComponentChild | false,
 
     // Interactions
-    sort?: TSortOptions,
-    onSort?: (columnId: string | null, order: TSortOptions["order"]) => void,
+    sortState?: [TSortOptions, React.SetStateAction<TSortOptions>],
     onCellClick?: (row: TRow) => void,
 
     selection?: [TRow[], React.SetStateAction<TRow[]>],
@@ -57,7 +56,7 @@ type TSortOptions = {
 - COMPOSANTS
 ----------------------------------*/
 export default function Liste<TRow extends TDonneeInconnue>({
-    stickyHeader, onSort, sort: sorted,
+    stickyHeader, sortState,
     data: rows, setData, empty,
     onCellClick,
     selection: selectionState, maxSelection,
@@ -84,6 +83,23 @@ export default function Liste<TRow extends TDonneeInconnue>({
             </div>
         );
 
+    const sortBy = (columnId: string | null, defaultOrder: 'asc' | 'desc') => {
+
+        if (!sortState) return;
+
+        const [sort, setSort] = sortState;
+
+        if (columnId === sort.id) {
+            setSort({
+                id: columnId,
+                order: defaultOrder === 'asc' ? 'desc' : 'asc'
+            });
+        } else {
+            setSort({ columnId, order: defaultOrder });
+        }
+
+    }
+
     /*----------------------------------
     - RENDU COLONNES / LIGNES
     ----------------------------------*/
@@ -141,15 +157,15 @@ export default function Liste<TRow extends TDonneeInconnue>({
                 if (iDonnee === 0) {
 
                     const headerProps = { className: '', ...cellProps };
-                    const isCurrentlySorted = sort && sorted && sorted.id === sort.id;
-                    const isSortable = sort && onSort;
-                    if (isSortable) {
+                    const isCurrentlySorted = sort && sort.id === sort.id;
+                    const isSortable = sort;
+                    if (isSortable && sortState[1]) {
                         headerProps.className += ' clickable';
                         headerProps.onClick = () => {
                             if (isCurrentlySorted)
-                                onSort(null, sort.order);
+                                sortBy(null, sort.order);
                             else
-                                onSort(sort.id, sort.order);
+                                sortBy(sort.id, sort.order);
                         }
                     }
                     

package/common/errors/index.tsx

@@ -20,9 +20,16 @@ export type TJsonError = {
 } & TErrorDetails
 
 type TErrorDetails = {
+
     // Allow to identify the error catched (ex: displaying custop content, running custom actions, ...)
     id?: string,
     data?: {},
+
+    cta?: {
+        label: string,
+        link: string,
+    },
+
     // For debugging
     stack?: string,
     origin?: string,

package/package.json

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

package/server/services/auth/index.ts

@@ -41,7 +41,7 @@ export type TConfig = {
     jwt: {
         // 2048 bits
         key: string,
-        expiration: string,
+        expiration: number,
     },
 }
 
@@ -173,7 +173,9 @@ export default abstract class AuthService<
 
         this.config.debug && console.info(LogPrefix, `Generated JWT token for session:` + token);
 
-        request.res.cookie('authorization', token);
+        request.res.cookie('authorization', token, {
+            maxAge: this.config.jwt.expiration,
+        });
 
         return token;
     }

package/types/global/utils.d.ts

@@ -82,26 +82,4 @@ type TServiceRef = {
 
 type TServiceSubservices = {
     [key: string]: TServiceSetup | TServiceRef
-}
-
-declare module '@cli/app' {
-    type App = {
-
-        env: TEnvConfig;
-
-        use: (referenceName: string) => TServiceRef;
-
-        setup: (...args: [
-            // { user: app.setup('Core/User') }
-            servicePath: string,
-            serviceConfig?: {}
-        ] | [
-            // app.setup('User', 'Core/User')
-            serviceName: string, 
-            servicePath: string,
-            serviceConfig?: {}
-        ]) => TServiceSetup;
-    }
-    const app: App;
-    export = app;
 }

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "long-arrow-right"|"times"|"solid/spinner-third"|"sack-dollar"|"bell"|"bullseye"|"project-diagram"|"user-friends"|"eye"|"lock"|"comments"|"phone"|"chalkboard-teacher"|"rocket"|"chart-bar"|"user-circle"|"crosshairs"|"arrow-right"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"link"|"file-alt"|"long-arrow-left"|"plus-circle"|"comments-alt"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"at"|"calendar-alt"|"paper-plane"|"brands/linkedin"|"angle-up"|"angle-down"|"solid/crown"|"brands/discord"|"pen"|"plus"|"file"|"search"|"lightbulb"|"magnet"|"key"|"user"|"envelope"|"clock"|"cog"|"trash"|"ellipsis-h"|"regular/shield-check"|"binoculars"|"check"|"times-circle"|"coins"|"download"|"info-circle"|"check-circle"|"exclamation-circle"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"power-off"|"arrow-left"|"meh-rolling-eyes"|"bars"|"question-circle"|"users"|"bug"|"plane-departure"|"brands/whatsapp"|"wind"|"play"|"minus-circle"|"external-link"|"map-marker-alt"|"arrow-to-bottom"|"broom"|"exclamation-triangle"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"hourglass"|"comment-alt"|"minus"|"coin"|"solid/magic"|"briefcase"|"map-marker"|"fire"|"globe"|"magic"|"industry"|"plug"|"calendar"|"building"|"graduation-cap"|"unlink"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"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"|"traffic-light-stop"|"times-circle"|"search"|"times"|"brands/whatsapp"|"comment-alt"|"solid/download"|"angle-down"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"info-circle"|"check-circle"|"exclamation-circle"|"heart"|"bell"|"chart-bar"|"power-off"|"chart-line"|"lock"|"eye"|"credit-card"|"at"|"brands/linkedin"|"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"|"newspaper"|"pills"|"medal"|"capsules"|"balance-scale"|"home"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"paper-plane"|"brands/google"|"check"|"database"|"brain"|"download"|"code"|"money-bill"|"bars"|"rocket"|"user-circle"|"plus-circle"|"brands/twitter"|"brands/facebook"|"books"|"box-full"|"planet-ringed"|"solid/heart"|"regular/heart"|"trash"|"meh-rolling-eyes"|"arrow-left"|"arrow-right"|"unlink"|"pen"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"link"|"file"|"plus"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"