fix: 6.5.0 user requirements

packages/admin-ui/src/DatePicker/DatePicker.tsx

@@ -9,8 +9,22 @@ import {
     FormComponentLabel,
     FormComponentNote
 } from "~/FormComponent/index.js";
+import { Text } from "~/Text/index.js";
 
-type DatePickerProps = DatePickerPrimitiveProps & FormComponentProps;
+interface DatePickerOwnProps {
+    showTimezone?: boolean;
+}
+
+type DatePickerProps = DatePickerPrimitiveProps & FormComponentProps & DatePickerOwnProps;
+
+const TimezoneLabel = () => {
+    const timezone = useMemo(() => Intl.DateTimeFormat().resolvedOptions().timeZone, []);
+    return (
+        <Text size={"sm"} className={"text-neutral-strong mt-xxs"}>
+            Timezone: {timezone}
+        </Text>
+    );
+};
 
 const DecoratableDatePicker = ({
     label,
@@ -20,6 +34,7 @@ const DecoratableDatePicker = ({
     required,
     disabled,
     validation,
+    showTimezone = false,
     ...props
 }: DatePickerProps) => {
     const { isValid: validationIsValid, message: validationMessage } = validation || {};
@@ -40,6 +55,7 @@ const DecoratableDatePicker = ({
                 disabled={disabled}
                 invalid={invalid}
             />
+            {showTimezone && <TimezoneLabel />}
             <FormComponentErrorMessage
                 text={validationMessage}
                 invalid={invalid}

packages/admin-ui/src/DatePicker/primitives/DateTimePicker.tsx

@@ -10,9 +10,9 @@ import {
     formatDateForDisplay,
     formatTimeValue,
     getLocalTimezone,
-    parseTimeValue,
-    toIsoWithTz
+    parseTimeValue
 } from "../utils/dateHelpers.js";
+import { naiveDateToUtcIso, parseToDate, utcToTimezoneDate } from "../utils/timezoneHelpers.js";
 import { DatePickerTrigger } from "./components/DatePickerTrigger.js";
 import { TimePicker } from "./components/TimePicker.js";
 
@@ -22,17 +22,6 @@ type DateTimePickerInternalProps = (DateTimeLocalPickerProps | DateTimeTzPickerP
 
 const timezoneOptions = UTC_TIMEZONES.map(tz => ({ value: tz.value, label: tz.label }));
 
-function parseToDate(value: string | undefined): Date | undefined {
-    if (!value) {
-        return undefined;
-    }
-    const d = new Date(value);
-    if (Number.isNaN(d.getTime())) {
-        return undefined;
-    }
-    return d;
-}
-
 const DateTimePicker = ({
     value,
     onChange,
@@ -51,7 +40,7 @@ const DateTimePicker = ({
 }: DateTimePickerInternalProps) => {
     const [open, setOpen] = useState(false);
 
-    const existingTz = withTimezone && value ? extractTimezone(value as string) : undefined;
+    const existingTz = withTimezone && value ? extractTimezone(value) : undefined;
     const [timezone, setTimezone] = useState(existingTz || getLocalTimezone());
 
     const handleOpenChange = (isOpen: boolean) => {
@@ -63,18 +52,27 @@ const DateTimePicker = ({
 
     const currentDate = parseToDate(value);
 
+    const displayDate =
+        withTimezone && currentDate ? utcToTimezoneDate(currentDate, timezone) : currentDate;
+
     const displayValue = withTimezone
-        ? formatDateForDisplay(value, "dateTimeTz", displayFormat)
+        ? displayDate
+            ? formatDateForDisplay(
+                  format(displayDate, "yyyy-MM-dd'T'HH:mm:ss") + timezone,
+                  "dateTimeTz",
+                  displayFormat
+              )
+            : undefined
         : formatDateForDisplay(value, "dateTimeLocal", displayFormat);
 
-    const timeValue = currentDate ? formatTimeValue(currentDate) : "";
+    const timeValue = displayDate ? formatTimeValue(displayDate) : "";
 
     const emitChange = (date: Date, tz?: string) => {
         if (!onChange) {
             return;
         }
         if (withTimezone) {
-            onChange(toIsoWithTz(date, tz || timezone));
+            onChange(naiveDateToUtcIso(date, tz || timezone));
         } else {
             onChange(format(date, "yyyy-MM-dd'T'HH:mm:ss") + ".000Z");
         }
@@ -84,8 +82,8 @@ const DateTimePicker = ({
         if (!date) {
             return;
         }
-        if (currentDate) {
-            date.setHours(currentDate.getHours(), currentDate.getMinutes());
+        if (displayDate) {
+            date.setHours(displayDate.getHours(), displayDate.getMinutes());
         }
         emitChange(date);
     };
@@ -98,16 +96,13 @@ const DateTimePicker = ({
         if (!parsed) {
             return;
         }
-        const base = currentDate ? new Date(currentDate) : new Date();
+        const base = displayDate ? new Date(displayDate) : new Date();
         base.setHours(parsed.hours, parsed.minutes, 0, 0);
         emitChange(base);
     };
 
     const handleTimezoneChange = (tz: string) => {
         setTimezone(tz);
-        if (currentDate) {
-            emitChange(currentDate, tz);
-        }
     };
 
     return (
@@ -125,7 +120,7 @@ const DateTimePicker = ({
                     <div className="flex flex-col gap-sm">
                         <Calendar
                             mode="single"
-                            selected={currentDate}
+                            selected={displayDate}
                             onSelect={handleDateSelect}
                             weekStartsOn={weekStartsOn}
                             disabled={[

packages/admin-ui/src/DatePicker/utils/dateHelpers.ts

@@ -29,7 +29,7 @@ export function formatDateForDisplay(
             if (!value) {
                 return undefined;
             }
-            const isoStr = value as string;
+            const isoStr = value instanceof Date ? value.toISOString() : (value as string);
             const tzMatch = isoStr.match(/([+-]\d{2}:\d{2})$/);
             const tz = tzMatch ? `UTC${tzMatch[1]}` : "";
             const dateWithoutTz = isoStr.replace(/[+-]\d{2}:\d{2}$/, "");
@@ -164,7 +164,10 @@ export function getLocalTimezone(): string {
     return `${sign}${hours}:${minutes}`;
 }
 
-export function extractTimezone(isoString: string): string | undefined {
+export function extractTimezone(isoString: string | Date | unknown): string | undefined {
+    if (typeof isoString !== "string") {
+        return undefined;
+    }
     const match = isoString.match(/([+-]\d{2}:\d{2})$/);
     if (match) {
         return match[1];

packages/admin-ui/src/DatePicker/utils/timezoneHelpers.ts

@@ -0,0 +1,45 @@
+import { format } from "date-fns";
+
+interface ParsedOffset {
+    sign: number;
+    minutes: number;
+}
+
+function parseOffset(tz: string): ParsedOffset | null {
+    const match = tz.match(/^([+-])(\d{2}):(\d{2})$/);
+    if (!match) {
+        return null;
+    }
+    const sign = match[1] === "+" ? 1 : -1;
+    return { sign, minutes: sign * (Number(match[2]) * 60 + Number(match[3])) };
+}
+
+export function utcToTimezoneDate(utcDate: Date, timezone: string): Date {
+    const parsed = parseOffset(timezone);
+    if (!parsed) {
+        return utcDate;
+    }
+    const localOffsetMinutes = -utcDate.getTimezoneOffset();
+    const shiftMs = (parsed.minutes - localOffsetMinutes) * 60 * 1000;
+    return new Date(utcDate.getTime() + shiftMs);
+}
+
+export function naiveDateToUtcIso(date: Date, timezone: string): string {
+    const naive = format(date, "yyyy-MM-dd'T'HH:mm:ss");
+    const parsed = parseOffset(timezone);
+    if (parsed) {
+        return new Date(`${naive}${timezone}`).toISOString();
+    }
+    return date.toISOString();
+}
+
+export function parseToDate(value: string | Date | undefined): Date | undefined {
+    if (!value) {
+        return undefined;
+    }
+    const d = new Date(value);
+    if (Number.isNaN(d.getTime())) {
+        return undefined;
+    }
+    return d;
+}

packages/api-headless-cms-ddb-es/src/operations/entry/index.ts

@@ -600,6 +600,52 @@ export const createEntriesStorageOperations = (
         return initialStorageEntry;
     };
 
+    const updateRevision: CmsEntryStorageOperations["updateRevision"] = async (
+        initialModel,
+        params
+    ) => {
+        const { entry: initialEntry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+
+        const transformer = createTransformer({
+            valuesModifiers,
+            model,
+            entry: initialEntry,
+            storageEntry: initialStorageEntry,
+            fieldIndexRegistry,
+            compressionHandler
+        });
+
+        const { storageEntry } = transformer.transformEntryKeys();
+        const revisionKeys = createEntryRevisionKeys(storageEntry);
+
+        const entityBatch = entity.createEntityWriter({
+            put: [
+                {
+                    ...revisionKeys,
+                    data: storageEntry
+                }
+            ]
+        });
+
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                tenant: initialEntry.tenant
+            });
+            return initialStorageEntry;
+        } catch (ex) {
+            throw new WebinyError(
+                ex.message || "Could not update revision.",
+                ex.code || "UPDATE_REVISION_ERROR",
+                {
+                    error: ex,
+                    entry: initialEntry
+                }
+            );
+        }
+    };
+
     const move: CmsEntryStorageOperations["move"] = async (
         initialModel: CmsModel,
         id: string,
@@ -2169,6 +2215,7 @@ export const createEntriesStorageOperations = (
         create,
         createRevisionFrom,
         update,
+        updateRevision,
         move,
         delete: deleteEntry,
         moveToBin,

packages/api-headless-cms-ddb/src/operations/entry/index.ts

@@ -371,6 +371,45 @@ export const createEntriesStorageOperations = (
         }
     };
 
+    const updateRevision: CmsEntryStorageOperations["updateRevision"] = async (
+        initialModel,
+        params
+    ) => {
+        const { entry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+
+        const storageEntry = convertToStorageEntry({
+            model,
+            storageEntry: initialStorageEntry
+        });
+
+        const entityBatch = entity.createEntityWriter({
+            put: [
+                {
+                    ...createEntryRevisionKeys(storageEntry),
+                    data: storageEntry
+                }
+            ]
+        });
+
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                tenant: entry.tenant
+            });
+            return initialStorageEntry;
+        } catch (ex) {
+            throw new WebinyError(
+                ex.message || "Could not update revision.",
+                ex.code || "UPDATE_REVISION_ERROR",
+                {
+                    error: ex,
+                    entry
+                }
+            );
+        }
+    };
+
     const move: CmsEntryStorageOperations["move"] = async (initialModel, id, folderId) => {
         /**
          * We need to:
@@ -1387,6 +1426,7 @@ export const createEntriesStorageOperations = (
         create,
         createRevisionFrom,
         update,
+        updateRevision,
         move,
         delete: deleteEntry,
         moveToBin,

packages/api-headless-cms-sql/src/operations/entry/index.ts

@@ -488,6 +488,25 @@ export const createEntriesStorageOperations = (
             return entry;
         },
 
+        updateRevision: async (model, { entry, storageEntry }) => {
+            await entryTableManager.ensureTable();
+
+            const existing = await query().where("id", storageEntry.id).first();
+            const se = storageEntry as CmsStorageEntry;
+            se.isLatest = existing?.isLatest ?? se.isLatest;
+            se.isPublished = existing?.isPublished ?? se.isPublished;
+
+            const row = entryToRow(se);
+            const { isLatest: _il, isPublished: _ip, ...rowWithoutFlags } = row;
+
+            await query()
+                .where("tenant", model.tenant)
+                .andWhere("id", storageEntry.id)
+                .update(rowWithoutFlags);
+
+            return entry;
+        },
+
         publish: async (model, { entry, storageEntry }) => {
             await entryTableManager.ensureTable();