From 78ac365c008e87dd8eebc8d79606d30b39db87d4 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Sun, 23 Nov 2025 00:43:31 +0100
Subject: [PATCH] Some fixes

---
 CHANGELOG.md                                    | 12 ++++++++++++
 .../controllers/color_picker_controller.js      |  7 ++++++-
 app/views/imports/_form.html.erb                |  2 +-
 app/views/settings/index.html.erb               |  2 +-
 app/views/tags/_form.html.erb                   | 14 ++++++--------
 .../20251028130433_add_omniauth_to_users.rb     |  5 +++--
 .../20251116184506_add_user_id_to_places.rb     |  6 ++++--
 ...20251118204141_add_privacy_radius_to_tags.rb | 17 +++++++++++++++--
 db/migrate/20251118210506_add_note_to_places.rb |  2 +-
 9 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5bfb34b..dc1e9553 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## TEST
+
+- [ ] KML upload
+- [ ] OIDC login with Authentik
+  - [ ] How does it work with existing settings to disable registrations?
+- [ ] Place creation
+- [ ] Tag creation + management
+- [ ] Place privacy zones
+- [ ] Settings panel is scrollable
+- [ ] Family members can enable their location sharing and see each other on the map
+- [ ] Home location
+
 # OIDC and KML support release
 
 To configure your OIDC provider, set the following environment variables:
