fix(regulations-admin): Update strings, fix impactname (#17041)

* Fix strings date and impact name * Radio buttons --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Nov 27, 2024 · 4b7b30e · 4b7b30e
1 parent 9fa6dc7
commit 4b7b30e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 10 deletions.
diff --git a/libs/portals/admin/regulations-admin/src/components/impacts/EditChange.tsx b/libs/portals/admin/regulations-admin/src/components/impacts/EditChange.tsx
@@ -446,6 +446,7 @@ export const EditChange = (props: EditChangeProp) => {
             } as Regulation
           }
           baseName={'' as RegName}
+          asBase={draft.type.value === 'base'}
         />
       )}
       <GridContainer>

diff --git a/libs/portals/admin/regulations-admin/src/components/impacts/ImpactDate.tsx b/libs/portals/admin/regulations-admin/src/components/impacts/ImpactDate.tsx
@@ -1,4 +1,13 @@
-import { Box, Button, DatePicker, Checkbox } from '@island.is/island-ui/core'
+import {
+  Box,
+  Button,
+  DatePicker,
+  Checkbox,
+  Text,
+  RadioButton,
+  GridColumn,
+  GridRow,
+} from '@island.is/island-ui/core'
 import { impactMsgs } from '../../lib/messages'
 import { DraftImpactForm } from '../../state/types'
 import { useLocale } from '@island.is/localization'
@@ -37,12 +46,31 @@ export const ImpactDate = (props: ImpactDateProps) => {
   return (
     <Box marginBottom={4} width={size}>
       <Box marginBottom={3}>
-        <Checkbox
-          label={t(impactMsgs.specificDateApply)}
-          labelVariant="default"
-          checked={hasCustomDate}
-          onChange={() => setHasCustomDate(!hasCustomDate)}
-        />
+        <GridRow rowGap={1}>
+          <GridColumn span="1/1">
+            <RadioButton
+              name={`set-no-custom-date`}
+              checked={!hasCustomDate}
+              onChange={() => {
+                onChange(undefined)
+                setHasCustomDate(false)
+              }}
+              backgroundColor="white"
+              label={t(impactMsgs.specificDateApplyTextDetails)}
+            />
+          </GridColumn>
+          <GridColumn span="1/1">
+            <RadioButton
+              name={`select-custom-date`}
+              checked={hasCustomDate}
+              onChange={() => {
+                setHasCustomDate(true)
+              }}
+              backgroundColor="white"
+              label={t(impactMsgs.specificDateApply)}
+            />
+          </GridColumn>
+        </GridRow>
       </Box>
       {hasCustomDate ? (
         <>
@@ -65,7 +93,10 @@ export const ImpactDate = (props: ImpactDateProps) => {
               size="small"
               variant="text"
               preTextIcon="close"
-              onClick={() => onChange(undefined)}
+              onClick={() => {
+                onChange(undefined)
+                setHasCustomDate(false)
+              }}
             >
               {t(impactMsgs.effectiveDate_default)}
             </Button>

diff --git a/libs/portals/admin/regulations-admin/src/components/impacts/ReferenceText.tsx b/libs/portals/admin/regulations-admin/src/components/impacts/ReferenceText.tsx
@@ -26,8 +26,8 @@ const t = getTexts({
 
   effectiveDate: 'Tekur gildi þann',
 
-  referenceLegend: 'Texti áhrifareglugerðar {name}',
-  referenceBaseLegend: 'Texti grunnreglugerðarinnar {name}',
+  referenceLegend: 'Texti breytingareglugerðar {name}',
+  referenceBaseLegend: 'Texti stofnreglugerðarinnar {name}',
   referenceMeta: 'Útgáfudagur: {published}',
   referenceEditLink: 'Leiðrétta',
 

diff --git a/libs/portals/admin/regulations-admin/src/lib/messages.ts b/libs/portals/admin/regulations-admin/src/lib/messages.ts
@@ -425,6 +425,12 @@ export const impactMsgs = defineMessages({
     defaultMessage: 'Breyting tekur gildi á ákveðinni dagsetningu',
   },
 
+  specificDateApplyTextDetails: {
+    id: 'ap.regulations-admin:change-applied-on-specific-date-text-details',
+    defaultMessage:
+      'Breyting tekur gildi þegar í stað, daginn eftir útgáfudag.',
+  },
+
   // ---------------------------------------------------------------------------
 
   regExplainer: {