From ac8cd7c469183560372e3d3beb92e316d62bc35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20H?= Date: Fri, 30 Aug 2024 14:14:54 +0000 Subject: [PATCH] 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> --- .../src/components/EditBasics.tsx | 8 ++++++ .../regulations-admin/src/lib/messages.ts | 5 ++++ .../src/utils/fileUploader.ts | 4 ++- .../src/utils/formatAmendingRegulation.ts | 26 ++++++++++++++----- .../src/utils/getDeletionOrAddition.ts | 21 ++++++++------- 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/libs/portals/admin/regulations-admin/src/components/EditBasics.tsx b/libs/portals/admin/regulations-admin/src/components/EditBasics.tsx index 333df35ec545..7b20d6e862b4 100644 --- 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} > + + + 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 index 54a3a6051e53..d4cccd26ac03 100644 --- 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.

` as HTMLText const gildistaka = - `

Reglugerð þessi er sett með heimild í [].

Reglugerðin öðlast þegar gildi

` as HTMLText + `

Reglugerð þessi er sett með heimild í [].

Reglugerðin öðlast þegar gildi.

` 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 = ( ? (`

Á eftir ${ paragraph - 1 }. mgr. ${articleTitle} ${regNameDisplay} kemur ný málsgrein sem orðast svo:

${newText}

` as HTMLText) - : (`

1. mgr. ${articleTitle} ${regNameDisplay} orðast svo:

${newText}

` as HTMLText) + : (`

Á undan 1. mgr. ${articleTitle} ${regNameDisplay} kemur ný málsgrein svohljóðandi:

${newText}

` as HTMLText) } else if (isArticleTitle) { // Title was added testGroup.original?.push(`

${newText}

` as HTMLText) @@ -269,7 +269,7 @@ export const formatAmendingRegBody = ( } else if (isLetterList || isNumberList) { // List was changed pushHtml = - `

${paragraph}. mgr. ${articleTitle} ${regNameDisplay} breytist:

${liHtml}` as HTMLText + `

Eftirfarandi breytingar verða á ${paragraph}. mgr. ${articleTitle} ${regNameDisplay}:

${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([ - `

Á eftir ${prevArticleTitle} ${regNameDisplay} kemur ný grein, ${articleTitleNumber}, ásamt fyrirsögn, svohljóðandi: ${ - originalTextArray ? testGroup.original?.join('') : '' - }` as HTMLText, + `

Á eftir ${prevArticleTitleNumber} ${regNameDisplay} kemur ný grein, ${articleTitleNumber}, ásamt fyrirsögn, svohljóðandi:

${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 index f357fa0debfe..e515bec25e63 100644 --- 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)