diff --git a/assets/utils/functions/DomainToTag.tsx b/assets/utils/functions/DomainToTag.tsx index d77114e..b171ca8 100644 --- a/assets/utils/functions/DomainToTag.tsx +++ b/assets/utils/functions/DomainToTag.tsx @@ -1,29 +1,38 @@ -import {Tag} from 'antd' +import {Badge, Tag} from 'antd' import {DeleteOutlined, ExclamationCircleOutlined} from '@ant-design/icons' import punycode from 'punycode/punycode' import {Link} from 'react-router-dom' import React from 'react' +import type {Event} from "../api" +import {t} from "ttag" + +export function DomainToTag({domain}: { domain: { ldhName: string, deleted: boolean, status: string[], events: Event[] } }) { + const lastChangedEvent = domain.events.find(e => e.action === 'last changed' && !e.deleted) -export function DomainToTag({domain}: { domain: { ldhName: string, deleted: boolean, status: string[] } }) { return ( - - : domain.status.includes('redemption period') - ? - : domain.status.includes('pending delete') ? : null - } - >{punycode.toUnicode(domain.ldhName)} - + + + : domain.status.includes('redemption period') + ? + : domain.status.includes('pending delete') ? : null + } + >{punycode.toUnicode(domain.ldhName)} + + ) } diff --git a/src/Entity/Domain.php b/src/Entity/Domain.php index f3024a1..7c528fb 100644 --- a/src/Entity/Domain.php +++ b/src/Entity/Domain.php @@ -58,7 +58,7 @@ class Domain * @var Collection */ #[ORM\OneToMany(targetEntity: DomainEvent::class, mappedBy: 'domain', cascade: ['persist'], orphanRemoval: true)] - #[Groups(['domain:item', 'domain:list'])] + #[Groups(['domain:item', 'domain:list', 'watchlist:list'])] private Collection $events; /** diff --git a/src/Entity/WatchList.php b/src/Entity/WatchList.php index dbd53e0..d7acfd0 100644 --- a/src/Entity/WatchList.php +++ b/src/Entity/WatchList.php @@ -23,7 +23,11 @@ use Symfony\Component\Uid\Uuid; operations: [ new GetCollection( routeName: 'watchlist_get_all_mine', - normalizationContext: ['groups' => 'watchlist:list'], + normalizationContext: ['groups' => [ + 'watchlist:list', + 'domain:list', + 'event:list', + ]], name: 'get_all_mine', ), new GetCollection( @@ -33,6 +37,8 @@ use Symfony\Component\Uid\Uuid; 'domain:list', 'tld:list', 'event:list', + 'domain:list', + 'event:list', ]], name: 'get_tracked_domains' ), diff --git a/translations/translations.pot b/translations/translations.pot index 3de6525..858f20f 100644 --- a/translations/translations.pot +++ b/translations/translations.pot @@ -661,6 +661,10 @@ msgstr "" msgid "Roles" msgstr "" +#: assets/utils/functions/DomainToTag.tsx:16 +msgid "The domain name was updated less than a week ago." +msgstr "" + #: assets/utils/functions/rdapTranslation.ts:7 #: assets/utils/providers/forms/EppConnectorForm.tsx:241 msgid "Registrant"