profile-pane 3.1.2-test.5 → 3.1.2

package/lib/CVPresenter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CVPresenter.d.ts","sourceRoot":"","sources":["../src/CVPresenter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAa,IAAI,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAG9E,MAAM,WAAW,IAAI;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AACD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI,EAAE,CAAC;IACpB,UAAU,EAAE,IAAI,EAAE,CAAC;CACpB;AAID,eAAO,MAAM,WAAW,UAA4C,CAAA;AAEpE,wBAAgB,WAAW,CAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,GAAE,MAAM,CAW1D;AAED,wBAAgB,cAAc,CAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,GAAE,MAAM,CAM9D;AAED,wBAAgB,WAAW,CAAE,SAAS,CAAC,EAAC,OAAO,EAAE,OAAO,CAAC,EAAC,OAAO,GAAE,MAAM,CAIxE;AAsED,wBAAgB,SAAS,CACvB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,SAAS,GACf,cAAc,CAyBhB"}
+{"version":3,"file":"CVPresenter.d.ts","sourceRoot":"","sources":["../src/CVPresenter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAa,IAAI,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAG9E,MAAM,WAAW,IAAI;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AACD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI,EAAE,CAAC;IACpB,UAAU,EAAE,IAAI,EAAE,CAAC;CACpB;AAID,eAAO,MAAM,WAAW,UAA4C,CAAA;AAEpE,wBAAgB,WAAW,CAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,GAAE,MAAM,CAW1D;AAED,wBAAgB,cAAc,CAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,GAAE,MAAM,CAM9D;AAED,wBAAgB,WAAW,CAAE,SAAS,CAAC,EAAC,OAAO,EAAE,OAAO,CAAC,EAAC,OAAO,GAAE,MAAM,CAIxE;AAsED,wBAAgB,SAAS,CACvB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,SAAS,GACf,cAAc,CA0BhB"}

package/lib/CVPresenter.js

@@ -108,10 +108,12 @@ function presentCV(subject, store) {
   }
   const skills = store.each(subject, _solidUi.ns.schema('skills')).map(sk => skillAsText(store, sk)).filter(skill => skill !== '');
   const languageNodes = store.each(subject, _solidUi.ns.schema('knowsLanguage'));
-  const languages = languageNodes.flatMap(node => expandRdfList(store, node)).map(lan => languageAsText(store, lan)).filter(language => language !== '');
+  const languages = languageNodes.flatMap(node => expandRdfList(store, node)).map(lan => languageAsText(store, lan));
+  // Deduplicate languages
+  const uniqueLanguages = Array.from(new Set(languages));
   return {
     rolesByType,
     skills,
-    languages
+    languages: uniqueLanguages
   };
 }

