From 7c376b7229694e942705ae13fbfd43cc10545395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 16 Sep 2015 15:14:08 +0200 Subject: [PATCH] PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants --- .../ascribe_detail/further_details_fileuploader.js | 5 +---- js/components/ascribe_forms/form_create_contract.js | 5 ++--- js/components/ascribe_forms/form_register_piece.js | 5 +---- js/components/ascribe_settings/contract_settings.js | 12 ++++++------ .../contract_settings_update_button.js | 4 ++-- js/constants/application_constants.js | 13 +++++++++++++ 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/js/components/ascribe_detail/further_details_fileuploader.js b/js/components/ascribe_detail/further_details_fileuploader.js index bfbf9582..9bf0bd5b 100644 --- a/js/components/ascribe_detail/further_details_fileuploader.js +++ b/js/components/ascribe_detail/further_details_fileuploader.js @@ -55,10 +55,7 @@ let FurtherDetailsFileuploader = React.createClass({ url: ApiUrls.blob_otherdatas, pieceId: this.props.pieceId }} - validation={{ - itemLimit: 100000, - sizeLimit: '50000000' - }} + validation={AppConstants.fineUploader.validation.additionalData} submitFile={this.props.submitFile} setIsUploadReady={this.props.setIsUploadReady} isReadyForFormSubmission={this.props.isReadyForFormSubmission} diff --git a/js/components/ascribe_forms/form_create_contract.js b/js/components/ascribe_forms/form_create_contract.js index 26790269..b19cb050 100644 --- a/js/components/ascribe_forms/form_create_contract.js +++ b/js/components/ascribe_forms/form_create_contract.js @@ -78,13 +78,12 @@ let CreateContractForm = React.createClass({ url: ApiUrls.blob_contracts }} validation={{ - itemLimit: 100000, - sizeLimit: '50000000', + itemLimit: AppConstants.fineUploader.validation.additionalData.itemLimit, + sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit, allowedExtensions: ['pdf'] }} areAssetsDownloadable={true} areAssetsEditable={true} - submitFile={this.submitFile} setIsUploadReady={this.setIsUploadReady} isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile} fileClassToUpload={this.props.fileClassToUpload}/> diff --git a/js/components/ascribe_forms/form_register_piece.js b/js/components/ascribe_forms/form_register_piece.js index dab0b251..ed6fc701 100644 --- a/js/components/ascribe_forms/form_register_piece.js +++ b/js/components/ascribe_forms/form_register_piece.js @@ -107,10 +107,7 @@ let RegisterPieceForm = React.createClass({ createBlobRoutine={{ url: ApiUrls.blob_digitalworks }} - validation={{ - itemLimit: 100000, - sizeLimit: '25000000000' - }} + validation={AppConstants.fineUploader.validation.registerWork} setIsUploadReady={this.setIsUploadReady} isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile} isFineUploaderActive={this.props.isFineUploaderActive} diff --git a/js/components/ascribe_settings/contract_settings.js b/js/components/ascribe_settings/contract_settings.js index 278c0f52..c7abc682 100644 --- a/js/components/ascribe_settings/contract_settings.js +++ b/js/components/ascribe_settings/contract_settings.js @@ -101,12 +101,12 @@ let ContractSettings = React.createClass({ className="btn btn-default btn-sm margin-left-2px" href={contract.blob.url_safe} target="_blank"> - PREVIEW + {getLangText('PREVIEW')} } @@ -122,8 +122,8 @@ let ContractSettings = React.createClass({ {privateContracts.map((contract, i) => { return ( @@ -138,12 +138,12 @@ let ContractSettings = React.createClass({ className="btn btn-default btn-sm margin-left-2px" href={contract.blob.url_safe} target="_blank"> - PREVIEW + {getLangText('PREVIEW')} } diff --git a/js/components/ascribe_settings/contract_settings_update_button.js b/js/components/ascribe_settings/contract_settings_update_button.js index 5712d441..f2e54c50 100644 --- a/js/components/ascribe_settings/contract_settings_update_button.js +++ b/js/components/ascribe_settings/contract_settings_update_button.js @@ -65,8 +65,8 @@ let ContractSettingsUpdateButton = React.createClass({ url: ApiUrls.blob_contracts }} validation={{ - itemLimit: 100000, - sizeLimit: '50000000', + itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit, + sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit, allowedExtensions: ['pdf'] }} setIsUploadReady={() =>{/* So that ReactS3FineUploader is not complaining */}} diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js index f1455029..a2726d73 100644 --- a/js/constants/application_constants.js +++ b/js/constants/application_constants.js @@ -57,6 +57,19 @@ let constants = { // Source: http://www.w3schools.com/tags/att_input_type.asp 'possibleInputTypes': ['button', 'checkbox', 'color', 'date', 'datetime', 'datetime-local', 'email', 'file', 'hidden', 'image', 'month', 'number', 'password', 'radio', 'range', 'reset', 'search', 'submit', 'tel', 'text', 'time', 'url', 'week'], + 'fineUploader': { + 'validation': { + 'additionalData': { + 'itemLimit': 100, + 'sizeLimit': '50000000' + }, + 'registerWork': { + 'itemLimit': 1, + 'sizeLimit': '25000000000' + } + } + }, + // in case of whitelabel customization, we store stuff here 'whitelabel': {}, 'raven': {