@meetelise/chat 1.20.7 → 1.20.9

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

@@ -22,7 +22,7 @@ import { TimePicker } from "./time-picker";
 import { LabeledOption, UnitV2 } from "../../fetchBuildingInfo";
 import { isMobile } from "../../utils";
 import axios from "axios";
-import { mapValues } from "lodash";
+import { isNumber, isString, mapValues } from "lodash";
 import classnames from "classnames";
 import parseISO from "date-fns/parseISO";
 import compareAsc from "date-fns/compareAsc";
@@ -387,6 +387,12 @@ export class TourScheduler extends LitElement {
       grid-template-rows: 44px 54px 32px 195px 167px 1px;
     }
 
+    @media screen and (max-width: 1000px) {
+      .tour-scheduler {
+        transform: translate(-50%, -50%) scale(0.8, 0.6);
+      }
+    }
+
     h1,
     h2 {
       margin: 0;
@@ -1043,13 +1049,13 @@ export class TourScheduler extends LitElement {
                 <me-select
                   id="layoutType"
                   placeholder="Select layout"
-                  .options="${this.layoutOptions.map((i) => ({
+                  .options="${sortedLayouts(this.layoutOptions).map((i) => ({
                     label: getHumanReadableLayout(i),
                     value: i,
                   }))}"
                   defaultOption="Studio"
                   @change=${() => {
-                    // to revalidate the form
+                    // to revalidate the form.
                     this.requestUpdate();
                   }}
                   >Studio
@@ -1239,3 +1245,43 @@ const tourTypeForSubmission = {
   [TourType.Self]: "self-guided-tour",
   [TourType.Virtual]: "live-virtual-tour",
 };
+
+const getLayoutOrder = (layout: string) => {
+  return {
+    studio: 0,
+    "1br": 1,
+    "2br": 2,
+    "3br": 3,
+    "4br": 4,
+    "5br": 5,
+    "6br": 6,
+    "7br": 7,
+    "8br": 8,
+    "9br": 9,
+    "10br": 10,
+  }[layout];
+};
+
+const getLayoutFromOrder = (order: number) => {
+  return {
+    0: "studio",
+    1: "1br",
+    2: "2br",
+    3: "3br",
+    4: "4br",
+    5: "5br",
+    6: "6br",
+    7: "7br",
+    8: "8br",
+    9: "9br",
+    10: "10br",
+  }[order];
+};
+
+const sortedLayouts = (layouts: string[]) => {
+  const layoutOrder = layouts
+    .map((layout) => getLayoutOrder(layout))
+    .filter(isNumber)
+    .sort();
+  return layoutOrder.map((order) => getLayoutFromOrder(order)).filter(isString);
+};

package/src/utils.ts

@@ -12,7 +12,7 @@ export function useInterval(callback: () => void, delay: number | null): void {
   // Set up the interval.
   useEffect(() => {
     // Don't schedule if no delay is specified.
-    // Note: 0 is a valid value for delay.
+    // Note: 0 is a valid value for delay, so we can't just check for falsiness.
     if (!delay && delay !== 0) {
       return;
     }