@planningcenter/topbar 12.4.1-qa-983.0 → 12.5.0-qa-988.0

package/dist/topbar.js

@@ -4154,6 +4154,10 @@ async function mintToken(personId) {
   }
   return token;
 }
+function hasReadOnlyToken(personId) {
+  var _a;
+  return ((_a = cachedToken(personId)) === null || _a === void 0 ? void 0 : _a.readOnly) === true;
+}
 async function request(personId, key, init = {}, isRetry = false) {
   var _a;
   const token = isRetry ? await mintToken(personId) : (_a = cachedToken(personId)) !== null && _a !== void 0 ? _a : await mintToken(personId);
@@ -4189,8 +4193,8 @@ function ifMatch(version) {
 // retrying when another tab or device wrote in between. `change` returns null
 // when there's nothing to write. A read-only token (staff impersonating
 // someone) only reads, so nothing is written into the person's history.
-// Resolves to the value now stored, or null when the service couldn't be
-// reached.
+// Resolves to the value now stored, with whether the token was read-only, or
+// null when the service couldn't be reached.
 async function updateStoredValue(personId, key, change, attemptsLeft = MAX_ATTEMPTS) {
   const read = await request(personId, key);
   if (read === null || read === void 0 ? void 0 : read.response.ok) {
@@ -4198,9 +4202,15 @@ async function updateStoredValue(personId, key, change, attemptsLeft = MAX_ATTEM
       value,
       version
     } = await read.response.json();
-    const next = read.token.readOnly ? null : change(value);
+    const {
+      readOnly
+    } = read.token;
+    const next = readOnly ? null : change(value);
     if (next === null) {
-      return Array.isArray(value) ? value : [];
+      return {
+        readOnly,
+        value: Array.isArray(value) ? value : []
+      };
     } else {
       const write = await request(personId, key, {
         body: JSON.stringify({
@@ -4213,7 +4223,10 @@ async function updateStoredValue(personId, key, change, attemptsLeft = MAX_ATTEM
         method: "PUT"
       });
       if (write === null || write === void 0 ? void 0 : write.response.ok) {
-        return next;
+        return {
+          readOnly,
+          value: next
+        };
       } else if ((write === null || write === void 0 ? void 0 : write.response.status) === 409 && attemptsLeft > 1) {
         return updateStoredValue(personId, key, change, attemptsLeft - 1);
       } else {
@@ -4265,7 +4278,8 @@ async function syncOnce(scope) {
       return isSameList(mergeEntries(shared, local), shared) ? null : mergeStored(stored, local);
     });
     if (synced) {
-      writeRecentlyVisited(scope, mergeEntries(entriesFrom(synced), readRecentlyVisited(scope)));
+      const shared = entriesFrom(synced.value);
+      writeRecentlyVisited(scope, synced.readOnly ? shared : mergeEntries(shared, readRecentlyVisited(scope)));
     }
   } catch {
     // The service is best-effort; the local copy stands on its own.
@@ -4296,9 +4310,13 @@ function sync(scope, followUp) {
 function syncRecentlyVisited(scope) {
   return sync(scope, false);
 }
+// Staff impersonating someone get a read-only token, and their visits stay out
+// of that person's list. Until the token is minted the visit is kept, and the
+// sync that mints it replaces the local list with the synced one, so recording
+// never waits on the network.
 function recordVisit(visit, scope) {
   const entry = toEntry(visit, new Date());
-  if (isEntry(entry)) {
+  if (isEntry(entry) && !hasReadOnlyToken(scope.personId)) {
     writeRecentlyVisited(scope, addVisit(readRecentlyVisited(scope), entry));
     sync(scope, true);
   }
@@ -36859,13 +36877,15 @@ const useNotifications = ({
       return notification.data;
     }
   };
-  const updateStateFromJoltMessage = React.useCallback(message => {
+  const updateStateFromJoltMessage = React.useCallback(async message => {
     try {
       const joltMessageNotificationDataPayload = extractPayloadFromJoltMessage(message);
-      fetchNotification(joltMessageNotificationDataPayload.data.id).then(resp => {
-        const notification = buildNotificationFromApiResponse(resp.data, resp);
-        setNotifications(notifications => [...notifications.filter(candidate => candidate.id !== notification.id), notification]);
-      });
+      const resp = await fetchNotification(joltMessageNotificationDataPayload.data.id);
+      if (!(resp === null || resp === void 0 ? void 0 : resp.data)) {
+        return;
+      }
+      const notification = buildNotificationFromApiResponse(resp.data, resp);
+      setNotifications(notifications => [...notifications.filter(candidate => candidate.id !== notification.id), notification]);
     } catch (exception) {
       console.error("topbar encountered error when updating state from jolt message", exception);
     }