profile-pane 3.2.1 → 3.2.2-test.0

package/lib/sections/heading/HeadingSection.d.ts

@@ -1,9 +1,10 @@
 import { TemplateResult } from 'lit-html';
-import '../../styles/HeadingSection.css';
+import 'solid-ui/components/actions/button';
+import './HeadingSection.css';
 import { ProfileDetails } from './types';
 import { DataBrowserContext } from 'pane-registry';
 import { NamedNode } from 'rdflib';
 import { ViewerMode } from '../../types';
-export declare const renderHeadingSection: (context: DataBrowserContext, subject: NamedNode, profileData: ProfileDetails, viewerMode: ViewerMode, onSaved?: () => Promise<void> | void) => TemplateResult<1>;
+export declare const renderHeadingSection: (context: DataBrowserContext, subject: NamedNode, profileData: ProfileDetails, viewerMode: ViewerMode, onSaved?: () => Promise<void> | void) => Promise<TemplateResult<1>>;
 export declare const Image: (src: any, alt: any) => TemplateResult<1>;
 //# sourceMappingURL=HeadingSection.d.ts.map

package/lib/sections/heading/HeadingSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HeadingSection.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/HeadingSection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAE,MAAM,UAAU,CAAA;AACxD,OAAO,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAOxC,eAAO,MAAM,oBAAoB,GAC/B,SAAS,kBAAkB,EAC3B,SAAS,SAAS,EAClB,aAAa,cAAc,EAC3B,YAAY,UAAU,EACtB,UAAU,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,sBA2DrC,CAAA;AAaD,eAAO,MAAM,KAAK,GAAI,QAAG,EAAE,QAAG,sBAgBvB,CAAA"}
+{"version":3,"file":"HeadingSection.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/HeadingSection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAE,MAAM,UAAU,CAAA;AACxD,OAAO,oCAAoC,CAAA;AAC3C,OAAO,sBAAsB,CAAA;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAqBxC,eAAO,MAAM,oBAAoB,GAC/B,SAAS,kBAAkB,EAC3B,SAAS,SAAS,EAClB,aAAa,cAAc,EAC3B,YAAY,UAAU,EACtB,UAAU,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,+BAyErC,CAAA;AAaD,eAAO,MAAM,KAAK,GAAI,QAAG,EAAE,QAAG,sBAmB7B,CAAA"}

package/lib/sections/heading/HeadingSection.js

@@ -5,13 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.renderHeadingSection = exports.Image = void 0;
 var _litHtml = require("lit-html");
-require("../../styles/HeadingSection.css");
+require("solid-ui/components/actions/button");
+require("./HeadingSection.css");
 var _HeadingEditDialog = require("./HeadingEditDialog");
 var _textUtils = require("../../textUtils");
 var _dateHelpers = require("./dateHelpers");
 var _profileIcons = require("../../icons-svg/profileIcons");
 var _contactIcons = require("../../icons-svg/contactIcons");
