Merge branch 'dev' into test

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,29 @@
+# Description
+
+Please include a summary of the change and which issue is fixed.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. 
+
+# Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] Any dependent changes have been merged and published in downstream modules

frontend/src/components/common/form/ParentSelect.tsx

@@ -8,7 +8,7 @@ import styled from 'styled-components';
 import { SelectOption, SelectOptions } from './Select';
 import { TypeaheadField } from './Typeahead';
 
-/** this styled component is used to help condtionally apply bold font weight to items that have been assigned the bold-item className */
+/** this styled component is used to help conditionally apply bold font weight to items that have been assigned the bold-item className */
 const StyledMenuItemsDiv = styled.div`
   .bold-item {
     font-weight: bold;

frontend/src/components/tabs/styled/Tabs.tsx

@@ -3,7 +3,7 @@ import styled from 'styled-components';
 export const Tabs = styled.div`
   padding-top: 1em;
 
-  ul {
+  & > ul {
     list-style: none;
     display: flex;
     flex-direction: row;

frontend/src/features/projects/common/components/columns.tsx

@@ -113,12 +113,6 @@ export const getEditableDatePickerCell = (
   );
 };
 
-const responseOptions: SelectOption[] = [
-  { label: 'Not Interested', value: AgencyResponses.Unsubscribe, parent: '' },
-  { label: 'Interested', value: AgencyResponses.Watch, parent: '' },
-  { label: 'Send Notifications', value: AgencyResponses.Subscribe, parent: '' },
-];
-
 export const getProjectLinkCell = (namespace: string = 'properties') => (cellInfo: any) => {
   const { values } = useFormikContext<IProject>();
   const projectNumbers = _.filter(cellInfo.value, (p: string) => values.projectNumber !== p);
@@ -133,6 +127,12 @@ export const getProjectLinkCell = (namespace: string = 'properties') => (cellInf
   );
 };
 
+const responseOptions: SelectOption[] = [
+  { label: 'Not Interested', value: AgencyResponses.Unsubscribe, parent: '' },
+  { label: 'Interested', value: AgencyResponses.Watch, parent: '' },
+  { label: 'Send Notifications', value: AgencyResponses.Subscribe, parent: '' },
+];
+
 export const getEditableSelectCell = (namespace: string = 'properties') => (cellInfo: any) => {
   const formikProps = useFormikContext();
   return (

frontend/src/features/projects/disposals/erp/AgencyInterest.tsx

@@ -1,7 +1,7 @@
 import { ParentSelect } from 'components/common/form/ParentSelect';
 import { FormikTable } from 'features/projects/common';
+import { AgencyResponses } from 'features/projects/constants';
 import { getIn, useFormikContext } from 'formik';
-import { NotificationResponse } from 'hooks/api';
 import React from 'react';
 import { Button, Col, Row } from 'react-bootstrap';
 import { LookupType, useLookups } from 'store/hooks';
@@ -36,7 +36,7 @@ export const AgencyInterest = ({ disabled = false }: IAgencyInterestProps) => {
         project: values,
         agency: agency,
         note: '',
-        response: NotificationResponse.Watch,
+        response: AgencyResponses.Watch,
       });
       setValues(project, false);
       setEnableAdd(false);

frontend/src/features/projects/disposals/erp/utils/addAgency.ts

@@ -1,5 +1,5 @@
 import { ILookupCode } from 'actions/ILookupCode';
-import { NotificationResponse } from 'hooks/api';
+import { AgencyResponses } from 'features/projects/constants';
 
 import { IProjectForm } from '../../interfaces';
 
@@ -11,7 +11,7 @@ interface IAddAgencyProps {
   /** The agency response note. */
   note: string;
   /** Whether the agency is interested or not. */
-  response: NotificationResponse;
+  response: AgencyResponses;
 }
 
 /**

frontend/src/features/projects/disposals/interfaces/IProjectAgencyResponseForm.ts

@@ -1,10 +1,10 @@
-import { NotificationResponse } from 'hooks/api/constants';
+import { AgencyResponses } from 'features/projects/constants';
 
 export interface IProjectAgencyResponseForm {
   agencyId: number;
   agencyCode: string;
   notificationId: number | '';
-  response: NotificationResponse;
+  response: AgencyResponses;
   receivedOn: Date | '';
   note: string;
   offerAmount: number;

frontend/src/hooks/api/projects/disposals/interfaces/IProjectAgencyResponseModel.ts

@@ -1,12 +1,12 @@
-import { NotificationResponse } from 'hooks/api/constants';
+import { AgencyResponses } from 'features/projects/constants';
 import { IBaseModel } from 'hooks/api/interfaces';
 
 export interface IProjectAgencyResponseModel extends IBaseModel {
   projectId: number;
   agencyId: number;
   agencyCode?: string;
   notificationId?: number;
-  response: NotificationResponse;
+  response: AgencyResponses;
   receivedOn?: Date;
   note?: string;
   offerAmount: number;

frontend/src/index.scss

@@ -30,3 +30,7 @@ input::-webkit-inner-spin-button {
     width: 100%;
   }
 }
+
+.form-control-lg {
+  font-size: 1em;
+}