Merge branch '6.x' into multisite-entry-grouping

Author: jaygeorge

resources/js/components/entries/calendar/Calendar.vue

@@ -7,7 +7,7 @@ import Month from './Month.vue';
 import Week from './Week.vue';
 import { Listing, StatusIndicator } from '@/components/ui';
 import DateFormatter from '@/components/DateFormatter.js';
-import { getWeekDates, getCurrentDateRange } from './calendar.js';
+import { getWeekDates, getCurrentDateRange, getEntryDate } from './calendar.js';
 import { Link } from '@inertiajs/vue3';
 import { ToggleGroup, ToggleItem, Button, Popover, Label, Select, Heading } from '@ui';
 import { preferences } from '@api';
@@ -122,8 +122,7 @@ const selectedDateEntries = computed(() => {
     const dateStr = selectedDate.value.toString();
 
     return entries.value.filter(entry => {
-        const entryDate = new Date(entry.date?.date || entry.date);
-        return entryDate.toISOString().split('T')[0] === dateStr;
+        return getEntryDate(entry).toString().split('T')[0] === dateStr;
     });
 });
 

resources/js/components/entries/calendar/Month.vue

@@ -3,9 +3,8 @@ import { CalendarCell, CalendarCellTrigger, CalendarGrid, CalendarGridBody, Cale
 import CalendarEntry from './MonthEntry.vue';
 import CreateEntryButton from '../CreateEntryButton.vue';
 import { Button } from '@ui';
-import { isToday, getCreateUrlDateParam } from './calendar.js';
+import { isToday, getCreateUrlDateParam, getEntryDate } from './calendar.js';
 import DateFormatter from '@/components/DateFormatter.js';
-import { parseAbsoluteToLocal } from '@internationalized/date';
 
 const props = defineProps({
     weekDays: { type: Array, required: true },
@@ -32,8 +31,7 @@ const isCurrentDay = (dayIndex) => {
 const getEntriesForDate = (date) => {
     const dateStr = date.toString();
     return props.entries.filter(entry => {
-        const entryDate = parseAbsoluteToLocal(entry.date?.date || entry.date);
-        return entryDate.toString().split('T')[0] === dateStr;
+        return getEntryDate(entry).toString().split('T')[0] === dateStr;
     });
 };
 

resources/js/components/entries/calendar/MonthEntry.vue

@@ -13,7 +13,11 @@ const entryClasses = computed(() => ({
     'border-purple-500 hover:bg-purple-50 dark:hover:bg-purple-900': props.entry.status === 'scheduled'
 }));
 
-const time = computed(() => DateFormatter.format(props.entry.date?.date || props.entry.date, 'time'))
+const time = computed(() => {
+    if (props.entry.date?.format_has_time === false) return null;
+
+    return DateFormatter.format(props.entry.date?.date || props.entry.date, 'time');
+});
 </script>
 
 <template>
@@ -25,6 +29,7 @@ const time = computed(() => DateFormatter.format(props.entry.date?.date || props
     >
         <span class="line-clamp-2" v-text="entry.title" />
         <span
+            v-if="time"
             class="hidden @4xl:block text-2xs text-gray-400 dark:text-gray-400 group-hover/entry:dark:text-gray-300"
             v-text="time"
         />

resources/js/components/entries/calendar/Week.vue

@@ -6,9 +6,9 @@ import { Button } from '@ui';
 import {
     isToday,
     getCreateUrlDateParam,
+    getEntryDate,
 } from './calendar.js';
 import DateFormatter from '@/components/DateFormatter.js';
-import { parseAbsoluteToLocal } from '@internationalized/date';
 
 const props = defineProps({
     weekDates: { type: Array, required: true },
@@ -27,12 +27,11 @@ const visibleHours = Array.from({ length: 24 }, (_, i) => i);
 function getEntriesForHour(date, hour) {
     const dateStr = date.toString();
     return props.entries.filter(entry => {
-        const entryDate = parseAbsoluteToLocal(entry.date?.date || entry.date);
+        const entryDate = getEntryDate(entry);
         const entryDateStr = entryDate.toString().split('T')[0];
         if (entryDateStr !== dateStr) return false;
 
-        const entryHour = entryDate.hour;
-        return entryHour === hour;
+        return (entryDate.hour ?? 0) === hour;
     });
 }
 

resources/js/components/entries/calendar/calendar.js

@@ -1,6 +1,13 @@
-import { CalendarDate, CalendarDateTime, fromDate, getLocalTimeZone, startOfWeek, endOfWeek } from '@internationalized/date';
+import { CalendarDate, CalendarDateTime, fromDate, getLocalTimeZone, parseAbsoluteToLocal, parseDate, startOfWeek, endOfWeek } from '@internationalized/date';
 import DateFormatter from '@/components/DateFormatter.js';
 
+export function getEntryDate(entry) {
+    const date = entry.date?.date || entry.date;
+
+    // Fields using a format without a time save a plain date string, which can't be parsed as an absolute datetime.
+    return date.includes('T') ? parseAbsoluteToLocal(date) : parseDate(date);
+}
+
 export function getWeekDates(currentDate) {
     if (!currentDate) {
         throw new Error('getWeekDates called with undefined currentDate');

resources/js/components/field-conditions/Validator.js

@@ -11,6 +11,9 @@ const ROOT_PREFIX_RE = /^\$?root\./;
 const isEmpty = (value) => {
     if (value === null || value === undefined) return true;
 
+    // Object.keys() would consider numbers empty.
+    if (typeof value === 'number') return false;
+
     return Array.isArray(value) ? value.length === 0 : Object.keys(value).length === 0;
 };
 

resources/js/tests/FieldConditionsValidator.test.js

@@ -227,6 +227,8 @@ test('it can check if value is empty', () => {
         last_name: 'HasselHoff',
         user: { email: 'david@hasselhoff.com' },
         favorite_foods: ['lasagna'],
+        age: 43,
+        zero: 0,
         empty_string: '',
         empty_array: [],
         empty_object: {},
@@ -238,6 +240,9 @@ test('it can check if value is empty', () => {
     expect(showFieldIf({ last_name: 'not empty' })).toBe(true);
     expect(showFieldIf({ user: 'empty' })).toBe(false);
     expect(showFieldIf({ favorite_foods: 'empty' })).toBe(false);
+    expect(showFieldIf({ age: 'empty' })).toBe(false);
+    expect(showFieldIf({ age: 'not empty' })).toBe(true);
+    expect(showFieldIf({ zero: 'empty' })).toBe(false);
     expect(showFieldIf({ empty_string: 'empty' })).toBe(true);
     expect(showFieldIf({ empty_array: 'empty' })).toBe(true);
     expect(showFieldIf({ empty_object: 'empty' })).toBe(true);

resources/js/tests/components/entries/calendar.test.js

@@ -0,0 +1,19 @@
+import { expect, test } from 'vitest';
+import { getEntryDate } from '@/components/entries/calendar/calendar.js';
+
+test('it parses datetime values', () => {
+    const date = getEntryDate({ date: { date: '2026-08-24T12:30:00.000Z', format_has_time: true } });
+
+    expect(date.toString().split('T')[0]).toBe('2026-08-24');
+});
+
+test('it parses date-only values', () => {
+    const date = getEntryDate({ date: { date: '2026-08-24', format_has_time: false } });
+
+    expect(date.toString()).toBe('2026-08-24');
+});
+
+test('it parses values that are plain strings', () => {
+    expect(getEntryDate({ date: '2026-08-24T12:30:00.000Z' }).toString().split('T')[0]).toBe('2026-08-24');
+    expect(getEntryDate({ date: '2026-08-24' }).toString()).toBe('2026-08-24');
+});

src/Addons/Addon.php

@@ -350,18 +350,21 @@ public function config()
 
     public function hasSettingsBlueprint(): bool
     {
-        return $this->settingsBlueprint() !== null;
+        return app()->bound($this->settingsBlueprintBinding());
     }
 
     public function settingsBlueprint()
     {
-        $binding = "statamic.addons.{$this->slug()}.settings_blueprint";
-
-        if (! app()->bound($binding)) {
+        if (! $this->hasSettingsBlueprint()) {
             return null;
         }
 
-        return Blueprint::make("addons.{$this->slug()}")->setContents(app($binding));
+        return Blueprint::make("addons.{$this->slug()}")->setContents(app($this->settingsBlueprintBinding()));
+    }
+
+    private function settingsBlueprintBinding(): string
+    {
+        return "statamic.addons.{$this->slug()}.settings_blueprint";
     }
 
     public function setting($key, $default = null): mixed

src/Facades/Endpoint/URL.php

@@ -438,11 +438,11 @@ private function ensureSiteCaches(): void
         $sites = Site::all();
 
         self::$hasRelativeSiteCache = $sites->contains(
-            fn ($site) => Str::startsWith((string) ($site->rawConfig()['url'] ?? ''), '/')
+            fn ($site) => Str::startsWith((string) $site->url(), '/')
         );
 
         self::$absoluteSiteUrlsCache = $sites
-            ->map(fn ($site) => $site->rawConfig()['url'] ?? null)
+            ->map(fn ($site) => $site->url())
             ->filter(fn ($siteUrl) => self::isAbsolute($siteUrl))
             ->map(fn ($siteUrl) => self::getDomainFromAbsolute($siteUrl));