bump ui to 0.0.22 and api to 0.0.7

app/Service/Dto/ReportPropertiesDto.php

@@ -132,8 +132,12 @@ class ReportPropertiesDto implements Castable
                 $dto->roundingType = isset($data->roundingType) ? TimeEntryRoundingType::from($data->roundingType) : null;
                 // Note: roundingMinutes was added later so it is possible that the value is missing in persisted reports in the DB
                 $dto->roundingMinutes = isset($data->roundingMinutes) ? (int) $data->roundingMinutes : null;
-                // Note: timeEntryType was added later so it is possible that the value is missing in persisted reports in the DB
-                $dto->timeEntryType = isset($data->timeEntryType) ? TimeEntryType::from($data->timeEntryType) : null;
+                // Note: timeEntryType was added later, reports persisted before that are missing the value and default to "work"
+                if (property_exists($data, 'timeEntryType')) {
+                    $dto->timeEntryType = $data->timeEntryType !== null ? TimeEntryType::from($data->timeEntryType) : null;
+                } else {
+                    $dto->timeEntryType = TimeEntryType::Work;
+                }
 
                 return $dto;
             }

e2e/organization.spec.ts

@@ -4,7 +4,7 @@ import { PLAYWRIGHT_BASE_URL, TEST_USER_PASSWORD } from '../playwright/config';
 async function goToOrganizationSettings(page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
     await page.locator('[data-testid="organization_switcher"]:visible').click();
-    await page.getByText('Organization Settings').click();
+    await page.getByRole('menuitem', { name: 'Organization Settings' }).click();
 }
 
 async function createTimeEntry(page, duration: string) {

e2e/time.spec.ts

@@ -50,7 +50,7 @@ async function goToTimeOverview(page: Page) {
 async function goToOrganizationSettings(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
     await page.locator('[data-testid="organization_switcher"]:visible').click();
-    await page.getByText('Organization Settings').click();
+    await page.getByRole('menuitem', { name: 'Organization Settings' }).click();
 }
 
 async function createEmptyTimeEntry(page: Page) {

package-lock.json

@@ -8396,7 +8396,7 @@
         },
         "resources/js/packages/api": {
             "name": "@solidtime/api",
-            "version": "0.0.6",
+            "version": "0.0.7",
             "license": "AGPL-3.0",
             "devDependencies": {
                 "vite-plugin-dts": "^4.5.4"
@@ -8411,7 +8411,7 @@
         },
         "resources/js/packages/ui": {
             "name": "@solidtime/ui",
-            "version": "0.0.21",
+            "version": "0.0.22",
             "license": "AGPL-3.0",
             "devDependencies": {
                 "@types/chroma-js": "^3.1.2",

resources/js/Components/UpdateSidebarNotification.vue

@@ -2,10 +2,17 @@
 import { BellAlertIcon, XMarkIcon } from '@heroicons/vue/20/solid';
 import { SecondaryButton } from '@/packages/ui/src';
 import { useStorage } from '@vueuse/core';
-const showReleaseInfo = useStorage('showReleaseInfo-desktop', true);
+import { router } from '@inertiajs/vue3';
+import { getCurrentOrganizationId } from '@/utils/useUser';
+import { canUpdateOrganization } from '@/utils/permissions';
+const showReleaseInfo = useStorage('showReleaseInfo-breaks', true);
 
-function openDesktopGithubRepo() {
-    window.open('https://github.com/solidtime-io/solidtime-desktop', '_blank')?.focus();
+function openOrganizationSettings() {
+    router.visit(route('organizations.show', getCurrentOrganizationId()));
+}
+
+function openBreaksDocs() {
+    window.open('https://docs.solidtime.io/user-guide/breaks', '_blank')?.focus();
 }
 </script>
 
@@ -16,7 +23,7 @@ function openDesktopGithubRepo() {
                 <div
                     class="text-xs pb-1.5 font-semibold text-text-tertiary flex items-center space-x-1">
                     <BellAlertIcon class="w-3.5"></BellAlertIcon>
-                    <span> New Update </span>
+                    <span> New Feature </span>
                 </div>
                 <button>
                     <XMarkIcon
@@ -26,14 +33,22 @@ function openDesktopGithubRepo() {
             </div>
 
             <p class="text-xs">
-                <span class="font-semibold">Solidtime Desktop Beta</span> is here! Test our brand
-                new clients for Windows, macOS and Linux now.
+                <span class="font-semibold">Breaks</span> are here! Enable them in the organization
+                settings to track break time in the time tracker and timesheet.
             </p>
             <SecondaryButton
+                v-if="canUpdateOrganization()"
                 size="small"
                 class="w-full text-center justify-center mt-1.5"
-                @click="openDesktopGithubRepo"
-                >Download now</SecondaryButton
+                @click="openOrganizationSettings"
+                >Enable now</SecondaryButton
+            >
+            <SecondaryButton
+                v-else
+                size="small"
+                class="w-full text-center justify-center mt-1.5"
+                @click="openBreaksDocs"
+                >Learn more</SecondaryButton
             >
         </div>
     </div>

resources/js/packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidtime/api",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "description": "Package containing the solidtime api client and type declarations",
     "main": "./dist/solidtime-api.umd.cjs",
     "module": "./dist/solidtime-api.js",

resources/js/packages/ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidtime/ui",
-    "version": "0.0.21",
+    "version": "0.0.22",
     "description": "Package containing the solidtime ui components",
     "main": "./dist/solidtime-ui-lib.umd.cjs",
     "module": "./dist/solidtime-ui-lib.js",

tests/Unit/Service/Dto/ReportPropertiesDtoTest.php

@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service\Dto;
+
+use App\Enums\TimeEntryType;
+use App\Models\Report;
+use App\Service\Dto\ReportPropertiesDto;
+use PHPUnit\Framework\Attributes\CoversClass;
+use Tests\TestCase;
+
+#[CoversClass(ReportPropertiesDto::class)]
+class ReportPropertiesDtoTest extends TestCase
+{
+    /**
+     * @return array<string, mixed>
+     */
+    private function getBaseProperties(): array
+    {
+        return [
+            'group' => 'project',
+            'subGroup' => 'task',
+            'historyGroup' => 'day',
+            'weekStart' => 'monday',
+            'timezone' => 'Europe/Vienna',
+            'start' => '2024-01-01T00:00:00Z',
+            'end' => '2024-01-31T00:00:00Z',
+            'active' => null,
+            'memberIds' => null,
+            'billable' => null,
+            'clientIds' => null,
+            'projectIds' => null,
+            'tagIds' => null,
+            'taskIds' => null,
+        ];
+    }
+
+    /**
+     * @param  array<string, mixed>  $properties
+     */
+    private function castFromJson(array $properties): ReportPropertiesDto
+    {
+        $json = json_encode($properties);
+        $this->assertIsString($json);
+
+        return ReportPropertiesDto::castUsing([])->get(new Report, 'properties', $json, []);
+    }
+
+    public function test_time_entry_type_defaults_to_work_if_the_value_is_missing_in_the_persisted_report(): void
+    {
+        // Arrange
+        $properties = $this->getBaseProperties();
+
+        // Act
+        $dto = $this->castFromJson($properties);
+
+        // Assert
+        $this->assertSame(TimeEntryType::Work, $dto->timeEntryType);
+    }
+
+    public function test_time_entry_type_is_null_if_the_persisted_report_has_it_set_to_null(): void
+    {
+        // Arrange
+        $properties = $this->getBaseProperties();
+        $properties['timeEntryType'] = null;
+
+        // Act
+        $dto = $this->castFromJson($properties);
+
+        // Assert
+        $this->assertNull($dto->timeEntryType);
+    }
+
+    public function test_time_entry_type_is_casted_to_the_enum_if_the_persisted_report_has_a_value(): void
+    {
+        // Arrange
+        $propertiesWork = $this->getBaseProperties();
+        $propertiesWork['timeEntryType'] = 'work';
+        $propertiesBreak = $this->getBaseProperties();
+        $propertiesBreak['timeEntryType'] = 'break';
+
+        // Act
+        $dtoWork = $this->castFromJson($propertiesWork);
+        $dtoBreak = $this->castFromJson($propertiesBreak);
+
+        // Assert
+        $this->assertSame(TimeEntryType::Work, $dtoWork->timeEntryType);
+        $this->assertSame(TimeEntryType::Break, $dtoBreak->timeEntryType);
+    }
+}