fix(regulations-admin): Minor bugfixes for diff output (#15824)

* Minor refactor * Add missing closing tag --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Sep 2, 2024 · ac8cd7c · ac8cd7c
1 parent 9d1eacc
commit ac8cd7c
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 18 deletions.
diff --git a/libs/portals/admin/regulations-admin/src/components/EditBasics.tsx b/libs/portals/admin/regulations-admin/src/components/EditBasics.tsx
@@ -7,6 +7,7 @@ import {
   Text,
   Button,
   AlertMessage,
+  AlertBanner,
 } from '@island.is/island-ui/core'
 import { EditorInput } from './EditorInput'
 import { editorMsgs as msg, errorMsgs } from '../lib/messages'
@@ -161,6 +162,13 @@ export const EditBasics = () => {
             label={t(msg.text)}
             startExpanded={startTextExpanded}
           >
+            <Box marginBottom={3}>
+              <AlertBanner
+                description={t(msg.diffPrecisionWarning)}
+                variant="info"
+                dismissable
+              />
+            </Box>
             <Box marginBottom={3}>
               <EditorInput
                 key={editorKey} // Force re-render of TinyMCE

diff --git a/libs/portals/admin/regulations-admin/src/lib/messages.ts b/libs/portals/admin/regulations-admin/src/lib/messages.ts
@@ -345,6 +345,11 @@ export const editorMsgs = defineMessages({
     id: 'ap.regulations-admin:uploading-word-document',
     defaultMessage: 'Hleð inn Word skjali',
   },
+  diffPrecisionWarning: {
+    id: 'ap.regulations-admin:diff-precision-warning',
+    defaultMessage:
+      'Vakin er athygli á því að kerfið útbýr tillögu að breytingareglugerð sem starfsmaður þarf að rýna gaumgæfilega áður en haldið er áfram. Ekki er öruggt að inngangsliðir og efnisákvæði færist réttilega inn í breytingareglugerðina.',
+  },
 })
 
 export const impactMsgs = defineMessages({

diff --git a/libs/portals/admin/regulations-admin/src/utils/fileUploader.ts b/libs/portals/admin/regulations-admin/src/utils/fileUploader.ts
@@ -1,11 +1,13 @@
 import { EditorFileUploader } from '@island.is/regulations-tools/Editor'
 import { RegulationDraftId } from '@island.is/regulations/admin'
 import { fileUrl, useS3Upload } from './dataHooks'
+import { isRunningOnEnvironment } from '@island.is/shared/utils'
 
 export function useFileUploader(draftId: RegulationDraftId) {
   const { createPresignedPost, createFormData } = useS3Upload()
 
-  const isDevelopment = process.env.NODE_ENV === 'development'
+  const isDevelopment =
+    isRunningOnEnvironment('dev') || isRunningOnEnvironment('local')
 
   const fileUploader =
     (): EditorFileUploader => async (blobInfo, success, failure, progress) => {

diff --git a/libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts b/libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts
@@ -84,7 +84,7 @@ export const formatAmendingRegBody = (
       '',
     )}fellur brott.</p>` as HTMLText
     const gildistaka =
-      `<p>Reglugerð þessi er sett með heimild í [].</p><p>Reglugerðin öðlast þegar gildi</p>` as HTMLText
+      `<p>Reglugerð þessi er sett með heimild í [].</p><p>Reglugerðin öðlast þegar gildi.</p>` as HTMLText
     return [text, gildistaka]
   }
 
@@ -119,7 +119,7 @@ export const formatAmendingRegBody = (
 
     const regNameDisplay =
       regName && regName !== 'self'
-        ? `reglugerðar nr. ${regName}`
+        ? `reglugerðar nr. ${regName}`.replace(/\.$/, '')
         : 'reglugerðarinnar'
 
     group.forEach((element) => {
@@ -224,7 +224,7 @@ export const formatAmendingRegBody = (
                 ? (`<p>Á eftir ${
                     paragraph - 1
                   }. mgr. ${articleTitle} ${regNameDisplay} kemur ný málsgrein sem orðast svo:</p><p>${newText}</p>` as HTMLText)
-                : (`<p>1. mgr. ${articleTitle} ${regNameDisplay} orðast svo:</p><p>${newText}</p>` as HTMLText)
+                : (`<p>Á undan 1. mgr. ${articleTitle} ${regNameDisplay} kemur ný málsgrein svohljóðandi: </p><p>${newText}</p>` as HTMLText)
           } else if (isArticleTitle) {
             // Title was added
             testGroup.original?.push(`<p>${newText}</p>` as HTMLText)
@@ -269,7 +269,7 @@ export const formatAmendingRegBody = (
           } else if (isLetterList || isNumberList) {
             // List was changed
             pushHtml =
-              `<p>${paragraph}. mgr. ${articleTitle} ${regNameDisplay} breytist:</p> ${liHtml}` as HTMLText
+              `<p>Eftirfarandi breytingar verða á ${paragraph}. mgr. ${articleTitle} ${regNameDisplay}:</p> ${liHtml}` as HTMLText
           } else {
             // We don't know what you changed, but there was a change, and here's the changelog:
             pushHtml =
@@ -303,10 +303,22 @@ export const formatAmendingRegBody = (
       const originalTextArray = testGroup.original?.length
         ? flatten(testGroup.original)
         : []
+
+      const prevArticleTitleNumber = prevArticleTitle.match(/^\d+\. gr\./)
+
+      let articleDisplayText = ''
+
+      if (originalTextArray.length > 1) {
+        const [, ...rest] = originalTextArray
+        articleDisplayText = rest.join('')
+      } else {
+        articleDisplayText = testGroup.original
+          ? testGroup.original?.join('')
+          : ''
+      }
+
       additionArray.push([
-        `<p>Á eftir ${prevArticleTitle} ${regNameDisplay} kemur ný grein, ${articleTitleNumber}, ásamt fyrirsögn, svohljóðandi: ${
-          originalTextArray ? testGroup.original?.join('') : ''
-        }` as HTMLText,
+        `<p>Á eftir ${prevArticleTitleNumber} ${regNameDisplay} kemur ný grein, ${articleTitleNumber}, ásamt fyrirsögn, svohljóðandi:</p> ${articleDisplayText}` as HTMLText,
       ])
     } else {
       additionArray.push(testGroup.arr)

diff --git a/libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts b/libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts
@@ -73,26 +73,27 @@ export const formatListItemDiff = (item: Element) => {
       const isLiDeleted = newLiText === '' || newLiText === null
       const isLiAddition = oldLiText === '' || oldLiText === null
 
-      const liLidur = isStaflidur ? 'stafliður' : 'töluliður'
-      const liLidurShortened = isStaflidur ? 'stafl.' : 'tölul.'
+      const liLidur = isStaflidur ? '-liður' : 'töluliður'
+      const liLidurPassive = isStaflidur ? '-lið' : '. tölulið'
+      const liLidurShortened = isStaflidur ? '-liður' : '. tölul.'
 
       const lidurLabel = liItemHtml === '' ? liLidur.toLowerCase() : liLidur
 
       if (isLiDeleted) {
         liItemHtml = (liItemHtml +
-          `${getLiPoint(
-            lidur,
-            isStaflidur,
-          )}. ${lidurLabel} fellur brott og breytist númer annarra liða til samræmis.`) as HTMLText
+          `${getLiPoint(lidur, isStaflidur)}${
+            isStaflidur ? lidurLabel : '. ' + lidurLabel
+          } fellur brott og breytist númer annarra liða til samræmis.`) as HTMLText
 
         // Finish up:
         returningArray.push(liItemHtml)
         liItemHtml = '' as HTMLText
       } else if (isLiAddition) {
         liItemHtml = (liItemHtml +
-          `Á eftir ${getLiPoint(lidur - 1, isStaflidur)}. ${
-            isStaflidur ? 'staflið' : 'tölulið'
-          } kemur nýr liður svohljóðandi, og breytist númer annarra lið til samræmis: ${newLiText}`) as HTMLText
+          `Á eftir ${getLiPoint(
+            lidur - 1,
+            isStaflidur,
+          )}${liLidurPassive} kemur nýr liður svohljóðandi, og breytist númer annarra lið til samræmis: ${newLiText}`) as HTMLText
 
         // Finish up:
         returningArray.push(liItemHtml)
@@ -102,7 +103,7 @@ export const formatListItemDiff = (item: Element) => {
           `${getLiPoint(
             lidur,
             isStaflidur,
-          )}. ${liLidurShortened} orðast svo: ${newLiText}`) as HTMLText
+          )}${liLidurShortened} orðast svo: ${newLiText}`) as HTMLText
 
         // Finish up:
         returningArray.push(liItemHtml)