Skip to content

Your favorite shift management application!

fix: external shift visibility in the grid and scrambled preset ordering (#204)

panteL15b6da010ca6
diff --git a/app/page.tsx b/app/page.tsx
index 7f5a55f..bef6d39 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -163,7 +163,7 @@ function HomeContent() {
deleteNote: deleteNoteHook,
} = useNotes(isCompareMode ? compareNoteCalendarId : selectedCalendar);
const { externalSyncs, hasSyncErrors } = useExternalSync(
- can("manageExternalSync") ? selectedCalendar || null : null
+ selectedCalendar || null
);
const viewSettings = useViewSettings();
diff --git a/components/preset-select.tsx b/components/preset-select.tsx
index 4c8d62f..5ed607f 100644
--- a/components/preset-select.tsx
+++ b/components/preset-select.tsx
@@ -2,7 +2,7 @@ import { useTranslations } from "next-intl";
import { Field } from "@/components/form-kit";
import { ShiftPreset } from "@/lib/db/schema";
import { cn } from "@/lib/utils";
-import { shiftVars } from "@/lib/shift-display";
+import { groupPresetsByName, shiftVars } from "@/lib/shift-display";
interface PresetSelectProps {
presets: ShiftPreset[];
@@ -22,10 +22,13 @@ export function PresetSelect({ presets, value, onPresetSelect, onClear }: Preset
return null;
}
+ const { ungrouped, groups } = groupPresetsByName(presets);
+ const orderedPresets = [...ungrouped, ...groups.flatMap((group) => group.items)];
+
return (
<Field label={t("preset.preset")}>
<div role="radiogroup" aria-label={t("preset.preset")} className="flex flex-wrap gap-2">
- {presets.map((preset) => {
+ {orderedPresets.map((preset) => {
const selected = preset.id === value;
return (
<button
diff --git a/components/stamp-dock.tsx b/components/stamp-dock.tsx
index d0e9026..5bd0034 100644
--- a/components/stamp-dock.tsx
+++ b/components/stamp-dock.tsx
@@ -19,9 +19,11 @@ import { getShiftCode, groupPresetsByName, presetTime, shiftVars } from "@/lib/s
import { cn, isMultiSelectClick } from "@/lib/utils";
export function splitStampPresets(presets: ShiftPreset[]) {
+ const { ungrouped, groups } = groupPresetsByName(presets);
+ const ordered = [...ungrouped, ...groups.flatMap((group) => group.items)];
return {
- primary: presets.filter((p) => !p.isSecondary),
- secondary: presets.filter((p) => p.isSecondary),
+ primary: ordered.filter((p) => !p.isSecondary),
+ secondary: ordered.filter((p) => p.isSecondary),
};
}