Lease Last Updated By | PSP-6933

source/backend/api/Areas/Leases/Controllers/LeaseController.cs

@@ -75,6 +75,21 @@
             return new JsonResult(mapped);
         }
 
+        /// <summary>
+        /// Gets the specified lease last updated-by information.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("{id:long}/updateInfo")]
+        [HasPermission(Permissions.LeaseView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(Dal.Entities.Models.LastUpdatedByModel), 200)]
+        [SwaggerOperation(Tags = new[] { "lease" })]
+        public IActionResult GetLastUpdatedBy(long id)
+        {
+            var lastUpdated = _leaseService.GetLastUpdateInformation(id);
+            return new JsonResult(lastUpdated);
+        }
+
         /// <summary>
         /// Add the specified lease. Allows the user to override the normal restriction on adding properties already associated to a lease.
         /// </summary>

source/backend/api/Services/ILeaseService.cs

@@ -11,6 +11,8 @@ public interface ILeaseService
 
         PimsLease GetById(long leaseId);
 
+        LastUpdatedByModel GetLastUpdateInformation(long leaseId);
+
         Paged<PimsLease> GetPage(LeaseFilter filter, bool? all = false);
 
         PimsLease Add(PimsLease lease, IEnumerable<UserOverrideCode> userOverrides);

source/backend/api/Services/LeaseService.cs

@@ -85,6 +85,14 @@
             return lease;
         }
 
