From 6eb6f0f4c2964b4cc3f56fd7079337172aefe375 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Thu, 24 Feb 2022 15:39:30 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BB=D0=B0=D1=81=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F/=D0=BE=D1=82=D0=BA=D0=BB=D0=BE=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D1=81=D1=83=D1=82?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B8=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DrillingProgram/CategoryRender.jsx | 159 +++++++++----------
 1 file changed, 79 insertions(+), 80 deletions(-)

diff --git a/src/pages/DrillingProgram/CategoryRender.jsx b/src/pages/DrillingProgram/CategoryRender.jsx
index 2f31cb5..92e5ea9 100644
--- a/src/pages/DrillingProgram/CategoryRender.jsx
+++ b/src/pages/DrillingProgram/CategoryRender.jsx
@@ -1,22 +1,23 @@
 import { memo, useCallback, useState } from 'react'
 import { Button, Input, Popconfirm, Form } from 'antd'
 import {
-    ClearOutlined,
-    SettingOutlined,
+    DeleteOutlined,
+    EditOutlined,
     TableOutlined,
 } from '@ant-design/icons'
 
-import { formatDate } from '@utils'
-import { DrillingProgramService } from '@api'
-import { formatBytes, invokeWebApiWrapperAsync, notify } from '@components/factory'
-import { UploadForm } from '@components/UploadForm'
-import DownloadLink from '@components/DownloadLink'
+import Poprompt from '@components/Poprompt'
 import { UserView } from '@components/views'
+import UploadForm from '@components/UploadForm'
+import DownloadLink from '@components/DownloadLink'
+import { formatBytes, invokeWebApiWrapperAsync, notify } from '@components/factory'
+import { DrillingProgramService } from '@api'
+import { formatDate } from '@utils'
 
 import MarksCard from './MarksCard'
 
 import '@styles/drilling_program.less'
