Merge pull request #613 from City-of-Helsinki/bug/#603-map-marker

Solve #603 & #597 & 580
City-of-Helsinki · Mar 13, 2018 · 71fd9d9 · 71fd9d9
2 parents 2d30df5 + a1e2ed0
commit 71fd9d9
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 13 deletions.
diff --git a/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap b/__tests__/Hearing/__snapshots__/HearingContainer.react-test.js.snap
@@ -248,9 +248,11 @@ exports[`HearingContainer component should render as expected 1`] = `
               "delete": "Poista",
               "deleteComment": "Poista kommentti",
               "deleteConfirmation": "Oletko varma, että haluat poistaa kommentin?",
+              "deleteDraft": "Poista luonnos",
               "deleteSection": "Poista osio",
               "downloadReport": "Lataa yhteenveto kommenteista Excel-muodossa",
               "draft": "Luonnos",
+              "draftDeleted": "Luonnos poistettiin onnistuneesti",
               "draftNotPublished": "Luonnos, ei julkaistu",
               "drafts": "Luonnokset",
               "edit": "Muokkaa",
@@ -643,9 +645,11 @@ exports[`HearingContainer component should render as expected 1`] = `
               "delete": "Poista",
               "deleteComment": "Poista kommentti",
               "deleteConfirmation": "Oletko varma, että haluat poistaa kommentin?",
+              "deleteDraft": "Poista luonnos",
               "deleteSection": "Poista osio",
               "downloadReport": "Lataa yhteenveto kommenteista Excel-muodossa",
               "draft": "Luonnos",
+              "draftDeleted": "Luonnos poistettiin onnistuneesti",
               "draftNotPublished": "Luonnos, ei julkaistu",
               "drafts": "Luonnokset",
               "edit": "Muokkaa",

diff --git a/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap b/__tests__/Hearings/__snapshots__/HearingList.react-test.js.snap
@@ -74,9 +74,11 @@ exports[`HearingsList component should render as expected 1`] = `
                   "delete": "Poista",
                   "deleteComment": "Poista kommentti",
                   "deleteConfirmation": "Oletko varma, että haluat poistaa kommentin?",
+                  "deleteDraft": "Poista luonnos",
                   "deleteSection": "Poista osio",
                   "downloadReport": "Lataa yhteenveto kommenteista Excel-muodossa",
                   "draft": "Luonnos",
+                  "draftDeleted": "Luonnos poistettiin onnistuneesti",
                   "draftNotPublished": "Luonnos, ei julkaistu",
                   "drafts": "Luonnokset",
                   "edit": "Muokkaa",

diff --git a/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap b/__tests__/Hearings/__snapshots__/Hearings.react-test.js.snap
@@ -132,9 +132,11 @@ exports[`Hearings component should render as expected 1`] = `
           "delete": "Poista",
           "deleteComment": "Poista kommentti",
           "deleteConfirmation": "Oletko varma, että haluat poistaa kommentin?",
+          "deleteDraft": "Poista luonnos",
           "deleteSection": "Poista osio",
           "downloadReport": "Lataa yhteenveto kommenteista Excel-muodossa",
           "draft": "Luonnos",
+          "draftDeleted": "Luonnos poistettiin onnistuneesti",
           "draftNotPublished": "Luonnos, ei julkaistu",
           "drafts": "Luonnokset",
           "edit": "Muokkaa",

diff --git a/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap b/__tests__/Home/__snapshots__/FullWidthHearing.react-test.js.snap
@@ -58,9 +58,11 @@ exports[`FullWidthHearing component should render as expected 1`] = `
         "delete": "Poista",
         "deleteComment": "Poista kommentti",
         "deleteConfirmation": "Oletko varma, että haluat poistaa kommentin?",
+        "deleteDraft": "Poista luonnos",
         "deleteSection": "Poista osio",
         "downloadReport": "Lataa yhteenveto kommenteista Excel-muodossa",
         "draft": "Luonnos",
+        "draftDeleted": "Luonnos poistettiin onnistuneesti",
         "draftNotPublished": "Luonnos, ei julkaistu",
         "drafts": "Luonnokset",
         "edit": "Muokkaa",

diff --git a/__tests__/__snapshots__/SortableCommentList.react-test.js.snap b/__tests__/__snapshots__/SortableCommentList.react-test.js.snap
@@ -173,9 +173,11 @@ exports[`SortableCommentList component should render as expected 1`] = `
                 "delete": "Poista",
                 "deleteComment": "Poista kommentti",
                 "deleteConfirmation": "Oletko varma, että haluat poistaa kommentin?",
