0.25.10

.app_version

@@ -1 +1 @@
-0.25.9
+0.25.10

.github/workflows/build_and_push.yml

@@ -36,6 +36,12 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: freikin/dawarich
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3.1.0
         with:
@@ -67,6 +73,7 @@ jobs:
           file: ./docker/Dockerfile.dev
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

.gitignore

@@ -68,5 +68,7 @@
 
 /config/credentials/production.key
 /config/credentials/production.yml.enc
+/config/credentials/staging.key
+/config/credentials/staging.yml.enc
 
 Makefile

CHANGELOG.md

@@ -4,6 +4,24 @@ 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.25.10 - 2025-05-02
+
+## Added
+
+- Vector maps are supported in non-self-hosted mode.
+- Credentials for Sidekiq UI are now being set via environment variables: `SIDEKIQ_USERNAME` and `SIDEKIQ_PASSWORD`. Default credentials are `sidekiq` and `password`. If you don't set them, in self-hosted mode, Sidekiq UI will not be protected by basic auth.
+- New import page now shows progress of the upload.
+
+## Changed
+
+- Datetime is now being displayed with seconds in the Points page. #1088
+- Imported files are now being uploaded via direct uploads.
+- `/api/v1/points` endpoint now creates accepted points synchronously.
+
+## Removed
+
+- Sample points are no longer being imported automatically for new users.
+
 # 0.25.9 - 2025-04-29
 
 ## Fixed

Gemfile.lock

@@ -426,7 +426,7 @@ GEM
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.7)
-    strong_migrations (2.2.0)
+    strong_migrations (2.3.0)
       activerecord (>= 7)
     super_diff (0.15.0)
       attr_extras (>= 6.2.4)

Procfile

@@ -1,3 +1,2 @@
 web: bundle exec puma -C config/puma.rb
-
-release: bundle exec rails db:migrate
+worker: bundle exec sidekiq -C config/sidekiq.yml

app.json

@@ -1,10 +1,21 @@
 {
+  "name": "dawarich",
+  "description": "Dawarich",
+  "buildpacks": [
+    { "url": "https://github.com/heroku/heroku-buildpack-nodejs.git" },
+    { "url": "https://github.com/heroku/heroku-buildpack-ruby.git" }
+  ],
   "formation": {
     "web": {
       "quantity": 1
     },
     "worker": {
-      "quantity": 0
+      "quantity": 1
+    }
+  },
+  "scripts": {
+    "dokku": {
+      "predeploy": "bundle exec rails db:migrate"
     }
   }
 }

app/controllers/api/v1/points_controller.rb

@@ -24,9 +24,9 @@ def index
   end
 
   def create
-    Points::CreateJob.perform_later(batch_params, current_api_user.id)
+    points = Points::Create.new(current_api_user, batch_params).call
 
-    render json: { message: 'Points are being processed' }
+    render json: { data: points }
   end
 
   def update

app/controllers/api/v1/subscriptions_controller.rb

@@ -10,10 +10,10 @@ def callback
 
     render json: { message: 'Subscription updated successfully' }
   rescue JWT::DecodeError => e
-    Sentry.capture_exception(e)
+    ExceptionReporter.call(e)
     render json: { message: 'Failed to verify subscription update.' }, status: :unauthorized
   rescue ArgumentError => e
-    Sentry.capture_exception(e)
+    ExceptionReporter.call(e)
     render json: { message: 'Invalid subscription data received.' }, status: :unprocessable_entity
   end
 end

app/controllers/exports_controller.rb

@@ -25,6 +25,8 @@ def create
   rescue StandardError => e
     export&.destroy
 
+    ExceptionReporter.call(e)
+
     redirect_to exports_url, alert: "Export failed to initiate: #{e.message}", status: :unprocessable_entity
   end
 

app/controllers/imports_controller.rb

@@ -31,26 +31,43 @@ def update
   end
 
   def create
-    files = import_params[:files].reject(&:blank?)
+    files_params = params.dig(:import, :files)
+    raw_files = Array(files_params).reject(&:blank?)
 
