Merge pull request #323 from City-of-Helsinki/develop

Develop

src/components/attributes/PlotApplicationsAttributes.js

@@ -0,0 +1,58 @@
+// @flow
+import React, {PureComponent} from 'react';
+import {connect} from 'react-redux';
+import flowRight from 'lodash/flowRight';
+
+import {fetchAttributes as fetchPlotApplicationsAttributes} from '$src/plotApplications/actions';
+import {
+ getAttributes as getPlotApplicationsAttributes,
+ getIsFetchingAttributes as getIsFetchingPlotApplicationsAttributes,
+ getPlotApplicationsMethods,
+} from '$src/plotApplications/selectors';
+
+import type {Attributes, Methods} from '$src/types';
+
+function PlotApplicationsAttributes(WrappedComponent: any) {
+ type Props = {
+ fetchPlotApplicationsAttributes: Function,
+ isFetchingPlotApplicationsAttributes: boolean,
+ plotApplicationsAttributes: Attributes,
+ plotApplicationsMethods: Methods,
+ }
+
+ return class PlotApplicationsAttributes extends PureComponent<Props> {
+ componentDidMount() {
+ const {
+ fetchPlotApplicationsAttributes,
+ isFetchingPlotApplicationsAttributes,
+ plotApplicationsAttributes,
+ } = this.props;
+
+ if(!isFetchingPlotApplicationsAttributes && !plotApplicationsAttributes) {
+ fetchPlotApplicationsAttributes();
+ }
+ }
+
+ render() {
+ return <WrappedComponent {...this.props} />;
+ }
+ };
+}
+
+const withPlotApplicationsAttributes = flowRight(
+ connect(
+ (state) => {
+ return{
+ plotApplicationsAttributes: getPlotApplicationsAttributes(state),
+ isFetchingPlotApplicationsAttributes: getIsFetchingPlotApplicationsAttributes(state),
+ plotApplicationsMethods: getPlotApplicationsMethods(state),
+ };
+ },
+ {
+ fetchPlotApplicationsAttributes,
+ },
+ ),
+ PlotApplicationsAttributes,
+);
+
+export {withPlotApplicationsAttributes};

src/components/attributes/PlotSearchAttributes.js

@@ -3,21 +3,29 @@ import React, {PureComponent} from 'react';
 import {connect} from 'react-redux';
 import flowRight from 'lodash/flowRight';
 
-import {fetchAttributes as fetchPlotSearchAttributes} from '$src/plotSearch/actions';
+import {
+ fetchAttributes as fetchPlotSearchAttributes,
+ fetchPlotSearchSubtypes,
+} from '$src/plotSearch/actions';
 import {
  getAttributes as getPlotSearchAttributes,
  getIsFetchingAttributes as getIsFetchingPlotSearchAttributes,
  getPlotSearchMethods,
+ getPlotSearchSubTypes,
+ getIsFetching,
 } from '$src/plotSearch/selectors';
 
 import type {Attributes, Methods} from '$src/types';
 
 function PlotSearchAttributes(WrappedComponent: any) {
  type Props = {
  fetchPlotSearchAttributes: Function,
+ fetchPlotSearchSubtypes: Function,
  isFetchingPlotSearchAttributes: boolean,
+ isFetching: boolean,
  plotSearchAttributes: Attributes,
  plotSearchMethods: Methods,
+ plotSearchSubTypes: Object,
  }
 
  return class PlotSearchAttributes extends PureComponent<Props> {
@@ -26,11 +34,17 @@ function PlotSearchAttributes(WrappedComponent: any) {
  fetchPlotSearchAttributes,
  isFetchingPlotSearchAttributes,
  plotSearchAttributes,
+ fetchPlotSearchSubtypes,
+ plotSearchSubTypes,
+ isFetching,
  } = this.props;
 
  if(!isFetchingPlotSearchAttributes && !plotSearchAttributes) {
  fetchPlotSearchAttributes();
  }
+ if(!isFetching && !plotSearchSubTypes) {
+ fetchPlotSearchSubtypes();
+ }
  }
 
  render() {
@@ -46,10 +60,13 @@ const withPlotSearchAttributes = flowRight(
  plotSearchAttributes: getPlotSearchAttributes(state),
  isFetchingPlotSearchAttributes: getIsFetchingPlotSearchAttributes(state),
  plotSearchMethods: getPlotSearchMethods(state),
+ plotSearchSubTypes: getPlotSearchSubTypes(state),
+ isFetching: getIsFetching(state),
  };
  },
  {
  fetchPlotSearchAttributes,
+ fetchPlotSearchSubtypes,
  },
  ),
  PlotSearchAttributes,

src/components/sideMenu/SideMenu.js

@@ -188,21 +188,39 @@ class SideMenu extends Component<Props, State> {
  <li><Link onClick={handleClick} to={getRouteById(Routes.AREA_NOTES)}>Muistettavat ehdot</Link></li>
  </Authorization>
 
-
  <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_BASISOFRENT)}>
  <li><Link onClick={handleClick} to={getRouteById(Routes.RENT_BASIS)}>Vuokrausperiaatteet</Link></li>
  </Authorization>
 
  <li><Link onClick={handleClick} to={getRouteById(Routes.LEASE_STATISTIC_REPORT)}>Tilastot ja raportit</Link></li>
 
