From 247d308e268a60923d12d124e8fc7a6289e9d446 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Thu, 1 Mar 2018 22:51:48 +0100 Subject: [PATCH 1/3] Fix ctm formvalidations This logic needs to be redone Fix overflow on upload list --- .../lib/src/components/InputSelectWithErrors/index.js | 2 +- .../admin/src/utils/formValidations.js | 2 +- .../strapi-plugin-upload/admin/src/components/Li/styles.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/strapi-helper-plugin/lib/src/components/InputSelectWithErrors/index.js b/packages/strapi-helper-plugin/lib/src/components/InputSelectWithErrors/index.js index 9edd2d6f96..eed8b921de 100644 --- a/packages/strapi-helper-plugin/lib/src/components/InputSelectWithErrors/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/InputSelectWithErrors/index.js @@ -27,7 +27,7 @@ class InputSelectWithErrors extends React.Component { this.setState({ errors }); } - if (isEmpty(this.props.value) && this.props.validations.required) { + if (isEmpty(this.props.value) && this.props.validations.required === true) { const target = { type: 'select', name: this.props.name, diff --git a/packages/strapi-plugin-content-manager/admin/src/utils/formValidations.js b/packages/strapi-plugin-content-manager/admin/src/utils/formValidations.js index 51f5345352..94abc0046a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/utils/formValidations.js +++ b/packages/strapi-plugin-content-manager/admin/src/utils/formValidations.js @@ -76,7 +76,7 @@ function validate(value, validations) { } break; case 'required': - if (value.length === 0) { + if (validationValue === true && value.length === 0) { errors.push({ id: 'content-manager.error.validation.required' }); } break; diff --git a/packages/strapi-plugin-upload/admin/src/components/Li/styles.scss b/packages/strapi-plugin-upload/admin/src/components/Li/styles.scss index 5f404b385f..d58c7518ef 100644 --- a/packages/strapi-plugin-upload/admin/src/components/Li/styles.scss +++ b/packages/strapi-plugin-upload/admin/src/components/Li/styles.scss @@ -98,7 +98,7 @@ } .truncate { - overflow-x: hidden; + overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } From 094e2d6f660b4d162592be04daef6abfadc8f4e1 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Fri, 2 Mar 2018 09:27:29 +0100 Subject: [PATCH 2/3] Fix InputSearch transition css --- .../lib/src/components/InputSearch/styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/strapi-helper-plugin/lib/src/components/InputSearch/styles.scss b/packages/strapi-helper-plugin/lib/src/components/InputSearch/styles.scss index ecaf67761b..46b72d659d 100644 --- a/packages/strapi-helper-plugin/lib/src/components/InputSearch/styles.scss +++ b/packages/strapi-helper-plugin/lib/src/components/InputSearch/styles.scss @@ -63,6 +63,7 @@ .addonFocus { border-color: #78caff; border-right: 0; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; } .invalidSearch { From 2f90e52e6a29365ddaed963a7b6425b0ee1fb80d Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Fri, 2 Mar 2018 09:28:53 +0100 Subject: [PATCH 3/3] Fix translation typo --- packages/strapi-plugin-upload/admin/src/translations/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-upload/admin/src/translations/en.json b/packages/strapi-plugin-upload/admin/src/translations/en.json index ba4baa560b..19e25bfecd 100755 --- a/packages/strapi-plugin-upload/admin/src/translations/en.json +++ b/packages/strapi-plugin-upload/admin/src/translations/en.json @@ -7,7 +7,7 @@ "EditForm.Input.select.inputDescription": "Files can either be uploaded on your server or on external providers.", "EditForm.Input.toggle.label": "Enable file upload", - "EmptyLi.message": "There is no uploaded files", + "EmptyLi.message": "There are no uploaded files", "EntriesNumber.number": "{number} file found", "EntriesNumber.number.plural": "{number} files found",