Skip to content

feat: Sort user list and add default current user to incident creation #5186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 16, 2025
Merged

feat: Sort user list and add default current user to incident creation #5186

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6307861
Add default current user and sort users when creating an incident
piekarski-mateusz Jul 15, 2025
cef796d
Impove default
piekarski-mateusz Jul 16, 2025
981b703
Fix tab
piekarski-mateusz Jul 16, 2025
d14b928
Fix formatting
piekarski-mateusz Jul 16, 2025
0562fd7
Match main spaces
piekarski-mateusz Jul 16, 2025
03c0360
Merge branch 'main' into feature/easy-assign-incident-on-creation
piekarski-mateusz Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions keep-ui/features/incidents/create-or-update-incident/ui/create-or-update-incident-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import type { IncidentDto } from "@/entities/incidents/model";
import { getIncidentName } from "@/entities/incidents/lib/utils";
import "react-quill-new/dist/quill.snow.css";
import "./react-quill-override.css";
import { useSession } from "next-auth/react";
import dynamic from "next/dynamic";
import { IncidentSeveritySelect } from "@/features/incidents/change-incident-severity";
import { Severity } from "@/entities/incidents/model/models";
Expand All @@ -37,14 +38,20 @@ export function CreateOrUpdateIncidentForm({
const [incidentSeverity, setIncidentSeverity] = useState<Severity>(
Severity.Critical
);
const { data: session } = useSession();
const currentUser = session?.user;
const [incidentName, setIncidentName] = useState<string>("");
const [incidentUserSummary, setIncidentUserSummary] = useState<string>("");
const [incidentAssignee, setIncidentAssignee] = useState<string>("");
const [incidentAssignee, setIncidentAssignee] = useState<string>(currentUser?.email || "");
const [resolveOnAlertsResolved, setResolveOnAlertsResolved] =
useState<string>("all");
const { data: users = [] } = useUsers();
const { addIncident, updateIncident } = useIncidentActions();

// Sort users alphabetically
const sortedUsers = [...users].sort((a, b) =>
(a.name || a.email).localeCompare(b.name || b.email)
);
const editMode = incidentToEdit !== null;

// Display cancel btn if editing or we need to cancel for another reason (eg. going one step back in the modal etc.)
Expand Down Expand Up @@ -173,13 +180,12 @@ export function CreateOrUpdateIncidentForm({

<div className="mt-2.5">
<Text className="mb-2">Assignee</Text>
{users.length > 0 ? (
{sortedUsers.length > 0 ? (
<Select
placeholder="Who is responsible"
value={incidentAssignee}
onValueChange={setIncidentAssignee}
>
{users.map((user) => (
{sortedUsers.map((user) => (
<SelectItem key={user.email} value={user.email}>
{user.name || user.email}
</SelectItem>
Expand Down
Loading