Unit floor plan upload (#871)

* feat: upgrade to Meteor 1.8.1

* feat: refactored cloudinary transformation name and added a new one

* feat: upload unit floor plan UI and logic

* chore: clean up

* feat: disable unit floor plan (store old ones)

* feat: allowing all users change floor plan; outside of edit mode

* feat: unit membership check for floor plan change

* feat: revised design for "save" and "cancel" for editing unit details

* feat: changed "unit"->"property" in various labels

* fix: lint

Author: nbiton

.meteor/packages

@@ -6,19 +6,19 @@
 
 meteor-base@1.4.0             # Packages every Meteor app needs to have
 mobile-experience@1.0.5       # Packages for a great mobile UX
-mongo@1.6.0                   # The database Meteor supports right now
+mongo@1.6.2                   # The database Meteor supports right now
 blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
 reactive-var@1.0.11            # Reactive variable for tracker
 tracker@1.2.0                 # Meteor's client-side reactive programming library
 
-standard-minifier-js@2.4.0    # JS minifier run for production mode
+standard-minifier-js@2.4.1    # JS minifier run for production mode
 es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.12.3              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.12.4              # Enable ECMAScript2015+ syntax in app code
 shell-server@0.4.0            # Server-side component of the `meteor shell` command
 
 react-meteor-data
 accounts-password@1.5.1
-http@1.4.1
+http@1.4.2
 juliancwirko:postcss
 nathantreid:css-modules@=3.1.4
 dburles:factory
@@ -31,4 +31,4 @@ dburles:collection-helpers
 percolate:migrations
 underscore@1.0.10
 email@1.2.3
-accounts-base
+accounts-base@1.4.3

.meteor/release

@@ -1 +1 @@
-METEOR@1.8.0.1
+METEOR@1.8.1

.meteor/versions

@@ -1,8 +1,8 @@
 accounts-base@1.4.3
 accounts-password@1.5.1
 allow-deny@1.1.0
-autoupdate@1.5.0
-babel-compiler@7.2.3
+autoupdate@1.6.0
+babel-compiler@7.3.4
 babel-runtime@1.3.0
 base64@1.0.11
 binary-heap@1.0.11
@@ -22,18 +22,18 @@ ddp@1.4.0
 ddp-client@2.3.3
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.2.0
+ddp-server@2.3.0
 deps@1.0.12
 diff-sequence@1.1.1
 dynamic-import@0.5.1
-ecmascript@0.12.3
+ecmascript@0.12.4
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.8.0
 ecmascript-runtime-server@0.7.1
 ejson@1.1.0
 email@1.2.3
 es5-shim@4.8.0
-fetch@0.1.0
+fetch@0.1.1
 geojson-utils@1.0.10
 hasse:tachyons@1.0.0
 hot-code-push@1.0.4
@@ -48,36 +48,36 @@ launch-screen@1.1.1
 livedata@1.0.18
 localstorage@1.2.0
 logging@1.1.20
-meteor@1.9.2
+meteor@1.9.3
 meteor-base@1.4.0
-minifier-css@1.4.1
-minifier-js@2.4.0
+minifier-css@1.4.2
+minifier-js@2.4.1
 minimongo@1.4.5
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modern-browsers@0.1.3
+modern-browsers@0.1.4
 modules@0.13.0
 modules-runtime@0.10.3
-mongo@1.6.0
-mongo-decimal@0.1.0
+mongo@1.6.2
+mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 nathantreid:css-modules@3.1.4
 npm-bcrypt@0.9.3
-npm-mongo@3.1.1
+npm-mongo@3.1.2
 observe-sequence@1.0.16
 omega:dirty-chai@0.0.2
 ordered-dict@1.1.0
 pauldowman:dotenv@1.0.1
 percolate:migrations@1.0.2
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:sinon@1.14.1_2
-promise@0.11.1
+promise@0.11.2
 random@1.1.0
 rate-limit@1.0.9
 react-meteor-data@0.2.16
 reactive-var@1.0.11
-reload@1.2.0
+reload@1.3.0
 retry@1.1.0
 routepolicy@1.1.0
 service-configuration@1.0.11
@@ -88,7 +88,7 @@ socket-stream-client@0.2.2
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.12
-standard-minifier-js@2.4.0
+standard-minifier-js@2.4.1
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
@@ -98,5 +98,5 @@ tracker@1.2.0
 ui@1.0.13
 underscore@1.0.10
 url@1.2.0
-webapp@1.7.2
+webapp@1.7.3
 webapp-hashing@1.0.9

imports/api/unit-meta-data.js

@@ -1,5 +1,7 @@
 import { Mongo } from 'meteor/mongo'
 import { Meteor } from 'meteor/meteor'
+import randToken from 'rand-token'
+import UnitRolesData from './unit-roles-data'
 
 export const collectionName = 'unitMetaData'
 export const unitTypes = Object.freeze([
@@ -102,6 +104,51 @@ Meteor.methods({
     }
 
     UnitMetaData.update({ _id: id }, { $set: unitFields })
+  },
+  [`${collectionName}.updateFloorPlan`] (id, floorPlanUrl) {
+    const metaData = UnitMetaData.findOne({ _id: id })
+    if (!metaData) {
+      throw new Meteor.Error(`No unit found for id ${id}`)
+    }
+
+    const unitRole = UnitRolesData.findOne({
+      unitId: id,
+      'members.id': Meteor.userId()
+    })
+    if (!unitRole) {
+      throw new Meteor.Error('You are not one of the members of this unit, so you are not allowed to update the floor plan')
+    }
+
+    UnitMetaData.update({ _id: id }, {
+      $push: {
+        floorPlanUrls: {
+          url: floorPlanUrl,
+          addedBy: Meteor.userId(),
+          addedAt: new Date(),
+          id: randToken.generate(17)
+        }
+      }
+    })
+  },
+  [`${collectionName}.disableFloorPlan`] (id) {
+    const metaData = UnitMetaData.findOne({ _id: id })
+    if (!metaData) {
+      throw new Meteor.Error(`No unit found for id ${id}`)
+    }
+
+    const unitRole = UnitRolesData.findOne({
+      unitId: id,
+      'members.id': Meteor.userId()
+    })
+    if (!unitRole) {
+      throw new Meteor.Error('You are not one of the members of this unit, so you are not allowed to update the floor plan')
+    }
+
+    UnitMetaData.update({ _id: id }, {
+      $set: {
+        [`floorPlanUrls.${metaData.floorPlanUrls.length - 1}.disabled`]: true
+      }
+    })
   }
 })
 

imports/api/units.js

@@ -312,6 +312,7 @@ export const addUserToRole = (
 
 const rolesProjByOwnership = (userId, unitItem) => {
   return {
+    unitId: 1,
     unitBzId: 1,
     roleType: 1,
     members: 1,
@@ -425,7 +426,8 @@ if (Meteor.isServer) {
           state: 1,
           streetAddress: 1,
           zipCode: 1,
-          city: 1
+          city: 1,
+          floorPlanUrls: 1
         }),
         withRolesData(rolesProjByOwnership, rolesSelectionByOwnership)
       ],

imports/state/actions/unit-floor-plan.actions.js

@@ -0,0 +1,92 @@
+// @flow
+/* global File */
+export const UPLOAD_FLOOR_PLAN = 'upload_unit_floor_plan'
+export const UPLOAD_FLOOR_PLAN_STARTED = 'upload_unit_floor_plan_started'
+export const UPLOAD_FLOOR_PLAN_PROGRESS = 'upload_unit_floor_plan_progress'
+export const UPLOAD_FLOOR_PLAN_ERROR = 'upload_unit_floor_plan_error'
+export const UPLOAD_FLOOR_PLAN_COMPLETED = 'upload_unit_floor_plan_completed'
+export const CHANGE_FLOOR_PLAN_URL = 'change_unit_floor_plan_url'
+export const DISABLE_FLOOR_PLAN = 'disable_unit_floor_plan'
+
+export type UnitFloorPlanInitAction = {
+  type: string,
+  preview: string,
+  file: File,
+  unitMongoId: string
+}
+
+export type UnitFloorPlanProcessAction = {
+  type: string,
+  unitMongoId: string,
+  file?: File,
+  preview?: string,
+  percent?: number,
+  error?: {}
+}
+
+export type UnitFloorPlanCompleteAction = {
+  type: string,
+  unitMongoId: string,
+  url: string
+}
+
+export type UnitFloorPlanDisableAction = {
+  type: string,
+  unitMongoId: string
+}
+
+export function uploadFloorPlan (unitMongoId: string, preview: string, file: File): UnitFloorPlanInitAction {
+  return {
+    type: UPLOAD_FLOOR_PLAN,
+    unitMongoId,
+    preview,
+    file
+  }
+}
+
+export function uploadFloorPlanStarted (unitMongoId: string, preview: string, file: File): UnitFloorPlanProcessAction {
+  return {
+    type: UPLOAD_FLOOR_PLAN_STARTED,
+    unitMongoId,
+    preview,
+    file
+  }
+}
+
+export function uploadFloorPlanProgress (unitMongoId: string, percent: number): UnitFloorPlanProcessAction {
+  return {
+    type: UPLOAD_FLOOR_PLAN_PROGRESS,
+    unitMongoId,
+    percent
+  }
+}
+
+export function uploadFloorPlanError (unitMongoId: string, error: {}): UnitFloorPlanProcessAction {
+  return {
+    type: UPLOAD_FLOOR_PLAN_ERROR,
+    unitMongoId,
+    error
+  }
+}
+
+export function uploadFloorPlanCompleted (unitMongoId: string): UnitFloorPlanProcessAction {
+  return {
+    type: UPLOAD_FLOOR_PLAN_COMPLETED,
+    unitMongoId
+  }
+}
+
+export function changeFloorPlanUrl (unitMongoId: string, url: string): UnitFloorPlanCompleteAction {
+  return {
+    type: CHANGE_FLOOR_PLAN_URL,
+    unitMongoId,
+    url
+  }
+}
+
+export function disableFloorPlan (unitMongoId: string): UnitFloorPlanDisableAction {
+  return {
+    type: DISABLE_FLOOR_PLAN,
+    unitMongoId
+  }
+}

imports/state/epics/base/file-upload-processor.js

@@ -17,26 +17,26 @@ import 'rxjs/add/operator/bufferTime'
 import 'rxjs/add/operator/take'
 
 type Action = { type: string }
-export type InputAction = { ...Action, file: File }
-type ActionGenerators = {
-  init: (origAction: InputAction) => Action,
-  progress: (origAction: InputAction, percent: number) => Action,
-  error: (origAction: InputAction, error: {}) => Action,
-  complete: (origAction: InputAction, uploadedUrl: string) => Array<Action> | Action
+export type InputAction = Action & { file: File }
+type ActionGenerators<T> = {
+  init: (origAction: T) => Action,
+  progress: (origAction: T, percent: number) => Action,
+  error: (origAction: T, error: {}) => Action,
+  complete: (origAction: T, uploadedUrl: string) => Array<Action> | Action
 }
-export const fileUploadProcessor = (actionType: string, actionGenerators: ActionGenerators) =>
+export const fileUploadProcessor = <T: InputAction>(actionType: string, actionGenerators: ActionGenerators<T>) =>
   (action$: Observable, store: {}, deps: { ajax: (opts: {}) => Observable }) => {
     const { CLOUDINARY_URL, CLOUDINARY_PRESET } = Meteor.settings.public
 
     // Creating a stream to publish upload progress actions
-    const buildProgressStream = (action: InputAction) => {
+    const buildProgressStream = (action: T) => {
       return (new Subject())
         .filter(evt => evt.lengthComputable)
         .map(evt => actionGenerators.progress(action, Math.round(evt.loaded / evt.total * 100)))
     }
 
     // Creating a stream to execute the upload and chaining to publish completion, error and "CREATE_COMMENT"
-    const buildAjaxStream = (action: InputAction, progress$: Observable) => {
+    const buildAjaxStream = (action: T, progress$: Observable) => {
       // Creating the upload payload
       const formData = new FormData()
       formData.append('file', action.file)
@@ -62,7 +62,7 @@ export const fileUploadProcessor = (actionType: string, actionGenerators: Action
     return action$
       .ofType(actionType)
       .filter(() => !!Meteor.userId()) // fail safe, but shouldn't happen
-      .mergeMap((action: InputAction) => { // For any matching action
+      .mergeMap((action: T) => { // For any matching action
         const progress$ = buildProgressStream(action)
         const ajax$ = buildAjaxStream(action, progress$)
 

imports/state/epics/change-unit-floor-plan-url.js

@@ -0,0 +1,16 @@
+// @flow
+import fallibleMethodCaller from './base/fallible-method-caller'
+import { CHANGE_FLOOR_PLAN_URL } from '../actions/unit-floor-plan.actions'
+import { collectionName } from '../../api/unit-meta-data'
+import { genericErrorOccurred } from '../../ui/general-actions'
+
+export const changeUnitFloorPlanUrl = fallibleMethodCaller({
+  actionType: CHANGE_FLOOR_PLAN_URL,
+  methodName: `${collectionName}.updateFloorPlan`,
+  argTranslator: ({ unitMongoId, url }) => [unitMongoId, url],
+  actionGenerators: {
+    errorGen: (error, action) => genericErrorOccurred(
+      `Error occurred while trying to update the floor plan URL for unit ${action.unitMongoId}: ${error.message}`
+    )
+  }
+})