diff --git a/app/javascript/controllers/color_picker_controller.js b/app/javascript/controllers/color_picker_controller.js
index 035584ae..e6f562b9 100644
--- a/app/javascript/controllers/color_picker_controller.js
+++ b/app/javascript/controllers/color_picker_controller.js
@@ -3,7 +3,7 @@ import { Controller } from "@hotwired/stimulus"
 // Enhanced Color Picker Controller
 // Based on RailsBlocks pattern: https://railsblocks.com/docs/color-picker
 export default class extends Controller {
-  static targets = ["picker", "display", "input", "swatch"]
+  static targets = ["picker", "display", "displayText", "input", "swatch"]
   static values = {
     default: { type: String, default: "#6ab0a4" }
   }
@@ -49,6 +49,11 @@ export default class extends Controller {
       this.displayTarget.style.backgroundColor = color
     }
 
+    // Update display text
+    if (this.hasDisplayTextTarget) {
+      this.displayTextTarget.textContent = color
+    }
+
     // Update active swatch styling
     this.updateActiveSwatchWithColor(color)
 
diff --git a/app/views/imports/_form.html.erb b/app/views/imports/_form.html.erb
index 9b928b0d..fca03032 100644
--- a/app/views/imports/_form.html.erb
+++ b/app/views/imports/_form.html.erb
@@ -7,7 +7,7 @@
       <li><strong>✅ GPX:</strong> Track files (.gpx)</li>
       <li><strong>✅ GeoJSON:</strong> Feature collections (.json)</li>
       <li><strong>✅ OwnTracks:</strong> Recorder files (.rec)</li>
-      <li><strong>✅ KML:</strong> KML files (.kml)</li>
+      <li><strong>✅ KML:</strong> KML files (.kml, .kmz)</li>
     </ul>
     <div class="text-xs text-gray-500 mt-2">
       File format is automatically detected during upload.
diff --git a/app/views/settings/index.html.erb b/app/views/settings/index.html.erb
index d33d86b1..94e70556 100644
--- a/app/views/settings/index.html.erb
+++ b/app/views/settings/index.html.erb
@@ -69,7 +69,7 @@
             </div>
           </div>
 
-          <% unless DawarichSettings.self_hosted? %>
+          <% unless DawarichSettings.self_hosted? || current_user.provider.blank? %>
             <div>
               <h2 class="text-2xl font-bold mb-4 flex items-center">
                 <%= icon 'link', class: "text-primary mr-1" %> Connected Accounts
diff --git a/app/views/tags/_form.html.erb b/app/views/tags/_form.html.erb
index e9e5e609..8f35a923 100644
--- a/app/views/tags/_form.html.erb
+++ b/app/views/tags/_form.html.erb
@@ -71,13 +71,11 @@
         <div class="flex items-center gap-3">
           <label class="flex items-center gap-2 cursor-pointer group">
             <span class="text-sm font-medium">Custom:</span>
-            <%= f.color_field :color,
-                class: "w-12 h-12 rounded-lg cursor-pointer border-2 border-base-300 hover:scale-105 transition-transform color-input",
-                data: {
-                  color_picker_target: "picker",
-                  action: "input->color-picker#updateFromPicker"
-                },
-                value: tag.color.presence || '#6ab0a4' %>
+            <input type="color"
+                   class="w-12 h-12 rounded-lg cursor-pointer border-2 border-base-300 hover:scale-105 transition-transform color-input"
+                   value="<%= tag.color.presence || '#6ab0a4' %>"
+                   data-color-picker-target="picker"
+                   data-action="input->color-picker#updateFromPicker">
           </label>
 
           <!-- Color Display -->
@@ -92,7 +90,7 @@
         </div>
       </div>
 
-      <%= f.hidden_field :color, data: { color_picker_target: "input" } %>
+      <%= f.hidden_field :color, value: tag.color.presence || '#6ab0a4', data: { color_picker_target: "input" } %>
 
       <label class="label">
         <span class="label-text-alt">Choose from swatches or pick a custom color</span>
diff --git a/db/migrate/20251028130433_add_omniauth_to_users.rb b/db/migrate/20251028130433_add_omniauth_to_users.rb
index 01c61b71..75b37862 100644
--- a/db/migrate/20251028130433_add_omniauth_to_users.rb
+++ b/db/migrate/20251028130433_add_omniauth_to_users.rb
@@ -1,6 +1,7 @@
 class AddOmniauthToUsers < ActiveRecord::Migration[8.0]
   def change
-    add_column :users, :provider, :string
-    add_column :users, :uid, :string
+    add_column :users, :provider, :string unless column_exists? :users, :provider
+    add_column :users, :uid, :string unless column_exists? :users, :uid
+    add_index :users, [:provider, :uid], unique: true, algorithm: :concurrently
   end
 end
diff --git a/db/migrate/20251116184506_add_user_id_to_places.rb b/db/migrate/20251116184506_add_user_id_to_places.rb
index f54220be..bb159121 100644
--- a/db/migrate/20251116184506_add_user_id_to_places.rb
+++ b/db/migrate/20251116184506_add_user_id_to_places.rb
@@ -3,10 +3,12 @@ class AddUserIdToPlaces < ActiveRecord::Migration[8.0]
 
   def up
     # Add nullable for backward compatibility, will enforce later via data migration
-    add_reference :places, :user, null: true, index: {algorithm: :concurrently} unless foreign_key_exists?(:places, :users)
+    unless column_exists?(:places, :user_id)
+      add_reference :places, :user, null: true, index: { algorithm: :concurrently }
+    end
   end
 
   def down
-    remove_reference :places, :user, index: true if foreign_key_exists?(:places, :users)
+    remove_reference :places, :user, index: true if column_exists?(:places, :user_id)
   end
 end
diff --git a/db/migrate/20251118204141_add_privacy_radius_to_tags.rb b/db/migrate/20251118204141_add_privacy_radius_to_tags.rb
index b310fab4..a0582f6a 100644
--- a/db/migrate/20251118204141_add_privacy_radius_to_tags.rb
+++ b/db/migrate/20251118204141_add_privacy_radius_to_tags.rb
@@ -1,8 +1,21 @@
+# frozen_string_literal: true
+
 class AddPrivacyRadiusToTags < ActiveRecord::Migration[8.0]
   disable_ddl_transaction!
 
-  def change
+  def up
     add_column :tags, :privacy_radius_meters, :integer
-    add_index :tags, :privacy_radius_meters, where: "privacy_radius_meters IS NOT NULL", algorithm: :concurrently
+    add_index :tags,
+              :privacy_radius_meters,
+              where: 'privacy_radius_meters IS NOT NULL',
+              algorithm: :concurrently
+  end
+
+  def down
+    remove_index :tags,
+                 column: :privacy_radius_meters,
+                 where: 'privacy_radius_meters IS NOT NULL',
+                 algorithm: :concurrently
+    remove_column :tags, :privacy_radius_meters
   end
 end
diff --git a/db/migrate/20251118210506_add_note_to_places.rb b/db/migrate/20251118210506_add_note_to_places.rb
index b89709c0..8450f8d9 100644
--- a/db/migrate/20251118210506_add_note_to_places.rb
+++ b/db/migrate/20251118210506_add_note_to_places.rb
@@ -1,5 +1,5 @@
 class AddNoteToPlaces < ActiveRecord::Migration[8.0]
   def change
-    add_column :places, :note, :text
+    add_column :places, :note, :text unless column_exists? :places, :note
   end
 end