From 234153312921464740c1fc1dc22c2837d682ef7c Mon Sep 17 00:00:00 2001
From: Jukka Ahonen <jukka.ahonen@nordcloud.com>
Date: Fri, 29 Nov 2024 12:37:23 +0200
Subject: [PATCH] authorization and collapse state

cleanup
---
 ...dDwellingsInHousingCompaniesPriceIndex.tsx | 47 ++++++-------------
 .../leaseSections/rent/RentItem.tsx           | 15 +++---
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/leases/components/leaseSections/rent/OldDwellingsInHousingCompaniesPriceIndex.tsx b/src/leases/components/leaseSections/rent/OldDwellingsInHousingCompaniesPriceIndex.tsx
index a8b8b03a..5832f2c8 100644
--- a/src/leases/components/leaseSections/rent/OldDwellingsInHousingCompaniesPriceIndex.tsx
+++ b/src/leases/components/leaseSections/rent/OldDwellingsInHousingCompaniesPriceIndex.tsx
@@ -12,10 +12,8 @@ import { withWindowResize } from '@/components/resize/WindowResizeHandler';
 import FormText from "@/components/form/FormText";
 import FormTextTitle from '@/components/form/FormTextTitle';
 import { LeaseFieldTitles, LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths, LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldTitles } from '@/leases/enums';
-import Authorization from '@/components/authorization/Authorization';
 import { getUiDataLeaseKey } from '@/uiData/helpers';
-import { formatDate } from '../../../../util/helpers';
-import { OldDwellingsInHousingCompaniesPriceIndex } from '../../../types';
+import { formatDate } from '@/util/helpers';
 
 type Props = {
   oldDwellingsInHousingCompaniesPriceIndex: OldDwellingsInHousingCompaniesPriceIndexProps;
@@ -51,40 +49,25 @@ class OldDwellingsInHousingCompaniesPriceIndexView extends PureComponent<Props>
       <BoxItemContainer>
         <Row>
           <Column>
-            <Authorization allow={true/*isFieldAllowedToRead(leaseAttributes, LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NAME)*/}>
-              <>
-                <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NAME)}>
-                  {LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldTitles.NAME}
-                </FormTextTitle>
-                <FormText>{name}</FormText>
-              </>
-            </Authorization>
+            <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NAME)}>
+              {LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldTitles.NAME}
+            </FormTextTitle>
+            <FormText>{name}</FormText>
           </Column>
           <Column>
-          <Authorization allow={true/*isFieldAllowedToRead(leaseAttributes, LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NAME)*/}>
-              <>
-                <FormTextTitle>
-                  {LeaseFieldTitles.START_DATE}
-                </FormTextTitle>
-                <FormText>{formatDate(leaseStartDate)}</FormText>
-              </>
-            </Authorization>
+            <FormTextTitle>
+              {LeaseFieldTitles.START_DATE}
+            </FormTextTitle>
+            <FormText>{formatDate(leaseStartDate)}</FormText>
           </Column>
           <Column>
-            <Authorization allow={true/*isFieldAllowedToRead(leaseAttributes, LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NAME)*/}>
-              <>
-                <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NUMBERS)}>
-                  {LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldTitles.NUMBERS}
-                </FormTextTitle>
-                <FormText>{getLastYearsIndexPointNumber(pointFigures)}</FormText>
-                <FormText>{sourceTableLabel}</FormText>
-              </>
-            </Authorization>
-
+            <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NUMBERS)}>
+              {LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldTitles.NUMBERS}
+            </FormTextTitle>
+            <FormText>{getLastYearsIndexPointNumber(pointFigures)}</FormText>
+            <FormText>{sourceTableLabel}</FormText>
           </Column>
           <Column>
-            <Authorization allow={true/*isFieldAllowedToRead(leaseAttributes, LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NAME)*/}>
-              <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldPaths.NUMBERS)}>
                   {LeaseRentOldDwellingsInHousingCompaniesPriceIndexFieldTitles.REVIEW_DAYS}
                 </FormTextTitle>