+        public LastUpdatedByModel GetLastUpdateInformation(long leaseId)
+        {
+            _logger.LogInformation("Retrieving last updated-by information...");
+            _user.ThrowIfNotAuthorized(Permissions.LeaseView);
+
+            return _leaseRepository.GetLastUpdateBy(leaseId);
+        }
+
         public Paged<PimsLease> GetPage(LeaseFilter filter, bool? all = false)
         {
             _logger.LogInformation("Getting lease page {filter}", filter);

source/backend/dal/Repositories/Interfaces/ILeaseRepository.cs

@@ -19,6 +19,8 @@ public interface ILeaseRepository : IRepository<PimsLease>
 
         PimsLease GetNoTracking(long id);
 
+        LastUpdatedByModel GetLastUpdateBy(long leaseId);
+
         Paged<PimsLease> GetPage(LeaseFilter filter, HashSet<short> regions);
 
         IList<PimsLeaseDocument> GetAllLeaseDocuments(long leaseId);

source/frontend/src/features/leases/detail/LeasePages/deposits/DepositsContainer.test.tsx

@@ -22,6 +22,8 @@ import {
 import DepositsContainer from './DepositsContainer';
 import { FormLeaseDeposit } from './models/FormLeaseDeposit';
 
+const onSuccessMock = jest.fn();
+
 const mockAxios = new MockAdapter(axios);
 jest.mock('@react-keycloak/web');
 (useKeycloak as jest.Mock).mockReturnValue({
@@ -44,7 +46,7 @@ const setup = (renderOptions: RenderOptions & { lease?: LeaseFormModel } = {}):
       }}
     >
       <Formik onSubmit={noop} initialValues={renderOptions.lease ?? new LeaseFormModel()}>
-        <DepositsContainer />
+        <DepositsContainer onSuccess={onSuccessMock} />
       </Formik>
     </LeaseStateContext.Provider>,
     {

source/frontend/src/features/leases/detail/LeasePages/deposits/DepositsContainer.tsx

@@ -20,11 +20,13 @@
 import { LeaseDepositForm } from './models/LeaseDepositForm';
 import * as Styled from './styles';
 
-export interface IDepositsContainerProps {}
+export interface IDepositsContainerProps {
+  onSuccess: () => void;
+}
 
 export const DepositsContainer: React.FunctionComponent<
   React.PropsWithChildren<IDepositsContainerProps>
-> = () => {
+> = props => {
   const { lease } = useContext(LeaseStateContext);
   const {
     getSecurityDeposits: {
@@ -105,6 +107,7 @@
       setDepositToDelete(undefined);
       setDeleteModalWarning(false);
       getSecurityDeposits(lease.id);
+      props.onSuccess();
     }
   };
 
@@ -114,6 +117,7 @@
       setDepositReturnToDelete(undefined);
       setDeleteReturnModalWarning(false);
       getSecurityDeposits(lease.id);
+      props.onSuccess();
     }
   };
 
@@ -130,6 +134,7 @@
         setEditDepositValue(FormLeaseDeposit.createEmpty(lease.id));
         setShowEditModal(false);
         getSecurityDeposits(lease.id);
+        props.onSuccess();
       }
     } else {
       console.error('Lease information incomplete');
@@ -179,6 +184,7 @@
         setDepositReturnToDelete(undefined);
         setShowReturnEditModal(false);
         getSecurityDeposits(lease.id);
+        props.onSuccess();
       }
     } else {
       console.error('Lease information incomplete');
@@ -214,6 +220,7 @@
               onSave={async (notes: string) => {
                 lease?.id && (await updateSecurityDepositNote(lease.id, notes));
                 setEditNotes(false);
+                props.onSuccess();
               }}
               onCancel={() => {
                 setEditNotes(false);

source/frontend/src/features/leases/detail/LeasePages/improvements/AddImprovementsContainer.test.tsx

@@ -24,6 +24,8 @@ const storeState = {
 };
 const mockAxios = new MockAdapter(axios);
 
+const onSuccessMock = jest.fn();
+
 const SaveButton = () => {
   const { submitForm } = useFormikContext();
   return <button onClick={submitForm}>Save</button>;
@@ -51,6 +53,7 @@ describe('Add Improvements container component', () => {
           onEdit={noop}
           improvements={renderOptions.improvements ?? []}
           loading={false}
+          onSuccess={onSuccessMock}
         >
           <SaveButton />
         </AddImprovementsContainer>

source/frontend/src/features/leases/detail/LeasePages/improvements/AddImprovementsContainer.tsx

@@ -17,11 +17,12 @@ interface IAddImprovementsContainerProps {
   onEdit?: (isEditing: boolean) => void;
   improvements: Api_PropertyImprovement[];
   loading: boolean;
+  onSuccess: () => void;
 }
 
 export const AddImprovementsContainer: React.FunctionComponent<
   React.PropsWithChildren<IAddImprovementsContainerProps>
-> = ({ formikRef, onEdit, children, loading, improvements }) => {
+> = ({ formikRef, onEdit, children, loading, improvements, onSuccess }) => {
   const { lease } = useContext(LeaseStateContext);
   const { updatePropertyImprovements } = usePropertyImprovementRepository();
   const { getByType } = useLookupCodeHelpers();
@@ -44,6 +45,7 @@ export const AddImprovementsContainer: React.FunctionComponent<
           );
           formikRef?.current?.resetForm({ values: form });
           onEdit && onEdit(false);
+          onSuccess();
         }
       }
     } finally {

source/frontend/src/features/leases/detail/LeasePages/improvements/ImprovementsContainer.test.tsx

@@ -19,6 +19,8 @@ const storeState = {
 };
 const mockAxios = new MockAdapter(axios);
 
+const onSuccessMock = jest.fn();
+
 describe('Improvements Container component', () => {
   const setup = async (
     renderOptions: RenderOptions & { improvements?: Partial<ILeaseImprovementForm>[] } = {},
@@ -37,6 +39,7 @@ describe('Improvements Container component', () => {
         <ImprovementsContainer
           isEditing={false}
           formikRef={React.createRef()}
+          onSuccess={onSuccessMock}
         ></ImprovementsContainer>
       </LeaseStateContext.Provider>,
       {

source/frontend/src/features/leases/detail/LeasePages/improvements/ImprovementsContainer.tsx

@@ -16,7 +16,7 @@ import { Improvements } from './Improvements';
 
 export const ImprovementsContainer: React.FunctionComponent<
   React.PropsWithChildren<LeasePageProps>
-> = ({ isEditing, formikRef, onEdit }) => {
+> = ({ isEditing, formikRef, onEdit, onSuccess }) => {
   const { lease } = useContext(LeaseStateContext);
   const {
     getPropertyImprovements: { execute: getPropertyImprovements, loading, response: improvements },
@@ -44,6 +44,7 @@ export const ImprovementsContainer: React.FunctionComponent<
         onEdit={onEdit}
         improvements={improvements ?? []}
         loading={loading}
+        onSuccess={onSuccess}
       />
     </ProtectedComponent>
   ) : (

source/frontend/src/features/leases/detail/LeasePages/insurance/InsuranceContainer.tsx

@@ -20,6 +20,7 @@
   isEditing,
   onEdit,
   formikRef,
+  onSuccess,
 }) => {
   const { hasClaim } = useKeycloakWrapper();
   const [showCancelModal, setShowCancelModal] = useState(false);
@@ -49,10 +50,11 @@
         if (updatedInsurance) {
           leaseId && (await getInsurances(leaseId));
           onEdit && onEdit(false);
+          onSuccess();
         }
       }
     },
-    [getInsurances, leaseId, onEdit, updateInsurances],
+    [getInsurances, leaseId, onEdit, updateInsurances, onSuccess],
   );
 
   return (

source/frontend/src/features/leases/detail/LeasePages/payment/TermPaymentsContainer.tsx

@@ -26,7 +26,7 @@
  */
 export const TermPaymentsContainer: React.FunctionComponent<
   React.PropsWithChildren<LeasePageProps>
-> = ({ formikRef }) => {
+> = ({ formikRef, onSuccess }) => {
   const { lease } = useContext(LeaseStateContext);
   const generateH1005a = useGenerateH1005a(lease);
   const [editModalValues, setEditModalValues] = useState<FormLeaseTerm | undefined>(undefined);
@@ -67,7 +67,7 @@
     setDeleteModalWarning,
     setConfirmDeleteModalValues,
     comfirmDeleteModalValues,
-  } = useDeleteTermsPayments(deleteLeaseTerm, refreshLeaseTerms);
+  } = useDeleteTermsPayments(deleteLeaseTerm, refreshLeaseTerms, onSuccess);
 
   /**
    * Send the save request (either an update or an add). Use the response to update the parent lease.
@@ -82,9 +82,10 @@
         const response = await getLeaseTerms.execute(leaseId);
         setTerms(response ?? []);
         setEditModalValues(undefined);
+        onSuccess();
       }
     },
-    [addLeaseTerm, getLeaseTerms, gstDecimal, leaseId, updateLeaseTerm],
+    [addLeaseTerm, getLeaseTerms, gstDecimal, leaseId, updateLeaseTerm, onSuccess],
   );
 
   /**
@@ -101,10 +102,11 @@
           const response = await getLeaseTerms.execute(leaseId);
           setTerms(response ?? []);
           setEditPaymentModalValues(undefined);
+          onSuccess();
         }
       }
     },
-    [leaseId, updateLeasePayment, addLeasePayment, getLeaseTerms],
+    [leaseId, updateLeasePayment, addLeasePayment, getLeaseTerms, onSuccess],
   );
 
   const onEdit = useCallback(

source/frontend/src/features/leases/detail/LeasePages/payment/TermsPaymentsContainer.test.tsx

@@ -71,6 +71,7 @@ const storeState = {
   [lookupCodesSlice.name]: { lookupCodes: mockLookups },
 };
 const setLease = jest.fn();
+const onSuccessMock = jest.fn();
 
 describe('TermsPaymentsContainer component', () => {
   const setup = async (
@@ -93,7 +94,11 @@ describe('TermsPaymentsContainer component', () => {
         }}
       >
         <Formik initialValues={renderOptions.initialValues ?? {}} onSubmit={noop}>
-          <TermPaymentsContainer formikRef={React.createRef()} isEditing={false} />
+          <TermPaymentsContainer
+            formikRef={React.createRef()}
+            isEditing={false}
+            onSuccess={onSuccessMock}
+          />
         </Formik>
       </LeaseStateContext.Provider>,
       {

source/frontend/src/features/leases/detail/LeasePages/payment/hooks/useDeleteTermsPayments.tsx

@@ -11,6 +11,7 @@
 export const useDeleteTermsPayments = (
   deleteLeaseTerm: IResponseWrapper<(term: Api_LeaseTerm) => Promise<AxiosResponse<boolean, any>>>,
   getLeaseTerms: (leaseId: number) => Promise<void>,
+  onSuccess: () => void,
 ) => {
   const [comfirmDeleteModalValues, setConfirmDeleteModalValues] = useState<
     IDeleteConfirmationModal | undefined
@@ -36,9 +37,10 @@
       });
       if (deleted && lease?.id) {
         getLeaseTerms(lease.id);
+        onSuccess();
       }
     },
-    [deleteLeaseTerm, lease, getLeaseTerms],
+    [deleteLeaseTerm, lease, getLeaseTerms, onSuccess],
   );
 
   /**
@@ -96,10 +98,11 @@
         );
         if (deleted && leaseId) {
           getLeaseTerms(leaseId);
+          onSuccess();
         }
       }
     },
-    [deleteLeasePayment, leaseId, getLeaseTerms],
+    [deleteLeasePayment, leaseId, getLeaseTerms, onSuccess],
   );
 
   /**

source/frontend/src/features/leases/detail/LeasePages/tenant/AddLeaseTenantContainer.test.tsx

@@ -33,6 +33,7 @@ jest.mock('@/hooks/repositories/useLeaseTenantRepository');
 const getPersonConcept = jest.fn();
 const updateTenants = jest.fn().mockResolvedValue({ ...defaultApiLease, id: 1 });
 const onEdit = jest.fn();
+const onSuccess = jest.fn();
 
 const history = createMemoryHistory();
 const storeState = {
@@ -69,6 +70,7 @@ describe('AddLeaseTenantContainer component', () => {
           View={View}
           onEdit={onEdit}
           tenants={renderOptions.tenants ?? []}
+          onSuccess={onSuccess}
         >
           <SaveButton />
         </AddLeaseTenantContainer>

source/frontend/src/features/leases/detail/LeasePages/tenant/AddLeaseTenantContainer.tsx

@@ -23,25 +23,28 @@ interface IAddLeaseTenantContainerProps {
   formikRef: React.RefObject<FormikProps<LeaseFormModel>>;
   onEdit?: (isEditing: boolean) => void;
   tenants: FormTenant[];
+  onSuccess: () => void;
   View: React.FunctionComponent<
     React.PropsWithChildren<IAddLeaseTenantFormProps & IPrimaryContactWarningModalProps>
   >;
 }
 
 export const AddLeaseTenantContainer: React.FunctionComponent<
   React.PropsWithChildren<IAddLeaseTenantContainerProps>
-> = ({ formikRef, onEdit, children, View, tenants: initialTenants }) => {
+> = ({ formikRef, onEdit, children, View, tenants: initialTenants, onSuccess }) => {
   const { lease } = useContext(LeaseStateContext);
   const [tenants, setTenants] = useState<FormTenant[]>(initialTenants);
   const [selectedContacts, setSelectedContacts] = useState<IContactSearchResult[]>(
     tenants.map(t => FormTenant.toContactSearchResult(t)) || [],
   );
   const [showContactManager, setShowContactManager] = React.useState<boolean>(false);
   const [handleSubmit, setHandleSubmit] = useState<Function | undefined>(undefined);
+
   const {
     updateLeaseTenants,
     getLeaseTenants: { execute: getLeaseTenants, loading },
   } = useLeaseTenantRepository();
+
   const leaseId = lease?.id;
   useEffect(() => {
     const tenantFunc = async () => {
@@ -113,6 +116,7 @@ export const AddLeaseTenantContainer: React.FunctionComponent<
             }),
           });
           onEdit && onEdit(false);
+          onSuccess();
         }
       } finally {
         formikRef?.current?.setSubmitting(false);

source/frontend/src/features/leases/detail/LeasePages/tenant/TenantContainer.tsx

@@ -18,6 +18,7 @@ const TenantContainer: React.FunctionComponent<React.PropsWithChildren<LeasePage
   isEditing,
   formikRef,
   onEdit,
+  onSuccess,
 }) => {
   const { lease } = useContext(LeaseStateContext);
   const {
@@ -36,6 +37,7 @@ const TenantContainer: React.FunctionComponent<React.PropsWithChildren<LeasePage
         onEdit={onEdit}
         tenants={formTenants}
         View={AddLeaseTenantForm}
+        onSuccess={onSuccess}
       />
     </ProtectedComponent>
   ) : (