-    files.each do |file|
-      import = current_user.imports.build(
-        name: file.original_filename,
-        source: params[:import][:source]
-      )
+    if raw_files.empty?
+      redirect_to new_import_path, alert: 'No files were selected for upload', status: :unprocessable_entity
+      return
+    end
+
+    created_imports = []
 
-      import.file.attach(io: file, filename: file.original_filename, content_type: file.content_type)
+    raw_files.each do |item|
+      next if item.is_a?(ActionDispatch::Http::UploadedFile)
 
-      import.save!
+      import = create_import_from_signed_id(item)
+      created_imports << import if import.present?
     end
 
-    redirect_to imports_url, notice: "#{files.size} files are queued to be imported in background", status: :see_other
+    if created_imports.any?
+      redirect_to imports_url,
+                  notice: "#{created_imports.size} files are queued to be imported in background",
+                  status: :see_other
+    else
+      redirect_to new_import_path,
+                  alert: 'No valid file references were found. Please upload files using the file selector.',
+                  status: :unprocessable_entity
+    end
   rescue StandardError => e
-    Import.where(user: current_user, name: files.map(&:original_filename)).destroy_all
+    if created_imports.present?
+      import_ids = created_imports.map(&:id).compact
+      Import.where(id: import_ids).destroy_all if import_ids.any?
+    end
 
-    flash.now[:error] = e.message
+    Rails.logger.error "Import error: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+    ExceptionReporter.call(e)
 
-    redirect_to new_import_path, notice: e.message, status: :unprocessable_entity
+    redirect_to new_import_path, alert: e.message, status: :unprocessable_entity
   end
 
   def destroy
@@ -68,4 +85,21 @@ def set_import
   def import_params
     params.require(:import).permit(:source, files: [])
   end
+
+  def create_import_from_signed_id(signed_id)
+    Rails.logger.debug "Creating import from signed ID: #{signed_id[0..20]}..."
+
+    blob = ActiveStorage::Blob.find_signed(signed_id)
+
+    import = current_user.imports.build(
+      name: blob.filename.to_s,
+      source: params[:import][:source]
+    )
+
+    import.file.attach(blob)
+
+    import.save!
+
+    import
+  end
 end

app/helpers/application_helper.rb

@@ -126,6 +126,17 @@ def human_datetime(datetime)
     )
   end
 
+  def human_datetime_with_seconds(datetime)
+    return unless datetime
+
+    content_tag(
+      :span,
+      datetime.strftime('%e %b %Y, %H:%M:%S'),
+      class: 'tooltip',
+      data: { tip: datetime.iso8601 }
+    )
+  end
+
   def speed_text_color(speed)
     return 'text-default' if speed.to_i >= 0
 

app/javascript/controllers/direct_upload_controller.js