+                "deleteDraft": "Poista luonnos",
                 "deleteSection": "Poista osio",
                 "downloadReport": "Lataa yhteenveto kommenteista Excel-muodossa",
                 "draft": "Luonnos",
+                "draftDeleted": "Luonnos poistettiin onnistuneesti",
                 "draftNotPublished": "Luonnos, ei julkaistu",
                 "drafts": "Luonnokset",
                 "edit": "Muokkaa",

diff --git a/src/actions/index.js b/src/actions/index.js
@@ -4,6 +4,7 @@ import {localizedAlert, localizedNotifySuccess, localizedNotifyError} from '../u
 import merge from 'lodash/merge';
 import parse from 'url-parse';
 import Raven from 'raven-js';
+import { push } from 'react-router-redux';
 
 export {login, logout, retrieveUserFromSession} from './user';
 export const setLanguage = createAction('setLanguage');
@@ -248,3 +249,18 @@ export function postVote(commentId, hearingSlug, sectionId) {
     }).catch(voteCommentErrorHandler());
   };
 }
+
+export function deleteHearingDraft(hearingId, hearingSlug) {
+  return (dispatch, getState) => {
+    const fetchAction = createAction("deletingHearingDraft")({hearingId, hearingSlug});
+    dispatch(fetchAction);
+    const url = "/v1/hearing/" + hearingSlug;
+    return api.apiDelete(getState(), url).then(getResponseJSON).then(() => {
+      dispatch(createAction("deletedHearingDraft")({hearingSlug}));
+      localizedNotifySuccess("draftDeleted");
+      dispatch(push('/hearings/list?lang=' + getState().language));
+    }).catch(
+      requestErrorHandler()
+    );
+  };
+}
diff --git a/src/components/admin/HearingEditor.js b/src/components/admin/HearingEditor.js
@@ -20,6 +20,7 @@ import {
   sectionMoveUp,
   sectionMoveDown
 } from '../../actions/hearingEditor';
+import {deleteHearingDraft} from '../../actions/index';
 import HearingForm from './HearingForm';
 import HearingToolbar from './HearingToolbar';
 import {contactShape, hearingShape, labelShape, userShape} from '../../types';
@@ -114,6 +115,11 @@ class HearingEditor extends React.Component {
     this.props.dispatch(sectionMoveDown(sectionId));
   }
 
