Добавлен статус ошибки, усилена работа с правами

src/pages/DrillingProgram/CategoryRender.jsx

@@ -10,6 +10,7 @@ import Poprompt from '@components/Poprompt'
 import { UserView } from '@components/views'
 import UploadForm from '@components/UploadForm'
 import DownloadLink from '@components/DownloadLink'
+import LoaderPortal from '@components/LoaderPortal'
 import { formatBytes, invokeWebApiWrapperAsync, notify } from '@components/factory'
 import { DrillingProgramService } from '@api'
 import { formatDate } from '@utils'
@@ -17,7 +18,6 @@ import { formatDate } from '@utils'
 import MarksCard from './MarksCard'
 
 import '@styles/drilling_program.less'
-import LoaderPortal from '@asb/components/LoaderPortal'
 
 const CommentPrompt = memo((props) => (
     <Poprompt
@@ -41,12 +41,9 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
         approvers, // Полный список согласовантов
         permissionToApprove, // Наличие прав на согласование/отклонение документа
         permissionToUpload, // Наличие прав на загрузку нового файла
-        // permissionToEdit, // Наличие прав на редактирование/удаление категории
         file // Информация о файле
     } = partData ?? {}
 
-    const permissionToEdit = true
-
     const uploadUrl = `/api/well/${idWell}/drillingProgram/part/${idFileCategory}`
 
     const [isUploading, setIsUploading] = useState(false)
@@ -82,7 +79,7 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
             <div className={'drilling_category'} {...other}>
                 <div className={'category_header'}>
                     <h3>{title}</h3>
-                    {permissionToEdit && (
+                    {onEdit && (
                         <div>
                             <Button icon={<EditOutlined />} onClick={() => onEdit?.(idFileCategory)}>Редактировать</Button>
                             <Popconfirm
@@ -109,14 +106,15 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
                             )}
                         </div>
                         <div className={'file_actions'}>
+                            {permissionToUpload && (
                                 <UploadForm
                                     url={uploadUrl}
-                                disabled={!permissionToUpload}
                                     style={{ margin: '5px 0 10px 0' }}
                                     onUploadStart={() => setIsUploading(true)}
                                     onUploadComplete={() => onUpdate?.(idFileCategory)}
                                     onUploadError={(e) => notify(e?.message ?? 'Ошибка загрузки файла', 'error')}
                                 />
+                            )}
                             <Button
                                 disabled={!file}
                                 title={'История'}
@@ -135,18 +133,22 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
                                 </span>
                             ))}
                         </div>
