Fix: App forgets default activity ID

Rakefile

@@ -54,6 +54,7 @@ desc 'Provision the environment.'
 task :provision do
   puts 'Installing dev packages...'
   sleep(2)
+  sh 'docker compose exec redmine bundle lock --add-platform x86-mingw32 x64-mingw32 x86-mswin32'
   sh 'docker compose exec redmine bundle config set with "default dev test"'
   sh 'docker compose exec redmine bundle install'
 

assets.src/javascripts/t2r.ts

@@ -217,7 +217,7 @@ class FilterForm {
     const values: FilterFormValues = {}
 
     const $defaultActivityId = $('select#default-activity-id')
-    const defaultActivityId = $defaultActivityId.val()
+    const defaultActivityId = $defaultActivityId.val() || $defaultActivityId.data('selected')
     if (defaultActivityId) {
       values['default-activity-id'] = parseInt(defaultActivityId as string)
     }
@@ -553,7 +553,7 @@ class TogglReport {
         entries[key] = entry
       }
 
-      if (entries === {}) {
+      if (Object.keys(entries).length === 0) {
         this.showEmptyMessage()
       }
 

assets.src/javascripts/t2r/utils.ts

@@ -55,11 +55,11 @@ export class EventManager {
     this.listeners[eventName].push(callback)
   }
 
-  public trigger<Type>(eventName: string): void {
+  public trigger(eventName: string): void {
     if (typeof this.listeners[eventName] === 'undefined') return
 
     for (const listener of this.listeners[eventName]) {
-      const result = listener()
+      listener()
     }
   }
 }

assets.src/javascripts/t2r/widgets.ts

@@ -159,11 +159,15 @@ function initDurationInput(el: HTMLElement): void {
     .on('input', function() {
       const val = $el.val() as string
       try {
-        // If a duration object could be created, then the the time is valid.
+        // If a duration object could be created, then the time is valid.
         new datetime.Duration(val)
         input.setCustomValidity('')
       } catch (e) {
-        input.setCustomValidity(e)
+        if (e instanceof Error) {
+          input.setCustomValidity(e.toString())
+        } else {
+          throw e
+        }
       }
     })
     // Update totals as the user updates hours.
@@ -241,7 +245,7 @@ function initRedmineActivityDropdown(el: HTMLElement): void {
   redmineService.getTimeEntryActivities((activities: DropdownOption[] | null) => {
     if (activities === null) return
 
-    // Generate a SELECT element and use it's options.
+    // Generate a SELECT element and use its options.
     const $select = buildDropdownFromRecords({
       placeholder: $el.data('placeholder'),
       records: activities
@@ -250,7 +254,7 @@ function initRedmineActivityDropdown(el: HTMLElement): void {
     $el.append($select.find('option')).val('');
 
     const value = $el.data('selected') || '';
-    $el.val(value).removeAttr('selected');
+    $el.val(value).removeData('selected');
   })
 }