Исправил все баги и ошибки в репозитории + добавил обрадотку ошибок в регистрации + параметра в ссылках работают на всех страницах
This commit is contained in:
parent
013fe0c082
commit
7c247316ae
|
@ -9,32 +9,30 @@ export const GlobalStyles = createGlobalStyle`
|
|||
|
||||
body {
|
||||
font-family: "Roboto";
|
||||
color: ${props => props.theme.textColor};
|
||||
background: ${props => props.theme.bg};
|
||||
color: ${(props) => props.theme.textColor};
|
||||
background: ${(props) => props.theme.bg};
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
a {
|
||||
text-decoration: none;
|
||||
color: ${props => props.theme.textColor};
|
||||
color: ${(props) => props.theme.textColor};
|
||||
}
|
||||
|
||||
h1 {
|
||||
${props => props.theme.h1}
|
||||
${(props) => props.theme.h1}
|
||||
}
|
||||
|
||||
|
||||
h2 {
|
||||
${props => props.theme.h2}
|
||||
${(props) => props.theme.h2}
|
||||
}
|
||||
|
||||
|
||||
h3 {
|
||||
${props => props.theme.h3}
|
||||
${(props) => props.theme.h3}
|
||||
}
|
||||
|
||||
p {
|
||||
${props => props.theme.paragraph}
|
||||
${(props) => props.theme.paragraph}
|
||||
}
|
||||
`
|
|
@ -9,14 +9,15 @@ const TextareaContainer = styled.div`
|
|||
border-radius: 12px;
|
||||
background: ${(props) => props.theme.bg};
|
||||
border: 1px solid ${(props) => props.theme.text};
|
||||
font-size: 18px;
|
||||
font-weight: 500;
|
||||
outline: none;
|
||||
resize: none;
|
||||
height: 110px;
|
||||
width: 100%;
|
||||
overflow: -moz-scrollbars-none;
|
||||
scrollbar-width: none;
|
||||
font-family: Roboto;
|
||||
font-size: 18px;
|
||||
font-weight: 400;
|
||||
}
|
||||
`
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@ import {
|
|||
SearchNotification
|
||||
} from './styles'
|
||||
import { T_ColumnsState, T_NewRegistration, T_RegistrationItem } from './types'
|
||||
import { useLocation, useNavigate } from 'react-router-dom'
|
||||
|
||||
type Props = {}
|
||||
|
||||
|
@ -26,17 +27,36 @@ export default function Registrations({}: Props) {
|
|||
|
||||
const [registrations, setRegistrations] = useState<T_RegistrationItem[]>([])
|
||||
|
||||
const handleSearchQueryChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setQueryParams({ ...queryParams, search: e.target.value })
|
||||
}
|
||||
const location = useLocation()
|
||||
const searchParams = new URLSearchParams(location.search)
|
||||
const navigate = useNavigate()
|
||||
|
||||
const [queryParams, setQueryParams] = useState<I_QueryParams>({
|
||||
page: 1,
|
||||
count: 10,
|
||||
search: '',
|
||||
order: undefined
|
||||
order: 'email'
|
||||
})
|
||||
|
||||
const handleSearchQueryChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const newSearchQuery = e.target.value
|
||||
setQueryParams({ ...queryParams, search: e.target.value, page: 1 })
|
||||
const searchParams = new URLSearchParams(window.location.search)
|
||||
if (searchParams.has('page')) {
|
||||
searchParams.delete('page')
|
||||
}
|
||||
searchParams.append('page', '1')
|
||||
if (searchParams.has('search')) {
|
||||
searchParams.delete('search')
|
||||
}
|
||||
if (newSearchQuery.trim() !== '') {
|
||||
searchParams.append('search', newSearchQuery.trim())
|
||||
}
|
||||
navigate(`?${searchParams.toString()}`)
|
||||
}
|
||||
|
||||
|
||||
|
||||
const getReg = async () => {
|
||||
setSearchNotification(false)
|
||||
setErrorState(false)
|
||||
|
@ -54,6 +74,21 @@ export default function Registrations({}: Props) {
|
|||
setLoadingState(false)
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
const pageParam = searchParams.get('page')
|
||||
const countParam = searchParams.get('count')
|
||||
const searchParam = searchParams.get('search')
|
||||
const orderParam = searchParams.get('order')
|
||||
setQueryParams((prevState) => ({
|
||||
...prevState,
|
||||
page: pageParam ? parseInt(pageParam, 10) : prevState.page,
|
||||
count: countParam ? parseInt(countParam, 10) : prevState.count,
|
||||
search: searchParam || prevState.search,
|
||||
order: orderParam || prevState.order
|
||||
}))
|
||||
getReg()
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
getReg()
|
||||
}, [queryParams])
|
||||
|
@ -66,7 +101,7 @@ export default function Registrations({}: Props) {
|
|||
EndDate: { name: 'Дата окончания', status: true },
|
||||
CreatedDate: { name: 'Дата создания', status: false },
|
||||
UpdatedDate: { name: 'Дата изменения', status: true },
|
||||
Enabled: { name: 'Статус', status: true }
|
||||
Enabled: { name: 'Состояние', status: true }
|
||||
})
|
||||
|
||||
const [checkedColumns, setCheckedColumns] = useState<number[]>([])
|
||||
|
@ -127,10 +162,6 @@ export default function Registrations({}: Props) {
|
|||
})
|
||||
}, [modal])
|
||||
|
||||
useEffect(() => {
|
||||
getReg()
|
||||
}, [])
|
||||
|
||||
return (
|
||||
<>
|
||||
{loadingState ? (
|
||||
|
@ -167,9 +198,9 @@ export default function Registrations({}: Props) {
|
|||
<RegSelectNotification>
|
||||
<h3>
|
||||
{selectAll
|
||||
? `Выбранно: ${totalCount - notChecked.length}`
|
||||
? `Выбрано: ${totalCount - notChecked.length}`
|
||||
: checkedColumns.length !== 0 &&
|
||||
`Выбранно: ${checkedColumns.length}`}
|
||||
`Выбрано: ${checkedColumns.length}`}
|
||||
</h3>
|
||||
<div className='menu'>
|
||||
<img
|
||||
|
|
|
@ -2,14 +2,15 @@ import { useEffect, useState } from 'react'
|
|||
import MainButton from 'src/components/UI/button/MainButton'
|
||||
import MainInput from 'src/components/UI/input/MainInput'
|
||||
import Modal from 'src/components/UI/modal/Modal'
|
||||
import RegistrationsService from 'src/services/registrationsServices'
|
||||
import styled from 'styled-components'
|
||||
import { T_NewRegistration } from '../types'
|
||||
import { T_RegistrationItem } from '../types'
|
||||
|
||||
type Props = {
|
||||
modal: boolean
|
||||
setModal: (param: boolean) => void
|
||||
registration: T_NewRegistration
|
||||
editReg: (param: T_NewRegistration) => void
|
||||
registration: T_RegistrationItem
|
||||
getReg: () => void
|
||||
}
|
||||
|
||||
const ModalContainer = styled.div`
|
||||
|
@ -24,16 +25,45 @@ const ModalContainer = styled.div`
|
|||
}
|
||||
`
|
||||
|
||||
const ErrorContainer = styled.div`
|
||||
position: relative;
|
||||
z-index: 4;
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: end;
|
||||
width:420px;
|
||||
gap: 20px;
|
||||
}
|
||||
`
|
||||
|
||||
export default function EditRegModal({
|
||||
modal,
|
||||
setModal,
|
||||
registration,
|
||||
editReg
|
||||
getReg
|
||||
}: Props) {
|
||||
const [editRegData, setEditRegData] = useState(registration)
|
||||
|
||||
const [errorMessage, setErrorMessage] = useState(false)
|
||||
|
||||
const editReg = async () => {
|
||||
try {
|
||||
const response = await RegistrationsService.editRegistration(
|
||||
registration.Id,
|
||||
editRegData
|
||||
)
|
||||
if (response.status === 200) {
|
||||
getReg()
|
||||
setModal(false)
|
||||
} else if (response.status === 406) {
|
||||
console.log(1)
|
||||
setErrorMessage(true)
|
||||
}
|
||||
} catch (error) {}
|
||||
}
|
||||
|
||||
const handleContNumChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setEditRegData({ ...editRegData, ContNum: e.target.value })
|
||||
}
|
||||
|
@ -44,12 +74,24 @@ export default function EditRegModal({
|
|||
setEditRegData({ ...editRegData, Email: e.target.value })
|
||||
}
|
||||
const handleCountChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setEditRegData({ ...editRegData, Count: e.target.value })
|
||||
setEditRegData({ ...editRegData, Count: parseInt(e.target.value) })
|
||||
}
|
||||
const handleEndDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setEditRegData({ ...editRegData, EndDate: e.target.value })
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
function formatDate(isoDateString: string): string {
|
||||
const date = new Date(isoDateString)
|
||||
const year = date.getFullYear()
|
||||
const month = ('0' + (date.getMonth() + 1)).slice(-2)
|
||||
const day = ('0' + date.getDate()).slice(-2)
|
||||
return `${year}-${month}-${day}`
|
||||
}
|
||||
const formattedDate = formatDate(registration.EndDate)
|
||||
setEditRegData({ ...registration, EndDate: formattedDate })
|
||||
}, [modal])
|
||||
|
||||
useEffect(() => {
|
||||
function formatDate(isoDateString: string): string {
|
||||
const date = new Date(isoDateString)
|
||||
|
@ -63,6 +105,7 @@ export default function EditRegModal({
|
|||
}, [])
|
||||
|
||||
return (
|
||||
<>
|
||||
<Modal modal={modal} setModal={setModal}>
|
||||
<ModalContainer>
|
||||
<MainInput
|
||||
|
@ -99,11 +142,20 @@ export default function EditRegModal({
|
|||
>
|
||||
Отмена
|
||||
</MainButton>
|
||||
<MainButton fullWidth={true} onClick={() => editReg(editRegData)}>
|
||||
<MainButton fullWidth={true} onClick={editReg}>
|
||||
Сохранить
|
||||
</MainButton>
|
||||
</div>
|
||||
</ModalContainer>
|
||||
</Modal>
|
||||
<ErrorContainer>
|
||||
<Modal setModal={setErrorMessage} modal={errorMessage}>
|
||||
<div className="content">
|
||||
<h3>Номер контракта/поставки уже существует</h3>
|
||||
<MainButton onClick={() => setErrorMessage(false)}>Ok</MainButton>
|
||||
</div>
|
||||
</Modal>
|
||||
</ErrorContainer>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import { useState } from 'react'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import ContextMenu from 'src/components/UI/contextMenu/ContextMenu'
|
||||
import Checkbox from 'src/components/UI/input/Checkbox'
|
||||
import Table from 'src/components/UI/table/Table'
|
||||
|
@ -71,7 +72,9 @@ export default function RegTable({
|
|||
}: Props) {
|
||||
const [contextMenuState, setContextMenuState] = useState(false)
|
||||
|
||||
const [activeSort, setActiveSort] = useState('')
|
||||
const navigate = useNavigate()
|
||||
|
||||
const [activeSort, setActiveSort] = useState('email')
|
||||
const [sortState, setSortState] = useState(false)
|
||||
|
||||
const sort = (value: string) => {
|
||||
|
@ -82,17 +85,52 @@ export default function RegTable({
|
|||
'Кол-во активаций': 'count',
|
||||
'Дата окончания': 'end',
|
||||
'Дата изменения': 'updated',
|
||||
'Статус': 'enabled'
|
||||
};
|
||||
Состояние: 'enabled'
|
||||
}
|
||||
|
||||
const sortParam = sortOptions[value];
|
||||
if (!sortParam) return;
|
||||
const sortParam = sortOptions[value]
|
||||
if (!sortParam) return
|
||||
|
||||
setActiveSort(value);
|
||||
const newOrder = queryParams.order === sortParam ? `!${sortParam}` : sortParam;
|
||||
setQueryParams({ ...queryParams, order: newOrder });
|
||||
setSortState(queryParams.order === sortParam);
|
||||
};
|
||||
setActiveSort(value)
|
||||
const newOrder =
|
||||
queryParams.order === sortParam ? `!${sortParam}` : sortParam
|
||||
setQueryParams({ ...queryParams, order: newOrder })
|
||||
setSortState(queryParams.order === sortParam)
|
||||
|
||||
const searchParams = new URLSearchParams(window.location.search)
|
||||
if (searchParams.has('order')) {
|
||||
searchParams.delete('order')
|
||||
}
|
||||
if (newOrder.trim() !== '') {
|
||||
searchParams.append('order', newOrder.trim())
|
||||
}
|
||||
navigate(`?${searchParams.toString()}`)
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
const searchParams = new URLSearchParams(location.search)
|
||||
const orderParam = searchParams.get('order')
|
||||
|
||||
// Проверяем наличие параметра order в URL
|
||||
if (orderParam) {
|
||||
const sortOptions: { [key: string]: string } = {
|
||||
reg: 'Номер поставки',
|
||||
cont: 'Номер контракта',
|
||||
email: 'Эл. почта',
|
||||
count: 'Кол-во активаций',
|
||||
end: 'Дата окончания',
|
||||
updated: 'Дата изменения',
|
||||
enabled: 'Состояние',
|
||||
}
|
||||
|
||||
const activeSortValue = sortOptions[orderParam.replace('!', '')]
|
||||
const sortStateValue = orderParam[0] === '!'
|
||||
|
||||
setActiveSort(activeSortValue || '')
|
||||
setSortState(sortStateValue)
|
||||
|
||||
}
|
||||
}, [])
|
||||
|
||||
return (
|
||||
<Table>
|
||||
|
|
|
@ -74,17 +74,7 @@ export default function RrgTableItem ({
|
|||
}
|
||||
}
|
||||
|
||||
const editReg = async (reg: T_NewRegistration) => {
|
||||
setContextMenuState(false)
|
||||
const response = await RegistrationsService.editRegistration(
|
||||
registration.Id,
|
||||
reg
|
||||
)
|
||||
if (response.status === 200) {
|
||||
getReg()
|
||||
}
|
||||
setEditModalState(false)
|
||||
}
|
||||
|
||||
|
||||
return (
|
||||
<>
|
||||
|
@ -116,7 +106,7 @@ export default function RrgTableItem ({
|
|||
}}
|
||||
/>
|
||||
</td>
|
||||
{Object.entries(activeColumns).map(([key, item]) =>
|
||||
{Object.entries(activeColumns).map(([key, _]) =>
|
||||
activeColumns[key as keyof typeof activeColumns].status ? (
|
||||
<td key={key}>
|
||||
<p>
|
||||
|
@ -203,7 +193,7 @@ export default function RrgTableItem ({
|
|||
modal={editModalState}
|
||||
setModal={setEditModalState}
|
||||
registration={registration}
|
||||
editReg={editReg}
|
||||
getReg={getReg}
|
||||
/>
|
||||
</tr>
|
||||
</>
|
||||
|
|
|
@ -16,6 +16,7 @@ import {
|
|||
SearchNotification
|
||||
} from './styles'
|
||||
import { T_ColumnsState, T_RepositoryItem } from './types'
|
||||
import { useLocation, useNavigate } from 'react-router-dom'
|
||||
|
||||
|
||||
type Props = {}
|
||||
|
@ -29,9 +30,9 @@ export default function Repository({}: Props) {
|
|||
|
||||
const [Repository, setRepository] = useState<T_RepositoryItem[]>([])
|
||||
|
||||
const handleSearchQueryChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setQueryParams({ ...queryParams, search: e.target.value })
|
||||
}
|
||||
const location = useLocation()
|
||||
const searchParams = new URLSearchParams(location.search)
|
||||
const navigate = useNavigate()
|
||||
|
||||
const [queryParams, setQueryParams] = useState<I_QueryParams>({
|
||||
page: 1,
|
||||
|
@ -40,6 +41,23 @@ export default function Repository({}: Props) {
|
|||
order: undefined
|
||||
})
|
||||
|
||||
const handleSearchQueryChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const newSearchQuery = e.target.value
|
||||
setQueryParams({ ...queryParams, search: e.target.value, page: 1 })
|
||||
const searchParams = new URLSearchParams(window.location.search)
|
||||
if (searchParams.has('page')) {
|
||||
searchParams.delete('page')
|
||||
}
|
||||
searchParams.append('page', '1')
|
||||
if (searchParams.has('search')) {
|
||||
searchParams.delete('search')
|
||||
}
|
||||
if (newSearchQuery.trim() !== '') {
|
||||
searchParams.append('search', newSearchQuery.trim())
|
||||
}
|
||||
navigate(`?${searchParams.toString()}`)
|
||||
}
|
||||
|
||||
const getRep = async () => {
|
||||
if (!firstLoadingState) setLoadingState(true)
|
||||
setErrorState(false)
|
||||
|
@ -59,7 +77,19 @@ export default function Repository({}: Props) {
|
|||
setLoadingState(false)
|
||||
setFirstLoadingState(false)
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
const pageParam = searchParams.get('page')
|
||||
const countParam = searchParams.get('count')
|
||||
const searchParam = searchParams.get('search')
|
||||
const orderParam = searchParams.get('order')
|
||||
setQueryParams((prevState) => ({
|
||||
...prevState,
|
||||
page: pageParam ? parseInt(pageParam, 10) : prevState.page,
|
||||
count: countParam ? parseInt(countParam, 10) : prevState.count,
|
||||
search: searchParam || prevState.search,
|
||||
order: orderParam || prevState.order
|
||||
}))
|
||||
getRep()
|
||||
}, [])
|
||||
|
||||
|
@ -73,8 +103,8 @@ export default function Repository({}: Props) {
|
|||
Description: { name: 'Полное описание', status: true },
|
||||
ShortDescription: { name: 'Краткое описание', status: true },
|
||||
Category: { name: 'Категория', status: true },
|
||||
UpdatedDate: { name: 'Дата изменения', status: true },
|
||||
Enabled: { name: 'Статус', status: true }
|
||||
UpdatedDate: { name: 'Дата обновления', status: true },
|
||||
Enabled: { name: 'Состояние', status: true }
|
||||
})
|
||||
|
||||
const [checkedColumns, setCheckedColumns] = useState<number[]>([])
|
||||
|
@ -122,7 +152,7 @@ export default function Repository({}: Props) {
|
|||
|
||||
return (
|
||||
<>
|
||||
{loadingState ? (
|
||||
{firstLoadingState ? (
|
||||
<RepLoaderContainer>
|
||||
<Loader />
|
||||
</RepLoaderContainer>
|
||||
|
@ -190,6 +220,7 @@ export default function Repository({}: Props) {
|
|||
getRep={getRep}
|
||||
queryParams={queryParams}
|
||||
setQueryParams={setQueryParams}
|
||||
loadingState={loadingState}
|
||||
/>
|
||||
<div className='bottom-menu'>
|
||||
<Pagination
|
||||
|
@ -206,7 +237,6 @@ export default function Repository({}: Props) {
|
|||
</>
|
||||
</>
|
||||
)}
|
||||
|
||||
</RepContainer>
|
||||
)}
|
||||
<NewRepModal modal={modal} setModal={setModal} getRep={getRep} />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { useEffect, useRef, useState } from 'react'
|
||||
import MainButton from 'src/components/UI/button/MainButton'
|
||||
import MainInput from 'src/components/UI/input/MainInput'
|
||||
import Modal from 'src/components/UI/modal/Modal'
|
||||
import Textarea from 'src/components/UI/input/Textarea'
|
||||
import Modal from 'src/components/UI/modal/Modal'
|
||||
import RepositoryService from 'src/services/repositoryServices'
|
||||
import styled from 'styled-components'
|
||||
import { T_NewRepository, T_RepositoryItem } from '../types'
|
||||
|
@ -52,7 +52,12 @@ const NewRepFileBlock = styled.div`
|
|||
font-weight: 600;
|
||||
}
|
||||
`
|
||||
export default function EditRepModal({ modal, setModal, repository, getRep }: Props){
|
||||
export default function EditRepModal({
|
||||
modal,
|
||||
setModal,
|
||||
repository,
|
||||
getRep
|
||||
}: Props) {
|
||||
const [error, setError] = useState({
|
||||
state: false,
|
||||
message: ''
|
||||
|
@ -75,10 +80,14 @@ export default function EditRepModal({ modal, setModal, repository, getRep }: Pr
|
|||
const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setEditRepData({ ...editRepData, Name: e.target.value })
|
||||
}
|
||||
const handleDescriptionChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
|
||||
const handleDescriptionChange = (
|
||||
e: React.ChangeEvent<HTMLTextAreaElement>
|
||||
) => {
|
||||
setEditRepData({ ...editRepData, Description: e.target.value })
|
||||
}
|
||||
const handleShortDescriptionChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const handleShortDescriptionChange = (
|
||||
e: React.ChangeEvent<HTMLInputElement>
|
||||
) => {
|
||||
setEditRepData({ ...editRepData, ShortDescription: e.target.value })
|
||||
}
|
||||
const handleVersionChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
|
@ -99,8 +108,19 @@ export default function EditRepModal({ modal, setModal, repository, getRep }: Pr
|
|||
editRepData.Category !== ''
|
||||
)
|
||||
}, [editRepData])
|
||||
const fileInputRef = useRef<HTMLInputElement>(null);
|
||||
const [selectedFile, setSelectedFile] = useState<File | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
setEditRepData({
|
||||
Name: repository.Name,
|
||||
Description: repository.Description,
|
||||
ShortDescription: repository.ShortDescription,
|
||||
Version: repository.Version,
|
||||
Category: repository.Category
|
||||
})
|
||||
}, [modal])
|
||||
|
||||
const fileInputRef = useRef<HTMLInputElement>(null)
|
||||
const [selectedFile, setSelectedFile] = useState<File | null>(null)
|
||||
|
||||
const handleFileChange = () => {
|
||||
const file = fileInputRef.current?.files?.[0]
|
||||
|
@ -124,7 +144,10 @@ export default function EditRepModal({ modal, setModal, repository, getRep }: Pr
|
|||
editRepData.Version === repository.Version
|
||||
)
|
||||
) {
|
||||
const response = await RepositoryService.editRepository(repository.Id, editRepData)
|
||||
const response = await RepositoryService.editRepository(
|
||||
repository.Id,
|
||||
editRepData
|
||||
)
|
||||
if (response.status === 406) {
|
||||
setError({ state: true, message: response.data })
|
||||
setLoading(false)
|
||||
|
@ -133,7 +156,10 @@ export default function EditRepModal({ modal, setModal, repository, getRep }: Pr
|
|||
}
|
||||
|
||||
if (repository.Url !== selectedFile && selectedFile instanceof File) {
|
||||
const response = await RepositoryService.addFile(selectedFile, repository.Id)
|
||||
const response = await RepositoryService.addFile(
|
||||
selectedFile,
|
||||
repository.Id
|
||||
)
|
||||
if (response.status === 406) {
|
||||
setError({ state: true, message: response.data })
|
||||
setLoading(false)
|
||||
|
@ -150,7 +176,6 @@ export default function EditRepModal({ modal, setModal, repository, getRep }: Pr
|
|||
<>
|
||||
<Modal modal={modal} setModal={setModal}>
|
||||
<ModalContainer>
|
||||
|
||||
<h2>Изменение пакета в репозитории</h2>
|
||||
<MainInput
|
||||
placeholder='Название'
|
||||
|
@ -164,7 +189,7 @@ export default function EditRepModal({ modal, setModal, repository, getRep }: Pr
|
|||
/>
|
||||
<MainInput
|
||||
placeholder='Краткое описание'
|
||||
value={editRepData.Description}
|
||||
value={editRepData.ShortDescription}
|
||||
onChange={handleShortDescriptionChange}
|
||||
/>
|
||||
<Textarea
|
||||
|
@ -220,7 +245,6 @@ export default function EditRepModal({ modal, setModal, repository, getRep }: Pr
|
|||
</NewRepErrorMessage>
|
||||
</Modal>
|
||||
</NewRepErrorMessageContainer>
|
||||
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { useEffect, useRef, useState } from 'react'
|
||||
import MainButton from 'src/components/UI/button/MainButton'
|
||||
import MainInput from 'src/components/UI/input/MainInput'
|
||||
import Modal from 'src/components/UI/modal/Modal'
|
||||
import Textarea from 'src/components/UI/input/Textarea'
|
||||
import Modal from 'src/components/UI/modal/Modal'
|
||||
import RepositoryService from 'src/services/repositoryServices'
|
||||
import styled from 'styled-components'
|
||||
import { T_NewRepository } from '../types'
|
||||
|
@ -88,14 +88,17 @@ export default function NewRepModal({ modal, setModal, getRep }: Props) {
|
|||
|
||||
const [errorState, setErrorState] = useState(false)
|
||||
|
||||
|
||||
const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setNewRep({ ...newRep, Name: e.target.value })
|
||||
}
|
||||
const handleDescriptionChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
|
||||
const handleDescriptionChange = (
|
||||
e: React.ChangeEvent<HTMLTextAreaElement>
|
||||
) => {
|
||||
setNewRep({ ...newRep, Description: e.target.value })
|
||||
}
|
||||
const handleShortDescriptionChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const handleShortDescriptionChange = (
|
||||
e: React.ChangeEvent<HTMLInputElement>
|
||||
) => {
|
||||
setNewRep({ ...newRep, ShortDescription: e.target.value })
|
||||
}
|
||||
const handleVersionChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
|
@ -121,7 +124,6 @@ export default function NewRepModal({ modal, setModal, getRep }: Props) {
|
|||
try {
|
||||
const response = await RepositoryService.createRep(newRep)
|
||||
if (response.status === 200) {
|
||||
|
||||
selectedFile !== null &&
|
||||
(await RepositoryService.addFile(selectedFile, response.data.Id))
|
||||
} else if (response.status === 406) {
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import { useState } from 'react'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import ContextMenu from 'src/components/UI/contextMenu/ContextMenu'
|
||||
import Checkbox from 'src/components/UI/input/Checkbox'
|
||||
import Table from 'src/components/UI/table/Table'
|
||||
|
@ -53,6 +54,7 @@ type Props = {
|
|||
getRep: () => void
|
||||
queryParams: I_QueryParams
|
||||
setQueryParams: (param: I_QueryParams) => void
|
||||
loadingState?: boolean
|
||||
}
|
||||
|
||||
export default function RepTable({
|
||||
|
@ -67,33 +69,68 @@ export default function RepTable({
|
|||
repository,
|
||||
getRep,
|
||||
queryParams,
|
||||
setQueryParams
|
||||
setQueryParams,
|
||||
loadingState
|
||||
}: Props) {
|
||||
const [contextMenuState, setContextMenuState] = useState(false)
|
||||
|
||||
const [activeSort, setActiveSort] = useState('')
|
||||
const [sortState, setSortState] = useState(false)
|
||||
|
||||
const navigate = useNavigate()
|
||||
|
||||
useEffect(() => {
|
||||
const searchParams = new URLSearchParams(location.search)
|
||||
const orderParam = searchParams.get('order')
|
||||
|
||||
// Проверяем наличие параметра order в URL
|
||||
if (orderParam) {
|
||||
const sortOptions: { [key: string]: string } = {
|
||||
name: 'Название',
|
||||
updated: 'Дата обновления',
|
||||
version: 'Версия',
|
||||
short: 'Краткое описание',
|
||||
enabled: 'Состояние'
|
||||
}
|
||||
|
||||
const activeSortValue = sortOptions[orderParam.replace('!', '')]
|
||||
const sortStateValue = orderParam[0] === '!'
|
||||
|
||||
setActiveSort(activeSortValue || '')
|
||||
setSortState(sortStateValue)
|
||||
}
|
||||
}, [])
|
||||
|
||||
const sort = (value: string) => {
|
||||
const sortOptions: { [key: string]: string } = {
|
||||
'Статус': 'enabled',
|
||||
'Название': 'string',
|
||||
'Версия': 'string',
|
||||
'Описание': 'string',
|
||||
'Дата изменения': 'updated',
|
||||
};
|
||||
Название: 'name',
|
||||
'Дата обновления': 'updated',
|
||||
Версия: 'version',
|
||||
'Краткое описание': 'short',
|
||||
Состояние: 'enabled'
|
||||
}
|
||||
|
||||
const sortParam = sortOptions[value];
|
||||
if (!sortParam) return;
|
||||
const sortParam = sortOptions[value]
|
||||
if (!sortParam) return
|
||||
|
||||
setActiveSort(value);
|
||||
const newOrder = queryParams.order === sortParam ? `!${sortParam}` : sortParam;
|
||||
setQueryParams({ ...queryParams, order: newOrder });
|
||||
setSortState(queryParams.order === sortParam);
|
||||
};
|
||||
setActiveSort(value)
|
||||
const newOrder =
|
||||
queryParams.order === sortParam ? `!${sortParam}` : sortParam
|
||||
setQueryParams({ ...queryParams, order: newOrder })
|
||||
setSortState(queryParams.order === sortParam)
|
||||
|
||||
const searchParams = new URLSearchParams(window.location.search)
|
||||
if (searchParams.has('order')) {
|
||||
searchParams.delete('order')
|
||||
}
|
||||
if (newOrder.trim() !== '') {
|
||||
searchParams.append('order', newOrder.trim())
|
||||
}
|
||||
navigate(`?${searchParams.toString()}`)
|
||||
}
|
||||
|
||||
return (
|
||||
<Table>
|
||||
<Table loaderState={loadingState}>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import { useState } from 'react'
|
||||
import { HOST_NAME } from 'src/constants/host'
|
||||
import { Link } from 'react-router-dom'
|
||||
import MainButton from 'src/components/UI/button/MainButton'
|
||||
import ContextMenu from 'src/components/UI/contextMenu/ContextMenu'
|
||||
import Checkbox from 'src/components/UI/input/Checkbox'
|
||||
import Modal from 'src/components/UI/modal/Modal'
|
||||
import { HOST_NAME } from 'src/constants/host'
|
||||
import RepositoryService from 'src/services/repositoryServices'
|
||||
import styled from 'styled-components'
|
||||
import { T_ColumnsState, T_RepositoryItem } from '../types'
|
||||
|
@ -51,16 +51,13 @@ export default function ({
|
|||
|
||||
const deleteRep = async () => {
|
||||
setContextMenuState(false)
|
||||
const response = await RepositoryService.deleteRepository(
|
||||
repository.Id
|
||||
)
|
||||
const response = await RepositoryService.deleteRepository(repository.Id)
|
||||
if (response.status === 200) {
|
||||
getRep()
|
||||
}
|
||||
setDeleteNotificationState(false)
|
||||
}
|
||||
|
||||
|
||||
const onRep = async () => {
|
||||
setContextMenuState(false)
|
||||
const response = await RepositoryService.onRepository(repository.Id)
|
||||
|
@ -77,10 +74,9 @@ export default function ({
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
const repRep = async () => {
|
||||
const repackRep = async () => {
|
||||
setContextMenuState(false)
|
||||
const response = await RepositoryService.RepackReposytory(repository.Id)
|
||||
const response = await RepositoryService.RepackRepository(repository.Id)
|
||||
if (response.status === 200) {
|
||||
getRep()
|
||||
}
|
||||
|
@ -88,7 +84,9 @@ export default function ({
|
|||
|
||||
const depRep = async () => {
|
||||
setContextMenuState(false)
|
||||
const response = await RepositoryService.DependenciesReposytory(repository.Id)
|
||||
const response = await RepositoryService.DependenciesRepository(
|
||||
repository.Id
|
||||
)
|
||||
if (response.status === 200) {
|
||||
getRep()
|
||||
}
|
||||
|
@ -102,7 +100,6 @@ export default function ({
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
return (
|
||||
<>
|
||||
<tr key={repository.Id}>
|
||||
|
@ -133,7 +130,7 @@ export default function ({
|
|||
}}
|
||||
/>
|
||||
</td>
|
||||
{Object.entries(activeColumns).map(([key, item]) =>
|
||||
{Object.entries(activeColumns).map(([key, _]) =>
|
||||
activeColumns[key as keyof typeof activeColumns].status ? (
|
||||
<td key={key}>
|
||||
<p>
|
||||
|
@ -175,7 +172,7 @@ export default function ({
|
|||
<p>Включить</p>
|
||||
</Item>
|
||||
)}
|
||||
<Item onClick={repRep}>
|
||||
<Item onClick={repackRep}>
|
||||
<img src='/src/images/reload.svg' alt='' />
|
||||
<p>Перепаковать</p>
|
||||
</Item>
|
||||
|
@ -198,11 +195,16 @@ export default function ({
|
|||
</Item>
|
||||
</Link>
|
||||
)}
|
||||
<Item onClick={() => (setEditModalState(true), setContextMenuState(false))}>
|
||||
<Item
|
||||
onClick={() => (
|
||||
setEditModalState(true), setContextMenuState(false)
|
||||
)}
|
||||
>
|
||||
<img src='/src/images/edit.svg' alt='' />
|
||||
<p>Редактировать</p>
|
||||
</Item>
|
||||
<Item onClick={() => {
|
||||
<Item
|
||||
onClick={() => {
|
||||
setContextMenuState(false)
|
||||
setDeleteNotificationState(true)
|
||||
}}
|
||||
|
|
|
@ -169,7 +169,7 @@ export default function Store({}: Props) {
|
|||
<SearchInput
|
||||
value={queryParams.search}
|
||||
onChange={handleSearchQueryChange}
|
||||
placeholder='Введите номер контракта, поставки или email'
|
||||
placeholder='Введите название приложения, версию, категорию или краткое описание'
|
||||
/>
|
||||
<>
|
||||
{searchNotification ? (
|
||||
|
|
|
@ -18,18 +18,18 @@ export default class RepositoryService {
|
|||
|
||||
try {
|
||||
const response = await axios.get(url, { params })
|
||||
console.log(response.data)
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response
|
||||
}
|
||||
}
|
||||
|
||||
static async createRep(
|
||||
newRep: T_NewRepository
|
||||
): Promise<AxiosResponse> {
|
||||
static async createRep(newRep: T_NewRepository): Promise<AxiosResponse> {
|
||||
try {
|
||||
const response = await axios.post(`${API_HOST_NAME}/repository/packages`, newRep)
|
||||
const response = await axios.post(
|
||||
`${API_HOST_NAME}/repository/packages`,
|
||||
newRep
|
||||
)
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response
|
||||
|
@ -51,7 +51,9 @@ export default class RepositoryService {
|
|||
|
||||
static async onRepository(id: number): Promise<AxiosResponse> {
|
||||
try {
|
||||
const response = await axios.post(`${API_HOST_NAME}/repository/packages/${id}/enable`)
|
||||
const response = await axios.post(
|
||||
`${API_HOST_NAME}/repository/packages/${id}/enable`
|
||||
)
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response
|
||||
|
@ -60,23 +62,29 @@ export default class RepositoryService {
|
|||
|
||||
static async offRepository(id: number): Promise<AxiosResponse> {
|
||||
try {
|
||||
const response = await axios.post(`${API_HOST_NAME}/repository/packages/${id}/disable`)
|
||||
const response = await axios.post(
|
||||
`${API_HOST_NAME}/repository/packages/${id}/disable`
|
||||
)
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response
|
||||
}
|
||||
}
|
||||
static async RepackReposytory(id: number): Promise<AxiosResponse> {
|
||||
static async RepackRepository(id: number): Promise<AxiosResponse> {
|
||||
try {
|
||||
const response = await axios.post(`${API_HOST_NAME}/repository/packages/${id}/repack`)
|
||||
const response = await axios.post(
|
||||
`${API_HOST_NAME}/repository/packages/${id}/repack`
|
||||
)
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response
|
||||
}
|
||||
}
|
||||
static async DependenciesReposytory(id: number): Promise<AxiosResponse> {
|
||||
static async DependenciesRepository(id: number): Promise<AxiosResponse> {
|
||||
try {
|
||||
const response = await axios.post(`${API_HOST_NAME}/repository/packages/${id}/dependencies`)
|
||||
const response = await axios.post(
|
||||
`${API_HOST_NAME}/repository/packages/${id}/dependencies`
|
||||
)
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response
|
||||
|
@ -87,18 +95,20 @@ export default class RepositoryService {
|
|||
const response = await axios.get(
|
||||
`${API_HOST_NAME}/repository/packages/${id}/package/download`,
|
||||
{
|
||||
responseType: 'arraybuffer',
|
||||
responseType: 'arraybuffer'
|
||||
}
|
||||
)
|
||||
return response;
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response;
|
||||
return error.response
|
||||
}
|
||||
}
|
||||
|
||||
static async deleteRepository(id: number): Promise<AxiosResponse> {
|
||||
try {
|
||||
const response = await axios.delete(`${API_HOST_NAME}/repository/packages/${id}`)
|
||||
const response = await axios.delete(
|
||||
`${API_HOST_NAME}/repository/packages/${id}`
|
||||
)
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response
|
||||
|
@ -110,7 +120,10 @@ export default class RepositoryService {
|
|||
rep: T_NewRepository
|
||||
): Promise<AxiosResponse> {
|
||||
try {
|
||||
const response = await axios.post(`${API_HOST_NAME}/repository/packages/${id}`, rep)
|
||||
const response = await axios.post(
|
||||
`${API_HOST_NAME}/repository/packages/${id}`,
|
||||
rep
|
||||
)
|
||||
return response
|
||||
} catch (error: any) {
|
||||
return error.response
|
||||
|
|
Loading…
Reference in New Issue