@open-mercato/core 0.6.4-develop.4095.1.9c790dc021 → 0.6.4-develop.4110.1.836aafde58

package/dist/modules/planner/components/AvailabilityRulesEditor.js

@@ -29,6 +29,7 @@ import { useConfirmDialog } from "@open-mercato/ui/backend/confirm-dialog";
 import { parseAvailabilityRuleWindow } from "@open-mercato/core/modules/planner/lib/availabilitySchedule";
 import { CrudForm } from "@open-mercato/ui/backend/CrudForm";
 import { Calendar, Clock, List, PencilLine, Plus, Trash2 } from "lucide-react";
+import { resolveRuleSetSelectValue } from "./availabilityRulesEditorState.js";
 const DAY_LABELS = [
   { code: "SU", short: "S", nameKey: "schedule.weekday.sunday", fallback: "Sunday" },
   { code: "MO", short: "M", nameKey: "schedule.weekday.monday", fallback: "Monday" },
@@ -313,6 +314,7 @@ function AvailabilityRulesEditor({
   const [createRuleSetOpen, setCreateRuleSetOpen] = React.useState(false);
   const [isWeeklyAutoSaving, setIsWeeklyAutoSaving] = React.useState(false);
   const [customOverridesEnabled, setCustomOverridesEnabled] = React.useState(false);
+  const [selectedRulesetId, setSelectedRulesetId] = React.useState(rulesetId ?? null);
   const autoSaveTimerRef = React.useRef(null);
   const lastSavedWeeklyKeyRef = React.useRef(null);
   const weeklySaveStateRef = React.useRef({ inFlight: false, queued: false });
@@ -321,7 +323,11 @@ function AvailabilityRulesEditor({
   const viewModeRef = React.useRef(viewMode);
   const saveWeeklyRef = React.useRef(null);
   const timezoneOptions = React.useMemo(() => getTimezoneOptions(), []);
-  const usingRuleSet = Boolean(rulesetId) && availabilityRules.length === 0 && !customOverridesEnabled;
+  React.useEffect(() => {
+    setSelectedRulesetId(rulesetId ?? null);
+  }, [rulesetId]);
+  const effectiveRulesetId = selectedRulesetId;
+  const usingRuleSet = Boolean(effectiveRulesetId) && availabilityRules.length === 0 && !customOverridesEnabled;
   const activeRules = usingRuleSet ? rulesetRules : availabilityRules;
   const scheduleRules = React.useMemo(() => {
     const dateBlockers = /* @__PURE__ */ new Set();
@@ -455,7 +461,7 @@ function AvailabilityRulesEditor({
     }
   }, [labelPrefix, subjectId, subjectType, t]);
   const refreshRuleSetRules = React.useCallback(async () => {
-    if (!rulesetId) {
+    if (!effectiveRulesetId) {
       setRulesetRules([]);
       return;
     }
@@ -464,7 +470,7 @@ function AvailabilityRulesEditor({
         page: "1",
         pageSize: "100",
         subjectType: "ruleset",
-        subjectIds: rulesetId
+        subjectIds: effectiveRulesetId
       });
       const call = await apiCall(`/api/planner/availability?${params.toString()}`);
       const items = Array.isArray(call.result?.items) ? call.result.items : [];
@@ -472,7 +478,7 @@ function AvailabilityRulesEditor({
     } catch {
       setRulesetRules([]);
     }
-  }, [rulesetId]);
+  }, [effectiveRulesetId]);
   const refreshRuleSets = React.useCallback(async () => {
     if (!onRulesetChange) return;
     setRuleSetsLoading(true);
@@ -550,20 +556,20 @@ function AvailabilityRulesEditor({
   }, [activeRules, initialTimezone, timezoneDirty]);
   React.useEffect(() => {
     if (timezoneDirty) return;
-    if (!usingRuleSet || !rulesetId) return;
-    const ruleset = ruleSets.find((entry) => entry.id === rulesetId);
+    if (!usingRuleSet || !effectiveRulesetId) return;
+    const ruleset = ruleSets.find((entry) => entry.id === effectiveRulesetId);
     if (ruleset?.timezone) setTimezone(ruleset.timezone);
-  }, [rulesetId, ruleSets, timezoneDirty, usingRuleSet]);
+  }, [effectiveRulesetId, ruleSets, timezoneDirty, usingRuleSet]);
   React.useEffect(() => {
     if (availabilityRules.length > 0) {
       setCustomOverridesEnabled(true);
     }
   }, [availabilityRules.length]);
   React.useEffect(() => {
-    if (!rulesetId) {
+    if (!effectiveRulesetId) {
       setCustomOverridesEnabled(false);
     }
-  }, [rulesetId]);
+  }, [effectiveRulesetId]);
   const refreshBookedEvents = React.useCallback(async () => {
     if (!loadBookedEvents) return;
     setBookedLoading(true);
@@ -647,7 +653,7 @@ function AvailabilityRulesEditor({
   const saveWeeklyHours = React.useCallback(async (options) => {
     if (isReadOnly) return;
     const subjectForRules = usingRuleSet ? "ruleset" : subjectType;
-    const subjectIdForRules = usingRuleSet ? rulesetId ?? "" : subjectId;
+    const subjectIdForRules = usingRuleSet ? effectiveRulesetId ?? "" : subjectId;
     if (!subjectIdForRules) return;
     if (weeklyHasErrors) return;
     const shouldSkipRefresh = Boolean(options?.skipRefresh);
@@ -684,7 +690,7 @@ function AvailabilityRulesEditor({
     listLabels.saveWeeklySuccess,
     refreshAvailability,
     refreshRuleSetRules,
-    rulesetId,
+    effectiveRulesetId,
     subjectId,
     subjectType,
     timezone,
@@ -734,7 +740,7 @@ function AvailabilityRulesEditor({
     if (isReadOnly) return;
     if (timezoneSaveInFlightRef.current) return;
     const trimmedTimezone = nextTimezone.trim() || "UTC";
-    const rulesetTimezoneId = subjectType === "ruleset" ? subjectId : rulesetId;
+    const rulesetTimezoneId = subjectType === "ruleset" ? subjectId : effectiveRulesetId;
     const rulesToUpdate = activeRules.filter((rule) => rule.timezone !== trimmedTimezone);
     if (!rulesToUpdate.length && !rulesetTimezoneId) {
       setTimezoneDirty(false);
@@ -773,7 +779,7 @@ function AvailabilityRulesEditor({
     listLabels.timezoneSaveError,
     refreshAvailability,
     refreshRuleSetRules,
-    rulesetId,
+    effectiveRulesetId,
     subjectId,
     subjectType,
     isReadOnly
@@ -802,7 +808,7 @@ function AvailabilityRulesEditor({
   }, [canManageUnavailability, isReadOnly]);
   const handleCustomize = React.useCallback(async () => {
     if (isReadOnly) return;
-    if (!rulesetId) return;
+    if (!effectiveRulesetId) return;
     try {
       const creations = rulesetRules.map((rule) => createCrud("planner/availability", {
         subjectType,
@@ -820,10 +826,10 @@ function AvailabilityRulesEditor({
       const message = error2 instanceof Error ? error2.message : listLabels.saveWeeklyError;
       flash(message, "error");
     }
-  }, [listLabels.saveWeeklyError, refreshAvailability, rulesetId, rulesetRules, subjectId, subjectType, isReadOnly]);
+  }, [effectiveRulesetId, listLabels.saveWeeklyError, refreshAvailability, rulesetRules, subjectId, subjectType, isReadOnly]);
   const handleResetToRuleSet = React.useCallback(async () => {
     if (isReadOnly) return;
-    if (!rulesetId) return;
+    if (!effectiveRulesetId) return;
     try {
       await Promise.all(
         availabilityRules.map((rule) => deleteCrud("planner/availability", rule.id, { errorMessage: listLabels.saveWeeklyError }))
@@ -834,11 +840,11 @@ function AvailabilityRulesEditor({
       const message = error2 instanceof Error ? error2.message : listLabels.saveWeeklyError;
       flash(message, "error");
     }
-  }, [availabilityRules, listLabels.saveWeeklyError, refreshAvailability, rulesetId, isReadOnly]);
+  }, [availabilityRules, effectiveRulesetId, listLabels.saveWeeklyError, refreshAvailability, isReadOnly]);
   const handleRuleSetChange = React.useCallback(async (nextId) => {
     if (isReadOnly) return;
     if (!onRulesetChange) return;
-    if (availabilityRules.length > 0 && nextId !== rulesetId) {
+    if (availabilityRules.length > 0 && nextId !== effectiveRulesetId) {
       const confirmed = await confirm({
         title: listLabels.ruleSetConfirm,
         variant: "default"
@@ -848,17 +854,23 @@ function AvailabilityRulesEditor({
         availabilityRules.map((rule) => deleteCrud("planner/availability", rule.id, { errorMessage: listLabels.saveWeeklyError }))
       );
     }
+    setSelectedRulesetId(nextId);
     setCustomOverridesEnabled(false);
-    await onRulesetChange(nextId);
-    await refreshAvailability();
+    try {
+      await onRulesetChange(nextId);
+      await refreshAvailability();
+    } catch (error2) {
+      setSelectedRulesetId(effectiveRulesetId);
+      throw error2;
+    }
   }, [
     availabilityRules,
     confirm,
+    effectiveRulesetId,
     listLabels.ruleSetConfirm,
     listLabels.saveWeeklyError,
     onRulesetChange,
     refreshAvailability,
-    rulesetId,
     isReadOnly
   ]);
   const ruleSetFormSchema = React.useMemo(
@@ -927,6 +939,7 @@ function AvailabilityRulesEditor({
     }
     await refreshRuleSets();
     if (onRulesetChange) {
+      setSelectedRulesetId(id);
       await onRulesetChange(id);
       await refreshAvailability();
     }
@@ -1015,7 +1028,7 @@ function AvailabilityRulesEditor({
     if (isReadOnly) return;
     if (editorUnavailable && !canManageUnavailability) return;
     const subjectForRules = usingRuleSet ? "ruleset" : subjectType;
-    const subjectIdForRules = usingRuleSet ? rulesetId ?? "" : subjectId;
+    const subjectIdForRules = usingRuleSet ? effectiveRulesetId ?? "" : subjectId;
     if (!subjectIdForRules) return;
     if (!editorUnavailable && editorWindowErrors.some(Boolean)) return;
     const validWindows = editorWindows;
@@ -1091,7 +1104,7 @@ function AvailabilityRulesEditor({
     refreshAvailability,
     refreshRuleSetRules,
     reasonEntriesById,
-    rulesetId,
+    effectiveRulesetId,
     subjectId,
     subjectType,
     timezone,
@@ -1163,7 +1176,7 @@ function AvailabilityRulesEditor({
           ruleSetsLoading ? /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: listLabels.ruleSetLoading }) : /* @__PURE__ */ jsxs(
             Select,
             {
-              value: rulesetId || void 0,
+              value: resolveRuleSetSelectValue(ruleSets, effectiveRulesetId),
               onValueChange: (value) => {
                 void handleRuleSetChange(value ? value : null);
               },
@@ -1178,8 +1191,8 @@ function AvailabilityRulesEditor({
             /* @__PURE__ */ jsx(Plus, { className: "size-4 mr-2", "aria-hidden": true }),
             listLabels.ruleSetCreateLabel
           ] }),
-          rulesetId && usingRuleSet ? /* @__PURE__ */ jsx(Button, { type: "button", variant: "outline", size: "sm", onClick: handleCustomize, disabled: isReadOnly, children: listLabels.ruleSetCustomize }) : null,
-          rulesetId && !usingRuleSet ? /* @__PURE__ */ jsx(Button, { type: "button", variant: "ghost", size: "sm", onClick: handleResetToRuleSet, disabled: isReadOnly, children: listLabels.ruleSetReset }) : null
+          effectiveRulesetId && usingRuleSet ? /* @__PURE__ */ jsx(Button, { type: "button", variant: "outline", size: "sm", onClick: handleCustomize, disabled: isReadOnly, children: listLabels.ruleSetCustomize }) : null,
+          effectiveRulesetId && !usingRuleSet ? /* @__PURE__ */ jsx(Button, { type: "button", variant: "ghost", size: "sm", onClick: handleResetToRuleSet, disabled: isReadOnly, children: listLabels.ruleSetReset }) : null
         ] }) : null,
         /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 text-xs text-muted-foreground", children: [
           /* @__PURE__ */ jsx("span", { children: listLabels.timezoneLabel }),