@@ -0,0 +1,149 @@
+import { Controller } from "@hotwired/stimulus"
+import { DirectUpload } from "@rails/activestorage"
+
+export default class extends Controller {
+  static targets = ["input", "progress", "progressBar", "submit", "form"]
+  static values = {
+    url: String
+  }
+
+  connect() {
+    this.inputTarget.addEventListener("change", this.upload.bind(this))
+
+    // Add form submission handler to disable the file input
+    if (this.hasFormTarget) {
+      this.formTarget.addEventListener("submit", this.onSubmit.bind(this))
+    }
+  }
+
+  onSubmit(event) {
+    if (this.isUploading) {
+      // If still uploading, prevent submission
+      event.preventDefault()
+      console.log("Form submission prevented during upload")
+      return
+    }
+
+    // Disable the file input to prevent it from being submitted with the form
+    // This ensures only our hidden inputs with signed IDs are submitted
+    this.inputTarget.disabled = true
+
+    // Check if we have any signed IDs
+    const signedIds = this.element.querySelectorAll('input[name="import[files][]"][type="hidden"]')
+    if (signedIds.length === 0) {
+      event.preventDefault()
+      console.log("No files uploaded yet")
+      alert("Please select and upload files first")
+    } else {
+      console.log(`Submitting form with ${signedIds.length} uploaded files`)
+    }
+  }
+
+  upload() {
+    const files = this.inputTarget.files
+    if (files.length === 0) return
+
+    console.log(`Uploading ${files.length} files`)
+    this.isUploading = true
+
+    // Disable submit button during upload
+    this.submitTarget.disabled = true
+
+    // Always remove any existing progress bar to ensure we create a fresh one
+    if (this.hasProgressTarget) {
+      this.progressTarget.remove()
+    }
+
+    // Create a wrapper div for better positioning and visibility
+    const progressWrapper = document.createElement("div")
+    progressWrapper.className = "mt-4 mb-6 border p-4 rounded-lg bg-gray-50"
+
+    // Add a label
+    const progressLabel = document.createElement("div")
+    progressLabel.className = "font-medium mb-2 text-gray-700"
+    progressLabel.textContent = "Upload Progress"
+    progressWrapper.appendChild(progressLabel)
+
+    // Create a new progress container
+    const progressContainer = document.createElement("div")
+    progressContainer.setAttribute("data-direct-upload-target", "progress")
+    progressContainer.className = "w-full bg-gray-200 rounded-full h-4"
+
+    // Create the progress bar fill element
+    const progressBarFill = document.createElement("div")
+    progressBarFill.setAttribute("data-direct-upload-target", "progressBar")
+    progressBarFill.className = "bg-blue-600 h-4 rounded-full transition-all duration-300"
+    progressBarFill.style.width = "0%"
+
+    // Add the fill element to the container
+    progressContainer.appendChild(progressBarFill)
+    progressWrapper.appendChild(progressContainer)
+    progressBarFill.dataset.percentageDisplay = "true"
+
+    // Add the progress wrapper AFTER the file input field but BEFORE the submit button
+    this.submitTarget.parentNode.insertBefore(progressWrapper, this.submitTarget)
+
+    console.log("Progress bar created and inserted before submit button")
+
+    let uploadCount = 0
+    const totalFiles = files.length
+
+    // Clear any existing hidden fields for files
+    this.element.querySelectorAll('input[name="import[files][]"][type="hidden"]').forEach(el => {
+      if (el !== this.inputTarget) {
+        el.remove()
+      }
+    });
+
+    Array.from(files).forEach(file => {
+      console.log(`Starting upload for ${file.name}`)
+      const upload = new DirectUpload(file, this.urlValue, this)
+      upload.create((error, blob) => {
+        uploadCount++
+
+        if (error) {
+          console.error("Error uploading file:", error)
+        } else {
+          console.log(`Successfully uploaded ${file.name} with ID: ${blob.signed_id}`)
+
+          // Create a hidden field with the correct name
+          const hiddenField = document.createElement("input")
+          hiddenField.setAttribute("type", "hidden")
+          hiddenField.setAttribute("name", "import[files][]")
+          hiddenField.setAttribute("value", blob.signed_id)
+          this.element.appendChild(hiddenField)
+
+          console.log("Added hidden field with signed ID:", blob.signed_id)
+        }
+
+        // Enable submit button when all uploads are complete
+        if (uploadCount === totalFiles) {
+          this.submitTarget.disabled = false
+          this.isUploading = false
+          console.log("All uploads completed")
+          console.log(`Ready to submit with ${this.element.querySelectorAll('input[name="import[files][]"][type="hidden"]').length} files`)
+        }
+      })
+    })
+  }
+
+  directUploadWillStoreFileWithXHR(request) {
+    request.upload.addEventListener("progress", event => {
+      if (!this.hasProgressBarTarget) {
+        console.warn("Progress bar target not found")
+        return
+      }
+
+      const progress = (event.loaded / event.total) * 100
+      const progressPercentage = `${progress.toFixed(1)}%`
+      console.log(`Upload progress: ${progressPercentage}`)
+      this.progressBarTarget.style.width = progressPercentage
+
+      // Update text percentage if exists
+      const percentageDisplay = this.element.querySelector('[data-percentage-display="true"]')
+      if (percentageDisplay) {
+        percentageDisplay.textContent = progressPercentage
+      }
+    })
+  }
+}