Allow Clockify import without Billable column

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -116,10 +116,12 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     throw new ImportException('Time entry description is too long');
                 }
                 $timeEntry->description = $record['Description'];
-                if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
+                if (isset($record['Billable'])) {
-                    throw new ImportException('Invalid billable value');
+                    if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
+                        throw new ImportException('Invalid billable value');
+                    }
+                    $timeEntry->billable = $record['Billable'] === 'Yes';
                 }
-                $timeEntry->billable = $record['Billable'] === 'Yes';
                 $timeEntry->tags = $this->getTags($record['Tags']);
                 $timeEntry->is_imported = true;
 
@@ -219,7 +221,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
             'Group',
             'Email',
             'Tags',
-            'Billable',
             'Start Date',
             'Start Time',
             'End Date',

package.json

@@ -26,13 +26,13 @@
     },
     "devDependencies": {
         "@eslint/eslintrc": "^3.3.5",
-        "@eslint/js": "^10.0.1",
+        "@eslint/js": "^9.39.4",
-        "@inertiajs/vue3": "^3.4.0",
+        "@inertiajs/vue3": "^2.3.23",
         "@playwright/test": "^1.60.0",
         "@tailwindcss/forms": "^0.5.11",
         "@tailwindcss/typography": "^0.5.19",
         "@types/chroma-js": "^3.1.2",
-        "@types/node": "^25.9.3",
+        "@types/node": "^22.19.19",
         "@vitejs/plugin-vue": "^6.0.6",
         "@vue/test-utils": "^2.4.6",
         "@vue/tsconfig": "^0.8.1",
@@ -40,14 +40,14 @@
         "axios": "^1.16.0",
         "eslint-plugin-unused-imports": "^4.4.1",
         "happy-dom": "^20.8.9",
-        "laravel-vite-plugin": "^3.1.0",
+        "laravel-vite-plugin": "^2.1.0",
         "openapi-zod-client": "^1.18.3",
         "postcss": "^8.5.14",
-        "postcss-import": "^16.1.1",
+        "postcss-import": "^15.1.0",
-        "postcss-nesting": "^14.0.0",
+        "postcss-nesting": "^12.1.5",
-        "tailwindcss": "^4.3.1",
+        "tailwindcss": "^3.4.19",
-        "typescript": "^6.0.3",
+        "typescript": "^5.9.3",
-        "vite": "^8.0.16",
+        "vite": "^7.3.3",
         "vite-plugin-checker": "^0.12.0",
         "vitest": "^4.1.4",
         "vue": "^3.5.34",
@@ -55,14 +55,14 @@
     },
     "dependencies": {
         "@floating-ui/core": "^1.7.5",
-        "@floating-ui/vue": "^2.0.0",
+        "@floating-ui/vue": "^1.1.11",
         "@heroicons/vue": "^2.2.0",
         "@lucide/vue": "^1.14.0",
         "@rushstack/eslint-patch": "^1.16.1",
         "@tailwindcss/container-queries": "^0.1.1",
         "@tanstack/vue-form": "^1.32.0",
         "@tanstack/vue-query": "^5.100.10",
-        "@tanstack/vue-query-devtools": "^6.1.34",
+        "@tanstack/vue-query-devtools": "^5.91.0",
         "@tanstack/vue-table": "^8.21.3",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.7.0",
@@ -79,7 +79,7 @@
         "pinia": "^3.0.4",
         "radix-vue": "^1.9.17",
         "reka-ui": "^2.9.7",
-        "tailwind-merge": "^3.6.0",
+        "tailwind-merge": "^2.6.1",
         "tailwindcss-animate": "^1.0.7",
         "vue-draggable-plus": "^0.6.1",
         "vue-echarts": "^8.0.1",

resources/js/packages/api/package.json

@@ -29,7 +29,7 @@
     "author": "solidtime",
     "license": "AGPL-3.0",
     "devDependencies": {
-        "vite-plugin-dts": "^5.0.2"
+        "vite-plugin-dts": "^4.5.4"
     },
     "peerDependencies": {
         "@zodios/core": "^10.9.6",

resources/js/packages/ui/package.json

@@ -50,7 +50,7 @@
     "devDependencies": {
         "@types/chroma-js": "^3.1.2",
         "@zodios/core": "^10.9.6",
-        "vite-plugin-dts": "^5.0.2",
+        "vite-plugin-dts": "^4.5.4",
         "zod": "^3.25.76"
     },
     "peerDependencies": {

resources/testfiles/clockify_time_entries_import_test_4.csv

@@ -0,0 +1,3 @@
+"Project","Client","Description","Task","User","Group","Email","Tags","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
+"Project without Client","","","","Peter Tester","","peter.test@email.test","Development, Backend","03/04/2024","10:23:52 AM","03/04/2024","10:23:52 AM","00:00:00","0.00","0.00","0.00"
+"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","03/04/2024","10:23 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"

tests/Unit/Service/Import/Importers/ClockifyTimeEntriesImporterTest.php

@@ -41,6 +41,30 @@ class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
         $this->assertSame(1, $report->clientsCreated);
     }
 
+    public function test_import_of_test_file_without_billable_works_and_defaults_to_non_billable(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $timezone = 'Europe/Vienna';
+        $importer = new ClockifyTimeEntriesImporter;
+        $importer->init($organization);
+        $data = Storage::disk('testfiles')->get('clockify_time_entries_import_test_4.csv');
+
+        // Act
+        $importer->importData($data, $timezone);
+        $report = $importer->getReport();
+
+        // Assert
+        $testScenario = $this->checkTestScenarioAfterImportExcludingTimeEntries(false, true);
+        $this->checkTimeEntries($testScenario, false, true);
+        $this->assertSame(2, $report->timeEntriesCreated);
+        $this->assertSame(2, $report->tagsCreated);
+        $this->assertSame(1, $report->tasksCreated);
+        $this->assertSame(1, $report->usersCreated);
+        $this->assertSame(2, $report->projectsCreated);
+        $this->assertSame(1, $report->clientsCreated);
+    }
+
     public function test_import_of_test_with_special_characters_description_succeeds(): void
     {
         // Arrange

tests/Unit/Service/Import/Importers/ImporterTestAbstract.php

@@ -26,7 +26,7 @@ class ImporterTestAbstract extends TestCase
     /**
      * @return object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag}
      */
-    protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detailed = false): object
+    protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detailed = false, bool $billableDefault = false): object
     {
         $users = User::all();
         $this->assertCount(2, $users);
@@ -80,12 +80,12 @@ class ImporterTestAbstract extends TestCase
             $this->assertSame('#ef5350', $project1->color);
             $this->assertSame(null, $project1->billable_rate);
             // Project for Big Company
-            $this->assertSame(true, $project2->is_billable);
+            $this->assertSame(! $billableDefault, $project2->is_billable);
             $this->assertSame(false, $project2->is_public);
             $this->assertSame('#ec407a', $project2->color);
             $this->assertSame(10001, $project2->billable_rate);
             // Project (Archived)
-            $this->assertSame(true, $project3->is_billable);
+            $this->assertSame(! $billableDefault, $project3->is_billable);
             $this->assertSame(true, $project3->is_public);
             $this->assertSame('#6a407f', $project3->color);
             $this->assertSame(null, $project3->billable_rate);
@@ -176,7 +176,7 @@ class ImporterTestAbstract extends TestCase
     /**
      * @param  object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag}  $testScenario
      */
-    protected function checkTimeEntries(object $testScenario, bool $secondRun = false): void
+    protected function checkTimeEntries(object $testScenario, bool $secondRun = false, bool $billableDefault = false): void
     {
         $timeEntries = TimeEntry::all();
         if ($secondRun) {
@@ -197,7 +197,7 @@ class ImporterTestAbstract extends TestCase
         $this->assertSame('Working hard', $timeEntry2->description);
         $this->assertSame('2024-03-04 09:23:00', $timeEntry2->start->toDateTimeString());
         $this->assertSame('2024-03-04 10:23:01', $timeEntry2->end->toDateTimeString());
-        $this->assertTrue($timeEntry2->billable);
+        $this->assertSame(! $billableDefault, $timeEntry2->billable);
         $this->assertTrue($timeEntry2->is_imported);
         $this->assertSame([], $timeEntry2->tags);
     }