Tweaks

Provincie-Zuid-Holland · Sep 24, 2024 · 5ea759d · 5ea759d
1 parent d47fc0c
commit 5ea759d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/src/components/Publications/PublicationNotification/PublicationNotification.tsx b/src/components/Publications/PublicationNotification/PublicationNotification.tsx
@@ -1,3 +1,7 @@
+import { Button, Notification, formatDate } from '@pzh-ui/components'
+import { useQueryClient } from '@tanstack/react-query'
+import { useMemo } from 'react'
+
 import {
     getPublicationAnnouncementsGetQueryKey,
     usePublicationActPackagesActPackageUuidCreateAnnouncementPost,
@@ -7,9 +11,7 @@ import {
     PublicationPackage,
     PublicationVersion,
 } from '@/api/fetchers.schemas'
-import { Button, Notification, formatDate } from '@pzh-ui/components'
-import { useQueryClient } from '@tanstack/react-query'
-import { useMemo } from 'react'
+
 import { PublicationType } from '../types'
 
 interface PublicationNotificationProps {
@@ -41,19 +43,26 @@ const PublicationNotification = ({
             },
         })
 
-    if (publicationType === 'act') {
-        const announcementDate = useMemo(
-            () =>
-                version?.Announcement_Date &&
-                formatDate(new Date(version.Announcement_Date), 'd LLLL yyyy'),
-            [version]
-        )
+    const actAnnouncementDate = useMemo(
+        () =>
+            version?.Announcement_Date &&
+            formatDate(new Date(version.Announcement_Date), 'd LLLL yyyy'),
+        [version]
+    )
 
+    const announcementDate = useMemo(
+        () =>
+            announcement?.Announcement_Date &&
+            formatDate(new Date(announcement.Announcement_Date), 'd LLLL yyyy'),
+        [announcement]
+    )
+
+    if (publicationType === 'act') {
         return (
             <div className="flex w-full justify-between gap-4">
                 <Notification
                     variant="positive"
-                    title={`Regeling publicatie wordt bekend gemaakt op ${announcementDate}.${
+                    title={`Regeling publicatie wordt bekend gemaakt op ${actAnnouncementDate}.${
                         !!!announcement
                             ? ' Maak een kennisgeving om dit ontwerp te publiceren'
                             : ''
@@ -76,13 +85,6 @@ const PublicationNotification = ({
         )
     }
 
-    const announcementDate = useMemo(
-        () =>
-            announcement?.Announcement_Date &&
-            formatDate(new Date(announcement.Announcement_Date), 'd LLLL yyyy'),
-        [announcement]
-    )
-
     return (
         <div className="flex w-full justify-between">
             <Notification

diff --git a/src/pages/protected/Modules/ModuleDetail/ModuleDetail.tsx b/src/pages/protected/Modules/ModuleDetail/ModuleDetail.tsx
@@ -24,11 +24,7 @@ const ModuleDetail = () => {
 
     const [activeTab, setActiveTab] = useState<TabType>(tab || 'objecten')
 
-    const {
-        data: { Module: module } = {},
-        isLoading,
-        isModuleManager,
-    } = useModule()
+    const { data: { Module: module } = {}, isLoading } = useModule()
 
     const handleTabChange: TabsProps['onSelectionChange'] = key => {
         setActiveTab(key as TabType)