fix(INTERNAL-1851): decree fixes

asabotovich · asabotovich · commit fddd8b7ed79c · 2025-05-07T12:51:20.000+03:00
diff --git a/prisma/migrations/20250506195723_user_requests_completed_status/migration.sql b/prisma/migrations/20250506195723_user_requests_completed_status/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "UserCreationRequestStatus" ADD VALUE 'Completed';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -167,6 +167,7 @@ enum UserCreationRequestStatus {
   Approved
   Denied
   Canceled
+  Completed
 }
 
 model UserCreationRequest {
diff --git a/src/components/DecreeForm/DecreeForm.tsx b/src/components/DecreeForm/DecreeForm.tsx
@@ -57,7 +57,6 @@ export const DecreeForm: FC<DecreeFormProps> = ({
         resolver: zodResolver(userDecreeSchema),
         defaultValues,
     });
-
     const {
         handleSubmit,
         setValue,
@@ -214,7 +213,7 @@ export const DecreeForm: FC<DecreeFormProps> = ({
                         <UserFormWorkSpaceBlock
                             id="work-space"
                             className={s.FormBlock}
-                            requestType={type === 'toDecree' ? 'dismissal' : 'employment'}
+                            requestType={type}
                             type={mode === 'read' ? 'readOnly' : 'edit'}
                         />
 
diff --git a/src/components/RequestFormActions/RequestFormActions.tsx b/src/components/RequestFormActions/RequestFormActions.tsx
@@ -153,6 +153,8 @@ export const RequestFormActions = ({
             requestType === UserCreationRequestType.externalFromMainOrgEmployee ||
             requestType === UserCreationRequestType.internalEmployee);
 
+    const isCompletedDecreeRequest = requestStatus === 'Completed' && requestType === UserCreationRequestType.toDecree;
+
     return (
         <div className={s.FormActions}>
             {nullable(canEditRequest, () => (
@@ -172,7 +174,7 @@ export const RequestFormActions = ({
                         </div>
                     ))}
 
-                    {nullable(requestStatus !== 'Canceled', () => (
+                    {nullable(requestStatus !== 'Canceled' && !isCompletedDecreeRequest, () => (
                         <Button
                             ref={cancelRef}
                             iconLeft={small && <IconDeniedOutline size="s" />}
diff --git a/src/components/UserCreateRequestsPage/UserCreateRequestsPage.i18n/en.json b/src/components/UserCreateRequestsPage/UserCreateRequestsPage.i18n/en.json
@@ -19,5 +19,6 @@
     "Transfer intern to staff": "",
     "Transfer inside SD": "",
     "Draft": "",
-    "New supplemental position": ""
+    "New supplemental position": "",
+    "Completed": ""
 }
diff --git a/src/components/UserCreateRequestsPage/UserCreateRequestsPage.i18n/ru.json b/src/components/UserCreateRequestsPage/UserCreateRequestsPage.i18n/ru.json
@@ -19,5 +19,6 @@
     "Transfer intern to staff": "Перевод стажера в штат",
     "Transfer inside SD": "Перевод внутри SD",
     "Draft": "Черновик",
-    "New supplemental position": "Новое совмещение"
+    "New supplemental position": "Новое совмещение",
+    "Completed": "Выполнена"
 }
diff --git a/src/components/UserCreateRequestsPage/UserCreateRequestsPage.tsx b/src/components/UserCreateRequestsPage/UserCreateRequestsPage.tsx
@@ -137,11 +137,12 @@ export const UserCreateRequestsPage = () => {
         id: request.id,
     }));
 
-    const statusText = (status: 'Approved' | 'Denied' | 'Canceled' | 'Draft' | null) => {
+    const statusText = (status: 'Approved' | 'Denied' | 'Canceled' | 'Draft' | 'Completed' | null) => {
         if (status === 'Approved') return tr('Approved');
         if (status === 'Denied') return tr('Denied');
         if (status === 'Canceled') return tr('Canceled');
         if (status === 'Draft') return tr('Draft');
+        if (status === 'Completed') return tr('Completed');
         return tr('Under concideration');
     };
 
diff --git a/src/components/UserFormAttaches/UserFormAttaches.tsx b/src/components/UserFormAttaches/UserFormAttaches.tsx
@@ -33,7 +33,9 @@ const Attaches = ({
     requestType: string;
 }) => {
     const requestQuery =
-        requestType === 'transferInternToStaff' || requestType === UserCreationRequestType.transferInside
+        requestType === 'transferInternToStaff' ||
+        requestType === UserCreationRequestType.transferInside ||
+        requestType === UserCreationRequestType.toDecree
             ? trpc.userCreationRequest.getById.useQuery(id, { enabled: !!id })
             : trpc.scheduledDeactivation.getById.useQuery(id, { enabled: !!id });
 
diff --git a/src/components/UserFormPersonalDataBlock/UserFormPersonalDataBlock.tsx b/src/components/UserFormPersonalDataBlock/UserFormPersonalDataBlock.tsx
@@ -313,14 +313,10 @@ export const UserFormPersonalDataBlock = ({ className, id, type, readOnly = true
                         >
                             <FormControlInput
                                 readOnly={getReadOnly('personalEmail')}
-                                value={
-                                    getReadOnly('personalEmail') && !watch('personalEmail')
-                                        ? tr('Not specified')
-                                        : undefined
-                                }
+                                value={watch('personalEmail')}
                                 autoComplete="off"
                                 size="m"
-                                placeholder="name@mail.com"
+                                placeholder={getReadOnly('personalEmail') ? tr('Not specified') : 'name@mail.com'}
                                 outline
                                 {...register('personalEmail', { onChange: onEmailChange })}
                             />
@@ -345,12 +341,10 @@ export const UserFormPersonalDataBlock = ({ className, id, type, readOnly = true
                         >
                             <FormControlInput
                                 readOnly={getReadOnly('workEmail')}
-                                value={
-                                    getReadOnly('workEmail') && !watch('workEmail') ? tr('Not specified') : undefined
-                                }
+                                value={watch('workEmail')}
                                 autoComplete="off"
                                 size="m"
-                                placeholder="email@example.com"
+                                placeholder={getReadOnly('workEmail') ? tr('Not specified') : 'email@example.com'}
                                 outline
                                 {...register('workEmail', { onChange: onEmailChange })}
                             />
diff --git a/src/components/UserFormWorkSpaceBlock/UserFormWorkSpaceBlock.i18n/en.json b/src/components/UserFormWorkSpaceBlock/UserFormWorkSpaceBlock.i18n/en.json
@@ -14,5 +14,7 @@
     "Not specified": "",
     "Required euipment": "",
     "Test devices": "",
-    "Workspace № in format 6.01.195": ""
+    "Workspace № in format 6.01.195": "",
+    "Application №": "",
+    "Application for return of equipment": ""
 }
diff --git a/src/components/UserFormWorkSpaceBlock/UserFormWorkSpaceBlock.i18n/ru.json b/src/components/UserFormWorkSpaceBlock/UserFormWorkSpaceBlock.i18n/ru.json
@@ -14,5 +14,7 @@
     "Not specified": "Не указано",
     "Required euipment": "Требуемое оборудование",
     "Test devices": "Устройства для тестирования",
-    "Workspace № in format 6.01.195": "№ рабочего места в формате 6.01.195"
+    "Workspace № in format 6.01.195": "№ рабочего места в формате 6.01.195",
+    "Application №": "№ заявки",
+    "Application for return of equipment": "Заявка на сдачу техники"
 }
diff --git a/src/components/UserFormWorkSpaceBlock/UserFormWorkSpaceBlock.tsx b/src/components/UserFormWorkSpaceBlock/UserFormWorkSpaceBlock.tsx
@@ -16,7 +16,7 @@ interface UserFormWorkSpaceBlockProps {
     className: string;
     id: string;
     type: 'new' | 'edit' | 'readOnly';
-    requestType?: 'dismissal' | 'employment' | UserCreationRequestType;
+    requestType?: UserCreationRequestType;
     requestId?: string;
     status?: string;
 }
@@ -28,13 +28,14 @@ interface UserFormWorkSpaceBlockType {
     workSpace?: string;
     location: string;
     workModeComment?: string;
+    applicationForReturnOfEquipment?: string;
 }
 
 export const UserFormWorkSpaceBlock = ({
     className,
     id,
     type,
-    requestType = 'employment',
+    requestType = UserCreationRequestType.internalEmployee,
     requestId,
     status,
 }: UserFormWorkSpaceBlockProps) => {
@@ -58,6 +59,13 @@ export const UserFormWorkSpaceBlock = ({
     const equipment = watch('equipment');
     const [, copy] = useCopyToClipboard();
 
+    const isEmploymentRequest =
+        requestType === UserCreationRequestType.existing ||
+        requestType === UserCreationRequestType.internalEmployee ||
+        requestType === UserCreationRequestType.externalEmployee ||
+        requestType === UserCreationRequestType.externalFromMainOrgEmployee ||
+        requestType === UserCreationRequestType.fromDecree;
+
     let workSpaceLabel = tr('Work space application');
 
     if (requestType === UserCreationRequestType.transferInside) workSpaceLabel = tr('Work space');
@@ -79,7 +87,7 @@ export const UserFormWorkSpaceBlock = ({
                     control={control}
                     render={({ field }) => (
                         <FormControl
-                            label={requestType === 'employment' ? tr('Required euipment') : tr('Equipment')}
+                            label={isEmploymentRequest ? tr('Required euipment') : tr('Equipment')}
                             required={isRequiredField}
                             error={errors.equipment}
                         >
@@ -103,7 +111,7 @@ export const UserFormWorkSpaceBlock = ({
                     control={control}
                     render={({ field }) => (
                         <FormControl
-                            label={requestType === 'employment' ? tr('Extra equipment') : tr('Test devices')}
+                            label={isEmploymentRequest ? tr('Extra equipment') : tr('Test devices')}
                             error={errors.extraEquipment}
                         >
                             <FormControlEditor
@@ -120,22 +128,35 @@ export const UserFormWorkSpaceBlock = ({
                 />
             </div>
             <div className={requestType === UserCreationRequestType.transferInside ? s.ThreeInputsRow : s.TwoInputsRow}>
-                {nullable(
-                    requestType === 'employment' || requestType === UserCreationRequestType.transferInside,
-                    () => (
-                        <FormControl label={workSpaceLabel} error={errors.workSpace}>
-                            <FormControlInput
-                                readOnly={type === 'readOnly'}
-                                autoComplete="off"
-                                size="m"
-                                placeholder={workSpacePlaceholder}
-                                value={type === 'readOnly' && !watch('workSpace') ? tr('Not specified') : undefined}
-                                outline
-                                {...register('workSpace')}
-                            />
-                        </FormControl>
-                    ),
-                )}
+                {nullable(isEmploymentRequest || requestType === UserCreationRequestType.transferInside, () => (
+                    <FormControl label={workSpaceLabel} error={errors.workSpace}>
+                        <FormControlInput
+                            readOnly={type === 'readOnly'}
+                            autoComplete="off"
+                            size="m"
+                            placeholder={workSpacePlaceholder}
+                            value={type === 'readOnly' && !watch('workSpace') ? tr('Not specified') : undefined}
+                            outline
+                            {...register('workSpace')}
+                        />
+                    </FormControl>
+                ))}
+
+                {nullable(UserCreationRequestType.toDecree, () => (
+                    <FormControl
+                        label={tr('Application for return of equipment')}
+                        error={errors.applicationForReturnOfEquipment}
+                    >
+                        <FormControlInput
+                            readOnly={type === 'readOnly'}
+                            autoComplete="off"
+                            size="m"
+                            outline
+                            placeholder={tr('Application №')}
+                            {...register('applicationForReturnOfEquipment')}
+                        />
+                    </FormControl>
+                ))}
 
                 <FormControl label={tr('Location')} required error={errors.location}>
                     <FormControlInput
@@ -156,7 +177,7 @@ export const UserFormWorkSpaceBlock = ({
                     />
                 </FormControl>
 
-                {nullable(requestType === 'employment', () => (
+                {nullable(isEmploymentRequest, () => (
                     <FormControl label={tr('Work mode comment')} error={errors.workModeComment}>
                         <FormControlInput
                             readOnly={type === 'readOnly'}
diff --git a/src/config.ts b/src/config.ts
@@ -61,6 +61,7 @@ export const config = {
     deactivateJobUtcHour: !Number.isNaN(Number(process.env.DEACTIVATE_JOB_UTC_HOUR))
         ? Number(process.env.DEACTIVATE_JOB_UTC_HOUR)
         : 20,
+    decreeUtcHour: !Number.isNaN(Number(process.env.DECREE_UTC_HOUR)) ? Number(process.env.DECREE__UTC_HOUR) : 6,
     employmentUtcHour: !Number.isNaN(Number(process.env.EMPLOYMENT_UTC_HOUR))
         ? Number(process.env.EMPLOYMENT_UTC_HOUR)
         : 4,
diff --git a/src/generated/kyselyTypes.ts b/src/generated/kyselyTypes.ts
@@ -9,6 +9,7 @@ export const UserCreationRequestStatus = {
     Approved: 'Approved',
     Denied: 'Denied',
     Canceled: 'Canceled',
+    Completed: 'Completed',
 } as const;
 export type UserCreationRequestStatus = (typeof UserCreationRequestStatus)[keyof typeof UserCreationRequestStatus];
 export const UserRoleDeprecated = {
diff --git a/src/modules/modules.i18n/en.json b/src/modules/modules.i18n/en.json
@@ -91,5 +91,6 @@
     "To decree": "",
     "Enter date for at least one organization": "",
     "Transfer intern to staff": "",
-    "Select a date no earlier than 2000": ""
+    "Select a date no earlier than 2000": "",
+    "Enter Email": ""
 }
diff --git a/src/modules/modules.i18n/ru.json b/src/modules/modules.i18n/ru.json
@@ -91,5 +91,6 @@
     "To decree": "Декрет",
     "Enter date for at least one organization": "Укажите дату хотя бы для одной организации",
     "Transfer intern to staff": "Перевод стажера в штат",
-    "Select a date no earlier than 2000": "Выберите дату не ранее 2000 года"
+    "Select a date no earlier than 2000": "Выберите дату не ранее 2000 года",
+    "Enter Email": "Введите почту"
 }
diff --git a/src/modules/userCreationRequestMethods.ts b/src/modules/userCreationRequestMethods.ts
@@ -796,6 +796,7 @@ export const userCreationRequestsMethods = {
                 corporateEmail: data.corporateEmail || undefined,
                 createExternalAccount: Boolean(data.createExternalAccount),
                 disableAccount: data.type === 'toDecree' ? data.disableAccount : false,
+                applicationForReturnOfEquipment: data.applicationForReturnOfEquipment || undefined,
                 services: [],
                 workMode: data.workMode,
                 workModeComment: data.workModeComment,
diff --git a/src/modules/userCreationRequestSchemas.ts b/src/modules/userCreationRequestSchemas.ts
@@ -232,6 +232,7 @@ const getBaseDecreeSchema = () =>
                 .string({ invalid_type_error: tr('Required field'), required_error: tr('Required field') })
                 .min(1, { message: tr('Required field') }),
             workModeComment: z.string().optional(),
+            applicationForReturnOfEquipment: z.string().optional(),
             equipment: z
                 .string({ invalid_type_error: tr('Required field'), required_error: tr('Required field') })
                 .min(1, { message: tr('Required field') }),
@@ -256,7 +257,16 @@ export const getUserFromDecreeSchema = () =>
 
 export type UserFromDecreeSchema = z.infer<ReturnType<typeof getUserFromDecreeSchema>>;
 
-export const userDecreeSchema = z.discriminatedUnion('type', [getUserToDecreeSchema(), getUserFromDecreeSchema()]);
+export const userDecreeSchema = z
+    .discriminatedUnion('type', [getUserToDecreeSchema(), getUserFromDecreeSchema()])
+    .refine(({ workEmail, personalEmail }) => workEmail !== '' || personalEmail !== '', {
+        message: tr('Enter Email'),
+        path: ['workEmail'],
+    })
+    .refine(({ workEmail, personalEmail }) => workEmail !== '' || personalEmail !== '', {
+        message: tr('Enter Email'),
+        path: ['personalEmail'],
+    });
 
 export type UserDecreeSchema = z.infer<typeof userDecreeSchema>;
 
diff --git a/src/modules/userMethods.ts b/src/modules/userMethods.ts
@@ -1,4 +1,4 @@
-import { Prisma, SupplementalPosition, User, PositionStatus } from '@prisma/client';
+import { Prisma, SupplementalPosition, User, PositionStatus, UserCreationRequestStatus } from '@prisma/client';
 import { TRPCError } from '@trpc/server';
 import { sql } from 'kysely';
 
@@ -1033,6 +1033,11 @@ export const userMethods = {
             });
         }
 
+        await prisma.userCreationRequest.update({
+            where: { id: userCreationRequestId },
+            data: { status: UserCreationRequestStatus.Completed },
+        });
+
         return userMethods.getById(request.userTargetId);
     },
 };
diff --git a/src/utils/emailTemplates.ts b/src/utils/emailTemplates.ts
diff --git a/src/utils/utils.i18n/en.json b/src/utils/utils.i18n/en.json
diff --git a/src/utils/utils.i18n/ru.json b/src/utils/utils.i18n/ru.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- AlterEnum`
	`2`	`+ALTER TYPE "UserCreationRequestStatus" ADD VALUE 'Completed';`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ enum UserCreationRequestStatus {`
`167`	`167`	`Approved`
`168`	`168`	`Denied`
`169`	`169`	`Canceled`
	`170`	`+ Completed`
`170`	`171`	`}`
`171`	`172`
`172`	`173`	`model UserCreationRequest {`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@`
`19`	`19`	`"Transfer intern to staff": "",`
`20`	`20`	`"Transfer inside SD": "",`
`21`	`21`	`"Draft": "",`
`22`		`- "New supplemental position": ""`
	`22`	`+ "New supplemental position": "",`
	`23`	`+ "Completed": ""`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,7 @@`
`14`	`14`	`"Not specified": "",`
`15`	`15`	`"Required euipment": "",`
`16`	`16`	`"Test devices": "",`
`17`		`- "Workspace № in format 6.01.195": ""`
	`17`	`+ "Workspace № in format 6.01.195": "",`
	`18`	`+ "Application №": "",`
	`19`	`+ "Application for return of equipment": ""`
`18`	`20`	`}`