-const renderHeadingSection = (context, subject, profileData, viewerMode, onSaved) => {
+var _addMeToYourFriends = require("../../specialButtons/addMeToYourFriends");
+var _addMeToYourContacts = require("../../specialButtons/addContact/addMeToYourContacts");
+var _imageHelpers = require("./imageHelpers");
+const showHeadingImageFallback = event => {
+  const image = event.currentTarget;
+  const frame = image?.parentElement;
+  if (!image || !frame) {
+    return;
+  }
+  image.hidden = true;
+  frame.classList.add('profile__image-frame--fallback');
+};
+const renderHeadingSection = async (context, subject, profileData, viewerMode, onSaved) => {
   const {
     name,
     pronouns,
@@ -22,18 +35,22 @@ const renderHeadingSection = (context, subject, profileData, viewerMode, onSaved
     primaryEmail,
     imageSrc
   } = profileData;
+  const resolvedImageSrc = await (0, _imageHelpers.resolvePhotoDisplaySrc)(context.session.store, imageSrc);
   const isOwner = viewerMode === 'owner';
+  const isAuthenticatedViewer = viewerMode === 'authenticated';
+  const contactsButton = isAuthenticatedViewer ? await (0, _addMeToYourContacts.addMeToYourContactsDiv)(subject, context) : _litHtml.nothing;
+  const friendsButton = isAuthenticatedViewer ? (0, _addMeToYourFriends.addMeToYourFriendsDiv)(subject, context, viewerMode) : _litHtml.nothing;
   const phoneValue = (0, _textUtils.toText)(primaryPhone?.valueNode).replace(/^tel:/i, '');
   const emailValue = (0, _textUtils.toText)(primaryEmail?.valueNode).replace(/^mailto:/i, '');
-  const dateOfBirthDisplay = (0, _dateHelpers.toDisplayDateDMY)((0, _textUtils.toText)(dateOfBirth), 'DD-MM-YYYY');
+  const dateOfBirthDisplay = (0, _dateHelpers.toDisplayDateDMY)((0, _textUtils.toText)(dateOfBirth), '');
   return (0, _litHtml.html)`
-      <section class="profile__section border-lighter" aria-labelledby="profile-name">
+      <section class="profile__section" data-profile-section="heading" aria-labelledby="profile-name">
         <div class="profile__heading-top">
           <div class="profile__avatar">
-            ${Image(imageSrc, name)}
+            ${Image(resolvedImageSrc, name)}
           </div>
           <div class="profile__info">
-            <header class="profile__header-bar mb-md">
+            <header class="profile__header-bar">
               <div class="profile__identity" role="group" aria-label="Name and pronouns">
                 <h1 id="profile-name" class="profile__name">${name}</h1>
                 <span class="profile__pronouns">${pronouns ? `(${pronouns})` : ''}</span>
@@ -41,20 +58,30 @@ const renderHeadingSection = (context, subject, profileData, viewerMode, onSaved
               ${jobTitle ? (0, _litHtml.html)`<div class="profile__role-org">${jobTitle}</div>` : _litHtml.nothing}
             </header>
           </div>
-          ${isOwner ? (0, _litHtml.html)`
-              <div class="profile__actions profile__heading-actions" aria-label="Profile actions">
-                <button
-                  type="button"
-                  class="profile__action-button profile__heading-action-button profile-action-text flex-center"
-                  aria-label="Add or edit heading information"
-                  @click=${event => {
+          ${isOwner || isAuthenticatedViewer ? (0, _litHtml.html)`
+                ${isAuthenticatedViewer ? (0, _litHtml.html)`
+                  <div class="profile__actions profile__heading-actions">
+                    ${contactsButton}
+                    ${friendsButton}
+                  </div>
+                ` : _litHtml.nothing}
+                ${isOwner ? (0, _litHtml.html)`
+                  <div class="profile__actions profile__heading-edit-action">
+                    <solid-ui-button
+                      type="button"
+                      variant="secondary"
+                      size="sm"
+                      class="profile__action-button profile__heading-action-button profile-action-text profile-section-collapsible__edit-button"
+                      aria-label="Add or edit heading information"
+                      @click=${event => {
     return (0, _HeadingEditDialog.createHeadingEditDialog)(event, context.session.store, subject, profileData, viewerMode, onSaved);
   }}
-                >
-                  <span class="profile-section-collapsible__edit-label">${_profileIcons.editIcon} Edit</span>
-                  <span class="profile-section-collapsible__edit-icon" aria-hidden="true">${_profileIcons.editIcon}</span>
-                </button>
-              </div>
+                    >
+                    <span class="profile-section-collapsible__edit-label">${_profileIcons.editIcon} Edit</span>
+                    <span class="profile-section-collapsible__edit-icon" aria-hidden="true">${_profileIcons.editIcon}</span>
+                  </solid-ui-button>
+                </div>
+                ` : _litHtml.nothing}
             ` : _litHtml.nothing}
           <div class="profile__details">
             <div class="profile__meta-row" role="group" aria-label="Additional profile information">
@@ -80,18 +107,22 @@ const Line = (value, prefix = _litHtml.nothing, label = '') => value ? (0, _litH
       </span>
     </div>
   ` : _litHtml.nothing;
-const Image = (src, alt) => src ? (0, _litHtml.html)`
-        <img
-          class="profile__hero"
-          src=${src}
-          alt="${alt}"
-          width="140"
-          height="140"
-          loading="eager"
-        />
-      ` : (0, _litHtml.html)`
-        <div class="profile__hero-alt flex-center" role="img" aria-label="${alt}" tabindex="0">
-          <span class="profile__hero-icon">${_profileIcons.personInCircleIcon}</span>
-        </div>
-      `;
+const Image = (src, alt) => (0, _litHtml.html)`
+  <div class=${src ? 'profile__image-frame' : 'profile__image-frame profile__image-frame--fallback'}>
+    ${src ? (0, _litHtml.html)`
+          <img
+            class="profile__hero"
+            src=${src}
+            alt="${alt}"
+            width="140"
+            height="140"
+            loading="eager"
+            @error=${showHeadingImageFallback}
+          />
+        ` : _litHtml.nothing}
+    <div class="profile__hero-alt" role="img" aria-label="${alt}">
+      <span class="profile__hero-icon">${_profileIcons.personInCircleIcon}</span>
+    </div>
+  </div>
+`;
 exports.Image = Image;

package/lib/sections/heading/imageHelpers.d.ts

@@ -1,4 +1,5 @@
 import { LiveStore, NamedNode } from 'rdflib';
+export declare function resolvePhotoDisplaySrc(store: LiveStore, imageSrc?: string): Promise<string | undefined>;
 export declare function uploadPhotoFile(store: LiveStore, subject: NamedNode, file: File): Promise<string>;
 export declare function deletePhotoFile(store: LiveStore, subject: NamedNode, photoUri: string): Promise<void>;
 //# sourceMappingURL=imageHelpers.d.ts.map

package/lib/sections/heading/imageHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageHelpers.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/imageHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAO,MAAM,QAAQ,CAAA;AAoClD,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAsCvG;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY3G"}
+{"version":3,"file":"imageHelpers.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/imageHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAO,MAAM,QAAQ,CAAA;AAwClD,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4B7G;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAiDvG;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY3G"}

package/lib/sections/heading/imageHelpers.js

@@ -4,9 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.deletePhotoFile = deletePhotoFile;
+exports.resolvePhotoDisplaySrc = resolvePhotoDisplaySrc;
 exports.uploadPhotoFile = uploadPhotoFile;
 var _rdflib = require("rdflib");
 var _solidUi = require("solid-ui");
+var _solidLogic = require("solid-logic");
+var _debug = require("../../utils/debug");
+const resolvedHeadingImageCache = new Map();
 /* Code copied from contact-pane/src/mugshotGallery and modified to fit the needs of the new design */
 const mimeMap = {
   'image/png': 'png',
@@ -35,6 +39,31 @@ function subjectDirectoryUri(subject) {
   const lastSlash = docUri.lastIndexOf('/');
   return lastSlash >= 0 ? docUri.slice(0, lastSlash + 1) : docUri;
 }
+async function resolvePhotoDisplaySrc(store, imageSrc) {
+  if (!imageSrc || imageSrc.startsWith('blob:') || imageSrc.startsWith('data:')) {
+    return imageSrc;
+  }
+  const cachedImageSrc = resolvedHeadingImageCache.get(imageSrc);
+  if (cachedImageSrc) {
+    return cachedImageSrc;
+  }
+  const fetcher = store.fetcher;
+  if (!fetcher?._fetch || typeof URL.createObjectURL !== 'function') {
+    return imageSrc;
+  }
+  try {
+    const response = await fetcher._fetch(imageSrc);
+    if (!response.ok) {
+      return imageSrc;
+    }
+    const imageBlob = await response.blob();
+    const resolvedImageSrc = URL.createObjectURL(imageBlob);
+    resolvedHeadingImageCache.set(imageSrc, resolvedImageSrc);
+    return resolvedImageSrc;
+  } catch {
+    return imageSrc;
+  }
+}
 async function uploadPhotoFile(store, subject, file) {
   if (!store.fetcher) {
     throw new Error('Store has no fetcher.');
@@ -66,6 +95,16 @@ async function uploadPhotoFile(store, subject, file) {
   } catch (error) {
     throw new Error(`Error uploading picture: ${error}`);
   }
+  const currentUser = _solidLogic.authn.currentUser();
+  if (currentUser) {
+    try {
+      await _solidLogic.solidLogicSingleton.acl.setACLUserPublic(candidateUri, currentUser, {
+        public: ['Read']
+      });
+    } catch (error) {
+      (0, _debug.error)(`Error setting uploaded picture permissions: ${error}`);
+    }
+  }
   return candidateUri;
 }
 async function deletePhotoFile(store, subject, photoUri) {
@@ -75,7 +114,7 @@ async function deletePhotoFile(store, subject, photoUri) {
     try {
       await store.fetcher.webOperation('DELETE', photoUri);
     } catch (error) {
-      console.error(`Error deleting picture: ${error}`);
+      (0, _debug.error)(`Error deleting picture: ${error}`);
     }
   }
 }

package/lib/sections/heading/mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/mutations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAA0B,MAAM,QAAQ,CAAA;AAErE,OAAO,EAAmB,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAgO9D,wBAAsB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,iBAUpH"}
+{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/mutations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAA0B,MAAM,QAAQ,CAAA;AAErE,OAAO,EAAmB,mBAAmB,EAAE,MAAM,SAAS,CAAA;AA8S9D,wBAAsB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,iBAYpH"}

package/lib/sections/heading/mutations.js

@@ -9,6 +9,18 @@ var _solidUi = require("solid-ui");
 var _rdfMutationHelpers = require("../shared/rdfMutationHelpers");
 var _idNodeFactory = require("../shared/idNodeFactory");
 var _texts = require("../../texts");
+var _debug = require("../../utils/debug");
+function splitPronouns(value) {
+  const normalized = (value || '').trim();
+  if (!normalized) return {};
+  const [subjectPronounRaw, objectPronounRaw] = normalized.split('/').map(part => part.trim());
+  const subjectPronoun = subjectPronounRaw || undefined;
+  const objectPronoun = objectPronounRaw || undefined;
+  return {
+    subjectPronoun,
+    objectPronoun
+  };
+}
 function buildPhoneStatements(subject, doc, node, phone) {
   const normalizedValue = phone.value.startsWith('tel:') ? phone.value : `tel:${phone.value}`;
   const valueNode = (0, _rdflib.sym)(normalizedValue);
@@ -30,11 +42,11 @@ function buildEmailStatements(subject, doc, node, email) {
 function buildAddressStatements(subject, doc, node, address) {
   const inserts = [(0, _rdflib.st)(subject, _solidUi.ns.vcard('hasAddress'), node, doc)];
   if (address.type) inserts.push((0, _rdflib.st)(node, _solidUi.ns.rdf('type'), _solidUi.ns.vcard(address.type), doc));
-  if (address.streetAddress) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('street-address'), address.streetAddress, doc));
-  if (address.locality) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('locality'), address.locality, doc));
-  if (address.region) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('region'), address.region, doc));
-  if (address.postalCode) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('postal-code'), address.postalCode, doc));
-  if (address.countryName) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('country-name'), address.countryName, doc));
+  if (address.streetAddress) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('street-address'), (0, _rdflib.literal)(address.streetAddress), doc));
+  if (address.locality) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('locality'), (0, _rdflib.literal)(address.locality), doc));
+  if (address.region) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('region'), (0, _rdflib.literal)(address.region), doc));
+  if (address.postalCode) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('postal-code'), (0, _rdflib.literal)(address.postalCode), doc));
+  if (address.countryName) inserts.push((0, _rdflib.st)(node, _solidUi.ns.vcard('country-name'), (0, _rdflib.literal)(address.countryName), doc));
   return inserts;
 }
 function findOpWithExistingEntry(ops, existingNodes) {
@@ -43,7 +55,7 @@ function findOpWithExistingEntry(ops, existingNodes) {
 function findCreateOp(ops) {
   return ops.find(op => !op.entryNode);
 }
-async function mutatePhoneEntry(store, subject, phoneOps) {
+async function mutatePhoneEntry(store, subject, phoneOps, documentTextCache) {
   const doc = subject.doc();
   const existingPhoneNodes = store.each(subject, _solidUi.ns.vcard('hasTelephone'), null, doc);
   const deletions = [];
@@ -72,9 +84,19 @@ async function mutatePhoneEntry(store, subject, phoneOps) {
   if (createPhone) {
     insertions.push(...buildPhoneStatements(subject, doc, (0, _idNodeFactory.createIdNode)(doc), createPhone));
   }
-  await (0, _rdfMutationHelpers.applyUpdaterPatch)(store, deletions, insertions);
+  const shouldSerializeDocument = await (0, _rdfMutationHelpers.shouldForceDocumentPutForStatements)(store, doc, insertions, undefined, {
+    documentTextCache
+  });
+  await (0, _rdfMutationHelpers.runUpdateTransport)(store, doc, deletions, insertions, {
+    unsupportedMessage: _texts.updaterUnsupportedStoreErrorMessageText,
+    failureMessage: 'Failed to save heading updates',
+    documentTextCache,
+    useDavFallback: false,
+    usePutFallback: shouldSerializeDocument,
+    forcePut: shouldSerializeDocument
+  });
 }
-async function mutateEmailEntry(store, subject, emailOps) {
+async function mutateEmailEntry(store, subject, emailOps, documentTextCache) {
   const doc = subject.doc();
   const existingEmailNodes = store.each(subject, _solidUi.ns.vcard('hasEmail'), null, doc);
   const deletions = [];
@@ -103,9 +125,19 @@ async function mutateEmailEntry(store, subject, emailOps) {
   if (createEmail) {
     insertions.push(...buildEmailStatements(subject, doc, (0, _idNodeFactory.createIdNode)(doc), createEmail));
   }
-  await (0, _rdfMutationHelpers.applyUpdaterPatch)(store, deletions, insertions);
+  const shouldSerializeDocument = await (0, _rdfMutationHelpers.shouldForceDocumentPutForStatements)(store, doc, insertions, undefined, {
+    documentTextCache
+  });
+  await (0, _rdfMutationHelpers.runUpdateTransport)(store, doc, deletions, insertions, {
+    unsupportedMessage: _texts.updaterUnsupportedStoreErrorMessageText,
+    failureMessage: 'Failed to save heading updates',
+    documentTextCache,
+    useDavFallback: false,
+    usePutFallback: shouldSerializeDocument,
+    forcePut: shouldSerializeDocument
+  });
 }
-async function mutateAddressEntry(store, subject, addressOps) {
+async function mutateAddressEntry(store, subject, addressOps, documentTextCache) {
   const doc = subject.doc();
   const existingAddressNodes = store.each(subject, _solidUi.ns.vcard('hasAddress'), null, doc);
   const deletions = [];
@@ -134,9 +166,19 @@ async function mutateAddressEntry(store, subject, addressOps) {
   if (createAddress) {
     insertions.push(...buildAddressStatements(subject, doc, (0, _idNodeFactory.createIdNode)(doc), createAddress));
   }
-  await (0, _rdfMutationHelpers.applyUpdaterPatch)(store, deletions, insertions);
+  const shouldSerializeDocument = await (0, _rdfMutationHelpers.shouldForceDocumentPutForStatements)(store, doc, insertions, undefined, {
+    documentTextCache
+  });
+  await (0, _rdfMutationHelpers.runUpdateTransport)(store, doc, deletions, insertions, {
+    unsupportedMessage: _texts.updaterUnsupportedStoreErrorMessageText,
+    failureMessage: 'Failed to save heading updates',
+    documentTextCache,
+    useDavFallback: false,
+    usePutFallback: shouldSerializeDocument,
+    forcePut: shouldSerializeDocument
+  });
 }
-async function mutateBasicProfileEntry(store, subject, basicOps) {
+async function mutateBasicProfileEntry(store, subject, basicOps, documentTextCache) {
   const doc = subject.doc();
   const deletions = [];
   const insertions = [];
@@ -150,13 +192,21 @@ async function mutateBasicProfileEntry(store, subject, basicOps) {
     const nextObject = !normalized ? null : normalized.startsWith('http://') || normalized.startsWith('https://') ? (0, _rdflib.sym)(normalized) : (0, _rdflib.literal)(normalized);
     (0, _rdfMutationHelpers.replacePredicateStatements)(store, subject, _solidUi.ns.vcard('hasPhoto'), doc, deletions, insertions, nextObject);
   };
+  const replacePronounFields = value => {
+    const {
+      subjectPronoun,
+      objectPronoun
+    } = splitPronouns(value);
+    (0, _rdfMutationHelpers.replacePredicateStatements)(store, subject, _solidUi.ns.solid('preferredSubjectPronoun'), doc, deletions, insertions, subjectPronoun ? (0, _rdflib.literal)(subjectPronoun) : null);
+    (0, _rdfMutationHelpers.replacePredicateStatements)(store, subject, _solidUi.ns.solid('preferredObjectPronoun'), doc, deletions, insertions, objectPronoun ? (0, _rdflib.literal)(objectPronoun) : null);
+    (0, _rdfMutationHelpers.replacePredicateStatements)(store, subject, _solidUi.ns.solid('preferredRelativePronoun'), doc, deletions, insertions, null);
+  };
   const applyBasics = (basic, clearAll = false) => {
     const data = clearAll ? {
       name: '',
       nickname: '',
+      pronouns: '',
       dateOfBirth: '',
-      jobTitle: '',
-      orgName: '',
       imageSrc: ''
     } : basic;
     replaceLiteralField(_solidUi.ns.vcard('fn'), data.name);
@@ -164,8 +214,7 @@ async function mutateBasicProfileEntry(store, subject, basicOps) {
     replaceLiteralField(_solidUi.ns.foaf('nick'), data.nickname);
     replaceLiteralField(_solidUi.ns.vcard('nickname'), data.nickname);
     replaceLiteralField(_solidUi.ns.vcard('bday'), data.dateOfBirth);
-    replaceLiteralField(_solidUi.ns.vcard('role'), data.jobTitle);
-    replaceLiteralField(_solidUi.ns.vcard('organization-name'), data.orgName);
+    replacePronounFields(data.pronouns);
     replacePhotoField(data.imageSrc);
   };
   const removeBasic = basicOps.remove[0];
@@ -175,16 +224,30 @@ async function mutateBasicProfileEntry(store, subject, basicOps) {
   if (selectedBasic) {
     applyBasics(selectedBasic, Boolean(removeBasic && !updateBasic && !createBasic));
   }
-  await (0, _rdfMutationHelpers.applyUpdaterPatch)(store, deletions, insertions);
+  const shouldSerializeDocument = await (0, _rdfMutationHelpers.shouldForceDocumentPutForStatements)(store, doc, insertions, undefined, {
+    documentTextCache
+  });
+  await (0, _rdfMutationHelpers.runUpdateTransport)(store, doc, deletions, insertions, {
+    unsupportedMessage: _texts.updaterUnsupportedStoreErrorMessageText,
+    failureMessage: 'Failed to save heading updates',
+    documentTextCache,
+    useDavFallback: false,
+    usePutFallback: shouldSerializeDocument,
+    forcePut: shouldSerializeDocument
+  });
 }
 async function processHeadingMutations(store, subject, mutationPlan) {
   try {
-    await mutateBasicProfileEntry(store, subject, mutationPlan.basicOps);
-    await mutatePhoneEntry(store, subject, mutationPlan.phoneOps);
-    await mutateEmailEntry(store, subject, mutationPlan.emailOps);
-    await mutateAddressEntry(store, subject, mutationPlan.addressOps);
+    const documentTextCache = new Map();
+    await mutateBasicProfileEntry(store, subject, mutationPlan.basicOps, documentTextCache);
+    await mutatePhoneEntry(store, subject, mutationPlan.phoneOps, documentTextCache);
+    await mutateEmailEntry(store, subject, mutationPlan.emailOps, documentTextCache);
+    await mutateAddressEntry(store, subject, mutationPlan.addressOps, documentTextCache);
   } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    throw new Error(`${_texts.saveHeadingUpdatesFailedPrefixText} ${message}`);
+    const rootError = error instanceof Error ? error : new Error(String(error));
+    (0, _debug.error)(_texts.headingMutationSaveFailedDebugText, rootError);
+    throw new Error(_texts.saveHeadingUpdatesFailedMessageText, {
+      cause: rootError
+    });
   }
 }

package/lib/sections/heading/selectors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/selectors.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAQ,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAuH7C,wBAAgB,cAAc,CAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,SAAS,GAAG,MAAM,CAS3E;AAQD,eAAO,MAAM,cAAc,GACzB,SAAS,SAAS,EAClB,OAAO,SAAS,KACf,cA2EF,CAAA"}
+{"version":3,"file":"selectors.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/selectors.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAQ,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAyH7C,wBAAgB,cAAc,CAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,SAAS,GAAG,MAAM,CAS3E;AAsBD,eAAO,MAAM,cAAc,GACzB,SAAS,SAAS,EAClB,OAAO,SAAS,KACf,cA0EF,CAAA"}

package/lib/sections/heading/selectors.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.presentProfile = void 0;
 exports.pronounsAsText = pronounsAsText;
 var _solidUi = require("solid-ui");
+var _selectors = require("../resume/selectors");
 /* Copied from presenter and modified for new functionallity */
 
 function termValue(term) {
@@ -104,14 +105,25 @@ function pronounsAsText(store, subject) {
 function formatLocation(countryName, locality) {
   return countryName && locality ? `${locality}, ${countryName}` : countryName || locality || null;
 }
+function normalizeRoleType(value) {
+  return (value || '').replace(/\s+/g, '').toLowerCase();
+}
+function selectHeadingRole(roles) {
+  const currentRole = roles.find(role => role.isCurrentRole || normalizeRoleType(role.roleType) === 'currentrole');
+  if (currentRole) return currentRole;
+  return roles.find(role => {
+    const normalizedRoleType = normalizeRoleType(role.roleType);
+    return normalizedRoleType !== 'currentrole' && normalizedRoleType !== 'futurerole';
+  });
+}
 const presentProfile = (subject, store) => {
   const name = _solidUi.utils.label(subject);
   // on contact-pane form it is foaf, but maybe another app saves with vcard.
   const nickname = store.anyValue(subject, _solidUi.ns.vcard('nickname')) || store.anyValue(subject, _solidUi.ns.foaf('nick')) || undefined;
   const dateOfBirth = store.anyValue(subject, _solidUi.ns.vcard('bday')) || undefined;
   const imageSrc = _solidUi.widgets.findImage(subject);
-  const jobTitle = store.anyValue(subject, _solidUi.ns.vcard('role')) || undefined;
-  const orgName = store.anyValue(subject, _solidUi.ns.vcard('organization-name')) || undefined; // @@ Search whole store
+  const headingRole = selectHeadingRole((0, _selectors.presentCV)(subject, store));
+  const jobTitle = headingRole?.title || undefined;
   const doc = subject.doc();
 
   // Contact info - we will only show one of each type here
@@ -145,7 +157,6 @@ const presentProfile = (subject, store) => {
     imageSrc,
     dateOfBirth,
     jobTitle,
-    orgName,
     primaryPhone,
     primaryEmail,
     primaryAddress,

package/lib/sections/heading/types.d.ts

@@ -10,7 +10,6 @@ export interface ProfilePresentation {
     pronouns?: string;
     dateOfBirth?: string;
     jobTitle?: string;
-    orgName?: string;
     primaryPhone?: PointDetails;
     primaryEmail?: PointDetails;
     primaryAddress?: AddressDetails;
@@ -22,7 +21,7 @@ export interface ProfileRow extends ProfilePresentation {
     entryNode: string;
     status: RowStatus;
 }
-export type ProfileBasicFields = Omit<ProfilePresentation, 'primaryPhone' | 'primaryEmail' | 'primaryAddress'>;
+export type ProfileBasicFields = Omit<ProfilePresentation, 'jobTitle' | 'primaryPhone' | 'primaryEmail' | 'primaryAddress'>;
 export type ProfileBasicRow = ProfileBasicFields & {
     entryNode: string;
     status: RowStatus;

package/lib/sections/heading/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAE5G,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,cAAe,SAAQ,mBAAmB;IACzD,SAAS,EAAE,IAAI,CAAA;CAChB;AAED,MAAM,WAAW,UAAW,SAAQ,mBAAmB;IACrD,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,SAAS,CAAA;CAClB;AAED,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,mBAAmB,EACnB,cAAc,GAAG,cAAc,GAAG,gBAAgB,CACnD,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG;IACjD,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IACtC,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IACtC,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IACtC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAA;CAC3C,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/sections/heading/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAE5G,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,cAAe,SAAQ,mBAAmB;IACzD,SAAS,EAAE,IAAI,CAAA;CAChB;AAED,MAAM,WAAW,UAAW,SAAQ,mBAAmB;IACrD,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,SAAS,CAAA;CAClB;AAED,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,mBAAmB,EACnB,UAAU,GAAG,cAAc,GAAG,cAAc,GAAG,gBAAgB,CAChE,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG;IACjD,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IACtC,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IACtC,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IACtC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAA;CAC3C,CAAA"}

package/lib/sections/languages/LanguageEditDialog.d.ts

@@ -1,6 +1,8 @@
+import 'solid-ui/components/actions/button';
+import 'solid-ui/components/forms/combobox';
 import { LanguageDetails } from './types';
 import '../../styles/EditDialogs.css';
-import '../../styles/ContactInfoEditDialog.css';
+import '../contactInfo/ContactInfoEditDialog.css';
 import { LiveStore, NamedNode } from 'rdflib';
 import { ViewerMode } from '../../types';
 export declare function createLanguageEditDialog(event: Event, store: LiveStore, subject: NamedNode, languages: LanguageDetails[], viewerMode: ViewerMode, onSaved?: () => Promise<void> | void): Promise<void>;

package/lib/sections/languages/LanguageEditDialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LanguageEditDialog.d.ts","sourceRoot":"","sources":["../../../src/sections/languages/LanguageEditDialog.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,SAAS,CAAA;AACtD,OAAO,8BAA8B,CAAA;AACrC,OAAO,wCAAwC,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAwgBxC,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,eAAe,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,iBA2CrC"}
+{"version":3,"file":"LanguageEditDialog.d.ts","sourceRoot":"","sources":["../../../src/sections/languages/LanguageEditDialog.ts"],"names":[],"mappings":"AAEA,OAAO,oCAAoC,CAAA;AAC3C,OAAO,oCAAoC,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAe,MAAM,SAAS,CAAA;AACtD,OAAO,8BAA8B,CAAA;AACrC,OAAO,0CAA0C,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAymBxC,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,eAAe,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,iBAgDrC"}