Merge branch 'main' into feat/grant-slice

island-is · Dec 18, 2024 · 7d6dc62 · 7d6dc62
2 parents 4f93471 + ab48b56
commit 7d6dc62
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 21 deletions.
diff --git a/apps/native/app/android/app/build.gradle b/apps/native/app/android/app/build.gradle
@@ -103,7 +103,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode getMyVersionCode(143)
-        versionName "1.4.8"
+        versionName "1.4.9"
         manifestPlaceholders = [
             appAuthRedirectScheme: "is.island.app" // project.config.get("BUNDLE_ID_ANDROID")
         ]

diff --git a/apps/native/app/ios/IslandApp/Info.plist b/apps/native/app/ios/IslandApp/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.8</string>
+	<string>1.4.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/apps/native/app/src/messages/en.ts b/apps/native/app/src/messages/en.ts
@@ -665,15 +665,15 @@ export const en: TranslatedMessages = {
 
   // health - organ donation
   'health.organDonation': 'Organ Donation',
-  'health.organDonation.change': 'Breyta afstöðu',
-  'health.organDonation.isDonor': 'Ég er líffæragjafi',
+  'health.organDonation.change': 'Change selection',
+  'health.organDonation.isDonor': 'I am an organ donor',
   'health.organDonation.isDonorWithLimitations':
-    'Ég heimila líffæragjöf, með takmörkunum.',
-  'health.organDonation.isNotDonor': 'Ég heimila ekki líffæragjöf',
+    'I allow organ donation, with restrictions.',
+  'health.organDonation.isNotDonor': 'I forbid organ donation',
   'health.organDonation.isDonorDescription':
-    'Öll líffærin mín má nota til ígræðslu.',
+    'My organs can all be used for transplantation.',
   'health.organDonation.isNotDonorDescription':
-    'Engin líffæri má nota til ígræðslu.',
+    'No organs can be used for transplantation.',
   'health.organDonation.isDonorWithLimitationsDescription':
-    'Öll líffærin mín má nota til ígræðslu fyrir utan: {limitations}.',
+    'All organs can be used for transplantation except: {limitations}.',
 }
diff --git a/charts/islandis/values.staging.yaml b/charts/islandis/values.staging.yaml
@@ -1742,7 +1742,7 @@ search-indexer-service:
         cpuAverageUtilization: 90
         nginxRequestsIrate: 5
       replicas:
-        max: 3
+        max: 1
         min: 1
   image:
     repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-search-indexer'
@@ -1820,7 +1820,7 @@ search-indexer-service:
   pvcs: []
   replicaCount:
     default: 1
-    max: 3
+    max: 1
     min: 1
   resources:
     limits:

diff --git a/charts/services/search-indexer-service/values.staging.yaml b/charts/services/search-indexer-service/values.staging.yaml
@@ -49,7 +49,7 @@ hpa:
       cpuAverageUtilization: 90
       nginxRequestsIrate: 5
     replicas:
-      max: 3
+      max: 1
       min: 1
 image:
   repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-search-indexer'
@@ -127,7 +127,7 @@ progressDeadlineSeconds: 1500
 pvcs: []
 replicaCount:
   default: 1
-  max: 3
+  max: 1
   min: 1
 resources:
   limits:

diff --git a/infra/src/dsl/output-generators/map-to-helm-values.ts b/infra/src/dsl/output-generators/map-to-helm-values.ts
@@ -109,7 +109,7 @@ const serializeService: SerializeMethod<HelmService> = async (
   result.resources = serviceDef.resources
 
   // replicas
-  if (env1.type == 'staging') {
+  if (env1.type == 'staging' && service.name.indexOf('search-indexer') == -1) {
     result.replicaCount = {
       min: 1,
       max: 3,

diff --git a/libs/application/ui-fields/src/lib/DescriptionFormField/DescriptionFormField.tsx b/libs/application/ui-fields/src/lib/DescriptionFormField/DescriptionFormField.tsx
@@ -16,11 +16,13 @@ export const DescriptionFormField: FC<
 > = ({ application, field, showFieldName }) => {
   const { formatMessage, lang: locale } = useLocale()
 
+  const { space: paddingTop = 2, marginBottom, marginTop } = field
+
   return (
     <Box
-      paddingTop={field.space}
-      marginBottom={field.marginBottom}
-      marginTop={field.marginTop}
+      paddingTop={paddingTop}
+      marginBottom={marginBottom}
+      marginTop={marginTop}
     >
       {showFieldName && (
         <Text variant={field.titleVariant}>

diff --git a/libs/application/ui-fields/src/lib/RadioFormField/RadioFormField.tsx b/libs/application/ui-fields/src/lib/RadioFormField/RadioFormField.tsx
@@ -50,11 +50,13 @@ export const RadioFormField: FC<React.PropsWithChildren<Props>> = ({
     [options, application, locale],
   )
 
+  const paddingTop = field.space ?? 2
+
   return (
     <Box
       marginTop={marginTop}
       marginBottom={marginBottom}
-      paddingTop={field.space}
+      paddingTop={paddingTop}
       role="region"
       aria-labelledby={id + 'title'}
     >
@@ -80,7 +82,7 @@ export const RadioFormField: FC<React.PropsWithChildren<Props>> = ({
         />
       )}
 
-      <Box marginTop={2}>
+      <Box>
         <RadioController
           largeButtons={largeButtons}
           backgroundColor={backgroundColor}
@@ -114,6 +116,8 @@ export const RadioFormField: FC<React.PropsWithChildren<Props>> = ({
           }))}
           onSelect={field.onSelect}
           hasIllustration={hasIllustration}
+          paddingBottom={0}
+          paddingTop={2}
         />
       </Box>
     </Box>

diff --git a/libs/shared/form-fields/src/lib/RadioController/RadioController.tsx b/libs/shared/form-fields/src/lib/RadioController/RadioController.tsx
@@ -8,6 +8,7 @@ import {
   InputError,
   InputBackgroundColor,
   TagVariant,
+  BoxProps,
 } from '@island.is/island-ui/core'
 import { TestSupport } from '@island.is/island-ui/utils'
 
@@ -39,6 +40,8 @@ interface Props {
   backgroundColor?: InputBackgroundColor
   onSelect?: (s: string) => void
   hasIllustration?: boolean
+  paddingBottom?: BoxProps['paddingBottom']
+  paddingTop?: BoxProps['paddingTop']
 }
 
 export const RadioController: FC<React.PropsWithChildren<Props>> = ({
@@ -54,6 +57,8 @@ export const RadioController: FC<React.PropsWithChildren<Props>> = ({
   split = '1/1',
   smallScreenSplit = '1/1',
   hasIllustration = false,
+  paddingBottom = 2,
+  paddingTop = 0,
 }) => {
   const { clearErrors, setValue } = useFormContext()
 
@@ -66,7 +71,8 @@ export const RadioController: FC<React.PropsWithChildren<Props>> = ({
           {options.map((option, index) => (
             <GridColumn
               span={[smallScreenSplit, split]}
-              paddingBottom={2}
+              paddingBottom={paddingBottom}
+              paddingTop={paddingTop}
               key={`option-${option.value}`}
             >
               <RadioButton
@@ -97,7 +103,11 @@ export const RadioController: FC<React.PropsWithChildren<Props>> = ({
           ))}
 
           {error && (
-            <GridColumn span={['1/1', split]} paddingBottom={2}>
+            <GridColumn
+              span={['1/1', split]}
+              paddingBottom={paddingBottom}
+              paddingTop={paddingTop}
+            >
               <InputError errorMessage={error} />
             </GridColumn>
           )}