From 425071bc23f6881d5bf7f306aaf95b552dd85a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Gangloff?= Date: Fri, 20 Dec 2024 19:41:48 +0100 Subject: [PATCH] feat: improve ui --- assets/components/search/DomainResult.tsx | 73 +++++++++++-------- assets/components/search/EntitiesList.tsx | 15 ++-- assets/utils/functions/entityToName.tsx | 2 + .../functions/extractDetailsFromJCard.tsx | 14 ++++ src/Repository/EntityRepository.php | 12 +++ src/Service/RDAPService.php | 63 +++++++++++----- 6 files changed, 124 insertions(+), 55 deletions(-) create mode 100644 assets/utils/functions/extractDetailsFromJCard.tsx diff --git a/assets/components/search/DomainResult.tsx b/assets/components/search/DomainResult.tsx index 5464f7d..9161c4d 100644 --- a/assets/components/search/DomainResult.tsx +++ b/assets/components/search/DomainResult.tsx @@ -1,4 +1,4 @@ -import {Badge, Card, Divider, Flex, Space, Tag, Tooltip, Typography} from "antd"; +import {Badge, Card, Col, Divider, Flex, Row, Space, Tag, Tooltip, Typography} from "antd"; import {t} from "ttag"; import {EventTimeline} from "./EventTimeline"; import {EntitiesList} from "./EntitiesList"; @@ -11,12 +11,14 @@ import {regionNames} from "../../i18n"; import {getCountryCode} from "../../utils/functions/getCountryCode"; import {eppStatusCodeToColor} from "../../utils/functions/eppStatusCodeToColor"; import {DomainLifecycleSteps} from "./DomainLifecycleSteps"; +import useBreakpoint from "../../hooks/useBreakpoint"; export function DomainResult({domain}: { domain: Domain }) { const rdapStatusCodeDetailTranslated = rdapStatusCodeDetailTranslation() const {tld, events} = domain const domainEvents = events.sort((e1, e2) => new Date(e2.date).getTime() - new Date(e1.date).getTime()) + const xxl = useBreakpoint('xxl') return @@ -40,37 +42,46 @@ export function DomainResult({domain}: { domain: Domain }) { { domain.events.length > 0 && } - {domain.status.length > 0 && - <> - {t`EPP Status Codes`} - - { - domain.status.map(s => - - {s} - - ) - } - - - } - { - domain.events.length > 0 && <> - {t`Timeline`} - - - } - { - domain.entities.length > 0 && - <> - {t`Entities`} - - - } + + + {domain.status.length > 0 && + <> + {t`EPP Status Codes`} + + { + domain.status.map(s => + + {s} + + ) + } + + + } + { + domain.events.length > 0 && <> + {t`Timeline`} + + + } + { + domain.entities.length > 0 && + <> + {t`Entities`} + + + } + + {!xxl && + + + + } + - + {xxl && } } \ No newline at end of file diff --git a/assets/components/search/EntitiesList.tsx b/assets/components/search/EntitiesList.tsx index 90482bc..9bca8ab 100644 --- a/assets/components/search/EntitiesList.tsx +++ b/assets/components/search/EntitiesList.tsx @@ -4,9 +4,8 @@ import {Domain} from "../../utils/api"; import {rdapRoleDetailTranslation, rdapRoleTranslation} from "../../utils/functions/rdapTranslation"; import {roleToAvatar} from "../../utils/functions/roleToAvatar"; import {rolesToColor} from "../../utils/functions/rolesToColor"; -import {entityToName} from "../../utils/functions/entityToName"; import {sortDomainEntities} from "../../utils/functions/sortDomainEntities"; - +import {extractDetailsFromJCard} from "../../utils/functions/extractDetailsFromJCard"; export function EntitiesList({domain}: { domain: Domain }) { const rdapRoleTranslated = rdapRoleTranslation() @@ -23,15 +22,21 @@ export function EntitiesList({domain}: { domain: Domain }) { className="demo-loadmore-list" itemLayout="horizontal" dataSource={sortDomainEntities(domain)} - renderItem={(e) => - + renderItem={(e) => { + const details = extractDetailsFromJCard(e) + + return + {details.fn &&
👤 {details.fn}
} + {details.organization &&
🏢 {details.organization}
} + } /> {e.roles.map(roleToTag)} } + } /> } \ No newline at end of file diff --git a/assets/utils/functions/entityToName.tsx b/assets/utils/functions/entityToName.tsx index 1df483f..9d760bf 100644 --- a/assets/utils/functions/entityToName.tsx +++ b/assets/utils/functions/entityToName.tsx @@ -7,5 +7,7 @@ export const entityToName = (e: { entity: Entity }): string => { const jCard = vCard.fromJSON(e.entity.jCard) let name = e.entity.handle if (jCard.data.fn && !Array.isArray(jCard.data.fn) && jCard.data.fn.valueOf() !== '') name = jCard.data.fn.valueOf() + if (jCard.data.org && !Array.isArray(jCard.data.org) && jCard.data.org.valueOf() !== '') name = jCard.data.org.valueOf() + return name } \ No newline at end of file diff --git a/assets/utils/functions/extractDetailsFromJCard.tsx b/assets/utils/functions/extractDetailsFromJCard.tsx new file mode 100644 index 0000000..82cd061 --- /dev/null +++ b/assets/utils/functions/extractDetailsFromJCard.tsx @@ -0,0 +1,14 @@ +import vCard from "vcf"; +import {Entity} from "../api"; + +export const extractDetailsFromJCard = (e: { entity: Entity }): { + fn?: string + organization?: string; +} => { + if (e.entity.jCard.length === 0) return {fn: e.entity.handle} + const jCard = vCard.fromJSON(e.entity.jCard) + const fn = jCard.data.fn && !Array.isArray(jCard.data.fn) ? jCard.data.fn.valueOf() : undefined + const organization = jCard.data.org && !Array.isArray(jCard.data.org) ? jCard.data.org.valueOf() : undefined + + return {fn, organization} +} \ No newline at end of file diff --git a/src/Repository/EntityRepository.php b/src/Repository/EntityRepository.php index c4db888..5458b84 100644 --- a/src/Repository/EntityRepository.php +++ b/src/Repository/EntityRepository.php @@ -4,6 +4,7 @@ namespace App\Repository; use App\Entity\Entity; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\DBAL\Exception; use Doctrine\Persistence\ManagerRegistry; /** @@ -16,6 +17,17 @@ class EntityRepository extends ServiceEntityRepository parent::__construct($registry, Entity::class); } + /** + * @throws Exception + */ + public function findByjCard(array $vCardArray): array + { + return $this->getEntityManager()->getConnection() + ->prepare('SELECT * FROM entity WHERE j_Card @> :data') + ->executeQuery(['data' => json_encode($vCardArray)]) + ->fetchAllAssociative(); + } + // /** // * @return Entity[] Returns an array of Entity objects // */ diff --git a/src/Service/RDAPService.php b/src/Service/RDAPService.php index 7571ed0..adc366f 100644 --- a/src/Service/RDAPService.php +++ b/src/Service/RDAPService.php @@ -252,11 +252,11 @@ readonly class RDAPService if (array_key_exists('entities', $res) && is_array($res['entities'])) { foreach ($res['entities'] as $rdapEntity) { + if ((!array_key_exists('handle', $rdapEntity) || '' === $rdapEntity['handle']) && !array_key_exists('vcardArray', $rdapEntity)) { + continue; + } $entity = $this->registerEntity($rdapEntity); - $this->em->persist($entity); - $this->em->flush(); - $domainEntity = $this->domainEntityRepository->findOneBy([ 'domain' => $domain, 'entity' => $entity, @@ -323,14 +323,11 @@ readonly class RDAPService } foreach ($rdapNameserver['entities'] as $rdapEntity) { - if (!array_key_exists('handle', $rdapEntity) || '' === $rdapEntity['handle']) { + if ((!array_key_exists('handle', $rdapEntity) || '' === $rdapEntity['handle']) && !array_key_exists('vcardArray', $rdapEntity)) { continue; } $entity = $this->registerEntity($rdapEntity); - $this->em->persist($entity); - $this->em->flush(); - $nameserverEntity = $this->nameserverEntityRepository->findOneBy([ 'nameserver' => $nameserver, 'entity' => $entity, @@ -391,20 +388,31 @@ readonly class RDAPService */ private function registerEntity(array $rdapEntity): Entity { - $conn = $this->em->getConnection(); - $sql = 'SELECT * FROM entity WHERE j_Card @> :data'; - $stmt = $conn->prepare($sql)->executeQuery(['data' => json_encode($rdapEntity['vcardArray'])]); + if (array_key_exists('vcardArray', $rdapEntity)) { + $result = $this->entityRepository->findByjCard($rdapEntity['vcardArray']); - $result = $stmt->fetchAllAssociative(); + if (!array_key_exists('handle', $rdapEntity) || '' === $rdapEntity['handle']) { + if (count($result) > 0) { + $rdapEntity['handle'] = $result[0]['handle']; + } else { + $rdapEntity['handle'] = 'DW-NOHANDLE-'.hash('md5', json_encode($rdapEntity['vcardArray'])); + } + } else { + if (count($result) > 0) { + $entity = $this->entityRepository->findOneBy(['handle' => $result[0]['handle']]); - $rdapEntity['handle'] = array_key_exists('handle', $rdapEntity) && '' !== $rdapEntity['handle'] - ? $rdapEntity['handle'] - : ( - count($result) > 0 - ? $result[0]['handle'] - : 'DW-NOHANDLE-'.hash('md5', json_encode($rdapEntity) - ) - ); + if (null !== $entity) { + $domainEntities = $this->domainEntityRepository->findBy([ + 'entity' => $entity, + ]); + + $nameserverEntities = $this->nameserverEntityRepository->findBy([ + 'entity' => $entity, + ]); + } + } + } + } $entity = $this->entityRepository->findOneBy([ 'handle' => $rdapEntity['handle'], @@ -468,6 +476,23 @@ readonly class RDAPService ->setDeleted(false)); } + $this->em->persist($entity); + $this->em->flush(); + + if (isset($domainEntities)) { + /** @var DomainEntity[] $domainEntities */ + foreach ($domainEntities as $domainEntity) { + $domainEntity->setEntity($entity); + } + } + + if (isset($nameserverEntities)) { + /** @var NameserverEntity[] $nameserverEntities */ + foreach ($nameserverEntities as $nameserverEntity) { + $nameserverEntity->setEntity($entity); + } + } + return $entity; }