@@ -99,8 +82,6 @@ class OldDwellingsInHousingCompaniesPriceIndexView extends PureComponent<Props>
                       )
                       : ""}
                   </>
-              </>
-            </Authorization>
           </Column>
         </Row>
       </BoxItemContainer>
diff --git a/src/leases/components/leaseSections/rent/RentItem.tsx b/src/leases/components/leaseSections/rent/RentItem.tsx
index 035820b7..10116778 100644
--- a/src/leases/components/leaseSections/rent/RentItem.tsx
+++ b/src/leases/components/leaseSections/rent/RentItem.tsx
@@ -26,6 +26,7 @@ const formName = FormNames.LEASE_RENTS;
 type Props = {
   contractRentsCollapseState: boolean;
   equalizedRentsCollapseState: boolean;
+  oldDwellingsInHousingCompaniesPriceIndexCollapseState: boolean;
   fixedInitialYearRentsCollapseState: boolean;
   indexAdjustedRentsCollapseState: boolean;
   leaseAttributes: Attributes;
@@ -41,6 +42,7 @@ type Props = {
 const RentItem = ({
   contractRentsCollapseState,
   equalizedRentsCollapseState,
+  oldDwellingsInHousingCompaniesPriceIndexCollapseState,
   fixedInitialYearRentsCollapseState,
   indexAdjustedRentsCollapseState,
   leaseAttributes,
@@ -117,12 +119,12 @@ const RentItem = ({
         </Authorization>} onToggle={handleRentCollapseToggle}>
 
       {/* TODO: Add authorization for OldDwellingsInHousingCompaniesPriceIndex */}
-      { oldDwellingsInHousingCompaniesPriceIndex && 
-      /* <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.OLD_DWELLINGS_IN_HOUSING_COMPANIES_PRICE_INDEX)}> */
-      <Collapse className='collapse__secondary' defaultOpen={true} headerTitle='Tasotarkistus'>
-        <OldDwellingsInHousingCompaniesPriceIndexView oldDwellingsInHousingCompaniesPriceIndex={oldDwellingsInHousingCompaniesPriceIndex} />
-      </Collapse>
-      {/* </Authorization> */}
+      <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.OLD_DWELLINGS_IN_HOUSING_COMPANIES_PRICE_INDEX)}>
+      {oldDwellingsInHousingCompaniesPriceIndex &&
+          <Collapse className='collapse__secondary' defaultOpen={oldDwellingsInHousingCompaniesPriceIndexCollapseState !== undefined ? oldDwellingsInHousingCompaniesPriceIndexCollapseState : true} headerTitle='Tasotarkistus'>
+            <OldDwellingsInHousingCompaniesPriceIndexView oldDwellingsInHousingCompaniesPriceIndex={oldDwellingsInHousingCompaniesPriceIndex} />
+          </Collapse>}
+      </Authorization>
       <BasicInfo rent={rent} rentType={rentType} serviceUnit={serviceUnit} />
 
       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentFixedInitialYearRentsFieldPaths.FIXED_INITIAL_YEAR_RENTS)}>
@@ -168,6 +170,7 @@ export default connect((state, props) => {
   return {
     contractRentsCollapseState: getCollapseStateByKey(state, `${ViewModes.READONLY}.${formName}.${id}.contract_rents`),
     equalizedRentsCollapseState: getCollapseStateByKey(state, `${ViewModes.READONLY}.${formName}.${id}.equalized_rents`),
+    oldDwellingsInHousingCompaniesPriceIndexCollapseState: getCollapseStateByKey(state, `${ViewModes.READONLY}.${formName}.${id}.old_dwellings_in_housing_companies_price_index`),
     fixedInitialYearRentsCollapseState: getCollapseStateByKey(state, `${ViewModes.READONLY}.${formName}.${id}.fixed_initial_year_rents`),
     indexAdjustedRentsCollapseState: getCollapseStateByKey(state, `${ViewModes.READONLY}.${formName}.${id}.index_adjusted_rents`),
     leaseAttributes: getLeaseAttributes(state),