diff --git a/js/components/ascribe_detail/further_details_fileuploader.js b/js/components/ascribe_detail/further_details_fileuploader.js index a0ef3d4d..af53811e 100644 --- a/js/components/ascribe_detail/further_details_fileuploader.js +++ b/js/components/ascribe_detail/further_details_fileuploader.js @@ -7,7 +7,7 @@ import Property from './../ascribe_forms/property'; import ReactS3FineUploader from './../ascribe_uploader/react_s3_fine_uploader'; import AppConstants from '../../constants/application_constants'; -import { validationTypes } from '../../constants/uploader_constants'; +import { ValidationTypes } from '../../constants/uploader_constants'; import { makeCsrfHeader } from '../../utils/csrf'; import { getLangText } from '../../utils/lang'; @@ -40,7 +40,7 @@ let FurtherDetailsFileuploader = React.createClass({ areAssetsDownloadable: true, label: getLangText('Additional files'), multiple: false, - validation: validationTypes.additionalData + validation: ValidationTypes.additionalData }; }, diff --git a/js/components/ascribe_forms/form_create_contract.js b/js/components/ascribe_forms/form_create_contract.js index b5efce83..8aeea8f9 100644 --- a/js/components/ascribe_forms/form_create_contract.js +++ b/js/components/ascribe_forms/form_create_contract.js @@ -13,7 +13,7 @@ import Form from '../ascribe_forms/form'; import Property from '../ascribe_forms/property'; import AppConstants from '../../constants/application_constants'; -import { validationTypes } from '../../constants/uploader_constants'; +import { ValidationTypes } from '../../constants/uploader_constants'; import { getLangText } from '../../utils/lang'; import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils'; @@ -79,8 +79,8 @@ let CreateContractForm = React.createClass({ url: resolveUrl('blob_contracts') }} validation={{ - itemLimit: validationTypes.additionalData.itemLimit, - sizeLimit: validationTypes.additionalData.sizeLimit, + itemLimit: ValidationTypes.additionalData.itemLimit, + sizeLimit: ValidationTypes.additionalData.sizeLimit, allowedExtensions: ['pdf'] }} areAssetsDownloadable={true} diff --git a/js/components/ascribe_forms/form_register_piece.js b/js/components/ascribe_forms/form_register_piece.js index ca48686d..dbf59178 100644 --- a/js/components/ascribe_forms/form_register_piece.js +++ b/js/components/ascribe_forms/form_register_piece.js @@ -15,7 +15,7 @@ import withContext from '../context/with_context'; import { currentUserShape, locationShape } from '../prop_types'; import AppConstants from '../../constants/application_constants'; -import { validationParts, validationTypes } from '../../constants/uploader_constants'; +import { ValidationParts, ValidationTypes } from '../../constants/uploader_constants'; import { FileStatus, formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils'; import { getLangText } from '../../utils/lang'; @@ -170,7 +170,7 @@ let RegisterPieceForm = React.createClass({ createBlobRoutine={{ url: resolveUrl('blob_digitalworks') }} - validation={validationTypes.registerWork} + validation={ValidationTypes.registerWork} setIsUploadReady={this.setIsUploadReady('digitalWorkKeyReady')} isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile} isFineUploaderActive={isFineUploaderActive} @@ -197,9 +197,9 @@ let RegisterPieceForm = React.createClass({ fileClass: 'thumbnail' }} validation={{ - itemLimit: validationTypes.workThumbnail.itemLimit, - sizeLimit: validationTypes.workThumbnail.sizeLimit, - allowedExtensions: validationParts.allowedExtensions.images + itemLimit: ValidationTypes.workThumbnail.itemLimit, + sizeLimit: ValidationTypes.workThumbnail.sizeLimit, + allowedExtensions: ValidationParts.allowedExtensions.images }} setIsUploadReady={this.setIsUploadReady('thumbnailKeyReady')} fileClassToUpload={{ diff --git a/js/components/ascribe_settings/contract_settings_update_button.js b/js/components/ascribe_settings/contract_settings_update_button.js index e087eea4..45980574 100644 --- a/js/components/ascribe_settings/contract_settings_update_button.js +++ b/js/components/ascribe_settings/contract_settings_update_button.js @@ -11,7 +11,7 @@ import ReactS3FineUploader from '../ascribe_uploader/react_s3_fine_uploader'; import UploadButton from '../ascribe_uploader/ascribe_upload_button/upload_button'; import AppConstants from '../../constants/application_constants'; -import { validationTypes } from '../../constants/uploader_constants'; +import { ValidationTypes } from '../../constants/uploader_constants'; import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils'; import { makeCsrfHeader } from '../../utils/csrf'; @@ -69,8 +69,8 @@ let ContractSettingsUpdateButton = React.createClass({ url: resolveUrl('blob_contracts') }} validation={{ - itemLimit: validationTypes.registerWork.itemLimit, - sizeLimit: validationTypes.additionalData.sizeLimit, + itemLimit: ValidationTypes.registerWork.itemLimit, + sizeLimit: ValidationTypes.additionalData.sizeLimit, allowedExtensions: ['pdf'] }} setIsUploadReady={() =>{/* So that ReactS3FineUploader is not complaining */}} diff --git a/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js index 2c777054..1b2e74e5 100644 --- a/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js +++ b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js @@ -13,7 +13,7 @@ import Property from '../../../../../ascribe_forms/property'; import AscribeSpinner from '../../../../../ascribe_spinner'; -import { validationParts, validationTypes } from '../../../../../../constants/uploader_constants'; +import { ValidationParts, ValidationTypes } from '../../../../../../constants/uploader_constants'; import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils'; import { getLangText } from '../../../../../../utils/lang'; @@ -175,9 +175,9 @@ let MarketAdditionalDataForm = React.createClass({ setIsUploadReady={this.setIsUploadReady} submitFile={function () {}} validation={{ - itemLimit: validationTypes.workThumbnail.itemLimit, - sizeLimit: validationTypes.workThumbnail.sizeLimit, - allowedExtensions: validationParts.allowedExtensions.images + itemLimit: ValidationTypes.workThumbnail.itemLimit, + sizeLimit: ValidationTypes.workThumbnail.sizeLimit, + allowedExtensions: ValidationParts.allowedExtensions.images }} />