Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,17 @@ export const AssignPoolModal: FC<AssignPoolModalProps> = ({
<FormSectionHeader>Choose pool group</FormSectionHeader>
</SectionHeader>
<FormikSelect name="pool" options={poolOptions} />
<PoolMeta>
<div>Units: {selectedPool?.units ?? 0}</div>
<div>Miners: {selectedPool?.miners ?? 0}</div>
{selectedPool && (
<div>
Last Updated: {intlFormatDistance(selectedPool?.updatedAt, new Date())}
</div>
)}
</PoolMeta>
{!_isNil(formik.values.pool) && (
<PoolMeta>
<div>Units: {selectedPool?.units ?? 0}</div>
<div>Miners: {selectedPool?.miners ?? 0}</div>
{selectedPool && (
<div>
Last Updated: {intlFormatDistance(selectedPool?.updatedAt, new Date())}
</div>
)}
</PoolMeta>
)}
</Section>
{!_isNil(selectedPool) && (
<Section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ export const EndpointsSection = styled.div<StyledProps>`
gap: 16px;
`

export const EndpointsSectionError = styled.div<StyledProps>`
color: ${COLOR.RED};
`

export const EndpointsSectionHeader = styled.div<StyledProps>`
${flexRow};
justify-content: space-between;
Expand Down
10 changes: 9 additions & 1 deletion src/Components/PoolManager/Pools/AddPoolModal/AddPoolModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { CheckSquareFilled, CloseCircleOutlined, DeleteOutlined } from '@ant-des
import Button from 'antd/es/button'
import { FormikProvider, useFormik } from 'formik'
import _get from 'lodash/get'
import _isNil from 'lodash/isNil'
import _map from 'lodash/map'
import _pullAt from 'lodash/pullAt'
import _size from 'lodash/size'
Expand Down Expand Up @@ -33,6 +34,7 @@ import {
EndpointHeader,
EndpointPointRole,
EndpointsSection,
EndpointsSectionError,
EndpointsSectionHeader,
EndpointsWrapper,
EndpointWrapper,
Expand All @@ -59,7 +61,7 @@ const validationSchema = yup.object({
description: yup.string(),
workerName: yup.string().required('Port is required'),
workerPassword: yup.string().required('Region is required'),
endpoints: yup.array().required().min(1),
endpoints: yup.array().required().min(1, 'At least one endpoint is needed'),
})

interface FormValues {
Expand Down Expand Up @@ -149,6 +151,9 @@ export const AddPoolModal = ({ isOpen, onClose }: AddPoolModalProps) => {
const poolValidationColor = isPoolValidated ? COLOR.GREEN : COLOR.RED

const disableAddEndpointButton = _size(formik.values.endpoints) >= MAX_POOL_ENDPOINTS
const endpointsError = formik.errors.endpoints
const showEndpointsError =
!_isNil(endpointsError) && formik.touched.endpoints && typeof endpointsError === 'string'

return (
<StyledModal
Expand Down Expand Up @@ -181,6 +186,9 @@ export const AddPoolModal = ({ isOpen, onClose }: AddPoolModalProps) => {
Add Endpoint
</Button>
</EndpointsSectionHeader>
{showEndpointsError && (
<EndpointsSectionError>{endpointsError}</EndpointsSectionError>
)}
<EndpointsWrapper>
{formik.values.endpoints.map((endpoint, index) => (
<EndpointWrapper key={index}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,12 @@ export const SetPoolConfiguration = ({
</Option>
))}
</Select>
<InfoRow>
<Text type="secondary">#Units: {currentPool?.units ?? 0}</Text>
<Text type="secondary">#Miners: {currentPool?.miners ?? 0}</Text>
</InfoRow>
{!_isNil(selectedPoolId) && (
<InfoRow>
<Text type="secondary">#Units: {currentPool?.units ?? 0}</Text>
<Text type="secondary">#Miners: {currentPool?.miners ?? 0}</Text>
</InfoRow>
)}
</Section>

{!_isNil(currentPool) && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const SitesOverviewRow = styled.div<StyledProps>`
width: 100%;
align-items: flex-start;
margin-top: 40px;
gap: 16px;
`

export const SitesUnitCol = styled.div<StyledProps>`
Expand Down
Loading