prompt the user when moving and a file exists

test plan:
 - enable new files
 - have a multiple files with the same name in different
   folders
 - try to drag a file from one of these folders to another
   and confirm you are prompted to rename or overwrite
 - test renaming to another name that already exists, and
   confirm the dialog comes up again
 - test overwriting when the destination folder has been
   looked at previously without reloading the page, and
   confirm no duplicate file appears there
 - confirm that an error message is displayed if you try
   to rename a file to an existing name (and the file
   retains its original name)

fixes CNVS-18537

Change-Id: Id5ecedaafcfa762481e65ec2adf61640da5603d8
Reviewed-on: https://gerrit.instructure.com/48679
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
Product-Review: Jeremy Stanley <jeremy@instructure.com>

Author: jstanley0

app/coffeescripts/models/FilesystemObject.coffee

@@ -13,11 +13,21 @@ define [
     displayName: ->
       @get('display_name') or @get('name')
 
-    moveTo: (newFolder) ->
-      # only update the new parent_folder_id property
-      @save({}, {attrs: {parent_folder_id: newFolder.id} }).then =>
+    moveTo: (newFolder, options = {}) ->
+      attrs = {parent_folder_id: newFolder.id}
+      if options.dup == 'overwrite'
+        $.extend(attrs, {on_duplicate: 'overwrite'})
+      else if options.dup == 'rename'
+        if options.name
+          $.extend(attrs, {name: options.name})
+        else
+          $.extend(attrs, {on_duplicate: 'rename'})
+      @save({}, {attrs: attrs}).then =>
         @collection.remove(this)
 
         # add it to newFolder's children
         myType = if @saveFrd then 'file' else 'folder' #TODO find a better way to infer type
-        newFolder[myType+'s'].add(this, {merge:true})
+        collection = newFolder[myType+'s']
+        if options.dup == 'overwrite' # remove the overwriten object from the collection
+          collection.remove(collection.where({display_name: this.get('display_name')}))
+        collection.add(this, {merge:true})

app/coffeescripts/react_files/components/DialogAdapter.coffee

@@ -78,7 +78,7 @@ define [
     componentDidMount: ->
       @node = @getDOMNode()
 
-      options = 
+      options =
         modal: @props.modal
         close: @props.onClose
         open: @props.onOpen
@@ -89,5 +89,8 @@ define [
       @dialog = $(@node).dialog(options).data('dialog')
       @handlePropsChanged()
 
+    close: ->
+      @dialog.close()
+
     render: withReactDOM ->
       div {}

app/coffeescripts/react_files/components/FileRenameForm.coffee

@@ -36,6 +36,7 @@ define [
     # pass back expandZip to preserve options that was possibly already made
     # in a previous modal
     handleReplaceClick: ->
+      @refs.dialogAdapter.close() if @props.closeOnResolve
       @props.onNameConflictResolved({
         file: @state.fileOptions.file
         dup: 'overwrite'
@@ -45,6 +46,7 @@ define [
     # pass back expandZip to preserve options that was possibly already made
     # in a previous modal
     handleChangeClick: ->
+      @refs.dialogAdapter.close() if @props.closeOnResolve
       @props.onNameConflictResolved({
         file: @state.fileOptions.file
         dup: 'rename'
@@ -106,7 +108,7 @@ define [
 
 
     render: withReactDOM ->
-      DialogAdapter open: @props.fileOptions?, title: I18n.t('rename_title', 'Copy'), onClose: @props.onClose,
+      DialogAdapter ref: 'dialogAdapter', open: @props.fileOptions?, title: I18n.t('rename_title', 'Copy'), onClose: @props.onClose,
         DialogContent {},
           @buildContent()
         DialogButtons {},

app/coffeescripts/react_files/components/FolderChild.coffee

@@ -60,9 +60,14 @@ define [
 
     saveNameEdit: ->
       @setState editing: false, @focusNameLink
-      @props.model.save(name: @refs.newName.getDOMNode().value, {success: =>
+      newName = @refs.newName.getDOMNode().value
+      @props.model.save(name: newName, {
+        success: =>
           @focusNameLink()
-      })
+        error: (model, response) =>
+          $.flashError(I18n.t("A file named %{itemName} already exists in this folder.", itemName: newName)) if response.status == 409
+        }
+      )
 
     cancelEditingName: ->
       @props.model.collection.remove(@props.model) if @props.model.isNew()

app/coffeescripts/react_files/utils/moveStuff.coffee

@@ -1,10 +1,38 @@
 define [
   'i18n!react_files'
   'jquery'
-], (I18n, $) ->
+  '../components/FileRenameForm'
+  'old_unsupported_dont_use_react'
+  '../modules/FileOptionsCollection'
+], (I18n, $, FileRenameForm, React, FileOptionsCollection) ->
+
+  moveItem = (item, destinationFolder, options = {}) ->
+    dfd = $.Deferred()
+    item.moveTo(destinationFolder, options).then(
+      # success
+      (data) => dfd.resolve(data)
+      # failure
+      (jqXHR, textStatus, errorThrown) =>
+        if jqXHR.status == 409
+          # file already exists: prompt and retry
+          React.renderComponent(FileRenameForm(
+            closeOnResolve: true
+            fileOptions: {name: item.attributes.display_name}
+            onNameConflictResolved: (options) =>
+              moveItem(item, destinationFolder, options).then(
+                (data) => dfd.resolve(data)
+                => dfd.reject()
+              )
+          ), $('<div>').appendTo('body')[0])
+        else
+          # some other error: fail
+          dfd.reject()
+    )
+    dfd
+
 
   moveStuff = (filesAndFolders, destinationFolder) ->
-    promises = filesAndFolders.map (item) => item.moveTo(destinationFolder)
+    promises = filesAndFolders.map (item) => moveItem(item, destinationFolder)
     $.when(promises...).then =>
       $.flashMessage(I18n.t('move_success', {
         one: "%{item} moved to %{destinationFolder}",

public/javascripts/ajax_errors.js

@@ -111,7 +111,7 @@ define([
           var message = htmlEscape(I18n.t('errors.logged_out', "You are not currently logged in, possibly due to a long period of inactivity."))
           message += "<br\/><a href='/login' target='_new'>" + htmlEscape(I18n.t('links.login', 'Login')) + "<\/a>";
           $.flashError({ html: message }, 30000);
-        } else {
+        } else if (status != 409) {
           ajaxErrorFlash(I18n.t('errors.unhandled', "Oops! The last request didn't work out."), request);
         }
       }, function() {