5htp-core 0.3.9 → 0.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.3.9",
+	"version": "0.4.0",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -99,6 +99,6 @@
 		"babel-plugin-glob-import": "^0.0.7"
 	},
 	"peerDependencies": {
-		"5htp": "0.3.8"
+		"5htp": "0.3.9"
 	}
 }

package/src/client/components/Dialog/Manager.tsx

@@ -254,18 +254,6 @@ export default () => {
         const lastToast = modals[ modals.length - 1 ];
         focusContent( lastToast );
 
-        // Backdrop color
-        const header = lastToast.querySelector('header');
-        if (!header || !header.className)
-            return;
-
-        const headerColor = window.getComputedStyle(header, null).getPropertyValue('background-color');
-        if (!headerColor || !headerColor.startsWith('rgb('))
-            return;
-
-        const rgbBg = headerColor.substring(4, headerColor.length - 1);
-        lastToast.style.background = 'rgba(' + rgbBg + ', .5)';
-
     });
     
     return <>

package/src/client/services/router/components/Page.tsx

@@ -24,9 +24,17 @@ export default ({ page }: { page: Page }) => {
     const [apiData, setApiData] = React.useState<{[k: string]: any} | null>( 
         page.data || {}
     );
+
     page.setAllData = setApiData;
     context.data = apiData;
 
+    // Page component has not changed, but data were updated (ex: url parameters change)
+    React.useEffect(() => {
+
+        setApiData(page.data);
+
+    }, [page.data]);
+
     /*----------------------------------
     - RENDER
     ----------------------------------*/

package/src/client/services/router/components/router.tsx

@@ -117,13 +117,8 @@ export default ({ service: clientRouter }: { service?: ClientRouter }) => {
         // Add page container
         setPages( pages => {
 
-            // Check if the page changed
-            if (pages.current?.chunkId === newpage.chunkId)  {
-                console.warn(LogPrefix, "Canceling navigation to the same page:", {...request});
-                pages.current.setAllData(newData);
-                clientRouter.setLoading(false);
-                return { ...pages }
-            }
+            // WARN: Don't cancel navigation if same page as before, as we already instanciated the new page and bound the context with it
+            //  Otherwise it would cause reference issues (ex: page.setAllData makes ref to the new context)
 
             // If if the layout changed
             const curLayout = pages.current?.layout;

package/src/client/services/router/index.tsx

@@ -126,7 +126,6 @@ type THookName = 'location.change' | 'page.changed'
 type Config<TAdditionnalContext extends {} = {}> = {
     preload: string[], // List of globs
     context: (context: ClientContext, router: ClientRouter) => TAdditionnalContext,
-    domains: TDomainsList
 }
 
 /*----------------------------------
@@ -140,6 +139,7 @@ export default class ClientRouter<
     // Context data
     public ssrRoutes = window["routes"] as TSsrUnresolvedRoute[];
     public ssrContext = window["ssr"] as (TBasicSSrData | undefined);
+    public domains = window["ssr"].domains;
     public context!: ClientContext;
 
     public setLoading!: React.Dispatch< React.SetStateAction<boolean> >;

package/src/client/services/router/response/page.ts

@@ -37,6 +37,7 @@ export default class ClientPage<TRouter = ClientRouter> extends PageResponse<TRo
 
         this.bodyId = context.route.options.bodyId;
         this.scrollToId = context.request.hash;
+        
     }
     
     public async preRender( data?: TObjetDonnees ) {

package/src/common/validation/validators.ts

@@ -124,7 +124,8 @@ export default class SchemaValidators {
         const checkChoice = ( choice: any ) => {
 
             // Choice object = extract value
-            if (typeof choice === 'object' && ('value' in choice) && typeof choice.value !== 'object')
+            //  We check for choice objec via the label prop, as the value can be undefined (and so, not transmitted)
+            if (typeof choice === 'object' && ('label' in choice) && typeof choice.label === 'string' && typeof choice.value !== 'object')
                 choice = choice.value;
 
             // If choices list rpovided, check if the choice is in the choices list

package/src/server/app/container/config.ts

@@ -88,13 +88,8 @@ export default class ConfigParser {
         // We assume that when we run 5htp dev, we're in local
         // Otherwise, we're in production environment (docker)
         console.log("[app] Using environment:", process.env.NODE_ENV);
-        return process.env.NODE_ENV === 'development' ? {
-            name: 'local',
-            profile: 'dev'
-        } : {
-            name: 'server',
-            profile: 'prod',
-        }
+        const envFileName = this.appDir + '/env.yaml';
+        return this.loadYaml( envFileName );
     }
 
     public identity() {

package/src/server/services/router/response/index.ts

@@ -14,7 +14,7 @@ import express from 'express';
 import { Application } from '@server/app';
 import type ServerRouter from '@server/services/router';
 import ServerRequest from '@server/services/router/request';
-import { TRoute, TAnyRoute } from '@common/router';
+import { TRoute, TAnyRoute, TDomainsList } from '@common/router';
 import { NotFound, Forbidden, Anomaly } from '@common/errors';
 import BaseResponse, { TResponseData } from '@common/router/response';
 import Page from './page';
@@ -31,7 +31,8 @@ const debug = true;
 export type TBasicSSrData = {
     request: { data: TObjetDonnees, id: string },
     page: { chunkId: string, data?: TObjetDonnees },
-    user: User | null
+    user: User | null,
+    domains: TDomainsList
 }
 
 export type TRouterContext<TRouter extends ServerRouter = ServerRouter> = (
@@ -176,6 +177,7 @@ export default class ServerResponse<
                 chunkId: page.chunkId,
                 data: page.data
             },
+            domains: this.router.config.domains,
             ...customSsrData
         }
     }

package/src/server/services/router/response/page/document.tsx

@@ -83,7 +83,7 @@ export default class DocumentRenderer<TRouter extends Router> {
                     <meta content={page.description} name="description" />
                     <link rel="canonical" href={fullUrl} />
 
-                    {this.metas()}
+                    {this.metas( page )}
 
                     {this.styles( page )}
 
@@ -100,7 +100,7 @@ export default class DocumentRenderer<TRouter extends Router> {
         )
     }
 
-    private metas() {
+    private metas( page: Page ) {
         return <>
             {/* Réseaux sociaux */}
             {/*page.metas.metasAdditionnelles && Object.entries(page.metas.metasAdditionnelles).map(
@@ -130,6 +130,10 @@ export default class DocumentRenderer<TRouter extends Router> {
             <link rel="icon" type="image/png" sizes="32x32" href="/public/app/favicon-32x32.png" />
             <link rel="apple-touch-icon" sizes="180x180" href="/public/app/apple-touch-icon-180x180.png" />
             <meta name="msapplication-config" content="/public/app/browserconfig.xml" />
+
+            {page.metas?.map(({ $, ...attrs }) => (
+                React.createElement($, attrs)
+            ))}
         </>
     }
 

package/src/server/services/router/response/page/index.tsx

@@ -27,12 +27,16 @@ const seoLimits = {
     description: 255
 }
 
+type TMetasList = ({ $: string } & { [key: string]: string })[]
+
 /*----------------------------------
 - FONCTION
 ----------------------------------*/
 
 export default class Page<TRouter extends Router = Router> extends PageResponse<TRouter> {
 
+    public metas: TMetasList = [];
+
     public constructor(
         public route: TRoute | TErrorRoute,
         public renderer: TFrontRenderer,