+  onDeleteHearingDraft = () => {
+    const {hearing} = this.props;
+    this.props.dispatch(deleteHearingDraft(hearing.id, hearing.slug));
+  }
+
   getHearingForm() {
     const {contactPersons, hearing, hearingLanguages, labels, dispatch, show, language} = this.props;
 
@@ -158,6 +164,7 @@ class HearingEditor extends React.Component {
             onPublish={this.onPublish}
             onRevertPublishing={this.onUnPublish}
             user={this.props.user}
+            onDeleteHearingDraft={this.onDeleteHearingDraft}
           />
         }
       </div>

diff --git a/src/components/admin/HearingFormStep3.js b/src/components/admin/HearingFormStep3.js
@@ -40,7 +40,7 @@ function getHearingArea(hearing) {
       return <Polygon positions={latLngs}/>;
     }
     case "Point": {
-      const latLngs = new LatLng(geojson.coordinates[0], geojson.coordinates[1]);
+      const latLngs = new LatLng(geojson.coordinates[1], geojson.coordinates[0]);
       return (
         <Marker
           position={latLngs}

diff --git a/src/components/admin/HearingToolbar.js b/src/components/admin/HearingToolbar.js
@@ -53,6 +53,12 @@ class HearingToolbar extends React.Component {
           <Icon name="eye-slash"/> <FormattedMessage id="revertPublishing"/>
         </Button>
       );
+    } else if (!hearing.published) {
+      actions.push(
+        <Button bsStyle="danger" onClick={() => this.props.onDeleteHearingDraft()} key="unpublish">
+          <Icon name="eye-slash"/> <FormattedMessage id="deleteDraft"/>
+        </Button>
+      );
     } else {
       statusLabel = (<Alert bsStyle="info"><Icon name="pencil"/> <FormattedMessage id="draft"/></Alert>);
       let publishText = <FormattedMessage id="publishHearing"/>;
@@ -89,6 +95,7 @@ HearingToolbar.propTypes = {
   onEdit: PropTypes.func,
   onPublish: PropTypes.func,
   onRevertPublishing: PropTypes.func,
+  onDeleteHearingDraft: PropTypes.func,
   user: userShape,
 };
 

diff --git a/src/i18n/fi.json b/src/i18n/fi.json
@@ -194,5 +194,7 @@
   "mapView": "Kaikki kuulemiset kartalla",
   "loginToComment": "Kirjaudu sisään kommentoidaksesi.",
   "loginToVoteComment": "Kirjaudu sisään äänestääksesi kommenttia.",
-  "addGeojson": "Lisää geojson tiedostona"
+  "addGeojson": "Lisää geojson tiedostona",
+  "deleteDraft": "Poista luonnos",
+  "draftDeleted": "Luonnos poistettiin onnistuneesti"
 }
diff --git a/src/reducers/hearing.js b/src/reducers/hearing.js
@@ -1,6 +1,6 @@
 import updeep from 'updeep';
 import {handleActions} from 'redux-actions';
-import {has, isEmpty} from 'lodash';
+import {has, isEmpty, omit} from 'lodash';
 
 import {EditorActions} from '../actions/hearingEditor';
 
@@ -23,6 +23,16 @@ const receiveHearing = (state, {payload}) => {
   }, state);
 };
 
+const deletingHearingDraft = (state, {payload}) => {
+  return updeep({
+    [payload.hearingSlug]: {state: "pending"}
+  }, state);
+};
+
+const deletedHearingDraft = (state, {payload}) => {
+  return omit(state, [payload.hearingSlug]);
+};
+
 const receiveHearingError = (state, {payload}) => {
   return updeep({
     [payload.hearingSlug]: {state: "error"}
@@ -62,4 +72,6 @@ export default handleActions({
   clearNonPublicHearings,
   [EditorActions.POST_HEARING_SUCCESS]: savedHearing,
   [EditorActions.SAVE_HEARING_SUCCESS]: savedHearing,
+  deletingHearingDraft,
+  deletedHearingDraft
 }, {});
diff --git a/src/reducers/hearingEditor/hearing.js b/src/reducers/hearingEditor/hearing.js
@@ -1,8 +1,9 @@
 // @flow
 import { combineReducers } from 'redux';
 import { combineActions, handleActions } from 'redux-actions';
-import { head, findIndex, merge } from 'lodash';
+import { head, findIndex } from 'lodash';
 import { moveSubsectionInArray } from '../../utils/hearingEditor';
+import updeep from 'updeep';
 
 import { EditorActions } from '../../actions/hearingEditor';
 
@@ -45,15 +46,9 @@ const data = handleActions(
       ...state,
       ...entities.hearing[result],
     }),
-    [EditorActions.ADD_LABEL_SUCCESS]: (state, { payload: { label } }) => ({...merge(state, {labels: [...state.labels.push(label.id)]})}),
-    [EditorActions.SECTION_MOVE_UP]: (state, { payload: sectionId }) => ({...merge(
-      state,
-      {sections: sectionMoveUp(state.sections, sectionId)}
-    )}),
-    [EditorActions.SECTION_MOVE_DOWN]: (state, { payload: sectionId }) => ({...merge(
-      state,
-      {sections: sectionMoveDown(state.sections, sectionId)}
-    )})
+    [EditorActions.ADD_LABEL_SUCCESS]: (state, { payload: { label } }) => updeep({labels: [...state.labels.push(label.id)]}, state),
+    [EditorActions.SECTION_MOVE_UP]: (state, { payload: sectionId }) => updeep({sections: sectionMoveUp(state.sections, sectionId)}, state),
+    [EditorActions.SECTION_MOVE_DOWN]: (state, { payload: sectionId }) => updeep({sections: sectionMoveDown(state.sections, sectionId)}, state)
   },
   null,
 );