(ajustements) : les données d'utilisateur populé sont maintenant cent…

…ralisé dans le midleware et le model. Ce n'est plus un paramètres de middleware.

src/DataTypes/Entity/models/EntityModel.js

@@ -2,6 +2,7 @@ import {getType, TYPE_DEFAULT} from "@/DataTypes/Entity/Types";
 import {removeHtml} from "@/src/helpers/str";
 import {appUrl, replacePathname} from "@/src/helpers/url";
 import EntityTag from "@/DataTypes/Entity/layouts/EntityTag";
+import {lang} from "@/src/common/Data/GlobalConstants";
 
 /**
  * The abstract model for all the entities.
@@ -259,12 +260,23 @@ class EntityModel {
     }
 
     setUsersMetas() {
+        this.setUsersMetasOn(this.meta.requestedBy);
+        this.setUsersMetasOn(this.meta.lastModifiedBy);
+        console.log(this.title, "setUsersMetas", this.meta);
+    }
 
-        if (this.meta.requestedBy && typeof this.meta.requestedBy === "object" && (this.meta.requestedBy?.name === "" || !this.meta.requestedBy?.name)) {
-            this.meta.requestedBy.name = this.meta.requestedBy?.firstName + " " + this.meta.requestedBy?.lastName;
-        }
-        if (this.meta.lastModifiedBy && typeof this.meta.lastModifiedBy === "object" && (this.meta.lastModifiedBy?.name === "" || !this.meta.lastModifiedBy?.name)) {
-            this.meta.lastModifiedBy.name = this.meta.lastModifiedBy?.firstName + " " + this.meta.lastModifiedBy?.lastName;
+    setUsersMetasOn(targetUserData) {
+        if (targetUserData &&
+            typeof targetUserData === "object" &&
+            (targetUserData.name === "" || !targetUserData.name))
+        {
+            targetUserData.name = lang.anonyme;
+            if (targetUserData.firstName && targetUserData.firstName !== "") {
+                targetUserData.name += targetUserData.firstName + " " + targetUserData.lastName;
+            }
+            if (targetUserData.lastName && targetUserData.lastName !== "") {
+                targetUserData.name += targetUserData.firstName + " " + targetUserData.lastName;
+            }
         }
     }
 

src/DataTypes/Organisation/models/Organisation.js

@@ -29,8 +29,7 @@ class Organisation extends EntityModel {
         //this.taxonomies.set("skills", raw.skills);
 
         this.meta = {title: this.title, description: this.description, ...raw.meta};
-        console.log(this.meta);
-        //this.setUsersMetas();
+        this.setUsersMetas();
 
         params.showMeta = params.showMeta ?? true;
         params.showStatus = params.showStatus ?? true;

src/DataTypes/Person/components/layouts/single/PersonSingleView.js

@@ -63,7 +63,6 @@ const PersonSingleView = ({ data }) => {
     }, [firstName]);
 
 
-
     /****************************
      *  Sections
      ***************************/
@@ -201,7 +200,6 @@ const PersonSingleView = ({ data }) => {
                     title={lang.entityMetadata} 
                     className="border-top pt-3"
                 >
-                    {/*********** Entity data ***********/}
                     <SingleEntityMeta createdAt={createdAt} updatedAt={updatedAt} meta={meta} />
                 </SingleInfo>
             }

src/DataTypes/common/layouts/single/SingleBase.js

@@ -104,7 +104,6 @@ const SingleBase = (props) => {
                         </div>
                     </section>
                 }
-
             </div>
         </>
     )

src/common/PageMeta/PageMeta.js

@@ -129,9 +129,6 @@ const PageMeta = (props) => {
                 type='application/ld+json'
                 dangerouslySetInnerHTML={{__html: DOMPurify.sanitize(JSON.stringify(props.structuredData))}}
             />
-
-
-
         </Head>
     )
 }

src/languages/en-ca/base.js

@@ -20,6 +20,8 @@ export const base = {
     "continue": "Continue",
     "about": "About",
     "contactInformations": "Contact informations",
+    "anonyme": "anonym",
+    "parAvnu": "by AVNU",
 
     // App
 

src/languages/fr-ca/base.js

@@ -33,7 +33,8 @@ const base = {
     "hyperlinks":"Hyperliens",
     "externalLinks": "Liens externes",
     "contactInformations": "Informations de contact",
-
+    "anonyme": "anonyme",
+    "parAvnu": "par AVNU",
 
     // App