-import Poprompt from '@asb/components/Poprompt'
+import LoaderPortal from '@asb/components/LoaderPortal'
 
 const CommentPrompt = memo((props) => (
     <Poprompt
@@ -37,13 +38,15 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
     const {
         idFileCategory,
         name: title, // Название категории
-        idState, // Состояние категории
         approvers, // Полный список согласовантов
         permissionToApprove, // Наличие прав на согласование/отклонение документа
         permissionToUpload, // Наличие прав на загрузку нового файла
+        // permissionToEdit, // Наличие прав на редактирование/удаление категории
         file // Информация о файле
     } = partData ?? {}
 
+    const permissionToEdit = true
+
     const uploadUrl = `/api/well/${idWell}/drillingProgram/part/${idFileCategory}`
 
     const [isUploading, setIsUploading] = useState(false)
@@ -75,83 +78,79 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
     ), [idWell, idFileCategory, onUpdate, title])
 
     return (
-        <div className={'drilling_category'} {...other}>
-            <div className={'category_header'}>
-                <h3>{title}</h3>
-                <div>
-                    <Button icon={<SettingOutlined />} onClick={() => onEdit?.(idFileCategory)}>Редактировать</Button>
-                    <Popconfirm
-                        onConfirm={onRemoveClick}
-                        title={<>Вы уверены, что хотите удалить категорию<br/>"{title}"?</>}
-                    >
-                        <Button loading={isDeleting} icon={<ClearOutlined />}>Удалить</Button>
-                    </Popconfirm>
+        <LoaderPortal show={isUploading}>
+            <div className={'drilling_category'} {...other}>
+                <div className={'category_header'}>
+                    <h3>{title}</h3>
+                    {permissionToEdit && (
+                        <div>
+                            <Button icon={<EditOutlined />} onClick={() => onEdit?.(idFileCategory)}>Редактировать</Button>
+                            <Popconfirm
+                                onConfirm={onRemoveClick}
+                                title={<>Вы уверены, что хотите удалить категорию<br/>"{title}"?</>}
+                            >
+                                <Button loading={isDeleting} icon={<DeleteOutlined />}>Удалить</Button>
+                            </Popconfirm>
+                        </div>
+                    )}
                 </div>
-            </div>
-            <div className={'category_content'}>
-                <div className={'file_column'}>
-                    <div className={'file_info'}>
-                        {file ? (
-                            <>
-                                <DownloadLink file={file} />
-                                <div className={'ml-15'}>Автор: <UserView user={file.author ?? '-'}/></div>
-                                <div className={'ml-15'}>Размер: {file.size ? formatBytes(file.size) : '-'}</div>
-                                <div className={'ml-15'}>Загружен: {formatDate(file.uploadDate) ?? '-'}</div>
-                            </>
-                        ) : (
-                            <div>Нет загруженных файлов</div>
-                        )}
-                    </div>
-                    <div className={'file_actions'}>
-                        <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={'История'}
-                            icon={<TableOutlined />}
-                            onClick={() => onHistory?.(idFileCategory)}
-                        >
-                            История
-                        </Button>
-                    </div>
-                </div>
-                <div className={'approve_column'}>
-                    <div className={'user_list'}>
-                        {approvers.map((user, i) => (
-                            <span key={i}>
-                                <UserView user={user} />
-                            </span>
-                        ))}
-                    </div>
-                    <div className={'approve_list'}>
-                        {permissionToApprove && (
-                            <CommentPrompt
-                                text={'Согласовать'}
-                                title={'Согласование документа'}
-                                onDone={onApprove(true)}
+                <div className={'category_content'}>
+                    <div className={'file_column'}>
+                        <div className={'file_info'}>
+                            {file ? (
+                                <>
+                                    <DownloadLink file={file} />
+                                    <div className={'ml-15'}>Автор: <UserView user={file.author ?? '-'}/></div>
+                                    <div className={'ml-15'}>Размер: {file.size ? formatBytes(file.size) : '-'}</div>
+                                    <div className={'ml-15'}>Загружен: {formatDate(file.uploadDate) ?? '-'}</div>
+                                </>
+                            ) : (
+                                <div>Нет загруженных файлов</div>
+                            )}
+                        </div>
+                        <div className={'file_actions'}>
+                            <UploadForm
+                                url={uploadUrl}
+                                disabled={!permissionToUpload}
+                                style={{ margin: '5px 0 10px 0' }}
+                                onUploadStart={() => setIsUploading(true)}
+                                onUploadComplete={() => onUpdate?.(idFileCategory)}
+                                onUploadError={(e) => notify(e?.message ?? 'Ошибка загрузки файла', 'error')}
                             />
-                        )}
-                        <MarksCard title={'Согласовано'} className={'approve_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 1)} />
+                            <Button
+                                disabled={!file}
+                                title={'История'}
+                                icon={<TableOutlined />}
+                                onClick={() => onHistory?.(idFileCategory)}
+                            >
+                                История
+                            </Button>
+                        </div>
                     </div>
-                    <div className={'reject_list'}>
-                        {permissionToApprove && (
-                            <CommentPrompt
-                            text={'Отклонить'}
-                            title={'Отклонение документа'}
-                            onDone={onApprove(false)}
-                        />
-                        )}
-                        <MarksCard title={'Отклонено'} className={'reject_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 0)} />
+                    <div className={'approve_column'}>
+                        <div className={'user_list'}>
+                            {approvers.map((user, i) => (
+                                <span key={i}>
+                                    <UserView user={user} />
+                                </span>
+                            ))}
+                        </div>
+                        <div className={'approve_list'}>
+                            {permissionToApprove && file && (
+                                <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 && (
+                                <CommentPrompt text={'Отклонить'} title={'Отклонение документа'} onDone={onApprove(false)} />
+                            )}
+                            <MarksCard title={'Отклонено'} className={'reject_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 0)} />
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
+        </LoaderPortal>
     )
 })