Update prefil notice

Author: cb341

app/views/timer_sessions/_timer_container.html.erb

@@ -1,5 +1,6 @@
 <div class="box" data-controller="form timer" data-timer-timezone-value="<%= offset_for_time_zone %>"
      data-form-share-copied-value="<%= t('timer_sessions.timer.share_copied') %>"
+     data-form-share-prefilled-value="<%= t('timer_sessions.timer.share_prefilled') %>"
      data-form-share-ignored-value="<%= t('timer_sessions.timer.share_ignored') %>"
      data-form-session-active-value="<%= timer_session.persisted? %>">
   <div class="timer-container">

assets.src/src/redmine-tracky/controllers/form-controller.ts

@@ -10,6 +10,7 @@ export default class extends Controller {
   declare readonly descriptionTarget: HTMLInputElement
   declare readonly issueTargets: Element[]
   declare readonly shareCopiedValue: string
+  declare readonly sharePrefilledValue: string
   declare readonly shareIgnoredValue: string
   declare readonly sessionActiveValue: boolean
 
@@ -26,14 +27,18 @@ export default class extends Controller {
 
   static values = {
     shareCopied: String,
+    sharePrefilled: String,
     shareIgnored: String,
     sessionActive: Boolean,
   }
 
   public connect() {
     this.connected = true
-    this.prefillFieldsFromURL()
-    this.showShareIgnoredNotice()
+    if (this.sessionActiveValue) {
+      this.showShareIgnoredNotice()
+    } else {
+      this.prefillFieldsFromURL()
+    }
   }
 
   public disconnect() {
@@ -95,24 +100,31 @@ export default class extends Controller {
     const url = `${window.location.origin}${window.location.pathname}${query}`
 
     navigator.clipboard.writeText(url).then(() => {
-      this.showFlashNotice(this.shareCopiedValue)
+      this.showFlash(this.shareCopiedValue, 'notice')
     })
   }
 
   private prefillFieldsFromURL() {
     const urlParams = new URLSearchParams(window.location.search)
 
-    this.prefillField(urlParams, 'comments', this.descriptionTarget)
-    this.prefillField(urlParams, 'timer_start', this.startTarget)
-    this.prefillField(urlParams, 'timer_end', this.endTarget)
+    const prefilled = [
+      this.prefillField(urlParams, 'comments', this.descriptionTarget),
+      this.prefillField(urlParams, 'timer_start', this.startTarget),
+      this.prefillField(urlParams, 'timer_end', this.endTarget),
+    ].some(Boolean)
+
+    if (prefilled) {
+      this.showFlash(this.sharePrefilledValue, 'notice')
+    }
   }
 
-  private prefillField(urlParams: URLSearchParams, param: string, target: HTMLInputElement) {
+  private prefillField(urlParams: URLSearchParams, param: string, target: HTMLInputElement): boolean {
     const value = urlParams.get(param)
-    if (!value) return
+    if (!value) return false
 
     target.value = value
     target.dispatchEvent(new Event('change'))
+    return true
   }
 
   private showShareIgnoredNotice() {
@@ -125,26 +137,27 @@ export default class extends Controller {
       urlParams.getAll('issue_ids[]').some((v) => v !== '')
 
     if (hasShareParams) {
-      this.showFlashNotice(this.shareIgnoredValue)
+      this.showFlash(this.shareIgnoredValue, 'warning')
     }
   }
 
-  private showFlashNotice(message: string) {
-    const flash = document.getElementById('flash_notice')
-    if (flash) {
-      flash.textContent = message
-      flash.style.display = ''
+  private showFlash(message: string, type: 'notice' | 'warning') {
+    const flashId = `flash_${type}`
+    const existing = document.getElementById(flashId)
+    if (existing) {
+      existing.textContent = message
+      existing.style.display = ''
       return
     }
 
     const container = document.getElementById('content')
     if (!container) return
 
-    const notice = document.createElement('div')
-    notice.id = 'flash_notice'
-    notice.className = 'flash notice'
-    notice.textContent = message
-    container.prepend(notice)
+    const flash = document.createElement('div')
+    flash.id = flashId
+    flash.className = `flash ${type}`
+    flash.textContent = message
+    container.prepend(flash)
   }
 
   private extractIssueIds(): string[] {

assets/javascripts/redmine-tracky.js

@@ -75,6 +75,7 @@ de:
       continue_last_session: Anschliessend Starten
       share: Teilen
       share_copied: Link in die Zwischenablage kopiert
+      share_prefilled: Session wurde von einem geteilten Link vorausgefüllt
       share_ignored: Ein Timer läuft bereits. Die geteilten Parameter wurden ignoriert.
       stop: Stop
       cancel: Abbrechen

config/locales/de.yml

@@ -79,6 +79,7 @@ en:
       continue_last_session: Start on end of last session
       share: Share
       share_copied: Link copied to clipboard
+      share_prefilled: Session was prefilled from a shared link
       share_ignored: A timer is already running. Shared session parameters were ignored.
       stop: Stop
       cancel: Cancel

config/locales/en.yml

@@ -145,6 +145,7 @@ class TimerManagementTest < ApplicationSystemTestCase
       timer_end: '01.01.2026 10:00'
     )
 
+    assert_text I18n.t('timer_sessions.timer.share_prefilled')
     assert_text Issue.first.subject
     assert_equal 'Sprint planning', find('#timer_session_comments').value
     assert_equal '01.01.2026 09:00', find('#timer_session_timer_start').value
@@ -168,11 +169,19 @@ class TimerManagementTest < ApplicationSystemTestCase
     assert_no_selector('[data-name="timer-share"]')
   end
 
-  test 'shows prefill notice when active session exists and url has params' do
+  test 'shows only ignored notice when active session exists and url has params' do
     FactoryBot.create(:timer_session, finished: false, user: User.current)
     visit timer_sessions_path(comments: 'Meeting', issue_ids: [Issue.first.id])
 
     assert_text I18n.t('timer_sessions.timer.share_ignored')
+    assert_no_text I18n.t('timer_sessions.timer.share_prefilled')
+  end
+
+  test 'shows only prefilled notice when no active session and url has params' do
+    visit timer_sessions_path(comments: 'Sprint planning', timer_start: '01.01.2026 09:00')
+
+    assert_text I18n.t('timer_sessions.timer.share_prefilled')
+    assert_no_text I18n.t('timer_sessions.timer.share_ignored')
   end
 
   test 'preserves filter parameters when stopping a timer' do