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 02f7aadd5c..ecaf67761b 100644
--- a/packages/strapi-helper-plugin/lib/src/components/InputSearch/styles.scss
+++ b/packages/strapi-helper-plugin/lib/src/components/InputSearch/styles.scss
@@ -3,8 +3,6 @@
height: 3.4rem;
margin-top: .9rem;
padding-left: 0.9rem;
- // TODO check with @aurelsicoko if it's the right color
- // background-color: rgba(16, 22, 34, 0.02);
background-color: #FAFAFB;
border: 1px solid #E3E9F3;
border-right: 0;
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/reducer.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/reducer.js
index 0519c286c4..f89bcecb82 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/reducer.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/reducer.js
@@ -28,12 +28,12 @@ function listPageReducer(state = initialState, action) {
switch (action.type) {
case DELETE_DATA_SUCCESS:
return state.update('records', (list) => (
- list.filter(o => {
- if (o._id) {
- return o._id !== action.id;
+ list.filter(obj => {
+ if (obj._id) {
+ return obj._id !== action.id;
}
- return o.id !== parseInt(action.id, 10);
+ return obj.id !== parseInt(action.id, 10);
})
));
case CHANGE_PARAMS:
diff --git a/packages/strapi-plugin-upload/admin/src/components/FileIcon/index.js b/packages/strapi-plugin-upload/admin/src/components/FileIcon/index.js
index 3cb7077397..de26e59e65 100644
--- a/packages/strapi-plugin-upload/admin/src/components/FileIcon/index.js
+++ b/packages/strapi-plugin-upload/admin/src/components/FileIcon/index.js
@@ -11,15 +11,23 @@ import cn from 'classnames';
import styles from './styles.scss';
function FileIcon({ fileType }) {
- let iconType = fileType;
-
- if ( ['jpeg', 'jpg', 'png', 'gif'].includes(fileType) ) {
- iconType = 'image';
- }
-
- if ( ['avi', 'm4v', 'mpg', 'mp4', 'mov'].includes(fileType) ) {
- iconType = 'video';
- }
+ const iconType = (() => {
+ switch (fileType) {
+ case 'jpg':
+ case 'jpeg':
+ case 'png':
+ case 'gif':
+ return 'image';
+ case 'mov':
+ case 'avi':
+ case 'mpg':
+ case 'm4v':
+ case 'mp4':
+ return 'video';
+ default:
+ return fileType;
+ };
+ })();
return (
- {(message) => {message}}
+ {(message) => {message}}
);
@@ -65,9 +65,7 @@ class PluginInputFile extends React.PureComponent {
multiple
name={name}
onChange={onChange}
- ref={(input) => {
- this.input = input;
- }}
+ ref="input"
type="file"
/>
diff --git a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss
index cb4307a0da..8929b20417 100644
--- a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss
+++ b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss
@@ -41,3 +41,8 @@
background: rgba(28,93,231,0.01) !important;
border: 2px solid rgba(28,93,231,0.10) !important;
}
+
+.underline {
+ color: #1C5DE7;
+ text-decoration: underline;
+}
diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/saga.js b/packages/strapi-plugin-upload/admin/src/containers/HomePage/saga.js
index 90b8cb86af..ec296a3a9c 100755
--- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/saga.js
+++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/saga.js
@@ -78,6 +78,7 @@ function* uploadFiles() {
} catch(err) {
console.log(err);
+ strapi.notification.error('notification.error');
}
}
diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/styles.scss b/packages/strapi-plugin-upload/admin/src/containers/HomePage/styles.scss
index 0bbca33f5e..fc269b5952 100755
--- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/styles.scss
+++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/styles.scss
@@ -1,5 +1,5 @@
.homePageUpload {
- padding-Right: 20px;
+ padding-right: 20px;
font-family: Lato !important;
}
diff --git a/packages/strapi-plugin-upload/admin/src/translations/de.json b/packages/strapi-plugin-upload/admin/src/translations/de.json
index fb8adcaee4..7b9420d34e 100644
--- a/packages/strapi-plugin-upload/admin/src/translations/de.json
+++ b/packages/strapi-plugin-upload/admin/src/translations/de.json
@@ -6,7 +6,7 @@
"HomePage.description": "Discover all the uploaded files",
"HomePage.InputSearch.placeholder": "Search for a file...",
- "Li.linkCopied": "LINK COPIED INTO THE CLIPBOARD",
+ "Li.linkCopied": "Link copied into the clipboard",
"ListHeader.type": "Type",
"ListHeader.hash": "Hash",
diff --git a/packages/strapi-plugin-upload/admin/src/translations/en.json b/packages/strapi-plugin-upload/admin/src/translations/en.json
index fb8adcaee4..7b9420d34e 100755
--- a/packages/strapi-plugin-upload/admin/src/translations/en.json
+++ b/packages/strapi-plugin-upload/admin/src/translations/en.json
@@ -6,7 +6,7 @@
"HomePage.description": "Discover all the uploaded files",
"HomePage.InputSearch.placeholder": "Search for a file...",
- "Li.linkCopied": "LINK COPIED INTO THE CLIPBOARD",
+ "Li.linkCopied": "Link copied into the clipboard",
"ListHeader.type": "Type",
"ListHeader.hash": "Hash",
diff --git a/packages/strapi-plugin-upload/admin/src/translations/fr.json b/packages/strapi-plugin-upload/admin/src/translations/fr.json
index 355dfddc87..3832db3730 100755
--- a/packages/strapi-plugin-upload/admin/src/translations/fr.json
+++ b/packages/strapi-plugin-upload/admin/src/translations/fr.json
@@ -6,7 +6,7 @@
"HomePage.description": "Découvrez tous les fichiers téléchargés",
"HomePage.InputSearch.placeholder": "Rechercher un fichier...",
- "Li.linkCopied": "LINK COPIÉ DANS LE PRESSE-PAPIER",
+ "Li.linkCopied": "Lien copié dans le presse-papier",
"ListHeader.type": "Type",
"ListHeader.hash": "Hash",
diff --git a/packages/strapi-plugin-upload/admin/src/translations/pl.json b/packages/strapi-plugin-upload/admin/src/translations/pl.json
index fb8adcaee4..7b9420d34e 100644
--- a/packages/strapi-plugin-upload/admin/src/translations/pl.json
+++ b/packages/strapi-plugin-upload/admin/src/translations/pl.json
@@ -6,7 +6,7 @@
"HomePage.description": "Discover all the uploaded files",
"HomePage.InputSearch.placeholder": "Search for a file...",
- "Li.linkCopied": "LINK COPIED INTO THE CLIPBOARD",
+ "Li.linkCopied": "Link copied into the clipboard",
"ListHeader.type": "Type",
"ListHeader.hash": "Hash",