- <li><Link style={{color: '#b7b7b7'}} ref={this.setLinkRef} onClick={handleClick} to={getRouteById(Routes.PLOT_SEARCH)}>Tonttihaut</Link></li>
-
  <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_INFILLDEVELOPMENTCOMPENSATION)}>
  <li><Link style={{color: '#b7b7b7'}} onClick={handleClick} to={getRouteById(Routes.INFILL_DEVELOPMENTS)}>Täydennysrakentamiskorvaukset</Link></li>
  </Authorization>
 
  <li><Link style={{color: '#b7b7b7'}} onClick={handleClick} to={getRouteById(Routes.LAND_USE_CONTRACTS)}>Maankäyttösopimukset</Link></li>
-
+
+ <SubMenu
+ header='Tonttihaut ja kilpailut'
+ isOpen={subMenuKey === 'plot'}
+ items={[
+ {
+ allow: true,
+ onClick: handleClick,
+ text: 'Tonttihaut',
+ to: getRouteById(Routes.PLOT_SEARCH),
+ },
+ {
+ allow: true,
+ onClick: handleClick,
+ text: 'Tonttihakemukset',
+ to: getRouteById(Routes.PLOT_APPLICATIONS),
+ },
+ ]}
+ menuKey='plot'
+ onHeaderClick={this.handleHeaderClick}
+ />
+
  <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.ADD_LEASEBASISOFRENT) ||
  hasPermissions(usersPermissions, UsersPermissions.VIEW_INDEX) ||
  hasPermissions(usersPermissions, UsersPermissions.VIEW_JOBRUN) ||

src/enums.js

@@ -356,6 +356,11 @@ export const ConfirmationModalTexts = {
  LABEL: 'Haluatko varmasti poistaa tonttihaun?',
  TITLE: 'Poista tonttihaku',
  },
+ DELETE_PLOT_APPLICATION: {
+ BUTTON: 'Poista tonttihakemus',
+ LABEL: 'Haluatko varmasti poistaa tonttihakemuksen?',
+ TITLE: 'Poista tonttihakemus',
+ },
 };
 
 /**
@@ -440,6 +445,9 @@ export const FormNames = {
  TRADE_REGISTER_SEARCH: 'trade-register-search-form',
  PLOT_SEARCH_BASIC_INFORMATION: 'plot-search-basic-information-form',
  PLOT_SEARCH_APPLICATION: 'plot-search-application-form',
+ PLOT_APPLICATIONS_CREATE: 'plot-application-create-form',
+ PLOT_APPLICATIONS_SEARCH: 'plot-application-search',
+ PLOT_APPLICATION: 'plot-application',
 };
 
 /**
@@ -464,5 +472,6 @@ export const PermissionMissingTexts = {
  STATISTICS_AND_REPORTS: 'Ei oikeuksia tilastoihin ja raportteihin',
  TRADE_REGISTER: 'Ei oikeuksia kaupparekisteriotteisiin',
  PLOT_SEARCH: 'Ei oikeuksia tonttihakuun',
+ PLOT_APPLICATIONS: 'Ei oikeuksia tonttihakukemusiin',
  LAND_USE_CONTRACTS: 'Ei oikeuksia maankäyttösopimuksiin',
 };

src/leases/components/leaseSections/leaseArea/LeaseArea.js

@@ -322,7 +322,6 @@ const LeaseArea = ({
  <Column small={0} large={6}>
  {/* silence is golden */}
  </Column>
- {console.log(area)}
  <Column small={12} large={6}>
  <Collapse
  className='collapse__secondary'
@@ -345,7 +344,6 @@ const LeaseArea = ({
  </BoxItemContainer>
  </Collapse>
  </Column>
- {console.log(area)}
  </Row>
  </Authorization>
  </Fragment>

src/leases/components/leaseSections/leaseArea/PlanUnitItem.js

@@ -64,14 +64,22 @@ const PlanUnitItem = ({
  return (
  <BoxItem className='no-border-on-first-child no-border-on-last-child'>
  <Row>
- <Column small={12} medium={9} large={9}>
+ <Column small={12} medium={8} large={8}>
  <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.IDENTIFIER)}>
  <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.IDENTIFIER)}>
  {LeasePlanUnitsFieldTitles.IDENTIFIER}
  </FormTextTitle>
  <FormText>{planUnit.identifier || '-'}</FormText>
  </Authorization>
  </Column>
+ <Column small={12} medium={2} large={2}>
+ <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.IS_MASTER)}>
+ <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.IS_MASTER)}>
+ {LeasePlanUnitsFieldTitles.IS_MASTER}
+ </FormTextTitle>
+ <FormText>{planUnit.is_master ? 'Kyllä' : 'Ei'}</FormText>
+ </Authorization>
+ </Column>
  <Column small={12} medium={3} large={3}>
  <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.GEOMETRY)}>
  {!areaArchived && !isEmpty(planUnit.geometry) &&