fix: added priority model instead of string

src/components/FiltersPanel/FiltersPanel.tsx

@@ -153,6 +153,7 @@ export const FiltersPanel: FC<{
             useQueryOptions,
         );
         const { data: states = [] } = trpc.state.all.useQuery();
+        const { data: priorities = [] } = trpc.priority.getAll.useQuery();
 
         const setPartialQueryByKey = useCallback(<K extends keyof QueryState>(key: K) => {
             return (value: QueryState[K]) => {
@@ -260,6 +261,7 @@ export const FiltersPanel: FC<{
                     <PriorityFilter
                         text={tr('Priority')}
                         value={filterQuery?.priority}
+                        priorities={priorities}
                         onChange={setPartialQueryByKey('priority')}
                     />
 

src/components/GoalActivity.tsx

@@ -1,7 +1,6 @@
 import React, { forwardRef } from 'react';
 import { nullable } from '@taskany/bricks';
 
-import { Priority } from '../types/priority';
 import { GoalByIdReturnType } from '../../trpc/inferredTypes';
 import { HistoryAction } from '../types/history';
 
@@ -85,8 +84,8 @@ export const GoalActivity = forwardRef<HTMLDivElement, GoalActivityProps>(
                                     )}
                                     {value.subject === 'priority' && (
                                         <HistoryRecordPriority
-                                            from={value.previousValue as Priority}
-                                            to={value.nextValue as Priority}
+                                            from={excludeString(value.previousValue)}
+                                            to={excludeString(value.nextValue)}
                                         />
                                     )}
                                     {value.subject === 'state' && (

src/components/GoalCreateForm/GoalCreateForm.tsx

@@ -56,6 +56,9 @@ const GoalCreateForm: React.FC<GoalCreateFormProps> = ({ title, onGoalCreate })
     const [createGoalType, setСreateGoalType] = useState<number>(goalCreateFormActionCache || 3);
     const utils = trpc.useContext();
     const { goalCreate } = useGoalResource({});
+    // FIXME https://github.com/taskany-inc/issues/issues/1834
+    const { data: priorities } = trpc.priority.getAll.useQuery();
+    const defaultPriority = priorities?.at(-2);
 
     const createOptions = [
         {
@@ -130,8 +133,8 @@ const GoalCreateForm: React.FC<GoalCreateFormProps> = ({ title, onGoalCreate })
             validitySchema={goalCommonSchema}
             owner={{ id: user?.activityId, user } as ActivityByIdReturnType}
             parent={currentProjectCache || lastProjectCache || undefined}
-            priority="Medium"
-            onSumbit={createGoal}
+            priority={defaultPriority ?? undefined}
+            onSubmit={createGoal}
             title={title}
             actionButton={
                 <>

src/components/GoalEditForm/GoalEditForm.tsx

@@ -69,7 +69,7 @@ const GoalEditForm: React.FC<GoalEditFormProps> = ({ goal, onSubmit }) => {
             priority={goal.priority ?? undefined}
             tags={goal.tags}
             estimate={estimateValue}
-            onSumbit={updateGoal}
+            onSubmit={updateGoal}
             actionButton={
                 <>
                     <Button outline text={tr('Cancel')} onClick={dispatchModalEvent(ModalEvent.GoalEditModal)} />

src/components/GoalForm/GoalForm.tsx

@@ -21,7 +21,6 @@ import { errorsProvider } from '../../utils/forms';
 import { formateEstimate } from '../../utils/dateTime';
 import { DateType } from '../../types/date';
 import { useLocale } from '../../hooks/useLocale';
-import { Priority } from '../../types/priority';
 import { UserComboBox } from '../UserComboBox';
 import { GoalParentComboBox } from '../GoalParentComboBox';
 import { TagComboBox } from '../TagComboBox';
@@ -50,7 +49,11 @@ interface GoalFormProps extends React.HTMLAttributes<HTMLDivElement> {
     parent?: { id: string; title: string; flowId: string; description?: string | null };
     tags?: TagModel[];
     state?: State;
-    priority?: Priority | string;
+    priority?: {
+        id: string;
+        title: string;
+        value: number;
+    };
     estimate?: {
         date: string;
         type: DateType;
@@ -60,7 +63,7 @@ interface GoalFormProps extends React.HTMLAttributes<HTMLDivElement> {
     id?: string;
     tip?: React.ReactNode;
 
-    onSumbit: (fields: z.infer<GoalFormProps['validitySchema']>) => void;
+    onSubmit: (fields: z.infer<GoalFormProps['validitySchema']>) => void;
 }
 
 export const GoalForm: React.FC<GoalFormProps> = ({
@@ -77,7 +80,7 @@ export const GoalForm: React.FC<GoalFormProps> = ({
     validitySchema,
     actionButton,
     tip,
-    onSumbit,
+    onSubmit,
     ...attrs
 }) => {
     const locale = useLocale();
@@ -94,7 +97,7 @@ export const GoalForm: React.FC<GoalFormProps> = ({
         mode: 'onChange',
         reValidateMode: 'onChange',
         shouldFocusError: false,
-        defaultValues: {
+        values: {
             title,
             description,
             owner,
@@ -125,7 +128,7 @@ export const GoalForm: React.FC<GoalFormProps> = ({
 
     return (
         <ModalContent {...attrs}>
-            <Form onSubmit={handleSubmit(onSumbit)}>
+            <Form onSubmit={handleSubmit(onSubmit)}>
                 <FormInput
                     {...register('title')}
                     error={errorsResolver('title')}

src/components/HistoryRecord/HistoryRecord.tsx

@@ -8,6 +8,7 @@ import {
     GoalAchieveCriteria,
     Goal,
     Ghost,
+    Priority,
 } from '@prisma/client';
 import styled, { css } from 'styled-components';
 import { UserPic, Text, Tag, nullable, Button } from '@taskany/bricks';
@@ -17,7 +18,6 @@ import { backgroundColor, gray7 } from '@taskany/colors';
 import { ActivityFeedItem } from '../ActivityFeed';
 import { IssueListItem } from '../IssueListItem';
 import { RelativeTime } from '../RelativeTime/RelativeTime';
-import { Priority } from '../../types/priority';
 import { decodeHistoryEstimate, formateEstimate } from '../../utils/dateTime';
 import { getPriorityText } from '../PriorityText/PriorityText';
 import { StateDot } from '../StateDot';
@@ -395,16 +395,20 @@ export const HistoryRecordTextChange: React.FC<HistoryChangeProps<string>> = ({
 
 export const HistoryRecordPriority: React.FC<HistoryChangeProps<Priority>> = ({ from, to }) => (
     <HistorySimplifyRecord
-        from={nullable(from, (f) => (
-            <Text size="xs" weight="bold">
-                {getPriorityText(f)}
-            </Text>
-        ))}
-        to={nullable(to, (t) => (
-            <Text size="xs" weight="bold">
-                {getPriorityText(t)}
-            </Text>
-        ))}
+        from={
+            from ? (
+                <Text size="xs" weight="bold">
+                    {getPriorityText(from.title)}
+                </Text>
+            ) : null
+        }
+        to={
+            to ? (
+                <Text size="xs" weight="bold">
+                    {getPriorityText(to.title)}
+                </Text>
+            ) : null
+        }
     />
 );
 

src/components/PriorityDropdown.tsx

@@ -1,31 +1,34 @@
 import React from 'react';
 import { Button, Dropdown, MenuItem } from '@taskany/bricks';
 
-import { Priority, priorityVariants } from '../types/priority';
 import { comboboxItem, priorityCombobox } from '../utils/domObjects';
+import { trpc } from '../utils/trpcClient';
+import { PriorityReturnType } from '../../trpc/inferredTypes';
 
 import { getPriorityText } from './PriorityText/PriorityText';
 import { CommonDropdown } from './CommonDropdown';
 
 interface PriorityDropdownProps {
     text: React.ComponentProps<typeof Button>['text'];
-    value?: string | null;
+    value?: PriorityReturnType;
     disabled?: React.ComponentProps<typeof Dropdown>['disabled'];
     error?: React.ComponentProps<typeof Dropdown>['error'];
 
-    onChange?: (priority: Priority) => void;
+    onChange?: (priority: PriorityReturnType) => void;
 }
 
 export const PriorityDropdown = React.forwardRef<HTMLDivElement, PriorityDropdownProps>(
     ({ text, value, disabled, error, onChange }, ref) => {
+        const { data = [] } = trpc.priority.getAll.useQuery();
+
         return (
             <CommonDropdown
                 ref={ref}
                 error={error}
-                text={value || text}
-                value={value}
+                text={value?.title || text}
+                value={value?.title}
                 onChange={onChange}
-                items={Object.keys(priorityVariants)}
+                items={data}
                 disabled={disabled}
                 renderTrigger={(props) => (
                     <Button
@@ -39,12 +42,12 @@ export const PriorityDropdown = React.forwardRef<HTMLDivElement, PriorityDropdow
                 renderItem={(props) => (
                     <MenuItem
                         ghost
-                        key={props.item}
+                        key={props.item.id}
                         focused={props.cursor === props.index}
                         onClick={props.onClick}
                         {...comboboxItem.attr}
                     >
-                        {getPriorityText(props.item)}
+                        {getPriorityText(props.item.title)}
                     </MenuItem>
                 )}
             />

src/components/PriorityFilter.tsx

@@ -1,40 +1,36 @@
 import { FC, useMemo } from 'react';
 import { Tab } from '@taskany/bricks';
 
-import { Priority as PriorityName, priorityVariants } from '../types/priority';
-
 import { getPriorityText } from './PriorityText/PriorityText';
 import { FilterCheckbox } from './FilterCheckbox';
 import { FilterBase } from './FilterBase/FilterBase';
 import { FilterTabLabel } from './FilterTabLabel';
 
-type Variant = keyof typeof priorityVariants;
-
-type Priority = {
-    id: Variant;
-    data: string;
-};
-
-const priorities: Priority[] = (Object.keys(priorityVariants) as Variant[]).map((p) => ({
-    id: p,
-    data: getPriorityText(p as PriorityName),
-}));
-
-function getKey(item: Priority) {
-    return item.id;
+interface Priority {
+    id: string;
+    title: string;
+    value: number;
 }
 
-export const PriorityFilter: FC<{
+interface PriorityFilterProps {
     text: string;
     value?: string[];
+    priorities: Priority[];
     onChange: (value: string[]) => void;
-}> = ({ value = [], onChange, text }) => {
+}
+
+const getKey = (priority: Priority) => priority.id;
+
+export const PriorityFilter: FC<PriorityFilterProps> = ({ text, value = [], priorities, onChange }) => {
     const values = useMemo(() => {
         return priorities.filter((p) => value.includes(getKey(p)));
-    }, [value]);
+    }, [value, priorities]);
 
     return (
-        <Tab name="priority" label={<FilterTabLabel text={text} selected={values.map(({ data }) => data)} />}>
+        <Tab
+            name="priority"
+            label={<FilterTabLabel text={text} selected={values.map(({ title }) => getPriorityText(title))} />}
+        >
             <FilterBase
                 key="priority"
                 mode="multiple"
@@ -46,10 +42,10 @@ export const PriorityFilter: FC<{
                 renderItem={({ item, checked, onItemClick }) => (
                     <FilterCheckbox
                         name="priority"
-                        value={item.id}
+                        value={getKey(item)}
                         checked={checked}
                         onClick={onItemClick}
-                        label={item.data}
+                        label={getPriorityText(item.title)}
                     />
                 )}
             />

src/schema/goal.ts

@@ -70,7 +70,11 @@ export const goalCommonSchema = z.object({
         hue: z.number().optional(),
         title: z.string().optional(),
     }),
-    priority: z.string().nullable().optional(),
+    priority: z.object({
+        id: z.string(),
+        title: z.string(),
+        value: z.number(),
+    }),
     estimate: z
         .object({
             date: z.string(),
@@ -142,7 +146,11 @@ export const goalUpdateSchema = z.object({
             StateType.NotStarted,
         ]),
     }),
-    priority: z.string().nullable(),
+    priority: z.object({
+        id: z.string(),
+        title: z.string(),
+        value: z.number(),
+    }),
     estimate: z
         .object({
             date: z.string(),

src/types/history.ts

@@ -1,4 +1,15 @@
-import { Goal, State, Project, Tag, Activity, GoalHistory, User, GoalAchieveCriteria, Ghost } from '@prisma/client';
+import {
+    Goal,
+    State,
+    Project,
+    Tag,
+    Activity,
+    GoalHistory,
+    User,
+    GoalAchieveCriteria,
+    Ghost,
+    Priority,
+} from '@prisma/client';
 
 export const subjectToTableNameMap = {
     dependencies: true,
@@ -9,6 +20,7 @@ export const subjectToTableNameMap = {
     state: true,
     criteria: true,
     partnerProject: true,
+    priority: true,
 };
 
 export type HistoryRecordSubject = { [K in keyof typeof subjectToTableNameMap]: string };
@@ -22,6 +34,7 @@ export interface HistoryRecordMeta {
     state: State;
     criteria: GoalAchieveCriteria & { goalAsCriteria: Goal & { state: State | null } };
     partnerProject: Project;
+    priority: Priority;
 }
 
 export type HistoryAction = 'add' | 'change' | 'remove' | 'delete' | 'edit' | 'complete' | 'uncomplete';
@@ -46,6 +59,7 @@ type HistoryRecord =
           | HistoryValuesBySubject<'state'>
           | HistoryValuesBySubject<'owner'>
           | HistoryValuesBySubject<'criteria'>
+          | HistoryValuesBySubject<'priority'>
           | {
                 subject: 'title' | 'description' | 'estimate';
                 previousValue?: string;