0.36.4 (#2062)

Freika · rtuszik · web-flow · commit 3f0aaa09f541 · 2025-12-26T14:57:55.000+01:00
* fix: move foreman to global gems to fix startup crash (#1971) * Update exporting code to stream points data to file in batches to red… (#1980) * Update exporting code to stream points data to file in batches to reduce memory usage * Update changelog * Update changelog * Feature/maplibre frontend (#1953) * Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet * Implement phase 1 * Phases 1-3 + part of 4 * Fix e2e tests * Phase 6 * Implement fog of war * Phase 7 * Next step: fix specs, phase 7 done * Use our own map tiles * Extract v2 map logic to separate manager classes * Update settings panel on v2 map * Update v2 e2e tests structure * Reimplement location search in maps v2 * Update speed routes * Implement visits and places creation in v2 * Fix last failing test * Implement visits merging * Fix a routes e2e test and simplify the routes layer styling. * Extract js to modules from maps_v2_controller.js * Implement area creation * Fix spec problem * Fix some e2e tests * Implement live mode in v2 map * Update icons and panel * Extract some styles * Remove unused file * Start adding dark theme to popups on MapLibre maps * Make popups respect dark theme * Move v2 maps to maplibre namespace * Update v2 references to maplibre * Put place, area and visit info into side panel * Update API to use safe settings config method * Fix specs * Fix method name to config in SafeSettings and update usages accordingly * Add missing public files * Add handling for real time points * Fix remembering enabled/disabled layers of the v2 map * Fix lots of e2e tests * Add settings to select map version * Use maps/v2 as main path for MapLibre maps * Update routing * Update live mode * Update maplibre controller * Update changelog * Remove some console.log statements * Pull only necessary data for map v2 points * Feature/raw data archive (#2009) * 0.36.2 (#2007) * fix: move foreman to global gems to fix startup crash (#1971) * Update exporting code to stream points data to file in batches to red… (#1980) * Update exporting code to stream points data to file in batches to reduce memory usage * Update changelog * Update changelog * Feature/maplibre frontend (#1953) * Add a plan to use MapLibre GL JS for the frontend map rendering, replacing Leaflet * Implement phase 1 * Phases 1-3 + part of 4 * Fix e2e tests * Phase 6 * Implement fog of war * Phase 7 * Next step: fix specs, phase 7 done * Use our own map tiles * Extract v2 map logic to separate manager classes * Update settings panel on v2 map * Update v2 e2e tests structure * Reimplement location search in maps v2 * Update speed routes * Implement visits and places creation in v2 * Fix last failing test * Implement visits merging * Fix a routes e2e test and simplify the routes layer styling. * Extract js to modules from maps_v2_controller.js * Implement area creation * Fix spec problem * Fix some e2e tests * Implement live mode in v2 map * Update icons and panel * Extract some styles * Remove unused file * Start adding dark theme to popups on MapLibre maps * Make popups respect dark theme * Move v2 maps to maplibre namespace * Update v2 references to maplibre * Put place, area and visit info into side panel * Update API to use safe settings config method * Fix specs * Fix method name to config in SafeSettings and update usages accordingly * Add missing public files * Add handling for real time points * Fix remembering enabled/disabled layers of the v2 map * Fix lots of e2e tests * Add settings to select map version * Use maps/v2 as main path for MapLibre maps * Update routing * Update live mode * Update maplibre controller * Update changelog * Remove some console.log statements --------- Co-authored-by: Robin Tuszik <mail@robin.gg> * Remove esbuild scripts from package.json * Remove sideEffects field from package.json * Raw data archivation * Add tests * Fix tests * Fix tests * Update ExceptionReporter * Add schedule to run raw data archival job monthly * Change file structure for raw data archival feature * Update changelog and version for raw data archival feature --------- Co-authored-by: Robin Tuszik <mail@robin.gg> * Set raw_data to an empty hash instead of nil when archiving * Fix storage configuration and file extraction * Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation (#2018) * Consider MIN_MINUTES_SPENT_IN_CITY during stats calculation * Remove raw data from visited cities api endpoint * Use user timezone to show dates on maps (#2020) * Fix/pre epoch time (#2019) * Use user timezone to show dates on maps * Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates. * Limit timestamps to valid range to prevent database errors when users enter pre-epoch dates. * Fix tests failing due to new index on stats table * Fix failing specs * Update redis client configuration to support unix socket connection * Update changelog * Fix kml kmz import issues (#2023) * Fix kml kmz import issues * Refactor KML importer to improve readability and maintainability * Implement moving points in map v2 and fix route rendering logic to ma… (#2027) * Implement moving points in map v2 and fix route rendering logic to match map v1. * Fix route spec * fix(maplibre): update date format to ISO 8601 (#2029) * Add verification step to raw data archival process (#2028) * Add verification step to raw data archival process * Add actual verification of raw data archives after creation, and only clear raw_data for verified archives. * Fix failing specs * Eliminate zip-bomb risk * Fix potential memory leak in js * Return .keep files * Use Toast instead of alert for notifications * Add help section to navbar dropdown * Update changelog * Remove raw_data_archival_job * Ensure file is being closed properly after reading in Archivable concern * Add composite index to stats table if not exists * Update changelog * Update entrypoint to always sync static assets (not only new ones) * Add family layer to MapLibre maps (#2055) * Add family layer to MapLibre maps * Update migration * Don't show family toggle if feature is disabled * Update changelog * Return changelog * Update changelog * Update tailwind file --------- Co-authored-by: Robin Tuszik <mail@robin.gg>
diff --git a/.app_version b/.app_version
@@ -1 +1 @@
-0.36.3
+0.36.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+# [0.36.4] - Unreleased
+
+## Fixed
+
+- Fixed a bug preventing the app to start if a composite index on stats table already exists. #2034 #2051 #2046
+- New compiled assets will override old ones on app start to prevent serving stale assets.
+- Number of points in stats should no longer go negative when points are deleted. #2054
+- Disable Family::Invitations::CleanupJob no invitations are in the database. #2043
+- User can now enable family layer in Maps v2 and center on family members by clicking their emails. #2036
+
 # [0.36.3] - 2025-12-14
 
 ## Added
diff --git a/app/assets/builds/tailwind.css b/app/assets/builds/tailwind.css
diff --git a/app/javascript/controllers/maps/maplibre/routes_manager.js b/app/javascript/controllers/maps/maplibre/routes_manager.js
@@ -357,4 +357,28 @@ export class RoutesManager {
 
     SettingsManager.updateSetting('pointsVisible', visible)
   }
+
+  /**
+   * Toggle family members layer
+   */
+  async toggleFamily(event) {
+    const enabled = event.target.checked
+    SettingsManager.updateSetting('familyEnabled', enabled)
+
+    const familyLayer = this.layerManager.getLayer('family')
+    if (familyLayer) {
+      if (enabled) {
+        familyLayer.show()
+        // Load family members data
+        await this.controller.loadFamilyMembers()
+      } else {
+        familyLayer.hide()
+      }
+    }
+
+    // Show/hide the family members list
+    if (this.controller.hasFamilyMembersListTarget) {
+      this.controller.familyMembersListTarget.style.display = enabled ? 'block' : 'none'
+    }
+  }
 }
diff --git a/app/javascript/controllers/maps/maplibre/settings_manager.js b/app/javascript/controllers/maps/maplibre/settings_manager.js
@@ -53,6 +53,7 @@ export class SettingsController {
       placesToggle: 'placesEnabled',
       fogToggle: 'fogEnabled',
       scratchToggle: 'scratchEnabled',
+      familyToggle: 'familyEnabled',
       speedColoredToggle: 'speedColoredRoutesEnabled'
     }
 
@@ -73,6 +74,11 @@ export class SettingsController {
       controller.placesFiltersTarget.style.display = controller.placesToggleTarget.checked ? 'block' : 'none'
     }
 
+    // Show/hide family members list based on initial toggle state
+    if (controller.hasFamilyToggleTarget && controller.hasFamilyMembersListTarget) {
+      controller.familyMembersListTarget.style.display = controller.familyToggleTarget.checked ? 'block' : 'none'
+    }
+
     // Sync route opacity slider
     if (controller.hasRouteOpacityRangeTarget) {
       controller.routeOpacityRangeTarget.value = (this.settings.routeOpacity || 1.0) * 100
diff --git a/app/javascript/controllers/maps/maplibre_controller.js b/app/javascript/controllers/maps/maplibre_controller.js
@@ -58,11 +58,15 @@ export default class extends Controller {
     'placesToggle',
     'fogToggle',
     'scratchToggle',
+    'familyToggle',
     // Speed-colored routes
     'routesOptions',
     'speedColoredToggle',
     'speedColorScaleContainer',
     'speedColorScaleInput',
+    // Family members
+    'familyMembersList',
+    'familyMembersContainer',
     // Area selection
     'selectAreaButton',
     'selectionActions',
@@ -347,6 +351,103 @@ export default class extends Controller {
   toggleSpeedColoredRoutes(event) { return this.routesManager.toggleSpeedColoredRoutes(event) }
   openSpeedColorEditor() { return this.routesManager.openSpeedColorEditor() }
   handleSpeedColorSave(event) { return this.routesManager.handleSpeedColorSave(event) }
+  toggleFamily(event) { return this.routesManager.toggleFamily(event) }
+
+  // Family Members methods
+  async loadFamilyMembers() {
+    try {
+      const response = await fetch(`/api/v1/families/locations?api_key=${this.apiKeyValue}`, {
+        headers: {
+          'Accept': 'application/json',
+          'Content-Type': 'application/json'
+        }
+      })
+
+      if (!response.ok) {
+        if (response.status === 403) {
+          console.warn('[Maps V2] Family feature not enabled or user not in family')
+          Toast.info('Family feature not available')
+          return
+        }
+        throw new Error(`HTTP error! status: ${response.status}`)
+      }
+
+      const data = await response.json()
+      const locations = data.locations || []
+
+      // Update family layer with locations
+      const familyLayer = this.layerManager.getLayer('family')
+      if (familyLayer) {
+        familyLayer.loadMembers(locations)
+      }
+
+      // Render family members list
+      this.renderFamilyMembersList(locations)
+
+      Toast.success(`Loaded ${locations.length} family member(s)`)
+    } catch (error) {
+      console.error('[Maps V2] Failed to load family members:', error)
+      Toast.error('Failed to load family members')
+    }
+  }
+
+  renderFamilyMembersList(locations) {
+    if (!this.hasFamilyMembersContainerTarget) return
+
+    const container = this.familyMembersContainerTarget
+
+    if (locations.length === 0) {
+      container.innerHTML = '<p class="text-xs text-base-content/60">No family members sharing location</p>'
+      return
+    }
+
+    container.innerHTML = locations.map(location => {
+      const emailInitial = location.email?.charAt(0)?.toUpperCase() || '?'
+      const color = this.getFamilyMemberColor(location.user_id)
+      const lastSeen = new Date(location.updated_at).toLocaleString('en-US', {
+        timeZone: this.timezoneValue || 'UTC',
+        month: 'short',
+        day: 'numeric',
+        hour: 'numeric',
+        minute: '2-digit'
+      })
+
+      return `
+        <div class="flex items-center gap-2 p-2 hover:bg-base-200 rounded-lg cursor-pointer transition-colors"
+             data-action="click->maps--maplibre#centerOnFamilyMember"
+             data-member-id="${location.user_id}">
+          <div style="background-color: ${color}; color: white; border-radius: 50%; width: 24px; height: 24px; display: flex; align-items: center; justify-content: center; font-size: 12px; font-weight: bold; flex-shrink: 0;">
+            ${emailInitial}
+          </div>
+          <div class="flex-1 min-w-0">
+            <div class="text-sm font-medium truncate">${location.email || 'Unknown'}</div>
+            <div class="text-xs text-base-content/60">${lastSeen}</div>
+          </div>
+        </div>
+      `
+    }).join('')
+  }
+
+  getFamilyMemberColor(userId) {
+    const colors = [
+      '#3b82f6', '#10b981', '#f59e0b',
+      '#ef4444', '#8b5cf6', '#ec4899'
+    ]
+    // Use user ID to get consistent color
+    const hash = userId.toString().split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)
+    return colors[hash % colors.length]
+  }
+
+  centerOnFamilyMember(event) {
+    const memberId = event.currentTarget.dataset.memberId
+    if (!memberId) return
+
+    const familyLayer = this.layerManager.getLayer('family')
+    if (familyLayer) {
+      familyLayer.centerOnMember(parseInt(memberId))
+      Toast.success('Centered on family member')
+    }
+  }
 
   // Info Display methods
   showInfo(title, content, actions = []) {
diff --git a/app/javascript/maps_maplibre/layers/family_layer.js b/app/javascript/maps_maplibre/layers/family_layer.js
@@ -148,4 +148,63 @@ export class FamilyLayer extends BaseLayer {
       features: filtered
     })
   }
+
+  /**
+   * Load all family members from API
+   * @param {Object} locations - Array of family member locations
+   */
+  loadMembers(locations) {
+    if (!Array.isArray(locations)) {
+      console.warn('[FamilyLayer] Invalid locations data:', locations)
+      return
+    }
+
+    const features = locations.map(location => ({
+      type: 'Feature',
+      geometry: {
+        type: 'Point',
+        coordinates: [location.longitude, location.latitude]
+      },
+      properties: {
+        id: location.user_id,
+        name: location.email || 'Unknown',
+        email: location.email,
+        color: location.color || this.getMemberColor(location.user_id),
+        lastUpdate: Date.now(),
+        battery: location.battery,
+        batteryStatus: location.battery_status,
+        updatedAt: location.updated_at
+      }
+    }))
+
+    this.update({
+      type: 'FeatureCollection',
+      features
+    })
+  }
+
+  /**
+   * Center map on specific family member
+   * @param {string} memberId - ID of the member to center on
+   */
+  centerOnMember(memberId) {
+    const features = this.data?.features || []
+    const member = features.find(f => f.properties.id === memberId)
+
+    if (member && this.map) {
+      this.map.flyTo({
+        center: member.geometry.coordinates,
+        zoom: 15,
+        duration: 1500
+      })
+    }
+  }
+
+  /**
+   * Get all current family members
+   * @returns {Array} Array of member features
+   */
+  getMembers() {
+    return this.data?.features || []
+  }
 }
diff --git a/app/views/map/maplibre/_settings_panel.html.erb b/app/views/map/maplibre/_settings_panel.html.erb
@@ -317,6 +317,32 @@
             <p class="text-sm text-base-content/60 ml-14">Show scratched countries</p>
           </div>
 
+          <% if DawarichSettings.family_feature_enabled? %>
+            <div class="divider"></div>
+
+            <!-- Family Members Layer -->
+            <div class="form-control">
+              <label class="label cursor-pointer justify-start gap-3">
+                <input type="checkbox"
+                       class="toggle toggle-primary"
+                       data-maps--maplibre-target="familyToggle"
+                       data-action="change->maps--maplibre#toggleFamily" />
+                <span class="label-text font-medium">Family Members</span>
+              </label>
+              <p class="text-sm text-base-content/60 ml-14">Show family member locations</p>
+            </div>
+
+            <!-- Family Members List (conditionally shown) -->
+            <div class="ml-14 space-y-2" data-maps--maplibre-target="familyMembersList" style="display: none;">
+              <div class="text-xs text-base-content/60 mb-2">
+                Click to center on member
+              </div>
+              <div data-maps--maplibre-target="familyMembersContainer" class="space-y-1">
+                <!-- Family members will be dynamically inserted here -->
+              </div>
+            </div>
+          <% end %>
+
         </div>
       </div>
 
diff --git a/docker/web-entrypoint.sh b/docker/web-entrypoint.sh
@@ -35,10 +35,10 @@ export DATABASE_NAME
 rm -f $APP_PATH/tmp/pids/server.pid
 
 # Sync static assets from image to volume
-# This ensures new files (like maps_maplibre styles) are copied to the persistent volume
+# This ensures new and updated files are copied to the persistent volume
 if [ -d "/tmp/public_assets" ]; then
-  echo "📦 Syncing new static assets to public volume..."
-  cp -rn /tmp/public_assets/* $APP_PATH/public/ 2>/dev/null || true
+  echo "📦 Syncing static assets to public volume..."
+  cp -ru /tmp/public_assets/* $APP_PATH/public/ 2>/dev/null || true
   echo "✅ Static assets synced!"
 fi
 
diff --git a/e2e/v2/map/layers/family.spec.js b/e2e/v2/map/layers/family.spec.js
diff --git a/lib/tasks/demo.rake b/lib/tasks/demo.rake
