@meetelise/chat 1.13.8 → 1.13.11

package/src/WebComponent/Scheduler/tour-scheduler.ts

@@ -11,7 +11,7 @@ import "./time-picker.ts";
 import "./me-select.ts";
 import {
   DateWithTimeZoneOffset,
-  getAvailabilitiesGroupedByDayCached,
+  getAvailabilitiesGroupedByDay,
 } from "../../getAvailabilities";
 import { TourAvailabilityResponseRankOrderedSupportedTourTypesEnum } from "@meetelise/rest-sdk";
 import { format } from "date-fns";
@@ -53,8 +53,10 @@ export class TourScheduler extends LitElement {
   @state()
   private tourIsBooked = false;
 
-  @query("input#name")
-  nameInput!: HTMLInputElement;
+  @query("input#firstName")
+  firstNameInput!: HTMLInputElement;
+  @query("input#lastName")
+  lastNameInput!: HTMLInputElement;
   @query("input#email")
   emailInput!: HTMLInputElement;
   @query("input#phone")
@@ -63,7 +65,7 @@ export class TourScheduler extends LitElement {
   unitTypeSelect!: MESelect;
 
   firstUpdated = async (): Promise<void> => {
-    this.availabilitiesGroupedByDay = await getAvailabilitiesGroupedByDayCached(
+    this.availabilitiesGroupedByDay = await getAvailabilitiesGroupedByDay(
       tourTypeMap[this.tourType]
     );
   };
@@ -74,8 +76,9 @@ export class TourScheduler extends LitElement {
       | Map<PropertyKey, unknown>
   ): Promise<void> => {
     if (_changedProperties.has("tourType")) {
-      this.availabilitiesGroupedByDay =
-        await getAvailabilitiesGroupedByDayCached(tourTypeMap[this.tourType]);
+      this.availabilitiesGroupedByDay = await getAvailabilitiesGroupedByDay(
+        tourTypeMap[this.tourType]
+      );
     }
   };
 
@@ -235,7 +238,7 @@ export class TourScheduler extends LitElement {
     dateAndTime: (): boolean => !!this.selectedDate && !!this.selectedTime,
     leadInfo: (): boolean => {
       return (
-        !!this.nameInput?.value &&
+        (!!this.firstNameInput?.value || !!this.lastNameInput?.value) &&
         this.emailInput?.value.includes("@") &&
         // TODO: deleting phone number doesn't cause validation to fail, at least on mobile
         !!this.phoneNumber &&
@@ -272,9 +275,8 @@ export class TourScheduler extends LitElement {
       email_address: this.email,
       phone_number: `+1${this.phoneNumber.match(/\d/g)?.join("")}`, // e.g. +12125555555
       building_id: this.buildingId,
-      // TODO: this is very bad dumb name-splitting logic! I'm only doing it because the design had one name field and the backend expects two
-      first_name: this.nameInput.value.split(" ")[0],
-      last_name: this.nameInput.value.split(" ").slice(1).join(" "),
+      first_name: this.firstNameInput.value,
+      last_name: this.lastNameInput.value,
       tour_type: tourTypeForSubmission[this.tourType],
       tour_time: `${this.selectedTime.datetime}${this.selectedTime.offset}`, // e.g., "2022-06-27T09:00:00-07:00"
     };
@@ -606,7 +608,6 @@ export class TourScheduler extends LitElement {
       <div id="tourTypeMenu">
         ${this.tourTypeOptions.map((o) => o.value).includes("WITH_AGENT")
           ? html` <tour-type-option
-              tourtype="guided"
               heading="Guided tour"
               subtitle="with an agent"
               @click="${() => {
@@ -639,7 +640,6 @@ export class TourScheduler extends LitElement {
           : ""}
         ${this.tourTypeOptions.map((o) => o.value).includes("SELF_GUIDED")
           ? html`<tour-type-option
-              tourtype="self"
               heading="Take a tour"
               subtitle="on your own"
               @click="${() => {
@@ -670,9 +670,8 @@ export class TourScheduler extends LitElement {
               </svg>
             </tour-type-option>`
           : ""}
-        ${this.tourTypeOptions.map((o) => o.value).includes("SELF_GUIDED")
+        ${this.tourTypeOptions.map((o) => o.value).includes("VIRTUAL_SHOWING")
           ? html`<tour-type-option
-              tourtype="guided"
               heading="Virtual tour"
               subtitle="over video"
               @click="${() => {
@@ -741,7 +740,8 @@ export class TourScheduler extends LitElement {
                       .map((date) => format(new Date(date.datetime), "h:mmaaa"))
                       .indexOf(e.target.selectedTime)
                   : null;
-                this.selectedTime = index ? daysAvailabilities[index] : null; // this.selectedAvailabilityString ?
+                this.selectedTime =
+                  index !== null ? daysAvailabilities[index] : null;
               }
             }}
           ></time-picker>
@@ -811,8 +811,14 @@ export class TourScheduler extends LitElement {
       <div id="yourInformationMenu">
         <input
           type="text"
-          placeholder="Name"
-          id="name"
+          placeholder="First name"
+          id="firstName"
+          @input=${() => this.requestUpdate()}
+        />
+        <input
+          type="text"
+          placeholder="Last name"
+          id="lastName"
           @input=${() => this.requestUpdate()}
         />
         <input
@@ -842,25 +848,11 @@ export class TourScheduler extends LitElement {
           }}
         />
       </div>
-
-      ${this.layoutOptions.length > 0
-        ? html`<div id="unitChoiceMenu">
-            <h2 id="unitChoice">What would you like to view?</h2>
-            <div id="unitOptions">
-              <me-select
-                id="unitType"
-                placeholder="Select type"
-                .options="${this.layoutOptions.map((o) => o.label)}"
-                defaultOption="Studio"
-                @change=${() => {
-                  // to revalidate the form
-                  this.requestUpdate();
-                }}
-                >Studio
-              </me-select>
-            </div>
-          </div>`
-        : ""} `;
+      <!--
+        Layout dropdown would go here, but has been removed pending backend support.
+        Here is the code to add it back:
+        https://github.com/MeetElise/chat-ui/blob/e17aca8b39a0eed9430f22c182f2ebcdfb796417/src/WebComponent/Scheduler/tour-scheduler.ts#L846-L863
+      --> `;
   }
 
   confirmationMessage(): TemplateResult {

package/src/WebComponent/Scheduler/tour-type-option.ts

@@ -1,20 +1,16 @@
 import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { TourType } from "./tour-scheduler";
 
 @customElement("tour-type-option")
 export class TourTypeOption extends LitElement {
-  @property({ type: String })
-  tourtype = "";
   @property({ type: String })
   heading = "";
   @property({ type: String })
   subtitle = "";
   @property({ type: Boolean })
   selected = false;
-
   @property({ attribute: false })
-  onClick?: (tourType: TourType) => void;
+  onClick?: () => void;
 
   static styles = [
     css`

package/src/createConversation.ts

@@ -46,7 +46,7 @@ export default function createConversation(
       building.avatarType === "image" && building.avatarSrc
         ? avatarSrc
         : defaultAvatarUrl,
-    // uncomment this to test changes to the default avatar if your test building has its own avatar
+    // uncomment the following line to test changes to the default avatar if your test building has its own avatar
     // avatarUrl: defaultAvatarUrl,
   };
   return conversation;

package/src/getAvailabilities.ts

@@ -12,29 +12,46 @@ import {
 import groupBy from "lodash/groupBy";
 
 const availabilitiesCache: {
-  [buildingId: number]: TourAvailabilityResponse;
-} = {};
+  buildingId?: number | null;
+  availabilities: { [buildingId: number]: TourAvailabilityResponse };
+} = { buildingId: null, availabilities: {} };
 
+/**
+ * Returns the raw availabilities.
+ *
+ * If no `buildingId` is provided, it will use a cached buildingId from the previous call.
+ * If there is none cached, it will throw an error.
+ */
 export const getRawAvailabilities = async (
-  buildingId: number
+  buildingId?: number
 ): Promise<TourAvailabilityResponse> => {
-  if (availabilitiesCache[buildingId]) {
-    return availabilitiesCache[buildingId];
+  if (buildingId) {
+    availabilitiesCache.buildingId = buildingId;
+  }
+  const buildingIdToUse = availabilitiesCache.buildingId;
+  if (!buildingIdToUse) {
+    throw new Error(
+      "No buildingId was provided to getRawAvailabilities and there is no buildingId cached."
+    );
+  }
+  const availabilities = availabilitiesCache.availabilities;
+  if (availabilities[buildingIdToUse]) {
+    return availabilities[buildingIdToUse];
   }
   const startTime = startOfToday();
   const endTime = formatISO(endOfDay(addDays(startTime, 30)));
-  const url = `https://app.meetelise.com/api/pub/v1/buildings/${buildingId}/tour/availabilities?startTime=${formatISO(
+  const url = `https://app.meetelise.com/api/pub/v1/buildings/${buildingIdToUse}/tour/availabilities?startTime=${formatISO(
     startTime
   )}&endTime=${endTime}`;
   const result = await axios.get<TourAvailabilityResponse>(url);
-  availabilitiesCache[buildingId] = result.data;
+  availabilitiesCache.availabilities[buildingIdToUse] = result.data;
   // The endpoint INCORRECTLY states that these are returned as dates. They are, in fact, strings.
   return result.data;
 };
 
 export const getAvailabilitiesForTourType = async (
-  buildingId: number,
-  tourType: TourAvailabilityResponseRankOrderedSupportedTourTypesEnum
+  tourType: TourAvailabilityResponseRankOrderedSupportedTourTypesEnum,
+  buildingId?: number
 ): Promise<{
   /**
    *
@@ -69,12 +86,12 @@ export interface DateWithTimeZoneOffset {
 }
 
 export const getAvailabilitiesGroupedByDay = async (
-  buildingId: number,
-  tourType: TourAvailabilityResponseRankOrderedSupportedTourTypesEnum
+  tourType: TourAvailabilityResponseRankOrderedSupportedTourTypesEnum,
+  buildingId?: number
 ): Promise<{ [day: string]: DateWithTimeZoneOffset[] }> => {
   const availabilitiesForTourTypeRaw = await getAvailabilitiesForTourType(
-    buildingId,
-    tourType
+    tourType,
+    buildingId
   );
   if (!availabilitiesForTourTypeRaw) {
     return {};
@@ -97,16 +114,6 @@ export const getAvailabilitiesGroupedByDay = async (
   );
 };
 
-// TODO: if cache is empty, observe it and wait for it to be filled in.
-// TODO: alternative to this: cache the building id when getRawAvailabilities is called. Then I can call the normal methods.
-export const getAvailabilitiesGroupedByDayCached = async (
-  tourType: TourAvailabilityResponseRankOrderedSupportedTourTypesEnum
-): Promise<{ [day: string]: DateWithTimeZoneOffset[] }> =>
-  getAvailabilitiesGroupedByDay(
-    Object.keys(availabilitiesCache).map(Number)[0],
-    tourType
-  );
-
 /**
  * Takes an ISO 8601 date string with time zone offset and returns
  * an object of our custom type DateWithTimeZoneOffset.