Merge pull request #33 from tamucsa/develop

added workflow keepalive and editable schedule post timing

Author: akhilk999

.github/workflows/publish-scheduled-events.yml

@@ -42,3 +42,10 @@ jobs:
             echo "Response was not a publish JSON payload."
             exit 1
           fi
+  workflow-keepalive:
+    if: github.event_name == 'schedule'
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - uses: liskin/gh-workflow-keepalive@v1

src/app/(dashboard)/(officer)/officer/events/components/EventDetailClient.tsx

@@ -8,6 +8,7 @@ import EventRsvpPanel from "@/app/(dashboard)/(officer)/officer/events/component
 import { officerRemoveCheckIn } from "@/app/actions/attendance";
 import {
   publishEvent,
+  updateScheduledPublish,
   updateEventMixerFamilies,
   updateEventRsvp,
   updateEventSchedule,
@@ -160,6 +161,15 @@ export default function EventDetailClient({
   const [scheduleSaving, setScheduleSaving] = useState(false);
   const [scheduleError, setScheduleError] = useState<string | null>(null);
   const [scheduleSaved, setScheduleSaved] = useState(false);
+  const [publishDate, setPublishDate] = useState(() =>
+    event.publish_at ? eventTimestampToFormDate(event.publish_at) : "",
+  );
+  const [publishTime, setPublishTime] = useState(() =>
+    event.publish_at ? eventTimestampToFormTime(event.publish_at) : "",
+  );
+  const [publishTimeSaving, setPublishTimeSaving] = useState(false);
+  const [publishTimeError, setPublishTimeError] = useState<string | null>(null);
+  const [publishTimeSaved, setPublishTimeSaved] = useState(false);
   const [uncheckTarget, setUncheckTarget] = useState<AttendanceRow | null>(
     null,
   );
@@ -208,13 +218,16 @@ export default function EventDetailClient({
     setLocation(event.location ?? "");
     setLocationMapsUrl(event.location_maps_url ?? null);
     setDescription(event.description ?? "");
+    setPublishDate(event.publish_at ? eventTimestampToFormDate(event.publish_at) : "");
+    setPublishTime(event.publish_at ? eventTimestampToFormTime(event.publish_at) : "");
   }, [
     event.name,
     event.starts_at,
     event.ends_at,
     event.location,
     event.location_maps_url,
     event.description,
+    event.publish_at,
   ]);
 
   const toggleMixerFamily = (id: string) => {
@@ -300,6 +313,25 @@ export default function EventDetailClient({
     router.refresh();
   };
 
+  const handleSavePublishTime = async () => {
+    setPublishTimeSaving(true);
+    setPublishTimeError(null);
+    setPublishTimeSaved(false);
+
+    const result = await updateScheduledPublish(event.id, {
+      scheduleDate: publishDate,
+      scheduleTime: publishTime,
+    });
+
+    setPublishTimeSaving(false);
+    if (!result.success) {
+      setPublishTimeError(result.error ?? "Failed to update publish time.");
+      return;
+    }
+    setPublishTimeSaved(true);
+    router.refresh();
+  };
+
   const handlePublishStandings = async () => {
     if (
       !window.confirm(
@@ -499,6 +531,74 @@ export default function EventDetailClient({
         {publishError && (
           <p className="mt-3 text-sm text-red-600">{publishError}</p>
         )}
+        {publishStatus === "scheduled" && (
+          <CollapsibleSettings
+            title="Schedule publish"
+            defaultOpen
+            summary={
+              event.publish_at
+                ? new Date(event.publish_at).toLocaleString("en-US", {
+                    timeZone: EVENT_TIMEZONE,
+                    dateStyle: "medium",
+                    timeStyle: "short",
+                  }) + " CT"
+                : "No publish time set"
+            }
+          >
+            <p className="text-xs leading-5 text-subtitle">
+              Update when this event should become visible to members. Times are
+              Central Time.
+            </p>
+            <div className="grid gap-3 sm:grid-cols-2">
+              <div>
+                <label className={labelClassName} htmlFor="event-publish-date">
+                  Publish date
+                </label>
+                <input
+                  id="event-publish-date"
+                  type="date"
+                  className={inputClassName}
+                  value={publishDate}
+                  onChange={(e) => {
+                    setPublishDate(e.target.value);
+                    setPublishTimeSaved(false);
+                    setPublishTimeError(null);
+                  }}
+                />
+              </div>
+              <div>
+                <label className={labelClassName} htmlFor="event-publish-time">
+                  Publish time
+                </label>
+                <input
+                  id="event-publish-time"
+                  type="time"
+                  className={inputClassName}
+                  value={publishTime}
+                  onChange={(e) => {
+                    setPublishTime(e.target.value);
+                    setPublishTimeSaved(false);
+                    setPublishTimeError(null);
+                  }}
+                />
+              </div>
+            </div>
+            {publishTimeError && (
+              <p className="text-sm text-red-600">{publishTimeError}</p>
+            )}
+            {publishTimeSaved && (
+              <p className="text-sm text-green-700">Publish time saved.</p>
+            )}
+            <button
+              type="button"
+              onClick={() => void handleSavePublishTime()}
+              disabled={publishTimeSaving}
+              className={btnPrimaryClassName}
+            >
+              {publishTimeSaving ? "Saving…" : "Save publish time"}
+            </button>
+          </CollapsibleSettings>
+        )}
         <CollapsibleSettings
           title="Event details"
           defaultOpen

src/app/actions/events.ts

@@ -181,6 +181,88 @@ export async function publishEvent(eventId: string) {
   return { success: true, error: null };
 }
 
+/** Update the auto-publish date/time for an event that is still scheduled. */
+export async function updateScheduledPublish(
+  eventId: string,
+  input: { scheduleDate: string; scheduleTime: string },
+) {
+  if (!eventId) return { success: false, error: "Event not found." };
+  if (!input.scheduleDate || !input.scheduleTime) {
+    return {
+      success: false,
+      error: "Publish date and time are required.",
+    };
+  }
+
+  const { supabase, error: authError } = await requireOfficer();
+  if (authError) return { success: false, error: authError };
+
+  const { data: event } = await supabase
+    .from("events")
+    .select("id, publish_status, parent_event_id")
+    .eq("id", eventId)
+    .maybeSingle();
+
+  if (!event) return { success: false, error: "Event not found." };
+  if (event.parent_event_id) {
+    return {
+      success: false,
+      error: "Update the parent event schedule instead.",
+    };
+  }
+  if (event.publish_status !== "scheduled") {
+    return {
+      success: false,
+      error: "Only scheduled events can have a publish time.",
+    };
+  }
+
+  const { value: publishAt, error: scheduleError } =
+    await resolveCentralEventTimestamp(
+      supabase,
+      input.scheduleDate,
+      input.scheduleTime,
+    );
+
+  if (!publishAt) {
+    return {
+      success: false,
+      error: scheduleError ?? "Invalid publish date or time.",
+    };
+  }
+  if (new Date(publishAt).getTime() <= Date.now()) {
+    return {
+      success: false,
+      error: "Publish time must be in the future (Central Time).",
+    };
+  }
+
+  const { error } = await supabase
+    .from("events")
+    .update({ publish_at: publishAt })
+    .eq("id", eventId)
+    .eq("publish_status", "scheduled");
+
+  if (error) {
+    return { success: false, error: "Failed to update publish time." };
+  }
+
+  const { error: spectatorError } = await supabase
+    .from("events")
+    .update({ publish_at: publishAt })
+    .eq("parent_event_id", eventId)
+    .eq("publish_status", "scheduled");
+
+  if (spectatorError) {
+    return {
+      success: false,
+      error: "Publish time saved, but linked spectator event failed to update.",
+    };
+  }
+
+  return { success: true, error: null };
+}
+
 /** Used by cron: publish all scheduled events whose publish_at has passed. */
 export async function publishDueScheduledEvents() {
   const { createAdminSupabase } = await import("@/utils/supabase/admin");