fix(regulations-admin): date format signature, remove self affect, di…

…sclaimer text (#16288)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

libs/portals/admin/regulations-admin/src/components/EditSignature.tsx

@@ -20,6 +20,7 @@ import { downloadUrl } from '../utils/files'
 import { DownloadDraftButton } from './DownloadDraftButton'
 import { useLocale } from '@island.is/localization'
 import { useS3Upload } from '../utils/dataHooks'
+import { formatDate } from '../utils/formatAmendingUtils'
 
 // ---------------------------------------------------------------------------
 
@@ -31,7 +32,6 @@ const defaultSignatureText = `
 ` as HTMLText
 
 const getDefaultSignatureText = (
-  dateFormatter: (date: Date, str?: string) => string,
   /** The ministry of the author-type user that created the RegulationDraft */
   authorMinistry?: PlainText,
 ) => {
@@ -41,7 +41,7 @@ const getDefaultSignatureText = (
   const defaultMinister = '⸻ráðherra'
 
   return defaultSignatureText
-    .replace('{dags}', dateFormatter(new Date(), 'dd. MMMM yyyy'))
+    .replace('{dags}', formatDate(new Date()))
     .replace('{ministry}', authorMinistry || defaultMinistry)
     .replace('{minister}', authorMinister || defaultMinister) as HTMLText
 }
@@ -159,7 +159,7 @@ export const EditSignature = () => {
               draftId={draft.id}
               value={
                 draft.signatureText.value ||
-                getDefaultSignatureText(formatDateFns, draft.ministry.value)
+                getDefaultSignatureText(draft.ministry.value)
               }
               onChange={(text) => updateState('signatureText', text)}
               required={!!draft.signatureText.required}

libs/portals/admin/regulations-admin/src/components/impacts/ImpactBaseSelection.tsx

@@ -44,6 +44,9 @@ export const ImpactBaseSelection = ({
   if (loading) {
     return null
   }
+  if (!mentionedOptions.length) {
+    return null
+  }
   return (
     <Select
       size="sm"

libs/portals/admin/regulations-admin/src/lib/messages.ts

@@ -409,7 +409,7 @@ export const impactMsgs = defineMessages({
   regExplainer: {
     id: 'ap.regulations-admin:draft-impactedreg-explainer',
     defaultMessage:
-      'ATH: Einungis er hægt að breyta reglugerðum sem minnst er á með skýrum hætti í texta reglugerðarinnar.',
+      'ATH: Sé ætlunin að breyta annarri reglugerð, þarf að minnast á þá reglugerð með skýrum hætti í þessari stofnreglugerð.',
   },
   regExplainer_editLink: {
     id: 'ap.regulations-admin:draft-impactedreg-editlink',

libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts

@@ -4,14 +4,13 @@ import {
   GroupedDraftImpactForms,
   RegDraftForm,
 } from '../state/types'
-import format from 'date-fns/format'
-import is from 'date-fns/locale/is'
 import compact from 'lodash/compact'
 import flatten from 'lodash/flatten'
 import uniq from 'lodash/uniq'
 import {
   allSameDay,
   extractArticleTitleDisplay,
+  formatDate,
   getTextWithSpaces,
   groupElementsByArticleTitleFromDiv,
   hasAnyChange,
@@ -52,18 +51,6 @@ const formatAffectedAndPlaceAffectedAtEnd = (
     return ''
   }
 
-  const formatDate = (date: Date) => {
-    const newDate = new Date(date)
-    if (newDate) {
-      const formattedDate = format(new Date(date), 'dd. MMMM yyyy', {
-        locale: is,
-      })
-      return formattedDate.replace(/^0+/, '') // Remove leading zeros
-    } else {
-      return ''
-    }
-  }
-
   const extractArticleNumber = (str: string): number | null => {
     const match = str.match(/(\d+)\. gr/)
     return match ? parseInt(match[1], 10) : null

libs/portals/admin/regulations-admin/src/utils/formatAmendingUtils.ts

@@ -1,4 +1,6 @@
 import isSameDay from 'date-fns/isSameDay'
+import format from 'date-fns/format'
+import is from 'date-fns/locale/is'
 import { HTMLText, asDiv } from '@island.is/regulations'
 
 export const groupElementsByArticleTitleFromDiv = (
@@ -114,3 +116,15 @@ export const updateAppendixWording = (input: string): string => {
     return match
   })
 }
+
+export const formatDate = (date: Date) => {
+  const newDate = new Date(date)
+  if (newDate) {
+    const formattedDate = format(new Date(date), 'dd. MMMM yyyy', {
+      locale: is,
+    })
+    return formattedDate.replace(/^0+/, '') // Remove leading zeros
+  } else {
+    return ''
+  }
+}

libs/portals/admin/regulations-admin/src/utils/hooks.ts

@@ -91,11 +91,11 @@ export const useAffectedRegulations = (
       data,
     )
 
-    options.push({
-      type: selfType,
-      value: 'self',
-      label: selfAffectingText,
-    })
+    // options.push({
+    //   type: selfType,
+    //   value: 'self',
+    //   label: selfAffectingText,
+    // })
 
     return options
   }, [selfType, mentioned, data, notFoundText, selfAffectingText, repealedText])