From dbe64f2fad2e50d34009077573c5d199b0d009ad Mon Sep 17 00:00:00 2001
From: Kelvin Jackson <kelvin.jackson@gofore.com>
Date: Wed, 27 Nov 2024 14:18:13 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Tulotietojen=20sivun=20ulkon=C3=A4=C3=B6n?=
 =?UTF-8?q?=20bugikorjaus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../child-information/fee-alteration/FeeAlterationList.tsx | 7 +++++++
 .../components/person-profile/income/IncomeItemHeader.tsx  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/frontend/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx b/frontend/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx
index 26d8360506f..d651de4f5b1 100755
--- a/frontend/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx
+++ b/frontend/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx
@@ -88,6 +88,7 @@ export default React.memo(function FeeAlterationList({
                 }`}</Dates>
                 <span>{feeAlteration.notes}</span>
               </FixedSpaceRow>
+              <RightHandSide>
               {feeAlteration.modifiedAt && (
                 <FixedSpaceRow spacing="L">
                   <Tooltip
@@ -124,6 +125,7 @@ export default React.memo(function FeeAlterationList({
                   />
                 )}
               </FixedSpaceRow>
+              </RightHandSide>
             </FixedSpaceRow>
             {feeAlteration.attachments.length > 0 && (
               <FeeAlterationAttachments
@@ -184,3 +186,8 @@ const FileIcon = styled(FontAwesomeIcon)`
   color: ${(p) => p.theme.colors.main.m2};
   margin-right: ${defaultMargins.s};
 `
+
+const RightHandSide = styled(FixedSpaceRow)`
+  min-width: 50%;
+  justify-content: space-between;
+`
diff --git a/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx b/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx
index f2bd50633c6..bcb731c062e 100755
--- a/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx
+++ b/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx
@@ -41,6 +41,11 @@ const Row = styled(FixedSpaceRow)`
   align-items: center;
 `
 
+const RightHandSide = styled(Row)`
+  min-width: 50%;
+  justify-content: space-between;
+`
+
 interface Props {
   title: string
   isOpen: boolean
@@ -83,6 +88,7 @@ const IncomeItemHeader = React.memo(function IncomeItemHeader({
           <span>{period}</span>
         </Title>
       </ItemTitle>
+      <RightHandSide>
       {modifiedAt && (
         <Row>
           <Tooltip
@@ -127,6 +133,7 @@ const IncomeItemHeader = React.memo(function IncomeItemHeader({
           aria-label={isOpen ? i18n.common.close : i18n.common.open}
         />
       </Row>
+      </RightHandSide>
     </Container>
   )
 })

From 71ea5be77a086f9cf0ae28755609af07188fde75 Mon Sep 17 00:00:00 2001
From: Kelvin Jackson <kelvin.jackson@gofore.com>
Date: Wed, 27 Nov 2024 14:25:05 +0200
Subject: [PATCH 2/2] Ap;ease linter

---
 .../fee-alteration/FeeAlterationList.tsx      | 68 +++++++--------
 .../income/IncomeItemHeader.tsx               | 84 +++++++++----------
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/frontend/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx b/frontend/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx
index d651de4f5b1..189b5b7597f 100755
--- a/frontend/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx
+++ b/frontend/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx
@@ -89,42 +89,42 @@ export default React.memo(function FeeAlterationList({
                 <span>{feeAlteration.notes}</span>
               </FixedSpaceRow>
               <RightHandSide>
-              {feeAlteration.modifiedAt && (
-                <FixedSpaceRow spacing="L">
-                  <Tooltip
-                    tooltip={
-                      feeAlteration.modifiedBy &&
-                      i18n.childInformation.feeAlteration.lastModifiedBy(
-                        feeAlteration.modifiedBy.name
-                      )
-                    }
-                  >
-                    {i18n.childInformation.feeAlteration.lastModifiedAt(
-                      feeAlteration.modifiedAt.format()
-                    )}
-                  </Tooltip>
-                </FixedSpaceRow>
-              )}
-              <FixedSpaceRow>
-                {permittedActions.includes('UPDATE') && (
-                  <IconOnlyButton
-                    icon={faPen}
-                    onClick={() => {
-                      if (feeAlteration.id !== null) {
-                        toggleEditing(feeAlteration.id)
+                {feeAlteration.modifiedAt && (
+                  <FixedSpaceRow spacing="L">
+                    <Tooltip
+                      tooltip={
+                        feeAlteration.modifiedBy &&
+                        i18n.childInformation.feeAlteration.lastModifiedBy(
+                          feeAlteration.modifiedBy.name
+                        )
                       }
-                    }}
-                    aria-label={i18n.common.edit}
-                  />
-                )}
-                {permittedActions.includes('DELETE') && (
-                  <IconOnlyButton
-                    icon={faTrash}
-                    onClick={() => toggleDeleteModal(feeAlteration)}
-                    aria-label={i18n.common.remove}
-                  />
+                    >
+                      {i18n.childInformation.feeAlteration.lastModifiedAt(
+                        feeAlteration.modifiedAt.format()
+                      )}
+                    </Tooltip>
+                  </FixedSpaceRow>
                 )}
-              </FixedSpaceRow>
+                <FixedSpaceRow>
+                  {permittedActions.includes('UPDATE') && (
+                    <IconOnlyButton
+                      icon={faPen}
+                      onClick={() => {
+                        if (feeAlteration.id !== null) {
+                          toggleEditing(feeAlteration.id)
+                        }
+                      }}
+                      aria-label={i18n.common.edit}
+                    />
+                  )}
+                  {permittedActions.includes('DELETE') && (
+                    <IconOnlyButton
+                      icon={faTrash}
+                      onClick={() => toggleDeleteModal(feeAlteration)}
+                      aria-label={i18n.common.remove}
+                    />
+                  )}
+                </FixedSpaceRow>
               </RightHandSide>
             </FixedSpaceRow>
             {feeAlteration.attachments.length > 0 && (
diff --git a/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx b/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx
index bcb731c062e..77783c9a5f2 100755
--- a/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx
+++ b/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx
@@ -89,50 +89,50 @@ const IncomeItemHeader = React.memo(function IncomeItemHeader({
         </Title>
       </ItemTitle>
       <RightHandSide>
-      {modifiedAt && (
-        <Row>
-          <Tooltip
-            tooltip={
-              modifiedBy &&
-              i18n.personProfile.income.lastModifiedBy(modifiedBy.name)
-            }
-          >
-            {i18n.personProfile.income.lastModifiedAt(modifiedAt.format())}
-          </Tooltip>
-        </Row>
-      )}
-      <Row>
-        {permittedActions.includes('UPDATE') && (
-          <Button
-            icon={faPen}
-            onClick={() => {
-              startEditing()
-              if (!isOpen) toggle()
-            }}
-            disabled={!editable}
-            data-qa="edit-income-item"
-            aria-label={i18n.common.edit}
-          />
+        {modifiedAt && (
+          <Row>
+            <Tooltip
+              tooltip={
+                modifiedBy &&
+                i18n.personProfile.income.lastModifiedBy(modifiedBy.name)
+              }
+            >
+              {i18n.personProfile.income.lastModifiedAt(modifiedAt.format())}
+            </Tooltip>
+          </Row>
         )}
-        {permittedActions.includes('DELETE') && (
-          <Button
-            icon={faTrash}
-            onClick={() => {
-              startDeleting()
-            }}
-            disabled={!editable}
-            data-qa="delete-income-item"
-            aria-label={i18n.common.remove}
+        <Row>
+          {permittedActions.includes('UPDATE') && (
+            <Button
+              icon={faPen}
+              onClick={() => {
+                startEditing()
+                if (!isOpen) toggle()
+              }}
+              disabled={!editable}
+              data-qa="edit-income-item"
+              aria-label={i18n.common.edit}
+            />
+          )}
+          {permittedActions.includes('DELETE') && (
+            <Button
+              icon={faTrash}
+              onClick={() => {
+                startDeleting()
+              }}
+              disabled={!editable}
+              data-qa="delete-income-item"
+              aria-label={i18n.common.remove}
+            />
+          )}
+          <ToggleButton
+            icon={isOpen ? faChevronUp : faChevronDown}
+            onClick={toggle}
+            disabled={!toggleable}
+            data-qa="toggle-income-item"
+            aria-label={isOpen ? i18n.common.close : i18n.common.open}
           />
-        )}
-        <ToggleButton
-          icon={isOpen ? faChevronUp : faChevronDown}
-          onClick={toggle}
-          disabled={!toggleable}
-          data-qa="toggle-income-item"
-          aria-label={isOpen ? i18n.common.close : i18n.common.open}
-        />
-      </Row>
+        </Row>
       </RightHandSide>
     </Container>
   )