Texting + multiselect filter fix

Crewiz · Crewiz · commit 4b18a9718361 · 2026-02-20T14:17:23.000+01:00
diff --git a/apps/property-tree/src/components/leases/LeasesPage.tsx b/apps/property-tree/src/components/leases/LeasesPage.tsx
@@ -250,6 +250,10 @@ const LeasesPage = () => {
           selectedProperties.length > 0 ? selectedProperties : undefined,
         districtNames:
           selectedDistricts.length > 0 ? selectedDistricts : undefined,
+        buildingManager:
+          selectedBuildingManagers.length > 0
+            ? selectedBuildingManagers
+            : undefined,
         startDateFrom: startDateFrom || undefined,
         startDateTo: startDateTo || undefined,
         endDateFrom: endDateFrom || undefined,
@@ -322,6 +326,10 @@ const LeasesPage = () => {
       property: selectedProperties.length > 0 ? selectedProperties : undefined,
       districtNames:
         selectedDistricts.length > 0 ? selectedDistricts : undefined,
+      buildingManager:
+        selectedBuildingManagers.length > 0
+          ? selectedBuildingManagers
+          : undefined,
       startDateFrom: startDateFrom || undefined,
       startDateTo: startDateTo || undefined,
       endDateFrom: endDateFrom || undefined,
@@ -333,6 +341,7 @@ const LeasesPage = () => {
       selectedStatuses,
       selectedProperties,
       selectedDistricts,
+      selectedBuildingManagers,
       startDateFrom,
       startDateTo,
       endDateFrom,
@@ -751,13 +760,15 @@ const LeasesPage = () => {
         open={showSmsModal}
         onOpenChange={setShowSmsModal}
         recipients={smsRecipients}
+        totalSelectedItems={selectedCount}
         onSend={handleSendSms}
       />
 
       <BulkEmailModal
         open={showEmailModal}
         onOpenChange={setShowEmailModal}
         recipients={emailRecipients}
+        totalSelectedItems={selectedCount}
         onSend={handleSendEmail}
       />
     </div>
diff --git a/apps/property-tree/src/components/ui/BulkEmailModal.tsx b/apps/property-tree/src/components/ui/BulkEmailModal.tsx
@@ -1,5 +1,5 @@
 import { useState, useMemo, useCallback } from 'react'
-import { Mail, User, AlertTriangle } from 'lucide-react'
+import { Mail, User, AlertTriangle, ChevronDown, Info } from 'lucide-react'
 import {
   Dialog,
   DialogContent,
@@ -13,6 +13,7 @@ import { Textarea } from '@/components/ui/Textarea'
 import { Input } from '@/components/ui/Input'
 import { Badge } from '@/components/ui/v2/Badge'
 import { Label } from '@/components/ui/Label'
+import { cn } from '@/lib/utils'
 
 export interface EmailRecipient {
   id: string
@@ -24,6 +25,7 @@ interface BulkEmailModalProps {
   open: boolean
   onOpenChange: (open: boolean) => void
   recipients: EmailRecipient[]
+  totalSelectedItems?: number
   onSend?: (
     subject: string,
     body: string,
@@ -35,11 +37,13 @@ export function BulkEmailModal({
   open,
   onOpenChange,
   recipients,
+  totalSelectedItems,
   onSend,
 }: BulkEmailModalProps) {
   const [subject, setSubject] = useState('')
   const [body, setBody] = useState('')
   const [isSending, setIsSending] = useState(false)
+  const [showAllInvalid, setShowAllInvalid] = useState(false)
 
   const { validRecipients, invalidRecipients } = useMemo(() => {
     const valid = recipients.filter((r) => r.email)
@@ -75,8 +79,10 @@ export function BulkEmailModal({
             Skicka mejl
           </DialogTitle>
           <DialogDescription>
-            Skicka mejl till {validRecipients.length} av {recipients.length}{' '}
-            valda kunder
+            {totalSelectedItems != null &&
+            totalSelectedItems !== recipients.length
+              ? `${totalSelectedItems} valda hyreskontrakt \u2192 ${recipients.length} unika kontakter`
+              : `Skicka mejl till ${validRecipients.length} av ${recipients.length} valda kunder`}
           </DialogDescription>
         </DialogHeader>
 
@@ -99,20 +105,48 @@ export function BulkEmailModal({
             </div>
           </div>
 
-          {invalidRecipients.length > 0 && (
-            <div className="flex items-start gap-2 p-3 rounded-md bg-yellow-50 border border-yellow-200 text-yellow-800">
-              <AlertTriangle className="h-4 w-4 mt-0.5 shrink-0" />
-              <div className="text-sm">
-                <span className="font-medium">
-                  {invalidRecipients.length} mottagare saknar e-postadress:
-                </span>{' '}
-                {invalidRecipients
-                  .slice(0, 3)
-                  .map((r) => r.name)
-                  .join(', ')}
-                {invalidRecipients.length > 3 &&
-                  ` och ${invalidRecipients.length - 3} till`}
-              </div>
+          {((totalSelectedItems != null &&
+            totalSelectedItems > recipients.length) ||
+            invalidRecipients.length > 0) && (
+            <div className="space-y-2">
+              {totalSelectedItems != null &&
+                totalSelectedItems > recipients.length && (
+                  <div className="flex items-start gap-2 p-3 rounded-md bg-blue-50 border border-blue-200 text-blue-800">
+                    <Info className="h-4 w-4 mt-0.5 shrink-0" />
+                    <span className="text-sm">
+                      {totalSelectedItems - recipients.length} kontakter
+                      förekommer på flera kontrakt och visas bara en gång
+                    </span>
+                  </div>
+                )}
+
+              {invalidRecipients.length > 0 && (
+                <div className="p-3 rounded-md bg-yellow-50 border border-yellow-200 text-yellow-800">
+                  <button
+                    type="button"
+                    className="flex items-start gap-2 w-full text-left"
+                    onClick={() => setShowAllInvalid((prev) => !prev)}
+                  >
+                    <AlertTriangle className="h-4 w-4 mt-0.5 shrink-0" />
+                    <span className="text-sm font-medium flex-1">
+                      {invalidRecipients.length} mottagare saknar e-postadress
+                    </span>
+                    <ChevronDown
+                      className={cn(
+                        'h-4 w-4 mt-0.5 shrink-0 transition-transform',
+                        showAllInvalid && 'rotate-180'
+                      )}
+                    />
+                  </button>
+                  {showAllInvalid && (
+                    <div className="mt-2 ml-6 text-sm space-y-1 max-h-32 overflow-y-auto">
+                      {invalidRecipients.map((r) => (
+                        <div key={r.id}>{r.name}</div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
             </div>
           )}
 
diff --git a/apps/property-tree/src/components/ui/BulkSmsModal.tsx b/apps/property-tree/src/components/ui/BulkSmsModal.tsx
@@ -1,5 +1,11 @@
 import { useState, useMemo, useCallback } from 'react'
-import { MessageSquare, User, AlertTriangle } from 'lucide-react'
+import {
+  MessageSquare,
+  User,
+  AlertTriangle,
+  ChevronDown,
+  Info,
+} from 'lucide-react'
 import {
   Dialog,
   DialogContent,
@@ -17,11 +23,8 @@ const MAX_SMS_LENGTH = 1600
 const COST_WARNING_THRESHOLD = 100
 const SMS_COST_SEK = 0.5
 
-function isValidSwedishMobile(phone: string | null): boolean {
-  if (!phone) return false
-  const cleaned = phone.replace(/[\s-]/g, '')
-  // Swedish mobile: 07XXXXXXXX, +467XXXXXXXX, 00467XXXXXXXX, or 467XXXXXXXX
-  return /^(07\d{8}|\+467\d{8}|00467\d{8}|467\d{8})$/.test(cleaned)
+function hasPhoneNumber(phone: string | null): boolean {
+  return phone !== null && phone.trim().length > 0
 }
 
 export interface SmsRecipient {
@@ -34,28 +37,35 @@ interface BulkSmsModalProps {
   open: boolean
   onOpenChange: (open: boolean) => void
   recipients: SmsRecipient[]
+  totalSelectedItems?: number
   onSend?: (message: string, recipients: SmsRecipient[]) => Promise<void>
 }
 
 export function BulkSmsModal({
   open,
   onOpenChange,
   recipients,
+  totalSelectedItems,
   onSend,
 }: BulkSmsModalProps) {
   const [message, setMessage] = useState('')
   const [showCostConfirmation, setShowCostConfirmation] = useState(false)
+  const [showAllInvalid, setShowAllInvalid] = useState(false)
   const [isSending, setIsSending] = useState(false)
 
   const charactersLeft = MAX_SMS_LENGTH - message.length
 
   const { validRecipients, invalidRecipients } = useMemo(() => {
-    const valid = recipients.filter((r) => isValidSwedishMobile(r.phone))
-    const invalid = recipients.filter((r) => !isValidSwedishMobile(r.phone))
+    const valid = recipients.filter((r) => hasPhoneNumber(r.phone))
+    const invalid = recipients.filter((r) => !hasPhoneNumber(r.phone))
     return { validRecipients: valid, invalidRecipients: invalid }
   }, [recipients])
 
   const estimatedCost = validRecipients.length * SMS_COST_SEK
+  const duplicatesRemoved =
+    totalSelectedItems != null && totalSelectedItems > recipients.length
+      ? totalSelectedItems - recipients.length
+      : 0
 
   const doSend = useCallback(async () => {
     if (!onSend || isSending) return
@@ -107,8 +117,10 @@ export function BulkSmsModal({
             Skicka SMS
           </DialogTitle>
           <DialogDescription>
-            Skicka SMS till {validRecipients.length} av {recipients.length}{' '}
-            valda kunder
+            {totalSelectedItems != null &&
+            totalSelectedItems !== recipients.length
+              ? `${totalSelectedItems} valda hyreskontrakt \u2192 ${recipients.length} unika kontakter`
+              : `Skicka SMS till ${validRecipients.length} av ${recipients.length} valda kunder`}
           </DialogDescription>
         </DialogHeader>
 
@@ -131,20 +143,66 @@ export function BulkSmsModal({
             </div>
           </div>
 
-          {invalidRecipients.length > 0 && (
-            <div className="flex items-start gap-2 p-3 rounded-md bg-yellow-50 border border-yellow-200 text-yellow-800">
+          {(duplicatesRemoved > 0 || invalidRecipients.length > 0) && (
+            <div className="space-y-2">
+              {duplicatesRemoved > 0 && (
+                <div className="flex items-start gap-2 p-3 rounded-md bg-blue-50 border border-blue-200 text-blue-800">
+                  <Info className="h-4 w-4 mt-0.5 shrink-0" />
+                  <span className="text-sm">
+                    {duplicatesRemoved} kontakter förekommer på flera kontrakt
+                    och visas bara en gång
+                  </span>
+                </div>
+              )}
+
+              {invalidRecipients.length > 0 && (
+                <div className="p-3 rounded-md bg-yellow-50 border border-yellow-200 text-yellow-800">
+                  <button
+                    type="button"
+                    className="flex items-start gap-2 w-full text-left"
+                    onClick={() => setShowAllInvalid((prev) => !prev)}
+                  >
+                    <AlertTriangle className="h-4 w-4 mt-0.5 shrink-0" />
+                    <span className="text-sm font-medium flex-1">
+                      {invalidRecipients.length} mottagare saknar telefonnummer
+                    </span>
+                    <ChevronDown
+                      className={cn(
+                        'h-4 w-4 mt-0.5 shrink-0 transition-transform',
+                        showAllInvalid && 'rotate-180'
+                      )}
+                    />
+                  </button>
+                  {showAllInvalid && (
+                    <div className="mt-2 ml-6 text-sm space-y-1 max-h-32 overflow-y-auto">
+                      {invalidRecipients.map((r) => (
+                        <div key={r.id} className="flex justify-between gap-2">
+                          <span>{r.name}</span>
+                          <span className="text-yellow-600 shrink-0">
+                            {r.phone || 'Saknar nummer'}
+                          </span>
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
+            </div>
+          )}
+
+          {validRecipients.length > COST_WARNING_THRESHOLD && (
+            <div className="flex items-start gap-2 p-3 rounded-md bg-amber-50 border border-amber-200 text-amber-800">
               <AlertTriangle className="h-4 w-4 mt-0.5 shrink-0" />
               <div className="text-sm">
+                Beräknad kostnad:{' '}
                 <span className="font-medium">
-                  {invalidRecipients.length} mottagare saknar giltigt
-                  mobilnummer:
+                  {estimatedCost.toLocaleString('sv-SE', {
+                    minimumFractionDigits: 0,
+                    maximumFractionDigits: 2,
+                  })}{' '}
+                  kr
                 </span>{' '}
-                {invalidRecipients
-                  .slice(0, 3)
-                  .map((r) => r.name)
-                  .join(', ')}
-                {invalidRecipients.length > 3 &&
-                  ` och ${invalidRecipients.length - 3} till`}
+                ({validRecipients.length} mottagare &times; {SMS_COST_SEK} kr)
               </div>
             </div>
           )}
diff --git a/core/src/adapters/leasing-adapter/index.ts b/core/src/adapters/leasing-adapter/index.ts
@@ -889,6 +889,27 @@ const deleteListingTextContent = async (
   }
 }
 
+const getContactsByFilters = async (
+  queryParams: Record<string, string | string[] | undefined>
+): Promise<{ content: leasing.v1.ContactInfo[] }> => {
+  const params = new URLSearchParams()
+
+  Object.entries(queryParams).forEach(([key, value]) => {
+    if (value === undefined) return
+    if (Array.isArray(value)) {
+      value.forEach((v) => params.append(key, v))
+    } else {
+      params.append(key, value)
+    }
+  })
+
+  const response = await axios.get(
+    `${tenantsLeasesServiceUrl}/leases/contacts-by-filters?${params.toString()}`
+  )
+
+  return response.data
+}
+
 interface ExportLeasesResult {
   data: Buffer
   contentType: string
@@ -932,6 +953,7 @@ export {
   addApplicantToWaitingList,
   createLease,
   exportLeasesToExcel,
+  getContactsByFilters,
   getApplicantByContactCodeAndListingId,
   getApplicantsAndListingByContactCode,
   getApplicantsByContactCode,
diff --git a/core/src/services/lease-service/index.ts b/core/src/services/lease-service/index.ts
@@ -442,6 +442,27 @@ export const routes = (router: KoaRouter) => {
     }
   })
 
+  router.get('/leases/contacts-by-filters', async (ctx) => {
+    const metadata = generateRouteMetadata(ctx)
+
+    try {
+      const result = await leasingAdapter.getContactsByFilters(ctx.query)
+
+      ctx.status = 200
+      ctx.body = result
+    } catch (error: unknown) {
+      logger.error({ error, metadata }, 'Error fetching contacts by filters')
+      ctx.status = 500
+      ctx.body = {
+        error:
+          error instanceof Error
+            ? error.message
+            : 'Unknown error occurred fetching contacts',
+        ...metadata,
+      }
+    }
+  })
+
   /**
    * @swagger
    * /leases/by-rental-property-id/{rentalPropertyId}:
diff --git a/services/leasing/src/services/lease-service/routes/leases.ts b/services/leasing/src/services/lease-service/routes/leases.ts
