@nyaruka/temba-components 0.133.0 → 0.134.1

package/src/display/Chat.ts

@@ -1,41 +1,102 @@
 import { TemplateResult, html, PropertyValueMap, css } from 'lit';
 import { property } from 'lit/decorators.js';
+import { repeat } from 'lit/directives/repeat.js';
 import { RapidElement } from '../RapidElement';
 import { CustomEventType } from '../interfaces';
 import { DEFAULT_AVATAR } from '../webchat/assets';
-import { hashCode } from '../utils';
 
 const BATCH_TIME_WINDOW = 60 * 60 * 1000;
-const SCROLL_FETCH_BUFFER = 0.05;
+const SCROLL_FETCH_BUFFER = 200; // pixels from top
 const MIN_FETCH_TIME = 250;
 
+const getUnsendableReasonMessage = (reason: string): string => {
+  switch (reason) {
+    case 'no_route':
+      return 'No channel available to send message';
+    case 'contact_blocked':
+      return 'Contact has been blocked';
+    case 'contact_stopped':
+      return 'Contact has been stopped';
+    case 'contact_archived':
+      return 'Contact is archived';
+    case 'org_suspended':
+      return 'Workspace is suspended';
+    case 'looping':
+      return 'Message loop detected';
+    default:
+      return 'Unable to send message';
+  }
+};
+
+const getStatusReasonMessage = (reason: string): string => {
+  switch (reason) {
+    case 'error_limit':
+      return 'Error limit reached';
+    case 'too_old':
+      return 'Message is too old to send';
+    case 'channel_removed':
+      return 'Channel was removed';
+    default:
+      return 'Message failed to send';
+  }
+};
+
 export enum MessageType {
   Inline = 'inline',
   Error = 'error',
   Collapse = 'collapse',
-  Note = 'note',
-  MsgIn = 'msg_in',
-  MsgOut = 'msg_out'
+  Note = 'note'
 }
 
