allow creating report as guest user #93 WIP

impactoss · Sep 12, 2017 · 4903171 · 4903171
1 parent 93f394d
commit 4903171
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 18 deletions.
diff --git a/app/containers/App/sagas.js b/app/containers/App/sagas.js
@@ -445,7 +445,11 @@ export function* newEntitySaga({ data }) {
       data.onSuccess();
     }
     if (data.redirect) {
-      yield put(push(`${data.redirect}/${entityCreated.data.id}`));
+      if (data.redirectWithoutCreatedId) {
+        yield put(push(`${data.redirect}`));
+      } else {
+        yield put(push(`${data.redirect}/${entityCreated.data.id}`));
+      }
     }
   } catch (err) {
     err.response.json = yield err.response.json();

diff --git a/app/containers/IndicatorView/index.js b/app/containers/IndicatorView/index.js
@@ -90,7 +90,7 @@ export class IndicatorView extends React.PureComponent { // eslint-disable-line
         getReportsField(
           reports,
           appMessages,
-          isContributor && {
+          {
             type: 'add',
             title: this.context.intl.formatMessage(messages.addReport),
             onClick: this.props.handleNewReport,
@@ -159,10 +159,17 @@ export class IndicatorView extends React.PureComponent { // eslint-disable-line
         onClick: this.props.handleClose,
       },
     ]
-    : [{
-      type: 'close',
-      onClick: this.props.handleClose,
-    }];
+    : [
+      {
+        type: 'text',
+        title: this.context.intl.formatMessage(messages.addReport),
+        onClick: this.props.handleNewReport,
+      },
+      {
+        type: 'close',
+        onClick: this.props.handleClose,
+      },
+    ];
 
     return (
       <div>

diff --git a/app/containers/ReportNew/actions.js b/app/containers/ReportNew/actions.js
@@ -8,9 +8,11 @@ import {
   SAVE,
 } from './constants';
 
-export function save(data) {
+export function save(data, redirect, redirectWithoutCreatedId) {
   return {
     type: SAVE,
     data,
+    redirect,
+    redirectWithoutCreatedId,
   };
 }
diff --git a/app/containers/ReportNew/index.js b/app/containers/ReportNew/index.js
@@ -8,6 +8,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
+import { FormattedMessage } from 'react-intl';
 import { actions as formActions } from 'react-redux-form/immutable';
 
 import {
@@ -19,6 +20,10 @@ import {
   getUploadField,
 } from 'utils/forms';
 
+import { getStatusField as getStatusInfoField } from 'utils/fields';
+
+import { attributesEqual } from 'utils/entities';
+
 import { scrollToTop } from 'utils/scroll-to-component';
 import { hasNewError } from 'utils/entity-form';
 
@@ -33,7 +38,12 @@ import {
   saveErrorDismiss,
 } from 'containers/App/actions';
 
-import { selectReady } from 'containers/App/selectors';
+import {
+  selectReady,
+  selectIsUserContributor,
+  selectIsUserManager,
+  selectSessionUserId,
+} from 'containers/App/selectors';
 
 import ErrorMessages from 'components/ErrorMessages';
 import Loading from 'components/Loading';
@@ -74,8 +84,12 @@ export class ReportNew extends React.PureComponent { // eslint-disable-line reac
     },
   ]);
 
-  getHeaderAsideFields = () => ([{
-    fields: [getStatusField(this.context.intl.formatMessage, appMessages)],
+  getHeaderAsideFields = (canUserPublish) => ([{
+    fields: [
+      canUserPublish
+      ? getStatusField(this.context.intl.formatMessage, appMessages)
+      : getStatusInfoField(),
+    ],
   }]);
 
   getBodyMainFields = () => ([
@@ -103,10 +117,19 @@ export class ReportNew extends React.PureComponent { // eslint-disable-line reac
     },
   ]);
 
+  canUserPublish = (isUserContributor, isUserManager, userId, indicator) =>
+    isUserManager || (isUserContributor && attributesEqual(userId, indicator.getIn(['attributes', 'manager_id'])));
+
   render() {
-    const { dataReady, indicator, viewDomain } = this.props;
+    const { dataReady, indicator, viewDomain, isUserContributor, isUserManager, userId } = this.props;
     const { saveSending, saveError, submitValid } = viewDomain.page;
     const indicatorReference = this.props.params.id;
+    const canUserPublish = dataReady && this.canUserPublish(
+      isUserContributor,
+      isUserManager,
+      userId,
+      indicator
+    );
 
     let pageTitle = this.context.intl.formatMessage(messages.pageTitle);
     pageTitle = `${pageTitle} for indicator ${indicatorReference}`;
@@ -139,6 +162,9 @@ export class ReportNew extends React.PureComponent { // eslint-disable-line reac
               }] : null
             }
           />
+          { !canUserPublish &&
+            <FormattedMessage {...messages.guestNote} />
+          }
           {!submitValid &&
             <ErrorMessages
               error={{ messages: [this.context.intl.formatMessage(appMessages.forms.multipleErrors)] }}
@@ -169,11 +195,11 @@ export class ReportNew extends React.PureComponent { // eslint-disable-line reac
               fields={{
                 header: {
                   main: this.getHeaderMainFields(),
-                  aside: this.getHeaderAsideFields(),
+                  aside: this.getHeaderAsideFields(canUserPublish),
                 },
                 body: {
                   main: this.getBodyMainFields(),
-                  aside: this.getBodyAsideFields(indicator),
+                  aside: canUserPublish && this.getBodyAsideFields(indicator),
                 },
               }}
             />
@@ -201,6 +227,9 @@ ReportNew.propTypes = {
   initialiseForm: PropTypes.func,
   onErrorDismiss: PropTypes.func.isRequired,
   onServerErrorDismiss: PropTypes.func.isRequired,
+  isUserContributor: PropTypes.bool,
+  isUserManager: PropTypes.bool,
+  userId: PropTypes.string,
 };
 
 ReportNew.contextTypes = {
@@ -211,6 +240,9 @@ const mapStateToProps = (state, props) => ({
   viewDomain: selectDomain(state),
   dataReady: selectReady(state, { path: DEPENDENCIES }),
   indicator: selectIndicator(state, props.params.id),
+  isUserContributor: selectIsUserContributor(state),
+  isUserManager: selectIsUserManager(state),
+  userId: selectSessionUserId(state),
 });
 
 function mapDispatchToProps(dispatch) {
@@ -234,7 +266,7 @@ function mapDispatchToProps(dispatch) {
     handleSubmitRemote: (model) => {
       dispatch(formActions.submit(model));
     },
-    handleSubmit: (formData, indicatorReference) => {
+    handleSubmit: (formData, indicatorReference, canUserPublish) => {
       let saveData = formData;
 
       saveData = saveData.setIn(['attributes', 'indicator_id'], indicatorReference);
@@ -244,7 +276,7 @@ function mapDispatchToProps(dispatch) {
         saveData = saveData.setIn(['attributes', 'due_date_id'], null);
       }
 
-      dispatch(save(saveData.toJS()));
+      dispatch(save(saveData.toJS(), canUserPublish ? '/reports' : `/indicators/${indicatorReference}`, !canUserPublish));
     },
     handleCancel: (indicatorReference) => {
       dispatch(updatePath(`/indicators/${indicatorReference}`));

diff --git a/app/containers/ReportNew/messages.js b/app/containers/ReportNew/messages.js
@@ -34,4 +34,8 @@ export default defineMessages({
       },
     },
   },
+  guestNote: {
+    id: 'app.containers.ReportNew.guestNote',
+    defaultMessage: 'Please note: you are contributing as a guest user. Your report will only be publicly available once verified and published by an authorised user.',
+  },
 });
diff --git a/app/containers/ReportNew/sagas.js b/app/containers/ReportNew/sagas.js
@@ -4,11 +4,12 @@ import { LOCATION_CHANGE } from 'react-router-redux';
 import { newEntity, dueDateAssigned } from 'containers/App/actions';
 import { SAVE } from './constants';
 
-export function* save({ data }) {
+export function* save({ data, redirect, redirectWithoutCreatedId = false }) {
   yield put(newEntity({
     path: 'progress_reports',
     entity: data,
-    redirect: '/reports',
+    redirect,
+    redirectWithoutCreatedId,
   }));
   if (data.attributes.due_date_id) {
     yield put(dueDateAssigned(data.attributes.due_date_id));

diff --git a/app/utils/fields.js b/app/utils/fields.js
@@ -46,8 +46,9 @@ export const getTitleField = (entity, isManager, attribute = 'title', label) =>
   label,
 });
 export const getStatusField = (entity, attribute = 'draft', options, label) => ({
+  controlType: 'info',
   type: 'status',
-  value: entity.getIn(['attributes', attribute]),
+  value: entity ? entity.getIn(['attributes', attribute]) : true,
   options,
   label,
 });