+                        {file && (
+                            <>
                                 <div className={'approve_list'}>
-                            {permissionToApprove && file && (
+                                    {permissionToApprove && (
                                         <CommentPrompt text={'Согласовать'} title={'Согласование документа'} onDone={onApprove(true)} />
                                     )}
                                     <MarksCard title={'Согласовано'} className={'approve_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 1)} />
                                 </div>
                                 <div className={'reject_list'}>
-                            {permissionToApprove && file && (
+                                    {permissionToApprove && (
                                         <CommentPrompt text={'Отклонить'} title={'Отклонение документа'} onDone={onApprove(false)} />
                                     )}
                                     <MarksCard title={'Отклонено'} className={'reject_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 0)} />
                                 </div>
+                            </>
+                        )}
                     </div>
                 </div>
             </div>

src/pages/DrillingProgram/index.jsx

@@ -1,8 +1,13 @@
 import { Button, Layout } from 'antd'
-import { CloseOutlined, FileWordOutlined, LoadingOutlined } from '@ant-design/icons'
+import {
+  CloseOutlined,
+  FileWordOutlined,
+  LoadingOutlined,
+  ReloadOutlined,
+  WarningOutlined
+} from '@ant-design/icons'
 import { memo, useCallback, useEffect, useState } from 'react'
 
-import { Flex } from '@components/Grid'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { arrayOrDefault, formatDate } from '@utils'
@@ -15,11 +20,20 @@ import CategoryHistory from './CategoryHistory'
 
 import '@styles/drilling_program.less'
 
+const idStateNotInitialized = 0
+const idStateApproving = 1
+const idStateCreating = 2
+const idStateReady = 3
+const idStateError = 4
+const idStateUnknown = -1
+
 const stateString = {
-  0: 'Не настроена',
+  [idStateNotInitialized]: { icon: CloseOutlined, text: 'Не настроена' },
-  1: 'Согласовывается',
+  [idStateApproving]: { icon: LoadingOutlined, text: 'Согласовывается' },
-  2: 'Формируется',
+  [idStateCreating]: { icon: LoadingOutlined, text: 'Формируется' },
-  [-1]: 'Неизвестно',
+  [idStateReady]: { icon: null, text: 'Сформирована' },
+  [idStateError]: { icon: WarningOutlined, text: 'Ошибка формирования' },
+  [idStateUnknown]: { icon: WarningOutlined, text: 'Неизвестно' },
 }
 
 export const DrillingProgram = memo(({ idWell }) => {
@@ -30,6 +44,20 @@ export const DrillingProgram = memo(({ idWell }) => {
   const [categories, setCategories] = useState([])
   const [data, setData] = useState({})
 
+  const {
+    idState,
+    permissionToEdit,
+    parts,
+    program,
+    error,
+  } = data
+
+  const stateId = idState ?? idStateUnknown
+  const state = stateString[stateId]
+  const StateIcon = state.icon
+
+  console.log(parts)
+
   const updateData = useCallback(async () => await invokeWebApiWrapperAsync(
     async () => {
       const data = await DrillingProgramService.getState(idWell)
@@ -37,7 +65,7 @@ export const DrillingProgram = memo(({ idWell }) => {
       setData(data)
       setCategories(categories.filter(cat => {
         if (cat?.id && (cat.name || cat.shortName))
-          if (data?.parts.findIndex((val) => val.idFileCategory === cat.id) < 0)
+          if (parts?.findIndex((val) => val.idFileCategory === cat.id) < 0)
             return true
         return false
       }))
@@ -66,43 +94,50 @@ export const DrillingProgram = memo(({ idWell }) => {
   return (
     <LoaderPortal show={showLoader}>
       <Layout style={{ backgroundColor: 'white' }}>
-        {data && (
         <div className={'drilling_program'}>
           <div className={'program_header'}>
             <h3>Программа бурения</h3>
+            {permissionToEdit && (
+              <div>
+                <Button
+                  icon={<ReloadOutlined />}
+                  disabled={[idStateNotInitialized, idStateApproving, idStateUnknown].includes(stateId)}
+                  loading={stateId === idStateCreating}
+                >
+                  Сформировать заново
+                </Button>
               </div>
-            <Flex style={{ justifyContent: 'flex-start', alignItems: 'center', backgroundColor: 'white' }}>
+            )}
-              {data?.idState === 3 ? (
+          </div>
+          <div className={'program_content'}>
+            {stateId === idStateReady ? (
               <>
-                  <Button type={'link'} icon={<FileWordOutlined />} style={{ marginLeft: '10px' }}>{data.program.name}</Button>
+                <Button type={'link'} icon={<FileWordOutlined />} style={{ marginLeft: '10px' }}>{program?.name}</Button>
-                  <div style={{ margin: '10px' }}>Размер: {data.program.size}</div>
+                <div className={'m-10'}>Размер: {program?.size}</div>
-                  <div style={{ margin: '10px' }}>Загружен: {formatDate(data.program.uploadDate)}</div>
+                <div className={'m-10'}>Загружен: {formatDate(program?.uploadDate)}</div>
               </>
             ) : (
-                <h3 style={{ margin: '10px'}}>
+              <h3 className={`program_status ${stateId === idStateError ? 'error' : ''}`}>
-                  {data?.idState <= 0 ? (
+                <StateIcon className={'m-10'} />
-                    <CloseOutlined style={{ margin: '10px' }} />
+                {(stateId === idStateError && error?.message) ? error.message : state.text}
-                  ) : (
-                    <LoadingOutlined style={{ margin: '10px' }} />
-                  )}
-                  {stateString[data?.idState ?? -1]}
               </h3>
             )}
-            </Flex>
           </div>
-        )}
+        </div>
 
-        {data?.parts?.map?.((part, idx) => part && (
+        {parts?.map?.((part, idx) => part && (
           <CategoryRender
             key={`${idx}`}
             idWell={idWell}
             partData={part}
-            onEdit={onCategoryEdit}
+            onEdit={permissionToEdit && onCategoryEdit}
             onUpdate={updateData}
             onHistory={onCategoryHistory}
           />
         ))}
 
+        {permissionToEdit && (
+          <>
             <CategoryAdder
               idWell={idWell}
               categories={categories}
@@ -113,8 +148,10 @@ export const DrillingProgram = memo(({ idWell }) => {
               idWell={idWell}
               visible={editorVisible}
               onClosed={onEditorClosed}
-          category={data?.parts?.find((part) => part.idFileCategory === selectedCategory) ?? {}}
+              category={parts?.find((part) => part.idFileCategory === selectedCategory) ?? {}}
             />
+          </>
+        )}
 
         <CategoryHistory
           idWell={idWell}

src/styles/drilling_program.less

@@ -7,6 +7,7 @@
 
 .ml-15 { margin-left: 15px; }
 .mv-5 { margin: 5px 0; }
+.m-10 { margin: 10px; }
 
 .drilling_category {
     margin-top: 10px;
@@ -132,9 +133,25 @@
     border: @border-style;
     border-top: 0;
 
-    .program_header {
+    > .program_header {
         .drilling_category > .category_header();
     }
+
+    > .program_content {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        background-color: white;
+
+        .program_status {
+            margin: 10px;
+            color: black;
+        }
+
+        .program_status.error {
+            color: red;
+        }
+    }
 }
 
 /** Миксин для столбцов сетки (размер, отступы, границы) */