-interface User {
+export interface ObjectReference {
+  uuid: string;
+  name: string;
+}
+
+interface User extends ObjectReference {
   avatar?: string;
   email: string;
-  name: string;
 }
 
-export interface ChatEvent {
-  id?: string;
-  type: MessageType;
-  text: TemplateResult;
-  date: Date;
-  user?: User;
-  popup?: TemplateResult;
+export interface Msg {
+  text: string;
+  channel: ObjectReference;
+  quick_replies: string[];
+  urn: string;
+  direction: string;
+  type: string;
+  attachments: string[];
+  unsendable_reason?:
+    | 'no_route'
+    | 'contact_blocked'
+    | 'contact_stopped'
+    | 'contact_archived'
+    | 'org_suspended'
+    | 'looping';
+}
+
+export interface ContactEvent {
+  uuid?: string;
+  type: string;
+  created_on: Date;
+  _user?: User;
+  _rendered?: { html: TemplateResult; type: MessageType };
 }
 
-export interface Message extends ChatEvent {
-  sendError?: boolean;
-  attachments?: string[];
+export interface MsgEvent extends ContactEvent {
+  msg: Msg;
+  optin?: ObjectReference;
+  _status?: {
+    created_on: string;
+    status: 'wired' | 'sent' | 'delivered' | 'read' | 'errored' | 'failed';
+    reason: 'error_limit' | 'too_old' | 'channel_removed';
+  };
+  _deleted?: {
+    created_on: string;
+    by_contact: boolean;
+    user: { name: string; uuid: string };
+  };
+  _logs_url?: string;
 }
 
 const TIME_FORMAT = { hour: 'numeric', minute: '2-digit' } as any;
@@ -217,16 +278,24 @@ export class Chat extends RapidElement {
         color: rgba(0, 0, 0, 0.5);
       }
 
+      .failed .bubble,
+      .error .bubble {
+        border: 1px solid var(--color-error);
+        background: #ffe6e6;
+        color: #ad4747ff;
+      }
+
+      .error .bubble .name,
+      .failed .bubble .name {
+        color: #ad47479a;
+      }
+
       .message {
         margin-bottom: 0.5em;
         line-height: 1.2em;
         word-break: break-word;
       }
 
-      .message-text {
-        white-space: pre-line;
-      }
-
       .chat {
         width: 28rem;
         border-radius: var(--curvature);
@@ -437,19 +506,12 @@ export class Chat extends RapidElement {
         border-radius: var(--curvature);
       }
 
-      .error .bubble {
-        border: 1px solid var(--color-error);
-        background: white;
-        color: #333;
-      }
-
-      .error .bubble .name {
-        color: #999;
-      }
-
+      .failed temba-thumbnail,
       .error temba-thumbnail {
-        --thumb-background: var(--color-error);
-        --thumb-icon: white;
+        --thumb-background: #ffe6e6;
+        --thumb-border: var(--color-error);
+        border: 1px solid var(--color-error);
+        color: #ad4747a8;
       }
 
       .outgoing .popup {
@@ -493,6 +555,37 @@ export class Chat extends RapidElement {
         opacity: 1;
         transition-delay: 1s;
       }
+
+      .new-message-notification {
+        position: absolute;
+        bottom: 1em;
+        left: 50%;
+        transform: translateX(-50%) translateY(100px);
+        background: var(--color-primary-dark, #3c92dd);
+        color: white;
+        padding: 0.75em 1.5em;
+        border-radius: var(--curvature);
+        box-shadow: rgba(0, 0, 0, 0.2) 0px 3px 7px 0px,
+          rgba(0, 0, 0, 0.3) 0px 1px 2px 0px;
+        cursor: pointer;
+        opacity: 0;
+        transition: all 0.3s ease-out;
+        z-index: 100;
+        font-weight: 500;
+        pointer-events: none;
+      }
+
+      .new-message-notification.visible {
+        transform: translateX(-50%) translateY(0);
+        opacity: 1;
+        pointer-events: auto;
+      }
+
+      .new-message-notification:hover {
+        background: var(--color-primary-darker, #2b7ac4);
+        box-shadow: rgba(0, 0, 0, 0.3) 0px 4px 10px 0px,
+          rgba(0, 0, 0, 0.4) 0px 2px 4px 0px;
+      }
     `;
   }
 
@@ -520,7 +613,14 @@ export class Chat extends RapidElement {
   @property({ type: Object, attribute: false })
   oldestEventDate: Date = null;
 
-  private msgMap = new Map<string, ChatEvent>();
+  @property({ type: Boolean, attribute: false })
+  showNewMessageNotification = false;
+
+  @property({ type: Boolean })
+  hasFooter = false;
+
+  private msgMap = new Map<string, ContactEvent>();
+  private metadataCache = new Map<string, ContactEvent>();
 
   public firstUpdated(
     changed: PropertyValueMap<any> | Map<PropertyKey, unknown>
@@ -533,20 +633,10 @@ export class Chat extends RapidElement {
   }
 
   public addMessages(
-    messages: ChatEvent[],
+    messages: ContactEvent[],
     startTime: Date = null,
     append = false
   ) {
-    // make sure our messages have ids
-    messages.forEach((m) => {
-      if (!m.id) {
-        m.id =
-          hashCode((m.text.strings || []).join('')) +
-          '_' +
-          m.date.toISOString();
-      }
-    });
-
     if (!startTime) {
       startTime = new Date();
     }
@@ -558,8 +648,17 @@ export class Chat extends RapidElement {
         // first add messages to the map
         const newMessages = [];
         for (const m of messages) {
+          // filter out metadata events - they aren't rendered but cached for later reference
+          if (m.type === 'msg_deleted' || m.type === 'msg_status_changed') {
+            const msgUuid = (m as any).msg_uuid;
+            if (msgUuid) {
+              this.metadataCache.set(msgUuid, m);
+            }
+            continue;
+          }
+
           if (this.addMessage(m)) {
-            newMessages.push(m.id);
+            newMessages.push(m.uuid);
           }
         }
 
@@ -569,12 +668,28 @@ export class Chat extends RapidElement {
 
         const ele = this.shadowRoot.querySelector('.scroll');
         const prevTop = ele.scrollTop;
+        const prevScrollHeight = ele.scrollHeight;
+        const scrollableHeight = ele.scrollHeight - ele.clientHeight;
+        const isScrolledAway =
+          scrollableHeight > 0 && Math.abs(ele.scrollTop) > 50;
 
         const grouped = this.groupMessages(newMessages);
         this.insertGroups(grouped, append);
 
+        // show notification if new messages are appended and user is scrolled away from bottom
+        if (append && isScrolledAway && newMessages.length > 0) {
+          this.showNewMessageNotification = true;
+        }
+
         window.setTimeout(() => {
-          ele.scrollTop = prevTop;
+          // when appending (new messages at bottom), adjust scroll to maintain visible content
+          // with column-reverse, new content at bottom increases scrollHeight
+          if (append && isScrolledAway) {
+            const heightDiff = ele.scrollHeight - prevScrollHeight;
+            ele.scrollTop = prevTop - heightDiff;
+          } else {
+            ele.scrollTop = prevTop;
+          }
 
           this.fireCustomEvent(CustomEventType.FetchComplete);
         }, 100);
@@ -586,22 +701,23 @@ export class Chat extends RapidElement {
     );
   }
 
-  private addMessage(msg: ChatEvent): boolean {
+  private addMessage(msg: ContactEvent): boolean {
     const isNew = !this.messageExists(msg);
-    this.msgMap.set(msg.id, msg);
+    this.msgMap.set(msg.uuid, msg);
     return isNew;
   }
 
-  public messageExists(msg: ChatEvent): boolean {
-    return this.msgMap.has(msg.id);
+  public messageExists(msg: ContactEvent): boolean {
+    return this.msgMap.has(msg.uuid);
   }
 
-  private isSameGroup(msg1: ChatEvent, msg2: ChatEvent): boolean {
+  private isSameGroup(msg1: ContactEvent, msg2: ContactEvent): boolean {
     if (msg1 && msg2) {
       const sameGroup =
         msg1.type === msg2.type &&
-        msg1.user?.name === msg2.user?.name &&
-        Math.abs(msg1.date.getTime() - msg2.date.getTime()) < BATCH_TIME_WINDOW;
+        msg1._user?.name === msg2._user?.name &&
+        Math.abs(msg1.created_on.getTime() - msg2.created_on.getTime()) <
+          BATCH_TIME_WINDOW;
       return sameGroup;
     }
 
@@ -664,14 +780,29 @@ export class Chat extends RapidElement {
 
   private handleScroll(event: any) {
     const ele = event.target;
-    const top = ele.scrollHeight - ele.clientHeight;
-    const scroll = Math.round(top + ele.scrollTop);
-    const scrollPct = scroll / top;
+    const scrollableHeight = ele.scrollHeight - ele.clientHeight;
 
-    this.hideTopScroll = scrollPct <= 0.01;
-    this.hideBottomScroll = scrollPct >= 0.99;
+    if (scrollableHeight <= 0) {
+      return;
+    }
 
-    if (scrollPct < SCROLL_FETCH_BUFFER) {
+    // with column-reverse, scrollTop behavior depends on the browser
+    // check if scrollTop is negative (some browsers) or positive (others)
+    const absScrollTop = Math.abs(ele.scrollTop);
+
+    // when scrolling up to older messages, absScrollTop increases
+    // trigger when we're close to the maximum scroll (oldest messages)
+    const shouldFetch = absScrollTop >= scrollableHeight - SCROLL_FETCH_BUFFER;
+
+    this.hideTopScroll = absScrollTop >= scrollableHeight - 1;
+    this.hideBottomScroll = absScrollTop <= 1;
+
+    // hide notification when scrolled to bottom
+    if (absScrollTop <= 10) {
+      this.showNewMessageNotification = false;
+    }
+
+    if (shouldFetch) {
       this.fireCustomEvent(CustomEventType.ScrollThreshold);
     }
   }
@@ -679,11 +810,16 @@ export class Chat extends RapidElement {
   private scrollToBottom() {
     const scroll = this.shadowRoot.querySelector('.scroll');
     if (scroll) {
-      scroll.scrollTop = scroll.scrollHeight;
+      scroll.scrollTop = 0;
       this.hideBottomScroll = true;
+      this.showNewMessageNotification = false;
     }
   }
 
+  private handleNewMessageClick() {
+    this.scrollToBottom();
+  }
+
   private renderMessageGroup(
     msgIds: string[],
     idx: number,
@@ -692,7 +828,7 @@ export class Chat extends RapidElement {
     const today = new Date();
     const firstGroup = idx === groups.length - 1;
 
-    let prevMsg: ChatEvent;
+    let prevMsg: ContactEvent;
     if (idx > 0) {
       const lastGroup = groups[idx - 1];
       if (lastGroup && lastGroup.length > 0) {
@@ -707,58 +843,72 @@ export class Chat extends RapidElement {
     if (
       prevMsg &&
       !this.isSameGroup(prevMsg, currentMsg) &&
-      (Math.abs(currentMsg.date.getTime() - prevMsg.date.getTime()) >
-        BATCH_TIME_WINDOW ||
+      (Math.abs(
+        currentMsg.created_on.getTime() - prevMsg.created_on.getTime()
+      ) > BATCH_TIME_WINDOW ||
         idx === groups.length - 1)
     ) {
       if (
-        today.getDate() !== prevMsg.date.getDate() ||
-        prevMsg.date.getDate() !== currentMsg.date.getDate()
+        today.getDate() !== prevMsg.created_on.getDate() ||
+        prevMsg.created_on.getDate() !== currentMsg.created_on.getDate()
       ) {
         timeDisplay = html`<div class="time ${firstGroup ? 'first' : ''}">
-          ${prevMsg.date.toLocaleTimeString(undefined, VERBOSE_FORMAT)}
+          ${prevMsg.created_on.toLocaleTimeString(undefined, VERBOSE_FORMAT)}
         </div>`;
       } else {
         timeDisplay = html`<div class="time ${firstGroup ? 'first' : ''}">
-          ${prevMsg.date.toLocaleTimeString(undefined, TIME_FORMAT)}
+          ${prevMsg.created_on.toLocaleTimeString(undefined, TIME_FORMAT)}
         </div>`;
       }
     }
 
     const incoming = this.agent
-      ? currentMsg.type !== 'msg_in'
-      : currentMsg.type === 'msg_in';
+      ? currentMsg.type !== 'msg_received'
+      : currentMsg.type === 'msg_received';
 
-    const name = currentMsg.user?.name;
-    const email = currentMsg.user?.email;
+    const name = currentMsg._user?.name;
 
     const showAvatar =
-      ((currentMsg.type === 'note' ||
-        currentMsg.type === 'msg_in' ||
-        currentMsg.type === 'msg_out') &&
+      ((currentMsg.type === 'msg_received' ||
+        currentMsg.type === 'msg_created') &&
         this.agent) ||
       !incoming;
 
+    const isSystem = !currentMsg._user?.uuid;
+
     return html`
       ${timeDisplay}
-      <div
-        class="block  ${incoming ? 'incoming' : 'outgoing'} ${currentMsg.type}"
-      >
+      <div class="block  ${incoming ? 'incoming' : 'outgoing'}">
         <div class="group-messages" style="flex-grow:1">
-          ${msgIds.map((msgId, index) => {
-            const msg = this.msgMap.get(msgId);
-            return html`<div class="row message">
-              ${this.renderMessage(msg, index == 0 ? name : null)}
-            </div>`;
-          })}
+          ${repeat(
+            msgIds,
+            (msgId) => msgId,
+            (msgId, index) => {
+              const msg = this.msgMap.get(msgId);
+              const msgEvent = msg as MsgEvent;
+              const statusClass = (msg as any)._status
+                ? (msg as any)._status.status
+                : '';
+              const hasError =
+                msgEvent.msg?.unsendable_reason ||
+                (msgEvent._status?.reason &&
+                  (statusClass === 'failed' || statusClass === 'errored'));
+              const unsendableClass = hasError ? 'error' : '';
+              return html`<div
+                class="row message ${statusClass} ${unsendableClass}"
+              >
+                ${this.renderMessage(msg, index == 0 ? name : null)}
+              </div>`;
+            }
+          )}
         </div>
         ${showAvatar
           ? html`<div class="avatar" style="align-self:flex-end">
               <temba-user
-                email=${email}
+                uuid=${currentMsg._user?.uuid}
                 name=${name}
-                avatar=${currentMsg.user?.avatar}
-                ?system=${!email && !name}
+                avatar=${currentMsg._user?.avatar}
+                ?system=${isSystem}
               >
               </temba-user>
             </div>`
@@ -767,50 +917,58 @@ export class Chat extends RapidElement {
     `;
   }
 
-  private renderMessage(event: ChatEvent, name = null): TemplateResult {
-    if (
-      event.type === MessageType.Error ||
-      event.type === MessageType.Collapse ||
-      event.type === MessageType.Inline
-    ) {
-      return html`<div class="event">${event.text}</div>`;
+  private renderMessage(event: ContactEvent, name = null): TemplateResult {
+    if (event._rendered) {
+      return html`<div class="event">${event._rendered.html}</div>`;
     }
 
-    const message = event as Message;
+    const message = event as MsgEvent;
+    const unsendableReason = message.msg?.unsendable_reason;
+    const statusReason = message._status?.reason;
+    const errorMessage = unsendableReason
+      ? getUnsendableReasonMessage(unsendableReason)
+      : statusReason
+      ? getStatusReasonMessage(statusReason)
+      : null;
+
     return html`
-        <div class="bubble-wrap ${message.sendError ? 'error' : ''}">
-        ${
-          message.popup
-            ? html`<div class="popup">
-                ${message.popup}
-                <div class="arrow">▼</div>
+      <div class="bubble-wrap">
+        <div class="popup" style="white-space: nowrap;">
+          ${errorMessage
+            ? html`<div style="color: var(--color-error); margin-right: 1em;">
+                ${errorMessage}
               </div>`
-            : null
-        }
-          
-          ${
-            message.text
-              ? html`
-                  <div class="bubble">
-                    ${name ? html`<div class="name">${name}</div>` : null}
-                    <div class="message message-text">${message.text}</div>
-                    <!--div>${message.date.toLocaleDateString(
-                      undefined,
-                      VERBOSE_FORMAT
-                    )}</div-->
-                  </div>
-                `
-              : null
-          }
+            : null}
+          <temba-date
+            value="${message.created_on.toISOString()}"
+            display="relative"
+          ></temba-date>
+          ${message._logs_url
+            ? html`<a
+                style="margin-left: 1em; color: var(--color-primary-dark);"
+                href="${message._logs_url}"
+                target="_blank"
+                rel="noopener noreferrer"
+                ><temba-icon name="log"></temba-icon
+              ></a>`
+            : null}
+
+          <div class="arrow">▼</div>
+        </div>
+        ${message.msg.text
+          ? html`<div class="bubble">
+              ${name ? html`<div class="name">${name}</div>` : null}
+              <div class="message message-text">${message.msg.text}</div>
+            </div>`
+          : null}
 
-          <div class="attachments">
-            ${(message.attachments || []).map(
-              (attachment) =>
-                html`<temba-thumbnail
-                  attachment="${attachment}"
-                ></temba-thumbnail>`
-            )}
-          </div>
+        <div class="attachments">
+          ${(message.msg.attachments || []).map(
+            (attachment) =>
+              html`<temba-thumbnail
+                attachment="${attachment}"
+              ></temba-thumbnail>`
+          )}
         </div>
       </div>
     `;
@@ -839,9 +997,15 @@ export class Chat extends RapidElement {
     >
       <div class="scroll" @scroll=${this.handleScroll}>
         ${this.messageGroups
-          ? this.messageGroups.map(
-              (msgGroup, idx, groups) =>
-                html`${this.renderMessageGroup(msgGroup, idx, groups)}`
+          ? repeat(
+              this.messageGroups,
+              (msgGroup) => msgGroup.join(','),
+              (msgGroup, idx) =>
+                html`${this.renderMessageGroup(
+                  msgGroup,
+                  idx,
+                  this.messageGroups
+                )}`
             )
           : null}
 
@@ -858,6 +1022,16 @@ export class Chat extends RapidElement {
             </div>`
           : null}
       </div>
+      ${!this.hasFooter
+        ? html`<div
+            class="new-message-notification ${this.showNewMessageNotification
+              ? 'visible'
+              : ''}"
+            @click=${this.handleNewMessageClick}
+          >
+            New Messages
+          </div>`
+        : null}
       <slot class="header" name="header"></slot>
       <slot class="footer" name="footer"></slot>
     </div>`;

package/src/display/TembaUser.ts

@@ -62,6 +62,9 @@ export class TembaUser extends RapidElement {
   @property({ type: String })
   email: string;
 
+  @property({ type: String })
+  uuid: string;
+
   @property({ type: String })
   avatar: string;
 
@@ -87,8 +90,6 @@ export class TembaUser extends RapidElement {
     if (changed.has('avatar')) {
       if (this.avatar) {
         this.bgimage = `url('${this.avatar}') center / contain no-repeat`;
-      } else if (!this.system) {
-        this.bgimage = null;
       }
     }
   }

package/src/events.ts

@@ -1,4 +1,5 @@
 import { Msg, ObjectReference, User } from './interfaces';
+import { ContactEvent } from './display/Chat';
 
 export interface EventGroup {
   type: string;
@@ -6,13 +7,6 @@ export interface EventGroup {
   open: boolean;
 }
 
-export interface ContactEvent {
-  uuid?: string;
-  type: string;
-  created_on: string;
-  _user?: ObjectReference;
-}
-
 export interface ChannelEvent extends ContactEvent {
   channel_event_type: string;
   duration: number;
@@ -57,7 +51,16 @@ export interface ChatStartedEvent extends ContactEvent {
 export interface MsgEvent extends ContactEvent {
   msg: Msg;
   optin?: ObjectReference;
-  _status?: { created_on: string; status: string; reason: string };
+  _status?: {
+    created_on: string;
+    status: 'wired' | 'sent' | 'delivered' | 'read' | 'errored' | 'failed';
+    reason: 'error_limit' | 'too_old' | 'channel_removed';
+  };
+  _deleted?: {
+    created_on: string;
+    by_contact: boolean;
+    user: { name: string; uuid: string };
+  };
   _logs_url?: string;
 }
 

package/src/flow/CanvasNode.ts

@@ -497,6 +497,16 @@ export class CanvasNode extends RapidElement {
     changes: PropertyValueMap<any> | Map<PropertyKey, unknown>
   ): void {
     super.updated(changes);
+
+    if (!!changes.get('ui') && changes.has('ui')) {
+      // run revalidation every 50ms until 350ms to catch animation updates
+      for (let delay = 25; delay <= 350; delay += 25) {
+        setTimeout(() => {
+          this.plumber.revalidate([this.node.uuid]);
+        }, delay);
+      }
+    }
+
     if (changes.has('node')) {
       // Only proceed if plumber is available (for tests that don't set it up)
       if (this.plumber) {