more fixes

Author: Parth Shah

app/directives/tc-fp-file-input/tc-fp-file-input.directive.js

@@ -4,9 +4,9 @@ import _ from 'lodash'
 (function() {
   'use strict'
 
-  angular.module('tcUIComponents').directive('tcFpFileInput', ['CONSTANTS', 'logger', 'UserService', 'filepickerService', tcFPFileInput])
+  angular.module('tcUIComponents').directive('tcFpFileInput', ['$rootScope', 'CONSTANTS', 'logger', 'UserService', 'filepickerService', tcFPFileInput])
 
-  function tcFPFileInput(CONSTANTS, logger, UserService, filepickerService) {
+  function tcFPFileInput($rootScope, CONSTANTS, logger, UserService, filepickerService) {
     return {
       restrict: 'E',
       require: '^form',
@@ -40,6 +40,7 @@ import _ from 'lodash'
 
         // set default services
         scope.fpServices = scope.fpServices || "COMPUTER,GOOGLE_DRIVE,BOX,DROPBOX"
+        scope.fpContainer = CONSTANTS.FILE_PICKER_SUBMISSION_CONTAINER_NAME || 'submission-staging-dev'
 
         // set max size
         scope.maxSize = 500*1024*1024
@@ -50,7 +51,7 @@ import _ from 'lodash'
         */
         element.bind('change', function(event) {
             event.preventDefault()
-            scope.onSuccess({event: event.originalEvent || event});
+            scope.onSuccess(event.originalEvent || event);
             $rootScope.$apply()
         });
         element = element.length ? element[0] : element;
@@ -60,15 +61,18 @@ import _ from 'lodash'
         }
         filepickerService.constructWidget(element)
 
-        scope.onSuccess = function (fpFile) {
-          scope.ngModel = {
+        scope.onSuccess = function (event) {
+          debugger
+          var fpFile = event.fpfile
+          var _file = {
             name: scope.filename || fpFile.filename,
-            container: fpFile.container,
+            container: fpFile.container || scope.fpContainer,
             path: fpFile.key,
             size: fpFile.size,
             mimetype: fpFile.mimetype
           }
-          scope.setFileReference({file: file, fieldId: scope.fieldId})
+          scope.ngModel = _file
+          scope.setFileReference({file: _file, fieldId: scope.fieldId})
         }
       }
     }

app/directives/tc-fp-file-input/tc-fp-file-input.jade

@@ -13,6 +13,7 @@
       data-fp-multiple="false",
       data-fp-extensions="{{extensions}}",
       data-fp-store-location="s3",
+      data-fp-store-container="{{fpContainer}}",
       data-fp-store-path="{{filePath}}",
       on-success="onFileSeleted(event.fpfile)"
     )

app/submissions/submissions.module.js

@@ -15,8 +15,7 @@ import angular from 'angular'
   angular.module('tc.submissions', dependencies)
   .config(['filepickerProvider', 'CONSTANTS',
     function (filepickerProvider, CONSTANTS) {
-      //CONSTANTS.FILE_PICKER_API_KEY
-      filepickerProvider.setKey("AzFINuQoqTmqw0QEoaw9az")
+      filepickerProvider.setKey(CONSTANTS.FILE_PICKER_API_KEY || 'AzFINuQoqTmqw0QEoaw9az')
     }
   ])
 

app/submissions/submit-design-files/submit-design-files.controller.js

@@ -50,9 +50,7 @@ import _ from 'lodash'
       },
       userId: userId,
       data: {
-        method: challengeToSubmitTo.challenge.track.toUpperCase() + '_CHALLENGE_ZIP_FILE',
-
-        // Can delete below since they are processed and added later?
+        method: 'DESIGN_CHALLENGE_FILE_PICKER_ZIP_FILE',
         files: [],
         submitterRank: 1,
         submitterComments: '',
@@ -149,7 +147,7 @@ import _ from 'lodash'
       }, [])
 
       vm.submissionsBody.data.fonts = processedFonts
-
+      debugger
       SubmissionsService.startSubmission(vm.submissionsBody, updateProgress)
       .then(function(newSubmission) {
         logger.debug("New Submission: ", newSubmission)