package/lib/SocialPresenter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SocialPresenter.d.ts","sourceRoot":"","sources":["../src/SocialPresenter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAQ,MAAM,QAAQ,CAAA;AAQnD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAuBD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,SAAS,GACf,kBAAkB,CAiEpB"}
+{"version":3,"file":"SocialPresenter.d.ts","sourceRoot":"","sources":["../src/SocialPresenter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAQ,MAAM,QAAQ,CAAA;AAQnD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAiCD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,SAAS,GACf,kBAAkB,CA+EpB"}

package/lib/SocialPresenter.js

@@ -13,22 +13,31 @@ const socialMediaFormName = 'socialMedia.ttl'; // The name of the file to upload
 const DEFAULT_ICON_URI = _solidUi.icons.iconBase + 'noun_10636_grey.svg'; // grey disc
 
 function expandRdfList(store, node) {
-  const collectionElements = node.elements;
-  if (Array.isArray(collectionElements)) {
-    return collectionElements.flatMap(element => expandRdfList(store, element));
-  }
-  const first = store.any(node, _solidUi.ns.rdf('first'));
-  if (!first) return [node];
-  const items = [];
-  let current = node;
-  while (current) {
-    const value = store.any(current, _solidUi.ns.rdf('first'));
-    if (value) items.push(...expandRdfList(store, value));
-    const rest = store.any(current, _solidUi.ns.rdf('rest'));
-    if (!rest || rest.termType === 'NamedNode' && rest.value === _solidUi.ns.rdf('nil').value) break;
-    current = rest;
+  const visited = new Set();
+  function inner(node) {
+    const termType = node.termType || typeof node;
+    const value = node.value || String(node);
+    const key = `${termType}:${value}`;
+    if (visited.has(key)) return [];
+    visited.add(key);
+    const collectionElements = node.elements;
+    if (Array.isArray(collectionElements)) {
+      return collectionElements.flatMap(element => inner(element));
+    }
+    const first = store.any(node, _solidUi.ns.rdf('first'));
+    if (!first) return [node];
+    const items = [];
+    let current = node;
+    while (current) {
+      const value = store.any(current, _solidUi.ns.rdf('first'));
+      if (value) items.push(...inner(value));
+      const rest = store.any(current, _solidUi.ns.rdf('rest'));
+      if (!rest || rest.termType === 'NamedNode' && rest.value === _solidUi.ns.rdf('nil').value) break;
+      current = rest;
+    }
+    return items;
   }
-  return items;
+  return inner(node);
 }
 function presentSocial(subject, store) {
   function nameForAccount(subject) {
@@ -59,12 +68,17 @@ function presentSocial(subject, store) {
     return DEFAULT_ICON_URI;
   }
   function homepageForAccount(subject) {
-    const id = store.anyJS(subject, _solidUi.ns.foaf('accountName'), null, subject.doc()) || '';
+    const acHomepage = store.any(subject, _solidUi.ns.foaf('homepage')); // on the account itself?
+    if (acHomepage) return acHomepage.value;
+    const id = store.anyJS(subject, _solidUi.ns.foaf('accountName'), null, subject.doc()) || 'No_account_Name';
     const classes = store.each(subject, _solidUi.ns.rdf('type'));
     for (const k of classes) {
-      const userProfilePrefix = store.any(k, _solidUi.ns.foaf('userProfilePrefix'));
-      if (userProfilePrefix) {
-        return userProfilePrefix.value + id.trim();
+      // Fix: ensure k is a NamedNode for store.any
+      if (k.termType === 'NamedNode') {
+        const userProfilePrefix = store.any(k, _solidUi.ns.foaf('userProfilePrefix'));
+        if (userProfilePrefix) {
+          return userProfilePrefix.value + id.trim();
+        }
       }
     }
     return store.anyJS(subject, _solidUi.ns.foaf('homepage'), null, subject.doc()) || '';
@@ -80,14 +94,23 @@ function presentSocial(subject, store) {
   // we need to load the social media accounts ontology to be able to query all data needed
   (0, _rdfFormsHelper.loadDocument)(store, socialMediaForm, socialMediaFormName);
   const accountNodes = store.each(subject, _solidUi.ns.foaf('account'));
-  const accountThings = accountNodes.flatMap(node => expandRdfList(store, node));
-  if (!accountThings.length) return {
+  let accountThings = accountNodes.flatMap(node => expandRdfList(store, node));
+  // Deduplicate by foaf:accountName value
+  const accountNameSet = new Set();
+  const accounts = [];
+  for (const ac of accountThings) {
+    if (ac.termType === 'NamedNode') {
+      const accountNameNode = store.any(ac, _solidUi.ns.foaf('accountName'));
+      const accountName = accountNameNode ? accountNameNode.value : '';
+      if (!accountNameSet.has(accountName)) {
+        accountNameSet.add(accountName);
+        accounts.push(accountAsObject(ac));
+      }
+    }
+  }
+  if (!accounts.length) return {
     accounts: []
   };
-  //console.log('Social: accountThings', accountThings)
-  const accounts = accountThings.map(ac => accountAsObject(ac));
-  //console.log('Social: account objects', accounts)
-
   return {
     accounts
   };

package/lib/profile-pane.js

@@ -5197,9 +5197,10 @@ function presentCV(subject, store) {
     const languageNodes = store.each(subject, external_UI_.ns.schema('knowsLanguage'));
     const languages = languageNodes
         .flatMap(node => expandRdfList(store, node))
-        .map(lan => languageAsText(store, lan))
-        .filter((language) => language !== '');
-    return { rolesByType, skills, languages };
+        .map(lan => languageAsText(store, lan));
+    // Deduplicate languages
+    const uniqueLanguages = Array.from(new Set(languages));
+    return { rolesByType, skills, languages: uniqueLanguages };
 }
 
 ;// ./src/ontology/socialMedia.ttl
@@ -5240,25 +5241,35 @@ function loadDocument(store, documentSource, documentName, documentURI) {
 const socialMediaFormName = 'socialMedia.ttl'; // The name of the file to upload
 const DEFAULT_ICON_URI = external_UI_.icons.iconBase + 'noun_10636_grey.svg'; // grey disc
 function SocialPresenter_expandRdfList(store, node) {
-    const collectionElements = node.elements;
-    if (Array.isArray(collectionElements)) {
-        return collectionElements.flatMap(element => SocialPresenter_expandRdfList(store, element));
-    }
-    const first = store.any(node, external_UI_.ns.rdf('first'));
-    if (!first)
-        return [node];
-    const items = [];
-    let current = node;
-    while (current) {
-        const value = store.any(current, external_UI_.ns.rdf('first'));
-        if (value)
-            items.push(...SocialPresenter_expandRdfList(store, value));
-        const rest = store.any(current, external_UI_.ns.rdf('rest'));
-        if (!rest || (rest.termType === 'NamedNode' && rest.value === external_UI_.ns.rdf('nil').value))
-            break;
-        current = rest;
+    const visited = new Set();
+    function inner(node) {
+        const termType = node.termType || typeof node;
+        const value = node.value || String(node);
+        const key = `${termType}:${value}`;
+        if (visited.has(key))
+            return [];
+        visited.add(key);
+        const collectionElements = node.elements;
+        if (Array.isArray(collectionElements)) {
+            return collectionElements.flatMap(element => inner(element));
+        }
+        const first = store.any(node, external_UI_.ns.rdf('first'));
+        if (!first)
+            return [node];
+        const items = [];
+        let current = node;
+        while (current) {
+            const value = store.any(current, external_UI_.ns.rdf('first'));
+            if (value)
+                items.push(...inner(value));
+            const rest = store.any(current, external_UI_.ns.rdf('rest'));
+            if (!rest || (rest.termType === 'NamedNode' && rest.value === external_UI_.ns.rdf('nil').value))
+                break;
+            current = rest;
+        }
+        return items;
     }
-    return items;
+    return inner(node);
 }
 function presentSocial(subject, store) {
     function nameForAccount(subject) {
@@ -5292,12 +5303,18 @@ function presentSocial(subject, store) {
         return DEFAULT_ICON_URI;
     }
     function homepageForAccount(subject) {
-        const id = store.anyJS(subject, external_UI_.ns.foaf('accountName'), null, subject.doc()) || '';
+        const acHomepage = store.any(subject, external_UI_.ns.foaf('homepage')); // on the account itself?
+        if (acHomepage)
+            return acHomepage.value;
+        const id = store.anyJS(subject, external_UI_.ns.foaf('accountName'), null, subject.doc()) || 'No_account_Name';
         const classes = store.each(subject, external_UI_.ns.rdf('type'));
         for (const k of classes) {
-            const userProfilePrefix = store.any(k, external_UI_.ns.foaf('userProfilePrefix'));
-            if (userProfilePrefix) {
-                return userProfilePrefix.value + id.trim();
+            // Fix: ensure k is a NamedNode for store.any
+            if (k.termType === 'NamedNode') {
+                const userProfilePrefix = store.any(k, external_UI_.ns.foaf('userProfilePrefix'));
+                if (userProfilePrefix) {
+                    return userProfilePrefix.value + id.trim();
+                }
             }
         }
         return store.anyJS(subject, external_UI_.ns.foaf('homepage'), null, subject.doc()) || '';
@@ -5312,12 +5329,22 @@ function presentSocial(subject, store) {
     // we need to load the social media accounts ontology to be able to query all data needed
     loadDocument(store, socialMedia_namespaceObject, socialMediaFormName);
     const accountNodes = store.each(subject, external_UI_.ns.foaf('account'));
-    const accountThings = accountNodes.flatMap(node => SocialPresenter_expandRdfList(store, node));
-    if (!accountThings.length)
+    let accountThings = accountNodes.flatMap(node => SocialPresenter_expandRdfList(store, node));
+    // Deduplicate by foaf:accountName value
+    const accountNameSet = new Set();
+    const accounts = [];
+    for (const ac of accountThings) {
+        if (ac.termType === 'NamedNode') {
+            const accountNameNode = store.any(ac, external_UI_.ns.foaf('accountName'));
+            const accountName = accountNameNode ? accountNameNode.value : '';
+            if (!accountNameSet.has(accountName)) {
+                accountNameSet.add(accountName);
+                accounts.push(accountAsObject(ac));
+            }
+        }
+    }
+    if (!accounts.length)
         return { accounts: [] };
-    //console.log('Social: accountThings', accountThings)
-    const accounts = accountThings.map(ac => accountAsObject(ac));
-    //console.log('Social: account objects', accounts)
     return { accounts };
 }